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 #7516

Browse Source
This commit is contained in:
James Cole 2023-05-18 05:38:17 +02:00
parent 6d532470e6
commit e8392155f9
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Transformers/TransactionGroupTransformer.php
View File

@ -382,17 +382,17 @@ class TransactionGroupTransformer extends AbstractTransformer
$source = $this->getSourceTransaction($journal); $source = $this->getSourceTransaction($journal);
$destination = $this->getDestinationTransaction($journal); $destination = $this->getDestinationTransaction($journal);
$type = $journal->transactionType->type; $type = $journal->transactionType->type;
$amount = $this->getAmount($type, (string)$source->amount); $currency = $source->transactionCurrency;
$amount = app('steam')->bcround($this->getAmount($type, (string)$source->amount), $currency->decimal_places ?? 0);
$foreignAmount = $this->getForeignAmount($type, null === $source->foreign_amount ? null : (string)$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;
$foreignCurrency = $this->getForeignCurrency($source->foreignCurrency); $foreignCurrency = $this->getForeignCurrency($source->foreignCurrency);
$budget = $this->getBudget($journal->budgets->first()); $budget = $this->getBudget($journal->budgets->first());
$category = $this->getCategory($journal->categories->first()); $category = $this->getCategory($journal->categories->first());
$bill = $this->getBill($journal->bill); $bill = $this->getBill($journal->bill);
if (null !== $foreignAmount && null !== $foreignCurrency) { if (null !== $foreignAmount && null !== $source->foreignCurrency) {
$foreignAmount = app('steam')->bcround($foreignAmount, $foreignCurrency['decimal_places'] ?? 0); $foreignAmount = app('steam')->bcround($foreignAmount, $foreignCurrency['decimal_places'] ?? 0);
} }
@ -529,12 +529,7 @@ class TransactionGroupTransformer extends AbstractTransformer
*/ */
private function getAmount(string $type, string $amount): string private function getAmount(string $type, string $amount): string
{ {
$amount = app('steam')->positive($amount); return app('steam')->positive($amount);
if (TransactionType::WITHDRAWAL !== $type) {
$amount = app('steam')->negative($amount);
}
return $amount;
} }
/** /**
@ -547,7 +542,7 @@ class TransactionGroupTransformer extends AbstractTransformer
{ {
$result = null; $result = null;
if (null !== $foreignAmount && '' !== $foreignAmount && bccomp('0', $foreignAmount) !== 0) { if (null !== $foreignAmount && '' !== $foreignAmount && bccomp('0', $foreignAmount) !== 0) {
$result = TransactionType::WITHDRAWAL !== $type ? app('steam')->negative($foreignAmount) : app('steam')->positive($foreignAmount); $result = app('steam')->positive($foreignAmount);
} }
return $result; return $result;