dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] MO : fixed bug #PSCFV-3769

Browse Source
This commit is contained in:
vAugagneur
2012-09-17 13:20:11 +00:00
parent 216da99a22
commit b2c9d72a9d
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/carriercompare/carriercompare.php
+8 -5
View File
@@ -119,7 +119,7 @@ class CarrierCompare extends Module
$refresh_method = Configuration::get('SE_RERESH_METHOD'); $refresh_method = Configuration::get('SE_RERESH_METHOD');
$this->smarty->assign(array( $this->smarty->assign(array(
'countries' => Country::getCountries((int)$this->context->cookie->id_lang), 'countries' => Country::getCountries((int)$this->context->cookie->id_lang, true),
'id_carrier' => ($params['cart']->id_carrier ? $params['cart']->id_carrier : Configuration::get('PS_CARRIER_DEFAULT')), 'id_carrier' => ($params['cart']->id_carrier ? $params['cart']->id_carrier : Configuration::get('PS_CARRIER_DEFAULT')),
'id_country' => (isset($this->context->customer->geoloc_id_country) ? $this->context->customer->geoloc_id_country : Configuration::get('PS_COUNTRY_DEFAULT')), 'id_country' => (isset($this->context->customer->geoloc_id_country) ? $this->context->customer->geoloc_id_country : Configuration::get('PS_COUNTRY_DEFAULT')),
'id_state' => (isset($this->context->customer->geoloc_id_state) ? $this->context->customer->geoloc_id_state : 0), 'id_state' => (isset($this->context->customer->geoloc_id_state) ? $this->context->customer->geoloc_id_state : 0),
@@ -215,21 +215,24 @@ class CarrierCompare extends Module
*/ */
private function checkZipcode($zipcode, $id_country) private function checkZipcode($zipcode, $id_country)
{ {
$country = new Country((int)$id_country);
if (!Validate::isLoadedObject($country))
return true;
$zipcodeFormat = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue(' $zipcodeFormat = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
SELECT `zip_code_format` SELECT `zip_code_format`
FROM `'._DB_PREFIX_.'country` FROM `'._DB_PREFIX_.'country`
WHERE `id_country` = '.(int)$id_country); WHERE `id_country` = '.(int)$id_country);
if (!$zipcodeFormat) if (!$country->need_zip_code || !$country->zip_code_format)
return false; return true;
$regxMask = str_replace( $regxMask = str_replace(
array('N', 'C', 'L'), array('N', 'C', 'L'),
array( array(
'[0-9]', '[0-9]',
Country::getIsoById((int)$id_country), $country->iso_code,
'[a-zA-Z]'), '[a-zA-Z]'),
$zipcodeFormat); $country->zip_code_format);
if (preg_match('/'.$regxMask.'/', $zipcode)) if (preg_match('/'.$regxMask.'/', $zipcode))
return true; return true;
return false; return false;