mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-09-18 18:44:16 +00:00
This commit is contained in:
@@ -151,6 +151,7 @@ class CategoryController extends Controller
|
|||||||
*/
|
*/
|
||||||
private function reportPeriodChart(Collection $accounts, Carbon $start, Carbon $end, ?Category $category): array
|
private function reportPeriodChart(Collection $accounts, Carbon $start, Carbon $end, ?Category $category): array
|
||||||
{
|
{
|
||||||
|
|
||||||
$income = [];
|
$income = [];
|
||||||
$expenses = [];
|
$expenses = [];
|
||||||
$categoryId = 0;
|
$categoryId = 0;
|
||||||
@@ -169,8 +170,8 @@ class CategoryController extends Controller
|
|||||||
$categoryId = $category->id;
|
$categoryId = $category->id;
|
||||||
// this gives us all currencies
|
// this gives us all currencies
|
||||||
$collection = new Collection([$category]);
|
$collection = new Collection([$category]);
|
||||||
$expenses = $opsRepository->listExpenses($start, $end, null, $collection);
|
$expenses = $opsRepository->listExpenses($start, $end, $accounts, $collection);
|
||||||
$income = $opsRepository->listIncome($start, $end, null, $collection);
|
$income = $opsRepository->listIncome($start, $end, $accounts, $collection);
|
||||||
}
|
}
|
||||||
$currencies = array_unique(array_merge(array_keys($income), array_keys($expenses)));
|
$currencies = array_unique(array_merge(array_keys($income), array_keys($expenses)));
|
||||||
$periods = app('navigation')->listOfPeriods($start, $end);
|
$periods = app('navigation')->listOfPeriods($start, $end);
|
||||||
|
Reference in New Issue
Block a user