IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-26 08:51:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2584

Browse Source
This commit is contained in:
James Cole 2019-09-23 16:33:27 +02:00
parent 7735402f54
commit 0eae4329f4
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Repositories/Category/OperationsRepository.php
View File

@ -254,7 +254,7 @@ class OperationsRepository implements OperationsRepositoryInterface
'currency_name' => $journal['currency_name'], 'currency_name' => $journal['currency_name'],
'currency_symbol' => $journal['currency_symbol'], 'currency_symbol' => $journal['currency_symbol'],
'currency_code' => $journal['currency_code'], 'currency_code' => $journal['currency_code'],
'currency_decimal_places' => $journal['currency_decimal_places'], 'currency_decimal_places' => (int)$journal['currency_decimal_places'],
]; ];
$array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], app('steam')->negative($journal['amount'])); $array[$currencyId]['sum'] = bcadd($array[$currencyId]['sum'], app('steam')->negative($journal['amount']));
} }

2
app/Validation/TransactionValidation.php
View File

@ -96,7 +96,7 @@ trait TransactionValidation
foreach ($transactions as $index => $transaction) { foreach ($transactions as $index => $transaction) {
$originalType = $this->getOriginalType((int)($transaction['transaction_journal_id'] ?? 0)); $originalType = $this->getOriginalType((int)($transaction['transaction_journal_id'] ?? 0));
$originalData = $this->getOriginalData($transaction['transaction_journal_id'] ?? 0); $originalData = $this->getOriginalData((int)($transaction['transaction_journal_id'] ?? 0));
$transactionType = $transaction['type'] ?? $originalType; $transactionType = $transaction['type'] ?? $originalType;
$accountValidator->setTransactionType($transactionType); $accountValidator->setTransactionType($transactionType);