From a610c9231f935a7e5af231e98b934365e35d491b Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Fri, 19 Aug 2022 16:19:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A8=8E=E8=B4=B9=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Admin/Repositories/RegionRepo.php | 6 +++---
 beike/Libraries/Tax.php                 | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/beike/Admin/Repositories/RegionRepo.php b/beike/Admin/Repositories/RegionRepo.php
index 16b3185f..2b9cb6b3 100644
--- a/beike/Admin/Repositories/RegionRepo.php
+++ b/beike/Admin/Repositories/RegionRepo.php
@@ -36,10 +36,10 @@ class RegionRepo
 
         $newRegionZones = [];
         foreach ($data['region_zones'] as $regionZone) {
-            if ($regionZone['country_id'] && $regionZone['zone_id']) {
+            if ($regionZone['country_id']) {
                 $newRegionZones[] = [
-                    'country_id' => $regionZone['country_id'],
-                    'zone_id' => $regionZone['zone_id'],
+                    'country_id' => (int)$regionZone['country_id'],
+                    'zone_id' => (int)$regionZone['zone_id'],
                 ];
             }
         }
diff --git a/beike/Libraries/Tax.php b/beike/Libraries/Tax.php
index 6007b706..21071f40 100644
--- a/beike/Libraries/Tax.php
+++ b/beike/Libraries/Tax.php
@@ -38,7 +38,7 @@ class Tax
             } else {
                 $this->setShippingAddress($shippingAddress['country_id'], $shippingAddress['zone_id']);
             }
-        } elseif (system_setting('base.config_tax_default') == 'shipping') {
+        } elseif (system_setting('base.tax_address') == 'shipping') {
             $this->setShippingAddress($countryId, $zoneId);
         }
 
@@ -50,7 +50,7 @@ class Tax
             } else {
                 $this->setPaymentAddress($paymentAddress['country_id'], $paymentAddress['zone_id']);
             }
-        } elseif (system_setting('base.config_tax_default') == 'payment') {
+        } elseif (system_setting('base.tax_address') == 'payment') {
             $this->setPaymentAddress($countryId, $zoneId);
         }