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

[-] FO: Fix #PSCFV-4992

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17872 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-10-16 09:58:54 +00:00
parent 4d2a15d74a
commit e03dd8c158
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/CartRule.php
+8 -5
View File
@@ -1095,12 +1095,15 @@ class CartRuleCore extends ObjectModel
)
AND cr.id_cart_rule NOT IN (SELECT id_cart_rule FROM '._DB_PREFIX_.'cart_cart_rule WHERE id_cart = '.(int)$context->cart->id.')
ORDER BY priority');
$cartRules = ObjectModel::hydrateCollection('CartRule', $result);
foreach ($cartRules as $cartRule)
if ($cartRule->checkValidity($context, false, false))
$context->cart->addCartRule($cartRule->id);
if ($result)
{
$cart_rules = ObjectModel::hydrateCollection('CartRule', $result);
if ($cart_rules)
foreach ($cart_rules as $cart_rule)
if ($cart_rule->checkValidity($context, false, false))
$context->cart->addCartRule($cart_rule->id);
}
}
/**