restore country code check

Invertus · Feb 29, 2024 · 0f7f5b7 · 0f7f5b7
1 parent 6dca1fb
commit 0f7f5b7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/src/Adapter/AddressAdapter.php b/src/Adapter/AddressAdapter.php
@@ -85,10 +85,9 @@ private function getFormattedZipCode(Country $country, $postCode)
 
         $postCode = preg_replace("/[^a-zA-Z0-9]+/", "", $postCode);
         // If C doesn't exist in zip code format - don't modify the zip code
-        //todo this check prevents from saving zip code to numeric not sure why c has to be checked
-//        if (false === $countryCodePosition) {
-//            return $postCode;
-//        }
+        if (false === $countryCodePosition) {
+            return $postCode;
+        }
 
         $countryCodeLength = Tools::strlen($country->iso_code);
         $countryCode = Tools::substr($postCode, $countryCodePosition, $countryCodeLength);

diff --git a/src/Repository/ZoneRepository.php b/src/Repository/ZoneRepository.php
@@ -25,6 +25,7 @@
 use Country;
 use DbQuery;
 use Invertus\dpdBaltics\Adapter\AddressAdapter;
+use Invertus\dpdBaltics\Validate\Zone\ZoneRangeValidate;
 use PrestaShopDatabaseException;
 
 class ZoneRepository extends AbstractEntityRepository
@@ -102,9 +103,7 @@ public function addProductZonesFromArray(array $zones)
     public function findZoneInRangeByAddress(Address $address)
     {
         $idCountry = $address->id_country ?: (int)\Configuration::get('PS_COUNTRY_DEFAULT');
-        $addressAdapter = new AddressAdapter();
-
-        $zipCode = $addressAdapter->getZipCodeByCountry($idCountry, $address->postcode);
+        $zipCode = ZoneRangeValidate::getNumericZipCode($address->postcode, $idCountry);
 
         $query = new DbQuery();
         $query->select('dz.id_dpd_zone');