IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed order view.

Browse Source
This commit is contained in:
James Cole 2015-03-27 09:29:14 +01:00
parent e8b58154e0
commit 2288e3705a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/TransactionController.php
View File

@ -250,9 +250,11 @@ class TransactionController extends Controller
$t->before = floatval( $t->before = floatval(
$t->account->transactions()->leftJoin( $t->account->transactions()->leftJoin(
'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id' 'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id'
)->where('transaction_journals.date', '<=', $journal->date->format('Y-m-d'))->where( )
'transaction_journals.created_at', '<=', $journal->created_at->format('Y-m-d H:i:s') ->where('transaction_journals.date', '<=', $journal->date->format('Y-m-d'))
)->where('transaction_journals.id', '!=', $journal->id)->sum('transactions.amount') ->where('transaction_journals.order','>=',$journal->order)
->where('transaction_journals.id', '!=', $journal->id)
->sum('transactions.amount')
); );
$t->after = $t->before + $t->amount; $t->after = $t->before + $t->amount;
} }