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

[-] FO: Fix #PSCFV-4814 cart rule not combinables

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17864 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard committed 2012-10-15 15:31:04 +00:00
1 parent 8f4c2f7362
commit 51b6aba6f4
1 file changed
+1 -1
Download Patch File Download Diff File Expand all files Collapse all files
classes/CartRule.php
+1 -1
View File
@@ -536,7 +536,7 @@ class CartRuleCore extends ObjectModel
OR (id_cart_rule_2 = '.(int)$this->id.' AND id_cart_rule_1 = '.(int)$otherCartRule['id_cart_rule'].')'); OR (id_cart_rule_2 = '.(int)$this->id.' AND id_cart_rule_1 = '.(int)$otherCartRule['id_cart_rule'].')');
if (!$combinable) if (!$combinable)
{ {
$cart_rule = new CartRule($otherCartRule['cart_rule_restriction'], $context->cart->id_lang); $cart_rule = new CartRule((int)$otherCartRule['id_cart_rule'], $context->cart->id_lang);
// The cart rules are not combinable and the cart rule currently in the cart has priority over the one tested // The cart rules are not combinable and the cart rule currently in the cart has priority over the one tested
if ($cart_rule->priority <= $this->priority) if ($cart_rule->priority <= $this->priority)
return (!$display_error) ? false : Tools::displayError('This voucher is not combinable with an other voucher already in your cart:').' '.$cart_rule->name; return (!$display_error) ? false : Tools::displayError('This voucher is not combinable with an other voucher already in your cart:').' '.$cart_rule->name;