From 7c7740d3ba8606e1a1e71aca2b5e926159549d47 Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 10 May 2016 09:33:23 +0200 Subject: [PATCH] Should fix frontpage. --- app/Models/TransactionJournal.php | 5 +++++ app/Repositories/Account/AccountRepository.php | 3 +++ 2 files changed, 8 insertions(+) diff --git a/app/Models/TransactionJournal.php b/app/Models/TransactionJournal.php index 6a16338f95..5b0ec94ad5 100644 --- a/app/Models/TransactionJournal.php +++ b/app/Models/TransactionJournal.php @@ -338,6 +338,11 @@ class TransactionJournal extends TransactionJournalSupport $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->with(['categories', 'budgets', 'attachments', 'bill','transactions']); } diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index 198c9bd9b6..4353db8d10 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -246,6 +246,9 @@ class AccountRepository implements AccountRepositoryInterface } )->where('source.account_id', $account->id); + $query->take(10); + + $set = $query->get(TransactionJournal::queryFields()); return $set;