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

// Fix stock for customizable features

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8340 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-09-05 13:53:39 +00:00
parent 1e55c19726
commit 9032e37b38
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Product.php
+5 -5
View File
@@ -2050,7 +2050,9 @@ class ProductCore extends ObjectModel
$sql = (($innerJoin) ? ' INNER ' : ' LEFT ').'JOIN '._DB_PREFIX_.'stock stock ON stock.id_product = '.pSQL($productAlias).'.id_product';
if (!is_null($productAttribute))
{
if (is_numeric($productAttribute))
if (!Combination::isFeatureActive())
$sql .= ' AND stock.id_product_attribute = 0';
else if (is_numeric($productAttribute))
$sql .= ' AND stock.id_product_attribute = '.$productAttribute;
else if (is_string($productAttribute))
$sql .= ' AND stock.id_product_attribute = IFNULL('.pSQL($productAttribute).'.id_product_attribute, 0)';
@@ -2524,12 +2526,10 @@ class ProductCore extends ObjectModel
if (Combination::isFeatureActive())
{
$sql['join'] .= '
LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa ON pa.`id_product` = p.`id_product`
'.Product::sqlStock('p', 'pa', false, $context->shop);
LEFT JOIN `'._DB_PREFIX_.'product_attribute` pa ON pa.`id_product` = p.`id_product`';
$sql['where'] .= 'OR pa.`reference` LIKE \'%'.pSQL($query).'%\'';
}
else
$sql['join'] .= Product::sqlStock('p', null, false, $context->shop);
$sql['join'] .= Product::sqlStock('p', 'pa', false, $context->shop);
$result = Db::getInstance()->ExecuteS(Tools::buildQuery($sql));