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

[-] BO : #PSCFV-71 - Fix bug with currency conversion

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15055 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-05-03 15:13:10 +00:00
parent 2c81894949
commit 9be7d4e389
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Tools.php
+2 -11
View File
@@ -537,26 +537,17 @@ class ToolsCore
return $amount;
if ($currency_from === null)
{
$currency_from = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
$default_currency = $currency_from;
}
if ($currency_to === null)
{
$currency_to = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
$default_currency = $currency_to;
}
if ($currency_from->id == Configuration::get('PS_CURRENCY_DEFAULT'))
$amount *= $currency_to->conversion_rate;
else
{
if (!isset($default_currency))
$default_currency = new Currency(Configuration::get('PS_CURRENCY_DEFAULT'));
// Convert amount to default currency
$amount = Tools::ps_round($amount / $default_currency->conversion_rate, 2);
// Convert amount to default currency (using the old currency rate)
$amount = Tools::ps_round($amount / $currency_from->conversion_rate, 2);
// Convert to new currency
$amount *= $currency_to->conversion_rate;
}