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); }