diff --git a/app/Helpers/Report/ReportQuery.php b/app/Helpers/Report/ReportQuery.php index 9d0a5aab8f..3dd13231e2 100644 --- a/app/Helpers/Report/ReportQuery.php +++ b/app/Helpers/Report/ReportQuery.php @@ -87,6 +87,9 @@ class ReportQuery implements ReportQueryInterface ->whereNull('budget_transaction_journal.budget_id')->whereNull('transaction_journals.deleted_at') ->whereNull('otherJournals.deleted_at') ->where('transactions.account_id', $account->id) + ->orderBy('transaction_journals.date', 'DESC') + ->orderBy('transaction_journals.order','ASC') + ->orderBy('transaction_journals.id','DESC') ->whereNotNull('transaction_group_transaction_journal.transaction_group_id') ->get( [ diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index 739330db65..f53bd43785 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -138,7 +138,12 @@ class BillController extends Controller */ public function show(Bill $bill, BillRepositoryInterface $repository) { - $journals = $bill->transactionjournals()->withRelevantData()->orderBy('date', 'DESC')->get(); + $journals = $bill->transactionjournals()->withRelevantData() + ->orderBy('transaction_journals.date', 'DESC') + ->orderBy('transaction_journals.order','ASC') + ->orderBy('transaction_journals.id','DESC') + + ->get(); $bill->nextExpectedMatch = $repository->nextExpectedMatch($bill); $hideBill = true; diff --git a/app/Http/Controllers/BudgetController.php b/app/Http/Controllers/BudgetController.php index 38de9570bd..e0147eb5ab 100644 --- a/app/Http/Controllers/BudgetController.php +++ b/app/Http/Controllers/BudgetController.php @@ -133,7 +133,9 @@ class BudgetController extends Controller ->whereNull('budget_transaction_journal.id') ->before($end) ->after($start) - ->orderBy('transaction_journals.date') + ->orderBy('transaction_journals.date', 'DESC') + ->orderBy('transaction_journals.order','ASC') + ->orderBy('transaction_journals.id','DESC') ->get(['transaction_journals.*']); $subTitle = 'Transactions without a budget in ' . $start->format('F Y'); diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 4fec077136..b128d6e37d 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -88,7 +88,11 @@ class CategoryController extends Controller $categories->each( function (Category $category) { - $latest = $category->transactionjournals()->orderBy('date', 'DESC')->first(); + $latest = $category->transactionjournals() + ->orderBy('transaction_journals.date', 'DESC') + ->orderBy('transaction_journals.order','ASC') + ->orderBy('transaction_journals.id','DESC') + ->first(); if ($latest) { $category->lastActivity = $latest->date; } @@ -111,7 +115,9 @@ class CategoryController extends Controller ->whereNull('category_transaction_journal.id') ->before($end) ->after($start) - ->orderBy('transaction_journals.date') + ->orderBy('transaction_journals.date', 'DESC') + ->orderBy('transaction_journals.order','ASC') + ->orderBy('transaction_journals.id','DESC') ->get(['transaction_journals.*']); $subTitle = 'Transactions without a category between ' . $start->format('jS F Y') . ' and ' . $end->format('jS F Y'); @@ -129,7 +135,13 @@ class CategoryController extends Controller $hideCategory = true; // used in list. $page = intval(Input::get('page')); $offset = $page > 0 ? $page * 50 : 0; - $set = $category->transactionJournals()->withRelevantData()->take(50)->offset($offset)->orderBy('date', 'DESC')->get( + $set = $category->transactionJournals()->withRelevantData()->take(50)->offset($offset) + + ->orderBy('transaction_journals.date', 'DESC') + ->orderBy('transaction_journals.order','ASC') + ->orderBy('transaction_journals.id','DESC') + + ->get( ['transaction_journals.*'] ); $count = $category->transactionJournals()->count(); diff --git a/app/Repositories/Account/AccountRepository.php b/app/Repositories/Account/AccountRepository.php index 6788e3d468..859d06b09a 100644 --- a/app/Repositories/Account/AccountRepository.php +++ b/app/Repositories/Account/AccountRepository.php @@ -106,7 +106,9 @@ class AccountRepository implements AccountRepositoryInterface ->withRelevantData() ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') ->where('transactions.account_id', $account->id) - ->orderBy('date', 'DESC'); + ->orderBy('transaction_journals.date', 'DESC') + ->orderBy('transaction_journals.order','ASC') + ->orderBy('transaction_journals.id','DESC'); $query->before(Session::get('end', Carbon::now()->endOfMonth())); $query->after(Session::get('start', Carbon::now()->startOfMonth())); diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index ba09cdb9e5..f409b4c063 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -42,7 +42,10 @@ class BudgetRepository implements BudgetRepositoryInterface $offset = intval(\Input::get('page')) > 0 ? intval(\Input::get('page')) * $take : 0; - $setQuery = $budget->transactionJournals()->withRelevantData()->take($take)->offset($offset)->orderBy('date', 'DESC'); + $setQuery = $budget->transactionJournals()->withRelevantData()->take($take)->offset($offset) + ->orderBy('transaction_journals.date', 'DESC') + ->orderBy('transaction_journals.order','ASC') + ->orderBy('transaction_journals.id','DESC'); $countQuery = $budget->transactionJournals();