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

// Merge -> revision 8952

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8957 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-10-03 09:14:01 +00:00
parent f1e265fad4
commit ef17d0b7da
44 changed files with 622 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/carriercompare/carriercompare.php
+3 -3
View File
@@ -116,13 +116,13 @@ class CarrierCompare extends Module
if (!Validate::isInt($id_state))
$errors[] = $this->l('Invalid state ID');
if ($id_state != 0 && !Validate::isLoadedObject(new State($id_state)))
$errors[] = $this->l('Invalid state ID');
$errors[] = $this->l('Please select a state');
if (!Validate::isInt($id_country) || !Validate::isLoadedObject(new Country($id_country)))
$errors[] = $this->l('Invalid country ID');
$errors[] = $this->l('Please select a country');
if (!$this->checkZipcode($zipcode, $id_country))
$errors[] = $this->l('Please use a valid zip/postal code depending on your country selection');
if (!Validate::isInt($id_carrier) || !Validate::isLoadedObject(new Carrier($id_carrier)))
$errors[] = $this->l('Invalid carrier ID');
$errors[] = $this->l('Please select a carrier');
if (sizeof($errors))
return $errors;