From 72def39102b88a3db1ab1112f56b6155f38c360c Mon Sep 17 00:00:00 2001 From: Nicolas Sorosac Date: Mon, 10 Jun 2013 17:43:03 +0200 Subject: [PATCH] [-] CORE : CartRule::checkProductRestrictions : A gift product in the same category as its restrictions causes the gift to stay in the cart even if emptied --- classes/CartRule.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/classes/CartRule.php b/classes/CartRule.php index e32bd3451..ab5cef179 100644 --- a/classes/CartRule.php +++ b/classes/CartRule.php @@ -637,7 +637,8 @@ class CartRuleCore extends ObjectModel FROM `'._DB_PREFIX_.'cart_product` cp LEFT JOIN `'._DB_PREFIX_.'category_product` catp ON cp.id_product = catp.id_product WHERE cp.`id_cart` = '.(int)$context->cart->id.' - AND cp.`id_product` IN ('.implode(array_map('intval', $eligibleProductsList), ',').')'); + AND cp.`id_product` IN ('.implode(array_map('intval', $eligibleProductsList), ',').') + AND cp.`id_product` <> '.(int)$this->gift_product); $countMatchingProducts = 0; $matchingProductsList = array(); foreach ($cartCategories as $cartCategory)