From ddb242c8a6226f4c9d7359c551cec166eca643d0 Mon Sep 17 00:00:00 2001 From: bMancone Date: Tue, 17 Apr 2012 09:49:55 +0000 Subject: [PATCH] // Fixed #PSTEST-1146 --- controllers/admin/AdminCarriersController.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php index 877905f51..bd52c2777 100644 --- a/controllers/admin/AdminCarriersController.php +++ b/controllers/admin/AdminCarriersController.php @@ -178,7 +178,7 @@ class AdminCarriersControllerCore extends AdminController ); $this->_select = 'b.*'; $this->_join = 'LEFT JOIN `'._DB_PREFIX_.'carrier_lang` b ON a.id_carrier = b.id_carrier - LEFT JOIN `'._DB_PREFIX_.'carrier_tax_rules_group_shop` ctrgs ON (a.`id_carrier` = ctrgs.`id_carrier` + LEFT JOIN `'._DB_PREFIX_.'carrier_tax_rules_group_shop` ctrgs ON (a.`id_carrier` = ctrgs.`id_carrier` AND ctrgs.id_shop='.(int)$this->context->shop->id.')'; $this->_where = 'AND b.id_lang = '.$this->context->language->id; @@ -550,6 +550,13 @@ class AdminCarriersControllerCore extends AdminController $id = (int)Tools::getValue('id_'.$this->table); Warehouse::removeCarrier($id); } + else if (Tools::isSubmit($this->table.'Box') && count(Tools::isSubmit($this->table.'Box')) > 0) + { + $ids = Tools::getValue($this->table.'Box'); + array_walk($ids, 'intval'); + foreach ($ids as $id) + Warehouse::removeCarrier($id); + } parent::postProcess(); } } @@ -592,7 +599,7 @@ class AdminCarriersControllerCore extends AdminController foreach ($groups as $group) $this->fields_value['groupBox_'.$group['id_group']] = Tools::getValue('groupBox_'.$group['id_group'], (in_array($group['id_group'], $carrier_groups_ids) || empty($carrier_groups_ids) && !$obj->id)); - + $this->fields_value['id_tax_rules_group'] = $this->object->getIdTaxRulesGroup($this->context); } @@ -637,7 +644,7 @@ class AdminCarriersControllerCore extends AdminController public function getList($id_lang, $order_by = null, $order_way = null, $start = 0, $limit = null, $id_lang_shop = false) { parent::getList($id_lang, $order_by, $order_way, $start, $limit, $id_lang_shop); - + foreach ($this->_list as $key => $list) if ($list['name'] == '0') $this->_list[$key]['name'] = Configuration::get('PS_SHOP_NAME');