kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-07 06:31:22 +00:00
Code Issues Projects Releases Wiki Activity

Various improvs to the report generator.

Browse Source
This commit is contained in:
James Cole
2021-10-30 11:42:35 +02:00
parent a16b6cb2b8
commit 8b81526e54
8 changed files with 177 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Helpers/Report/PopupReport.php
View File

@@ -210,10 +210,9 @@ class PopupReport implements PopupReportInterface
// set report accounts + the request accounts:
//$set = $attributes['accounts'] ?? new Collection;
$set = new Collection;
$set->push($account);
//$set->push($account);
$collector->setBothAccounts($set)
$collector->setDestinationAccounts(new Collection([$account]))
->setRange($attributes['startDate'], $attributes['endDate'])
->withAccountInformation()
->withBudgetInformation()
@@ -223,7 +222,6 @@ class PopupReport implements PopupReportInterface
if (null !== $currency) {
$collector->setCurrency($currency);
}
return $collector->getExtractedJournals();
}