From 0c953611162da1ac4a6c9f49fb01b1235c6e9867 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 30 Apr 2024 22:48:57 +1000 Subject: [PATCH] Fixes for filters --- app/Filters/RecurringExpenseFilters.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Filters/RecurringExpenseFilters.php b/app/Filters/RecurringExpenseFilters.php index 53fdf0c44452..cfd8258d6a49 100644 --- a/app/Filters/RecurringExpenseFilters.php +++ b/app/Filters/RecurringExpenseFilters.php @@ -146,14 +146,14 @@ class RecurringExpenseFilters extends QueryFilters return $this->builder ->orderByRaw('ISNULL(client_id), client_id '. $sort_col[1]) ->orderBy(\App\Models\Client::select('name') - ->whereColumn('clients.id', 'expenses.client_id'), $sort_col[1]); + ->whereColumn('clients.id', 'recurring_expenses.client_id'), $sort_col[1]); } if ($sort_col[0] == 'vendor_id' && in_array($sort_col[1], ['asc', 'desc'])) { return $this->builder ->orderByRaw('ISNULL(vendor_id), vendor_id '. $sort_col[1]) ->orderBy(\App\Models\Vendor::select('name') - ->whereColumn('vendors.id', 'expenses.vendor_id'), $sort_col[1]); + ->whereColumn('vendors.id', 'recurring_expenses.vendor_id'), $sort_col[1]); } @@ -161,7 +161,7 @@ class RecurringExpenseFilters extends QueryFilters return $this->builder ->orderByRaw('ISNULL(category_id), category_id '. $sort_col[1]) ->orderBy(\App\Models\ExpenseCategory::select('name') - ->whereColumn('expense_categories.id', 'expenses.category_id'), $sort_col[1]); + ->whereColumn('expense_categories.id', 'recurring_expenses.category_id'), $sort_col[1]); } if($sort_col[0] == 'number') {