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

Fixed the category chart.

Browse Source
This commit is contained in:
James Cole 2015-05-21 17:27:48 +02:00
parent ffb11b01a6
commit 003a05ee8d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Repositories/Category/CategoryRepository.php
View File

@ -107,7 +107,7 @@ class CategoryRepository implements CategoryRepositoryInterface
->after($start) ->after($start)
->transactionTypes(['Withdrawal']) ->transactionTypes(['Withdrawal'])
->groupBy('categories.id') ->groupBy('categories.id')
->get(['categories.id as category_id', 'categories.encrypted', 'categories.name', 'transaction_journals.*']); ->get(['categories.id as category_id', 'categories.encrypted as category_encrypted', 'categories.name', 'transaction_journals.*']);
$result = []; $result = [];
foreach ($set as $entry) { foreach ($set as $entry) {
@ -115,7 +115,7 @@ class CategoryRepository implements CategoryRepositoryInterface
if (isset($result[$categoryId])) { if (isset($result[$categoryId])) {
$result[$categoryId]['sum'] += $entry->amount; $result[$categoryId]['sum'] += $entry->amount;
} else { } else {
$isEncrypted = intval($entry->encrypted) == 1 ? true : false; $isEncrypted = intval($entry->category_encrypted) == 1 ? true : false;
$name = strlen($entry->name) == 0 ? trans('firefly.noCategory') : $entry->name; $name = strlen($entry->name) == 0 ? trans('firefly.noCategory') : $entry->name;
$name = $isEncrypted ? Crypt::decrypt($name) : $name; $name = $isEncrypted ? Crypt::decrypt($name) : $name;
$result[$categoryId] = [ $result[$categoryId] = [