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

Merge branch 'develop' into 5.8-dev

Browse Source
This commit is contained in:
James Cole
2022-07-24 08:16:27 +02:00
parent ea808b441b 76dadd1cab
commit 4e394d6017
6 changed files with 69 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Transformers/TransactionGroupTransformer.php
View File

@@ -354,7 +354,7 @@ class TransactionGroupTransformer extends AbstractTransformer
$destination = $this->getDestinationTransaction($journal);
$type = $journal->transactionType->type;
$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);
$metaDates = $this->getDates($this->groupRepos->getMetaDateFields($journal->id, $this->metaDateFields));
$currency = $source->transactionCurrency;