[*] BO: It is now possible to apply a specific price of 0 euros

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14612 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-04-12 14:51:23 +00:00
parent e6ab36e942
commit b1f2433205
3 changed files with 5 additions and 9 deletions
+2 -2
View File
@@ -2453,12 +2453,12 @@ class ProductCore extends ObjectModel
}
$result = self::$_pricesLevel2[$cache_id_2];
if (!$specific_price || $specific_price['price'] == 0)
if (!$specific_price)
$price = (float)$result['price'];
else
$price = (float)$specific_price['price'];
// convert only if the specific price is in the default currency (id_currency = 0)
if (!$specific_price || !($specific_price['price'] > 0 && $specific_price['id_currency']))
if (!$specific_price || !($specific_price['price'] >= 0 && $specific_price['id_currency']))
$price = Tools::convertPrice($price, $id_currency);
// Attribute price