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

[-] BO : #PSCFV-3192 - Product::getAttributeGroups return duplicated attributes

Browse Source 
// Fix little bug

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16411 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-07-13 12:35:52 +00:00
parent 681302369f
commit cab8b2b251
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Product.php
+2 -1
View File
@@ -2481,7 +2481,7 @@ class ProductCore extends ObjectModel
if (is_array($result) && (!$specific_price || !$specific_price['id_product_attribute']))
{
$attribute_price = Tools::convertPrice($result['attribute_price'] !== null ? (float)$result['attribute_price'] : 0, $id_currency);
if ($id_product_attribute !== false) // If you want the default combination, please use NULL value instead
if ($id_product_attribute !== false && !is_null($id_product_attribute)) // If you want the default combination, please use NULL value instead
$price += $attribute_price;
}
@@ -2847,6 +2847,7 @@ class ProductCore extends ObjectModel
WHERE pa.`id_product` = '.(int)$this->id.'
AND al.`id_lang` = '.(int)$id_lang.'
AND agl.`id_lang` = '.(int)$id_lang.'
GROUP BY a.id_attribute
ORDER BY ag.`position` ASC, a.`position` ASC';
return Db::getInstance()->executeS($sql);
}