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

Some small changes.

Browse Source
This commit is contained in:
James Cole
2016-05-11 07:57:16 +02:00
parent d233a2df3c
commit 934656c954
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Models/TransactionJournal.php
View File

@@ -319,6 +319,14 @@ class TransactionJournal extends TransactionJournalSupport
return $query->where('transaction_journals.date', '<=', $date->format('Y-m-d 00:00:00'));
}
public function scopeSortCorrectly(EloquentBuilder $query)
{
$query->orderBy('transaction_journals.date', 'DESC');
$query->orderBy('transaction_journals.order', 'ASC');
$query->orderBy('transaction_journals.id', 'DESC');
}
/**
* @param EloquentBuilder $query
*/
@@ -339,7 +347,7 @@ class TransactionJournal extends TransactionJournalSupport
}
);
$query->groupBy('transaction_journals.id');
$query->with(['categories', 'budgets', 'attachments', 'bill','transactions']);
$query->with(['categories', 'budgets', 'attachments', 'bill', 'transactions']);
}
/**