kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-19 02:52:44 +00:00
Code Issues Projects Releases Wiki Activity

Fix balance thing.

Browse Source
This commit is contained in:
James Cole
2015-03-04 19:09:57 +01:00
parent 83b169c6ef
commit a349aac8a4
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/AccountController.php
View File

@@ -131,8 +131,10 @@ class AccountController extends Controller
$total = Auth::user()->accounts()->accountTypeIn($types)->count(); $total = Auth::user()->accounts()->accountTypeIn($types)->count();
// last activity: // last activity:
$start = clone Session::get('start');
$start->subDay();
$set->each( $set->each(
function (Account $account) { function (Account $account) use($start) {
$lastTransaction = $account->transactions()->leftJoin( $lastTransaction = $account->transactions()->leftJoin(
'transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id' 'transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id'
)->orderBy('transaction_journals.date', 'DESC')->first(['transactions.*', 'transaction_journals.date']); )->orderBy('transaction_journals.date', 'DESC')->first(['transactions.*', 'transaction_journals.date']);
@@ -141,7 +143,7 @@ class AccountController extends Controller
} else { } else {
$account->lastActivityDate = null; $account->lastActivityDate = null;
} }
$account->startBalance = Steam::balance($account, Session::get('start')); $account->startBalance = Steam::balance($account, $start);
$account->endBalance = Steam::balance($account, Session::get('end')); $account->endBalance = Steam::balance($account, Session::get('end'));
} }
); );