[-] FO : uncombinable cart rules are not combinable anymore

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12721 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-01-26 15:17:23 +00:00
parent 2a21769946
commit ff44291d38
4 changed files with 3 additions and 4 deletions
+1 -1
View File
@@ -294,7 +294,7 @@ class CartRuleCore extends ObjectModel
{
if ($otherCartRule['id_cart_rule'] == $this->id && !$alreadyInCart)
return Tools::displayError('This voucher is already in your cart');
if ($this->carrier_restriction && $otherCartRule['cart_rule_restriction'])
if ($this->cart_rule_restriction && $otherCartRule['cart_rule_restriction'])
{
$combinable = Db::getInstance()->getValue('
SELECT id_cart_rule_1