From 9217c2f003186e750e89205ac2428351067650da Mon Sep 17 00:00:00 2001 From: James Cole Date: Wed, 20 May 2015 06:49:51 +0200 Subject: [PATCH] Corrected some charts [skip ci] --- app/Http/Controllers/BudgetController.php | 2 +- app/Http/Controllers/JsonController.php | 9 +++++++-- app/Http/Controllers/TransactionController.php | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index c62d06a799..dec660f378 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -138,7 +138,7 @@ class BudgetController extends Controller function (Budget $budget) use ($repository) { $date = Session::get('start', Carbon::now()->startOfMonth()); $end = Session::get('end', Carbon::now()->endOfMonth()); - $budget->spent = $repository->spentInPeriod($budget, $date, $end); + $budget->spent = $repository->spentInPeriodCorrected($budget, $date, $end); $budget->currentRep = $repository->getCurrentRepetition($budget, $date); } ); diff --git a/app/Http/Controllers/JsonController.php b/app/Http/Controllers/JsonController.php index 8c4f64e97a..3f47dbdc67 100644 --- a/app/Http/Controllers/JsonController.php +++ b/app/Http/Controllers/JsonController.php @@ -122,7 +122,12 @@ class JsonController extends Controller { $start = Session::get('start', Carbon::now()->startOfMonth()); $end = Session::get('end', Carbon::now()->endOfMonth()); - $amount = $reportQuery->incomeInPeriod($start, $end, true)->sum('queryAmount'); + $amount = $reportQuery->incomeInPeriodCorrected($start, $end, true)->sum('amount'); + // $amount = 0; + // foreach($set as $entry) { + // //echo $entry->description.' ('.$entry->tags->count().'): ' . $entry->amount."\n"; + // $amount += $entry->amount; + // } return Response::json(['box' => 'in', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]); } @@ -136,7 +141,7 @@ class JsonController extends Controller { $start = Session::get('start', Carbon::now()->startOfMonth()); $end = Session::get('end', Carbon::now()->endOfMonth()); - $amount = $reportQuery->expenseInPeriod($start, $end, true)->sum('queryAmount') * -1; + $amount = $reportQuery->expenseInPeriodCorrected($start, $end, true)->sum('amount'); return Response::json(['box' => 'out', 'amount' => Amount::format($amount, false), 'amount_raw' => $amount]); } diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index e8a0c23a81..8188ceb1f1 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -149,7 +149,7 @@ class TransactionController extends Controller $preFilled['piggy_bank_id'] = $journal->piggyBankEvents()->orderBy('date', 'DESC')->first()->piggy_bank_id; } - $preFilled['amount'] = $journal->amount; + $preFilled['amount'] = $journal->actualAmount; $preFilled['account_id'] = $journal->assetAccount->id; $preFilled['expense_account'] = $transactions[0]->account->name; $preFilled['revenue_account'] = $transactions[1]->account->name;