From d025d058564c76dde3a38f50be3da0902a222264 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 17 Mar 2024 22:38:41 +1100
Subject: [PATCH] Tweaks for invoice number filtering

---
 app/Filters/InvoiceFilters.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Filters/InvoiceFilters.php b/app/Filters/InvoiceFilters.php
index c1b41dd4b7e2..bd03ca01d42a 100644
--- a/app/Filters/InvoiceFilters.php
+++ b/app/Filters/InvoiceFilters.php
@@ -329,7 +329,9 @@ class InvoiceFilters extends QueryFilters
 
         if($sort_col[0] == 'number') {
             // return $this->builder->orderByRaw('CAST(number AS UNSIGNED), number ' . $dir);
-            return $this->builder->orderByRaw('ABS(number) ' . $dir);
+            // return $this->builder->orderByRaw("number REGEXP '^[A-Za-z]+$',CAST(number as SIGNED INTEGER),CAST(REPLACE(number,'-','')AS SIGNED INTEGER) ,number");
+            // return $this->builder->orderByRaw('ABS(number) ' . $dir);
+               return $this->builder->orderByRaw("REGEXP_REPLACE(number,'[^0-9]+','')+0 " . $dir);
         }
 
         return $this->builder->orderBy($sort_col[0], $dir);