kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Fix issue in multi year reports

Browse Source
This commit is contained in:
James Cole
2019-09-06 17:18:55 +02:00
parent 69af0c3d65
commit 1a583c771b
3 changed files with 52 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/Chart/ReportController.php
View File

@@ -162,8 +162,8 @@ class ReportController extends Controller
$chartData = [];
/** @var GroupCollectorInterface $collector */
$collector = app(GroupCollectorInterface::class);
$collector->setRange($start, $end)->setAccounts($accounts)
->withAccountInformation();
$collector->setRange($start, $end)->withAccountInformation();
$collector->setXorAccounts($accounts);
$journals = $collector->getExtractedJournals();
// loop. group by currency and by period.
@@ -186,11 +186,10 @@ class ReportController extends Controller
// in our outgoing?
$key = 'spent';
$amount = app('steam')->positive($journal['amount']);
if (TransactionType::DEPOSIT === $journal['transaction_type_type']
|| (TransactionType::TRANSFER === $journal['transaction_type_type']
&& in_array(
$journal['destination_account_id'], $ids, true
))) {
if (TransactionType::DEPOSIT === $journal['transaction_type_type'] ||
(TransactionType::TRANSFER === $journal['transaction_type_type']
&& in_array($journal['destination_account_id'], $ids, true)
)) {
$key = 'earned';
}
$data[$currencyId][$period][$key] = bcadd($data[$currencyId][$period][$key], $amount);