shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

close #134 Fixed: Dashboard Error after making entry in Income or Expense Tab. / Currency rate issue

Browse Source
This commit is contained in:
cuneytsenturk 2017-12-18 13:07:42 +03:00
parent 7c1673b8db
commit cb02800bf5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Traits/Currencies.php
View File

@ -13,9 +13,9 @@ trait Currencies
$default = new Currency(setting('general.default_currency', 'USD')); $default = new Currency(setting('general.default_currency', 'USD'));
if ($format) { if ($format) {
$money = Money::$code($amount, true)->convert($default, $rate)->format(); $money = Money::$code($amount, true)->convert($default, (double) $rate)->format();
} else { } else {
$money = Money::$code($amount)->convert($default, $rate)->getAmount(); $money = Money::$code($amount)->convert($default, (double) $rate)->getAmount();
} }
return $money; return $money;
@ -28,9 +28,9 @@ trait Currencies
$code = new Currency($code); $code = new Currency($code);
if ($format) { if ($format) {
$money = Money::$default($amount, true)->convert($code, $rate)->format(); $money = Money::$default($amount, true)->convert($code, (double) $rate)->format();
} else { } else {
$money = Money::$default($amount)->convert($code, $rate)->getAmount(); $money = Money::$default($amount)->convert($code, (double) $rate)->getAmount();
} }
return $money; return $money;
@ -41,9 +41,9 @@ trait Currencies
$code = new Currency($code); $code = new Currency($code);
if ($format) { if ($format) {
$money = Money::$default($amount, true)->convert($code, $rate)->format(); $money = Money::$default($amount, true)->convert($code, (double) $rate)->format();
} else { } else {
$money = Money::$default($amount)->convert($code, $rate)->getAmount(); $money = Money::$default($amount)->convert($code, (double) $rate)->getAmount();
} }
return $money; return $money;