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

[-] Core: Fix #PSCFV-5997 - Product::priceCalculation not return the price of default combination

Browse Source
This commit is contained in:
Rémi Gaillard
2012-12-11 17:45:06 +01:00
parent 0727da6aeb
commit 82a230aa70
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Product.php
+3 -2
View File
@@ -244,7 +244,7 @@ class ProductCore extends ObjectModel
'multilang' => true, 'multilang' => true,
'multilang_shop' => true, 'multilang_shop' => true,
'fields' => array( 'fields' => array(
// Classic fields /* Classic fields */
'id_shop_default' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), 'id_shop_default' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
'id_manufacturer' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), 'id_manufacturer' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
'id_supplier' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), 'id_supplier' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
@@ -2604,7 +2604,8 @@ class ProductCore extends ObjectModel
if (is_array($result) && (!$specific_price || !$specific_price['id_product_attribute'] || $specific_price['price'] < 0)) if (is_array($result) && (!$specific_price || !$specific_price['id_product_attribute'] || $specific_price['price'] < 0))
{ {
$attribute_price = Tools::convertPrice($result['attribute_price'] !== null ? (float)$result['attribute_price'] : 0, $id_currency); $attribute_price = Tools::convertPrice($result['attribute_price'] !== null ? (float)$result['attribute_price'] : 0, $id_currency);
if ($id_product_attribute !== false && !is_null($id_product_attribute)) // If you want the default combination, please use NULL value instead // If you want the default combination, please use NULL value instead
if ($id_product_attribute !== false)
$price += $attribute_price; $price += $attribute_price;
} }