From 993aeec8d54e45bed5ad451c5d87f6f1ca407e3f Mon Sep 17 00:00:00 2001 From: vChabot Date: Tue, 15 May 2012 14:51:06 +0000 Subject: [PATCH] // little fix alias sql product --- controllers/admin/AdminProductsController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index 275690118..a7a9134a0 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -196,11 +196,12 @@ class AdminProductsControllerCore extends AdminController else $this->_category = new Category(); + $alias = Shop::isFeatureActive() ? 'sa' : 'a'; $this->_join = 'LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (a.`id_category_default` = cl.`id_category` AND b.`id_lang` = cl.`id_lang`) LEFT JOIN `'._DB_PREFIX_.'image` i ON (i.`id_product` = a.`id_product` AND i.`cover` = 1) LEFT JOIN `'._DB_PREFIX_.'category_product` cp ON (cp.`id_product` = a.`id_product`) - LEFT JOIN `'._DB_PREFIX_.'tax_rule` tr ON (sa.`id_tax_rules_group` = tr.`id_tax_rules_group` + LEFT JOIN `'._DB_PREFIX_.'tax_rule` tr ON ('.$alias.'.`id_tax_rules_group` = tr.`id_tax_rules_group` AND tr.`id_country` = '.(int)$this->context->country->id.' AND tr.`id_state` = 0) LEFT JOIN `'._DB_PREFIX_.'tax` t ON (t.`id_tax` = tr.`id_tax`) LEFT JOIN `'._DB_PREFIX_.'stock_available` sav ON (sav.`id_product` = a.`id_product` AND sav.`id_product_attribute` = 0 @@ -210,7 +211,7 @@ class AdminProductsControllerCore extends AdminController if (Validate::isLoadedObject($this->_category) && empty($this->_filter)) $this->_filter = 'AND cp.`id_category` = '.(int)$this->_category->id; - $this->_select = 'cl.name `name_category`, cp.`position`, i.`id_image`, sa.`price`, (sa.`price` * ((100 + (t.`rate`))/100)) AS price_final, sav.`quantity` as sav_quantity'; + $this->_select = 'cl.name `name_category`, cp.`position`, i.`id_image`, '.$alias.'.`price`, ('.$alias.'.`price` * ((100 + (t.`rate`))/100)) AS price_final, sav.`quantity` as sav_quantity, '.$alias.'.`active`'; } protected function _cleanMetaKeywords($keywords) @@ -271,7 +272,6 @@ class AdminProductsControllerCore extends AdminController $orderWay = 'ASC'; } - $this->_select .= ', sa.`active`'; if (!Tools::isSubmit('productFilter_active')) $this->_filter = ''; parent::getList($id_lang, $orderBy, $orderWay, $start, $limit, $this->context->shop->id);