kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-22 12:04:00 +00:00
Code Issues Projects Releases Wiki Activity

Update GoogleChartController.php

Browse Source
This commit is contained in:
James Cole
2015-03-25 16:00:06 +01:00
parent 2159df6802
commit 0dbe44764b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/GoogleChartController.php
View File

@@ -236,7 +236,7 @@ class GoogleChartController extends Controller
$start = Session::get('start', Carbon::now()->startOfMonth()); $start = Session::get('start', Carbon::now()->startOfMonth());
$end = Session::get('end', Carbon::now()->endOfMonth()); $end = Session::get('end', Carbon::now()->endOfMonth());
$set = TransactionJournal:: $set = TransactionJournal::
where('user_id',Auth::user()->id) where('transaction_journals.user_id',Auth::user()->id)
->leftJoin( ->leftJoin(
'transactions', 'transactions',
function (JoinClause $join) { function (JoinClause $join) {
@@ -249,6 +249,7 @@ class GoogleChartController extends Controller
->leftJoin('categories', 'categories.id', '=', 'category_transaction_journal.category_id') ->leftJoin('categories', 'categories.id', '=', 'category_transaction_journal.category_id')
->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id') ->leftJoin('transaction_types', 'transaction_types.id', '=', 'transaction_journals.transaction_type_id')
->before($end) ->before($end)
->where('categories.user_id',Auth::user()->id)
->after($start) ->after($start)
->where('transaction_types.type', 'Withdrawal') ->where('transaction_types.type', 'Withdrawal')
->groupBy('categories.id') ->groupBy('categories.id')