IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #2728

Browse Source
This commit is contained in:
James Cole 2019-10-19 19:00:16 +02:00
parent 0708ea875a
commit 2d720f72bd
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Report/CategoryController.php
View File

@ -714,7 +714,6 @@ class CategoryController extends Controller
/** @var NoCategoryRepositoryInterface $noCatRepository */ /** @var NoCategoryRepositoryInterface $noCatRepository */
$noCatRepository = app(NoCategoryRepositoryInterface::class); $noCatRepository = app(NoCategoryRepositoryInterface::class);
$categories = $repository->getCategories();
$earnedWith = $opsRepository->listIncome($start, $end, $accounts); $earnedWith = $opsRepository->listIncome($start, $end, $accounts);
$spentWith = $opsRepository->listExpenses($start, $end, $accounts); $spentWith = $opsRepository->listExpenses($start, $end, $accounts);
$earnedWithout = $noCatRepository->listIncome($start, $end, $accounts); $earnedWithout = $noCatRepository->listIncome($start, $end, $accounts);
@ -745,7 +744,7 @@ class CategoryController extends Controller
$key = sprintf('%s-%s', $currencyId, $categoryId); $key = sprintf('%s-%s', $currencyId, $categoryId);
$report['categories'][$key] = $report['categories'][$key] ?? [ $report['categories'][$key] = $report['categories'][$key] ?? [
'id' => $categoryId, 'id' => $categoryId,
'title' => sprintf('%s (%s)', $categoryRow['name'], $currencyRow['currency_name']), 'title' => $categoryRow['name'],
'currency_id' => $currencyRow['currency_id'], 'currency_id' => $currencyRow['currency_id'],
'currency_symbol' => $currencyRow['currency_symbol'], 'currency_symbol' => $currencyRow['currency_symbol'],
'currency_name' => $currencyRow['currency_name'], 'currency_name' => $currencyRow['currency_name'],