IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix https://github.com/firefly-iii/firefly-iii/issues/6260

Browse Source
This commit is contained in:
James Cole 2022-07-23 20:15:55 +02:00
parent e8ec13ca5f
commit d49809c939
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Chart/AccountController.php
View File

@ -119,8 +119,8 @@ class AccountController extends Controller
// see if there is an accompanying start amount. // see if there is an accompanying start amount.
// grab the difference and find the currency. // grab the difference and find the currency.
$startAmount = $startBalances[$accountId][$currencyId] ?? '0'; $startAmount = (string) ($startBalances[$accountId][$currencyId] ?? '0')
$diff = bcsub($endAmount, $startAmount); $diff = bcsub((string)$endAmount, $startAmount);
$currencies[$currencyId] = $currencies[$currencyId] ?? $this->currencyRepository->find($currencyId); $currencies[$currencyId] = $currencies[$currencyId] ?? $this->currencyRepository->find($currencyId);
if (0 !== bccomp($diff, '0')) { if (0 !== bccomp($diff, '0')) {
// store the values in a temporary array. // store the values in a temporary array.
@ -578,8 +578,8 @@ class AccountController extends Controller
// see if there is an accompanying start amount. // see if there is an accompanying start amount.
// grab the difference and find the currency. // grab the difference and find the currency.
$startAmount = $startBalances[$accountId][$currencyId] ?? '0'; $startAmount = (string)($startBalances[$accountId][$currencyId] ?? '0');
$diff = bcsub($endAmount, $startAmount); $diff = bcsub((string) $endAmount, $startAmount);
$currencies[$currencyId] = $currencies[$currencyId] ?? $this->currencyRepository->find($currencyId); $currencies[$currencyId] = $currencies[$currencyId] ?? $this->currencyRepository->find($currencyId);
if (0 !== bccomp($diff, '0')) { if (0 !== bccomp($diff, '0')) {
// store the values in a temporary array. // store the values in a temporary array.

2
app/Transformers/TransactionGroupTransformer.php
View File

@ -353,7 +353,7 @@ class TransactionGroupTransformer extends AbstractTransformer
$destination = $this->getDestinationTransaction($journal); $destination = $this->getDestinationTransaction($journal);
$type = $journal->transactionType->type; $type = $journal->transactionType->type;
$amount = $this->getAmount($type, (string) $source->amount); $amount = $this->getAmount($type, (string) $source->amount);
$foreignAmount = $this->getForeignAmount($type, $source->foreign_amount); $foreignAmount = $this->getForeignAmount($type, null === $source->foreign_amount ? null : (string) $source->foreign_amount);
$metaFieldData = $this->groupRepos->getMetaFields($journal->id, $this->metaFields); $metaFieldData = $this->groupRepos->getMetaFields($journal->id, $this->metaFields);
$metaDates = $this->getDates($this->groupRepos->getMetaDateFields($journal->id, $this->metaDateFields)); $metaDates = $this->getDates($this->groupRepos->getMetaDateFields($journal->id, $this->metaDateFields));
$currency = $source->transactionCurrency; $currency = $source->transactionCurrency;