From 8076eb6d06bd4788cc8ce4c1fe7e126e627af469 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 24 Aug 2024 07:32:03 +1000 Subject: [PATCH] Improve filters for expenses --- app/Filters/ExpenseFilters.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/Filters/ExpenseFilters.php b/app/Filters/ExpenseFilters.php index c86a848d0b0b..ac12b6356de9 100644 --- a/app/Filters/ExpenseFilters.php +++ b/app/Filters/ExpenseFilters.php @@ -218,6 +218,11 @@ class ExpenseFilters extends QueryFilters ->whereColumn('expense_categories.id', 'expenses.category_id'), $sort_col[1]); } + if ($sort_col[0] == 'payment_date' && in_array($sort_col[1], ['asc', 'desc'])) { + return $this->builder + ->orderByRaw('ISNULL(payment_date), payment_date '. $sort_col[1]); + } + if($sort_col[0] == 'number') { return $this->builder->orderByRaw("REGEXP_REPLACE(number,'[^0-9]+','')+0 " . $dir); }