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

//now you can delete all carriers

Browse Source
This commit is contained in:
Vincent Augagneur committed 2013-08-12 15:25:26 +02:00
1 parent 7cc59b2f49
commit e2e5fbe33a
1 file changed
+7 -3
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCarriersController.php
+7 -3
View File
@@ -470,7 +470,8 @@ class AdminCarriersControllerCore extends AdminController
} }
parent::postProcess(); parent::postProcess();
} }
else if ((isset($_GET['status'.$this->table]) || isset($_GET['status'])) && Tools::getValue($this->identifier)) /*
else if ((isset($_GET['status'.$this->table]) || isset($_GET['status'])) && Tools::getValue($this->identifier))
{ {
if ($this->tabAccess['edit'] === '1') if ($this->tabAccess['edit'] === '1')
{ {
@@ -482,17 +483,20 @@ class AdminCarriersControllerCore extends AdminController
else else
$this->errors[] = Tools::displayError('You do not have permission to edit this.'); $this->errors[] = Tools::displayError('You do not have permission to edit this.');
} }
*/
else if (isset($_GET['isFree'.$this->table])) else if (isset($_GET['isFree'.$this->table]))
{ {
$this->processIsFree(); $this->processIsFree();
} }
else else
{ {
if ((Tools::isSubmit('submitDel'.$this->table) && in_array(Configuration::get('PS_CARRIER_DEFAULT'), Tools::getValue('carrierBox'))) /*
if ((Tools::isSubmit('submitDel'.$this->table) && in_array(Configuration::get('PS_CARRIER_DEFAULT'), Tools::getValue('carrierBox')))
|| (isset($_GET['delete'.$this->table]) && Tools::getValue('id_carrier') == Configuration::get('PS_CARRIER_DEFAULT'))) || (isset($_GET['delete'.$this->table]) && Tools::getValue('id_carrier') == Configuration::get('PS_CARRIER_DEFAULT')))
$this->errors[] = $this->l('Please set another carrier as default before deleting this one.'); $this->errors[] = $this->l('Please set another carrier as default before deleting this one.');
else else
{ {
*/
// if deletion : removes the carrier from the warehouse/carrier association // if deletion : removes the carrier from the warehouse/carrier association
if (Tools::isSubmit('delete'.$this->table)) if (Tools::isSubmit('delete'.$this->table))
{ {
@@ -514,7 +518,7 @@ class AdminCarriersControllerCore extends AdminController
} }
parent::postProcess(); parent::postProcess();
Carrier::cleanPositions(); Carrier::cleanPositions();
} //}
} }
} }