From 065b2bc2634fa4a80dde46f352de7fa0346e6c98 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Fri, 2 Nov 2012 10:21:57 +0000 Subject: [PATCH] [-] BO : fixed bug #PSCFV-5355 - issue in Carrier::delete() and Carrier::cleanPositions() --- classes/Carrier.php | 2 +- controllers/admin/AdminCarriersController.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/Carrier.php b/classes/Carrier.php index c25463890..047acad0c 100644 --- a/classes/Carrier.php +++ b/classes/Carrier.php @@ -202,7 +202,7 @@ class CarrierCore extends ObjectModel { if (!parent::delete()) return false; - $this->cleanPositions(); + Carrier::cleanPositions(); return (Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'cart_rule_carrier WHERE id_carrier = '.(int)$this->id) && $this->deleteTaxRulesGroup(Shop::getShops(true, null, true))); diff --git a/controllers/admin/AdminCarriersController.php b/controllers/admin/AdminCarriersController.php index b3ba82874..448c304c9 100644 --- a/controllers/admin/AdminCarriersController.php +++ b/controllers/admin/AdminCarriersController.php @@ -566,6 +566,7 @@ class AdminCarriersControllerCore extends AdminController Warehouse::removeCarrier($id); } parent::postProcess(); + Carrier::cleanPositions(); } } }