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

// Fixing bug in the cartrule

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12271 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-01-09 15:27:09 +00:00
parent 87fd511314
commit 0dda375bd6
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
classes/CartRule.php
View File

@@ -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);
}
}