diff --git a/app/Helpers/Report/ReportQuery.php b/app/Helpers/Report/ReportQuery.php index 6774143650..167ec0e33a 100644 --- a/app/Helpers/Report/ReportQuery.php +++ b/app/Helpers/Report/ReportQuery.php @@ -323,7 +323,7 @@ class ReportQuery implements ReportQueryInterface ->groupBy('categories.id') ->orderBy('amount'); - return $query->get(['categories.id', 'categories.name', DB::Raw('SUM(`transactions`.`amount`) AS `amount`')]); + return $query->get(['categories.id','categories.encrypted', 'categories.name', DB::Raw('SUM(`transactions`.`amount`) AS `amount`')]); } diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index da0f357c6d..676ca8774e 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -11,6 +11,7 @@ use Preferences; use Session; use Steam; use View; +use Crypt; /** * Class ReportController @@ -267,6 +268,12 @@ class ReportController extends Controller $result = $this->query->journalsByCategory($start, $end); $categories = Steam::makeArray($result); + // loop and decrypt if necessary: + foreach ($categories as $index => $category) { + $categories[$index]['name'] + = intval($categories[$index]['encrypted']) == 1 ? Crypt::decrypt($categories[$index]['name']) : $categories[$index]['name']; + } + // all transfers if ($showSharedReports === false) { $result = $this->query->sharedExpensesByCategory($start, $end);