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

// Normalize

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12658 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-01-24 17:30:33 +00:00
parent 9522086acc
commit 1c0f430600
22 changed files with 288 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Currency.php
+9 -10
View File
@@ -123,18 +123,17 @@ class CurrencyCore extends ObjectModel
* @param int|string $iso_code int for iso code number string for iso code
* @return boolean
*/
public static function exists ($iso_code)
public static function exists($iso_code)
{
if(is_int($iso_code))
if (is_int($iso_code))
$id_currency_exists = Currency::getIdByIsoCodeNum($iso_code);
else
$id_currency_exists = Currency::getIdByIsoCode($iso_code);
if ($id_currency_exists){
if ($id_currency_exists)
return true;
} else {
else
return false;
}
}
public function deleteSelection($selection)
@@ -173,7 +172,7 @@ class CurrencyCore extends ObjectModel
* @param string $side left or right
* @return string formated sign
*/
public function getSign($side=NULL)
public function getSign($side = null)
{
if (!$side)
return $this->sign;
@@ -296,7 +295,7 @@ class CurrencyCore extends ObjectModel
$conversion_rate = 1;
if ($defaultCurrency->iso_code != $isoCodeSource)
{
foreach ($data->currency AS $currency)
foreach ($data->currency as $currency)
if ($currency['iso_code'] == $defaultCurrency->iso_code)
{
$conversion_rate = round((float)$currency['rate'], 6);
@@ -312,15 +311,15 @@ class CurrencyCore extends ObjectModel
$rate = 1;
else
{
foreach ($data->currency AS $obj)
foreach ($data->currency as $obj)
if ($this->iso_code == strval($obj['iso_code']))
{
$rate = (float) $obj['rate'];
$rate = (float)$obj['rate'];
break;
}
}
$this->conversion_rate = round($rate / $conversion_rate, 6);
$this->conversion_rate = round($rate / $conversion_rate, 6);
}
$this->update();
}