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

Merge branch 'hotfix/#718'

Browse Source
This commit is contained in:
Luiz Fernando Vid 2019-01-15 15:00:56 -02:00
commit bf6bd6416a
2 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -11,4 +11,5 @@ npm-debug.log
.env .env
robots.txt robots.txt
_ide_helper.php _ide_helper.php
.phpstorm.meta.php .phpstorm.meta.php
/storage/debugbar/*

47
app/Traits/Currencies.php
View File

@ -4,18 +4,24 @@ namespace App\Traits;
use Akaunting\Money\Money; use Akaunting\Money\Money;
use Akaunting\Money\Currency; use Akaunting\Money\Currency;
use App\Models\Setting\Currency as CurrencyModel;
trait Currencies trait Currencies
{ {
public function convert($amount, $code, $rate, $format = false) public function convert($amount, $code, $rate, $format = false)
{ {
$default = new Currency(setting('general.default_currency', 'USD')); $default = new Currency(setting('general.default_currency', 'USD'));
$defaultCurrency = CurrencyModel::where('code', '=', $default->getCurrency())
->first(['code', 'rate']);
$defaultRate = $defaultCurrency ? $defaultCurrency->rate : 1;
$unratedAmount = $amount / $rate;
if ($format) { if ($format) {
$money = Money::$code($amount, true)->convert($default, (double) $rate)->format(); $money = Money::$code($unratedAmount, true)->convert($default, (double)$defaultRate)->format();
} else { } else {
$money = Money::$code($amount)->convert($default, (double) $rate)->getAmount(); $money = Money::$code($unratedAmount)->convert($default, (double)$defaultRate)->getAmount();
} }
return $money; return $money;
@ -24,9 +30,9 @@ trait Currencies
public function divide($amount, $code, $rate, $format = false) public function divide($amount, $code, $rate, $format = false)
{ {
if ($format) { if ($format) {
$money = Money::$code($amount, true)->divide((double) $rate)->format(); $money = Money::$code($amount, true)->divide((double)$rate)->format();
} else { } else {
$money = Money::$code($amount)->divide((double) $rate)->getAmount(); $money = Money::$code($amount)->divide((double)$rate)->getAmount();
} }
return $money; return $money;
@ -39,9 +45,9 @@ trait Currencies
$code = new Currency($code); $code = new Currency($code);
if ($format) { if ($format) {
$money = Money::$default($amount, true)->convert($code, (double) $rate)->format(); $money = Money::$default($amount, true)->convert($code, (double)$rate)->format();
} else { } else {
$money = Money::$default($amount)->convert($code, (double) $rate)->getAmount(); $money = Money::$default($amount)->convert($code, (double)$rate)->getAmount();
} }
return $money; return $money;
@ -52,9 +58,9 @@ trait Currencies
$code = new Currency($code); $code = new Currency($code);
if ($format) { if ($format) {
$money = Money::$default($amount, true)->convert($code, (double) $rate)->format(); $money = Money::$default($amount, true)->convert($code, (double)$rate)->format();
} else { } else {
$money = Money::$default($amount)->convert($code, (double) $rate)->getAmount(); $money = Money::$default($amount)->convert($code, (double)$rate)->getAmount();
} }
return $money; return $money;
@ -62,22 +68,37 @@ trait Currencies
public function getConvertedAmount($format = false, $with_tax = true) public function getConvertedAmount($format = false, $with_tax = true)
{ {
$amount = $with_tax ? $this->amount : (isset($this->amount_without_tax) ? $this->amount_without_tax : $this->amount); $amount = $this->amount;
if (! $with_tax && isset($this->amount_without_tax)) {
$amount = $this->amount_without_tax;
}
return $this->convert($amount, $this->currency_code, $this->currency_rate, $format); return $this->convert($amount, $this->currency_code, $this->currency_rate, $format);
} }
public function getReverseConvertedAmount($format = false, $with_tax = true) public function getReverseConvertedAmount($format = false, $with_tax = true)
{ {
$amount = $with_tax ? $this->amount : (isset($this->amount_without_tax) ? $this->amount_without_tax : $this->amount); $amount = $this->amount;
if (! $with_tax && isset($this->amount_without_tax)) {
$amount = $this->amount_without_tax;
}
return $this->reverseConvert($amount, $this->currency_code, $this->currency_rate, $format); return $this->reverseConvert($amount, $this->currency_code, $this->currency_rate, $format);
} }
public function getDynamicConvertedAmount($format = false, $with_tax = true) public function getDynamicConvertedAmount($format = false, $with_tax = true)
{ {
$amount = $with_tax ? $this->amount : (isset($this->amount_without_tax) ? $this->amount_without_tax : $this->amount); $amount = $this->amount;
if (! $with_tax && isset($this->amount_without_tax)) {
$amount = $this->amount_without_tax;
}
return $this->dynamicConvert($this->default_currency_code, $amount, $this->currency_code, $this->currency_rate, $format); return $this->dynamicConvert(
$this->default_currency_code,
$amount,
$this->currency_code,
$this->currency_rate,
$format
);
} }
} }