// Cart rule autoadd fixed

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15429 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger committed 2012-05-19 12:03:13 +00:00
1 parent 6e673b6075
commit f907523250
1 file changed
+2 -10
+2 -10
View File
@@ -1000,20 +1000,12 @@ class CartRuleCore extends ObjectModel
WHERE id_cart = '.(int)$context->cart->id.' WHERE id_cart = '.(int)$context->cart->id.'
) )
) )
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'); ORDER BY priority');
$cartRules = ObjectModel::hydrateCollection('CartRule', $result); $cartRules = ObjectModel::hydrateCollection('CartRule', $result);
// Todo: consider optimization (we can avoid many queries in checkValidity)
foreach ($cartRules as $cartRule) foreach ($cartRules as $cartRule)
if (Db::getInstance()->getValue('SELECT count(*) if ($cartRule->checkValidity($context, false, false))
FROM '._DB_PREFIX_.'cart_cart_rule
WHERE id_cart = '.(int)$context->cart->id.'
AND id_cart_rule = '.(int)$cartRule->id))
$context->cart->removeCartRule($cartRule->id);
foreach ($cartRules as $cartRule)
if ($cartRule->checkValidity($context, true, false))
$context->cart->addCartRule($cartRule->id); $context->cart->addCartRule($cartRule->id);
} }