From 4b397b5b3929385c0456c0048cfb0ada4e2b59a2 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Thu, 9 May 2024 11:42:52 +1000 Subject: [PATCH] Updates for expense filters --- app/Filters/ExpenseFilters.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Filters/ExpenseFilters.php b/app/Filters/ExpenseFilters.php index c3efee2535c0..6c580cb719cb 100644 --- a/app/Filters/ExpenseFilters.php +++ b/app/Filters/ExpenseFilters.php @@ -107,6 +107,12 @@ class ExpenseFilters extends QueryFilters $query->whereNull('payment_date'); }); } + + if(in_array('uncategorized', $status_parameters)){ + $query->orWhere(function ($query){ + $query->whereNull('category_id'); + }); + } }); // nlog($this->builder->toSql()); @@ -200,7 +206,7 @@ class ExpenseFilters extends QueryFilters return $this->builder->orderByRaw("REGEXP_REPLACE(number,'[^0-9]+','')+0 " . $dir); } - if (is_array($sort_col) && in_array($sort_col[1], ['asc', 'desc']) && in_array($sort_col[0], ['public_notes', 'date', 'id_number', 'custom_value1', 'custom_value2', 'custom_value3', 'custom_value4'])) { + if (is_array($sort_col) && in_array($sort_col[1], ['asc', 'desc']) && in_array($sort_col[0], ['amount', 'public_notes', 'date', 'id_number', 'custom_value1', 'custom_value2', 'custom_value3', 'custom_value4'])) { return $this->builder->orderBy($sort_col[0], $sort_col[1]); }