diff --git a/classes/Zone.php b/classes/Zone.php index e1d72bd5a..5306e9776 100644 --- a/classes/Zone.php +++ b/classes/Zone.php @@ -33,9 +33,6 @@ class ZoneCore extends ObjectModel /** @var boolean Zone status */ public $active = true; - /* @todo Obsolete; to remove */ - public $eu_zone = false; - /** * @see ObjectModel::$definition */ @@ -48,7 +45,6 @@ class ZoneCore extends ObjectModel ), ); - protected $webserviceParameters = array(); /** @@ -60,10 +56,11 @@ class ZoneCore extends ObjectModel public static function getZones($active = false) { return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS(' - SELECT * - FROM `'._DB_PREFIX_.'zone` - '.($active ? 'WHERE active = 1' : '').' - ORDER BY `name` ASC'); + SELECT * + FROM `'._DB_PREFIX_.'zone` + '.($active ? 'WHERE active = 1' : '').' + ORDER BY `name` ASC + '); } /** @@ -75,9 +72,10 @@ class ZoneCore extends ObjectModel public static function getIdByName($name) { return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue(' - SELECT `id_zone` - FROM `'._DB_PREFIX_.'zone` - WHERE `name` = \''.pSQL($name).'\''); + SELECT `id_zone` + FROM `'._DB_PREFIX_.'zone` + WHERE `name` = \''.pSQL($name).'\' + '); } /** @@ -89,11 +87,11 @@ class ZoneCore extends ObjectModel { if (parent::delete()) { - /* Delete regarding delivery preferences */ + // Delete regarding delivery preferences $result = Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'carrier_zone WHERE id_zone = '.(int)$this->id); $result &= Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'delivery WHERE id_zone = '.(int)$this->id); - /* Update Country & state zone with 0 */ + // Update Country & state zone with 0 $result &= Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'country SET id_zone = 0 WHERE id_zone = '.(int)$this->id); $result &= Db::getInstance()->execute('UPDATE '._DB_PREFIX_.'state SET id_zone = 0 WHERE id_zone = '.(int)$this->id);