From 2bd2416cc0e6fb3928f9ed752fe74bf29a88960a Mon Sep 17 00:00:00 2001 From: dMetzger Date: Wed, 9 May 2012 12:50:24 +0000 Subject: [PATCH] [-] BO : there was some row doubled in the cart rules because of the multi-shop git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15099 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminCartRulesController.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminCartRulesController.php b/controllers/admin/AdminCartRulesController.php index 4555f8e15..fa636bf6f 100644 --- a/controllers/admin/AdminCartRulesController.php +++ b/controllers/admin/AdminCartRulesController.php @@ -309,7 +309,7 @@ class AdminCartRulesControllerCore extends AdminController case 'products': $products = array('selected' => array(), 'unselected' => array()); $results = Db::getInstance()->executeS(' - SELECT name, p.id_product as id + SELECT DISTINCT name, p.id_product as id FROM '._DB_PREFIX_.'product p LEFT JOIN `'._DB_PREFIX_.'product_lang` pl ON (p.`id_product` = pl.`id_product` @@ -350,8 +350,12 @@ class AdminCartRulesControllerCore extends AdminController case 'categories': $categories = array('selected' => array(), 'unselected' => array()); $results = Db::getInstance()->executeS(' - SELECT name, id_category as id - FROM '._DB_PREFIX_.'category_lang pl + SELECT DISTINCT name, c.id_category as id + FROM '._DB_PREFIX_.'category c + LEFT JOIN `'._DB_PREFIX_.'category_lang` cl + ON (c.`id_category` = cl.`id_category` + AND cl.`id_lang` = '.(int)Context::getContext()->language->id.Shop::addSqlRestrictionOnLang('cl').') + '.Shop::addSqlAssociation('category', 'c').' WHERE id_lang = '.(int)Context::getContext()->language->id.' ORDER BY name'); foreach ($results as $row)