From 79cba4b655aef64d7dac144db767e58939ad08d8 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Mon, 28 Oct 2013 19:00:00 +0100 Subject: [PATCH] [-] FO : Fix bug #PSCFV-10851, no shop restriction in vouchers display in cart --- classes/CartRule.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/classes/CartRule.php b/classes/CartRule.php index ea87a4174..1890bda2d 100644 --- a/classes/CartRule.php +++ b/classes/CartRule.php @@ -255,6 +255,16 @@ class CartRuleCore extends ObjectModel else $cart_rule['quantity_for_user'] = 0; + foreach ($result as $cart_rule) + if ($cart_rule['shop_restriction']) + { + $cartRuleShops = Db::getInstance()->executeS('SELECT id_shop FROM '._DB_PREFIX_.'cart_rule_shop WHERE id_cart_rule = '.(int)$cart_rule['id_cart_rule']); + foreach ($cartRuleShops as $cartRuleShop) + if (Shop::isFeatureActive() && ($cartRuleShop['id_shop'] == Context::getContext()->shop->id)) + continue 2; + unset($result[$key]); + } + // Retrocompatibility with 1.4 discounts foreach ($result as &$cart_rule) {