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

Keep order

Browse Source
This commit is contained in:
James Cole 2018-04-22 08:07:46 +02:00
parent 49421f50ac
commit c682e69ee7
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Helpers/Collector/JournalCollector.php
View File

@ -254,7 +254,7 @@ class JournalCollector implements JournalCollectorInterface
$key = 'query-' . substr($hash, -8); $key = 'query-' . substr($hash, -8);
$cache = new CacheProperties; $cache = new CacheProperties;
$cache->addProperty($key); $cache->addProperty($key);
foreach($this->filters as $filter) { foreach ($this->filters as $filter) {
$cache->addProperty((string)$filter); $cache->addProperty((string)$filter);
} }
if ($cache->has()) { if ($cache->has()) {
@ -682,6 +682,7 @@ class JournalCollector implements JournalCollectorInterface
->orderBy('transaction_journals.order', 'ASC') ->orderBy('transaction_journals.order', 'ASC')
->orderBy('transaction_journals.id', 'DESC') ->orderBy('transaction_journals.id', 'DESC')
->orderBy('transaction_journals.description', 'DESC') ->orderBy('transaction_journals.description', 'DESC')
->orderBy('transactions.identifier', 'ASC')
->orderBy('transactions.amount', 'DESC'); ->orderBy('transactions.amount', 'DESC');
$this->query = $query; $this->query = $query;