[-] Core : If a specific price is applied to a combination the combination impact is no longer applied
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13959 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
1 parent
02cdbcd2cd
commit
3fd4003c36
1 file changed
+6
-3
+6
-3
@@ -2490,9 +2490,12 @@ class ProductCore extends ObjectModel
|
|||||||
$price = Tools::convertPrice($price, $id_currency);
|
$price = Tools::convertPrice($price, $id_currency);
|
||||||
|
|
||||||
// Attribute price
|
// Attribute price
|
||||||
$attribute_price = Tools::convertPrice(array_key_exists('attribute_price', $result) ? (float)$result['attribute_price'] : 0, $id_currency);
|
if (!$specific_price || !$specific_price['id_product_attribute'])
|
||||||
if ($id_product_attribute !== false) // If you want the default combination, please use NULL value instead
|
{
|
||||||
$price += $attribute_price;
|
$attribute_price = Tools::convertPrice(array_key_exists('attribute_price', $result) ? (float)$result['attribute_price'] : 0, $id_currency);
|
||||||
|
if ($id_product_attribute !== false) // If you want the default combination, please use NULL value instead
|
||||||
|
$price += $attribute_price;
|
||||||
|
}
|
||||||
|
|
||||||
// Tax
|
// Tax
|
||||||
$address = new Address();
|
$address = new Address();
|
||||||
|
|||||||
Reference in new issue
Block a user