From 01876be152c134d54bf4e86fe8c7a0fd93cca629 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 1 Sep 2019 18:50:10 +0200 Subject: [PATCH] Fix some bugs in multi-currency reports. --- app/Http/Controllers/Chart/CategoryController.php | 4 ++-- app/Repositories/Category/OperationsRepository.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Chart/CategoryController.php b/app/Http/Controllers/Chart/CategoryController.php index a9a5c92ff0..55e441a966 100644 --- a/app/Http/Controllers/Chart/CategoryController.php +++ b/app/Http/Controllers/Chart/CategoryController.php @@ -322,8 +322,8 @@ class CategoryController extends Controller $noCatRepository = app(NoCategoryRepositoryInterface::class); // this gives us all currencies - $expenses = $noCatRepository->listExpenses($start, $end); - $income = $noCatRepository->listIncome($start, $end); + $expenses = $noCatRepository->listExpenses($start, $end, $accounts); + $income = $noCatRepository->listIncome($start, $end, $accounts); $currencies = array_unique(array_merge(array_keys($income), array_keys($expenses))); $periods = app('navigation')->listOfPeriods($start, $end); $format = app('navigation')->preferredCarbonLocalizedFormat($start, $end); diff --git a/app/Repositories/Category/OperationsRepository.php b/app/Repositories/Category/OperationsRepository.php index 76f05b27e9..7ddd3805e3 100644 --- a/app/Repositories/Category/OperationsRepository.php +++ b/app/Repositories/Category/OperationsRepository.php @@ -89,7 +89,7 @@ class OperationsRepository implements OperationsRepositoryInterface // catch "no category" entries. if (0 === $categoryId) { - $categoryName = (string)trans('firefly.no_category'); + continue; } // info about the currency: