From 566fadad15b68ee8a50c64dd9cd1a28204dabd59 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 31 Mar 2015 21:18:22 +0200 Subject: [PATCH] Add decryption routine. --- app/Helpers/Report/ReportQuery.php | 12 ++++++++---- app/Http/Controllers/ReportController.php | 3 +++ app/Support/Steam.php | 8 +++++--- resources/views/reports/month.blade.php | 15 ++++++++++++--- resources/views/reports/year.blade.php | 18 +++++++++++++++--- 5 files changed, 43 insertions(+), 13 deletions(-) diff --git a/app/Helpers/Report/ReportQuery.php b/app/Helpers/Report/ReportQuery.php index 167ec0e33a..52bdc983aa 100644 --- a/app/Helpers/Report/ReportQuery.php +++ b/app/Helpers/Report/ReportQuery.php @@ -244,7 +244,9 @@ class ReportQuery implements ReportQueryInterface DB::Raw('SUM(`t_to`.`amount`) as `amount`'), 'transaction_journals.date', 't_from.account_id as account_id', - 'ac_from.name as name'] + 'ac_from.name as name', + 'ac_from.encrypted as account_encrypted' + ] ); } @@ -323,7 +325,7 @@ class ReportQuery implements ReportQueryInterface ->groupBy('categories.id') ->orderBy('amount'); - return $query->get(['categories.id','categories.encrypted', '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`')]); } @@ -370,7 +372,7 @@ class ReportQuery implements ReportQueryInterface ->groupBy('t_to.account_id') ->orderBy('amount', 'DESC'); - return $query->get(['t_to.account_id as id', 'ac_to.name as name', DB::Raw('SUM(t_to.amount) as `amount`')]); + return $query->get(['t_to.account_id as id', 'ac_to.name as name', 'ac_to.encrypted', DB::Raw('SUM(t_to.amount) as `amount`')]); } /** @@ -412,7 +414,9 @@ class ReportQuery implements ReportQueryInterface $query->groupBy('t_from.account_id')->orderBy('amount'); - return $query->get(['t_from.account_id as account_id', 'ac_from.name as name', DB::Raw('SUM(t_from.amount) as `amount`')]); + return $query->get( + ['t_from.account_id as account_id', 'ac_from.name as name', 'ac_from.encrypted as encrypted', DB::Raw('SUM(t_from.amount) as `amount`')] + ); } /** diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 676ca8774e..d3808f1d61 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -247,6 +247,7 @@ class ReportController extends Controller * Start getExpenseGroupedForMonth DONE */ $set = $this->query->journalsByExpenseAccount($start, $end, $showSharedReports); + $expenses = Steam::makeArray($set); $expenses = Steam::sortArray($expenses); $expenses = Steam::limitArray($expenses, 10); @@ -268,6 +269,7 @@ 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'] @@ -283,6 +285,7 @@ class ReportController extends Controller $merged = $categories; } + // sort. $sorted = Steam::sortNegativeArray($merged); diff --git a/app/Support/Steam.php b/app/Support/Steam.php index 756c11b73d..1fa262cbfd 100644 --- a/app/Support/Steam.php +++ b/app/Support/Steam.php @@ -100,11 +100,13 @@ class Steam if (isset($array[$id])) { $array[$id]['amount'] += floatval($entry->amount); $array[$id]['spent'] += floatval($entry->spent); + $array[$id]['encrypted'] = intval($entry->encrypted); } else { $array[$id] = [ - 'amount' => floatval($entry->amount), - 'spent' => floatval($entry->spent), - 'name' => $entry->name + 'amount' => floatval($entry->amount), + 'spent' => floatval($entry->spent), + 'encrypted' => intval($entry->encrypted), + 'name' => $entry->name ]; } } diff --git a/resources/views/reports/month.blade.php b/resources/views/reports/month.blade.php index 916c02e7a4..f8b24661ce 100644 --- a/resources/views/reports/month.blade.php +++ b/resources/views/reports/month.blade.php @@ -44,7 +44,11 @@ {{$entry->date->format('j F Y')}} - {{{$entry->name}}} + @if(intval($entry->account_encrypted) == 1) + {{{Crypt::decrypt($entry->name)}}} + @else + {{{$entry->name}}} + @endif @endforeach @@ -67,11 +71,16 @@ @foreach($expenses as $id => $expense) - + @if($id > 0) - + @else + @endif diff --git a/resources/views/reports/year.blade.php b/resources/views/reports/year.blade.php index e53995c8d7..8f48787b03 100644 --- a/resources/views/reports/year.blade.php +++ b/resources/views/reports/year.blade.php @@ -43,6 +43,12 @@ Account balance
{{{$expense['name']}}}{{{$name}}}{{{$expense['name']}}}{!! Amount::format($expense['amount']) !!}
+ + + + + + @foreach($groupedIncomes as $income) - amount)*-1;?> + amount)*-1; + $name = intval($income->encrypted) == 1 ? Crypt::decrypt($income->name) : $income->name; + ?> - + @endforeach @@ -142,8 +151,11 @@
NameBalance at start of yearBalance at end of yearDifference
{{{$income->name}}}{{{$name}}} {!! Amount::format(floatval($income->amount)*-1) !!}
@foreach($groupedExpenses as $id => $expense) + - +
{{{$expense['name']}}}{{{$name}}} {!! Amount::format(floatval($expense['amount'])*-1) !!}