kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-18 18:44:16 +00:00
Code Issues 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 16:47:05 +02:00
parent 7f694ede98
commit e8ec13ca5f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Repositories/Bill/BillRepository.php
View File

@@ -438,7 +438,7 @@ class BillRepository implements BillRepositoryInterface
//Log::debug(sprintf('Dates = %d, journalCount = %d, total = %d', $dates->count(), $count, $total));
if ($total > 0) {
$average = bcdiv(bcadd($bill->amount_max, $bill->amount_min), '2');
$average = bcdiv(bcadd((string) $bill->amount_max, (string) $bill->amount_min), '2');
$multi = bcmul($average, (string) $total);
$return[$currencyId] = $return[$currencyId] ?? '0';
$return[$currencyId] = bcadd($return[$currencyId], $multi);

2
app/Transformers/TransactionGroupTransformer.php
View File

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