From eda71ac8fb5c7797b03ad93e19ac420aa2886907 Mon Sep 17 00:00:00 2001 From: mDeflotte Date: Fri, 18 Nov 2011 14:14:06 +0000 Subject: [PATCH] // BugFix with carrier module and multishipping git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10267 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Cart.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/classes/Cart.php b/classes/Cart.php index 5ff29d76c..6d526d0cd 100644 --- a/classes/Cart.php +++ b/classes/Cart.php @@ -1785,7 +1785,10 @@ class CartCore extends ObjectModel if (array_key_exists('id_carrier', $module)) $module->id_carrier = $carrier->id; if ($carrier->need_range) - $shipping_cost = $module->getPackageShippingCost($this, $shipping_cost); + if (method_exists($module, 'getPackageShippingCost')) + $shipping_cost = $module->getPackageShippingCost($this, $shipping_cost, $products); + else + $shipping_cost = $module->getOrderShippingCost($this, $shipping_cost); else $shipping_cost = $module->getOrderShippingCostExternal($this);