From b672b3281eaec7c0fd09944b271780d61c782086 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Wed, 9 Jan 2013 17:05:33 +0100 Subject: [PATCH] [-] FO : Do not suggest states that are not active --- classes/Carrier.php | 3 ++- classes/Country.php | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/classes/Carrier.php b/classes/Carrier.php index 196822243..df57179cb 100644 --- a/classes/Carrier.php +++ b/classes/Carrier.php @@ -482,7 +482,8 @@ class CarrierCore extends ObjectModel $countries[$country['id_country']] = $country; foreach ($states as &$state) if (isset($countries[$state['id_country']])) /* Does not keep the state if its country has been disabled and not selected */ - $countries[$state['id_country']]['states'][] = $state; + if ($state['active'] == 1) + $countries[$state['id_country']]['states'][] = $state; return $countries; } diff --git a/classes/Country.php b/classes/Country.php index 731b79424..d9c96d5ff 100644 --- a/classes/Country.php +++ b/classes/Country.php @@ -82,7 +82,7 @@ class CountryCore extends ObjectModel 'zip_code_format' => array('type' => self::TYPE_STRING, 'validate' => 'isZipCodeFormat'), 'display_tax_label' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool', 'required' => true), - // Lang fields + /* Lang fields */ 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'required' => true, 'size' => 64), ), 'associations' => array( @@ -132,7 +132,8 @@ class CountryCore extends ObjectModel if ($list_states) foreach (Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('SELECT * FROM `'._DB_PREFIX_.'state` ORDER BY `name` ASC') as $state) if (isset($countries[$state['id_country']])) /* Does not keep the state if its country has been disabled and not selected */ - $countries[$state['id_country']]['states'][] = $state; + if ($state['active'] == 1) + $countries[$state['id_country']]['states'][] = $state; return $countries; }