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); }