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

Should fix frontpage.

Browse Source
This commit is contained in:
James Cole 2016-05-10 09:33:23 +02:00
parent e73d590ead
commit 7c7740d3ba
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Models/TransactionJournal.php
View File

@ -338,6 +338,11 @@ class TransactionJournal extends TransactionJournalSupport
$join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id')->where('transactions.amount', '>', 0); $join->on('transactions.transaction_journal_id', '=', 'transaction_journals.id')->where('transactions.amount', '>', 0);
} }
); );
$query->orderBy('transaction_journals.date', 'DESC');
$query->orderBy('transaction_journals.order', 'ASC');
$query->orderBy('transaction_journals.id', 'DESC');
$query->groupBy('transaction_journals.id'); $query->groupBy('transaction_journals.id');
$query->with(['categories', 'budgets', 'attachments', 'bill','transactions']); $query->with(['categories', 'budgets', 'attachments', 'bill','transactions']);
} }

3
app/Repositories/Account/AccountRepository.php
View File

@ -246,6 +246,9 @@ class AccountRepository implements AccountRepositoryInterface
} }
)->where('source.account_id', $account->id); )->where('source.account_id', $account->id);
$query->take(10);
$set = $query->get(TransactionJournal::queryFields()); $set = $query->get(TransactionJournal::queryFields());
return $set; return $set;