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

// Fixed #PSTEST-1146

Browse Source
This commit is contained in:
bMancone
2012-04-17 09:49:55 +00:00
parent fd6e11b941
commit ddb242c8a6
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCarriersController.php
+10 -3
View File
@@ -178,7 +178,7 @@ class AdminCarriersControllerCore extends AdminController
); );
$this->_select = 'b.*'; $this->_select = 'b.*';
$this->_join = 'LEFT JOIN `'._DB_PREFIX_.'carrier_lang` b ON a.id_carrier = b.id_carrier $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.')'; AND ctrgs.id_shop='.(int)$this->context->shop->id.')';
$this->_where = 'AND b.id_lang = '.$this->context->language->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); $id = (int)Tools::getValue('id_'.$this->table);
Warehouse::removeCarrier($id); 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(); parent::postProcess();
} }
} }
@@ -592,7 +599,7 @@ class AdminCarriersControllerCore extends AdminController
foreach ($groups as $group) 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['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); $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) 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); parent::getList($id_lang, $order_by, $order_way, $start, $limit, $id_lang_shop);
foreach ($this->_list as $key => $list) foreach ($this->_list as $key => $list)
if ($list['name'] == '0') if ($list['name'] == '0')
$this->_list[$key]['name'] = Configuration::get('PS_SHOP_NAME'); $this->_list[$key]['name'] = Configuration::get('PS_SHOP_NAME');