From 0dda375bd6ec986be96bbace02851ec37434fe45 Mon Sep 17 00:00:00 2001 From: mDeflotte Date: Mon, 9 Jan 2012 15:27:09 +0000 Subject: [PATCH] // Fixing bug in the cartrule git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12271 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/CartRule.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/classes/CartRule.php b/classes/CartRule.php index 0f7ec9981..dbaf9e271 100644 --- a/classes/CartRule.php +++ b/classes/CartRule.php @@ -422,14 +422,15 @@ class CartRuleCore extends ObjectModel $reductionValue += $context->cart->getTotalShippingCost(null, $useTax = true, $context->country); else { - foreach ((int)Db::getInstance()->executeS(' + $data = Db::getInstance()->executeS(' SELECT crc.id_cart_rule, crc.id_carrier FROM '._DB_PREFIX_.'cart_rule_carrier crc WHERE crc.id_cart_rule = '.(int)$this->id.' - AND crc.id_carrier = '.(int)$context->cart->id_carrier) - as $cart_rule - ) - $reductionValue += $context->cart->getCarrierCost($cart_rule['id_carrier'], $useTax, $context->country); + AND crc.id_carrier = '.(int)$context->cart->id_carrier); + + if ($data) + foreach ($data as $cart_rule) + $reductionValue += $context->cart->getCarrierCost((int)$cart_rule['id_carrier'], $useTax, $context->country); } }