From ddf6e94c43caa3ad8ab2eba9f5d0dcf7877e564c Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 6 Sep 2021 07:43:01 +1000
Subject: [PATCH] Make client_id query filter a global filter option

---
 app/Filters/InvoiceFilters.php | 12 ------------
 app/Filters/QueryFilters.php   | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/Filters/InvoiceFilters.php b/app/Filters/InvoiceFilters.php
index df0e557b4200..d6350dac6b37 100644
--- a/app/Filters/InvoiceFilters.php
+++ b/app/Filters/InvoiceFilters.php
@@ -67,18 +67,6 @@ class InvoiceFilters extends QueryFilters
         return $this->builder;
     }
 
-    public function client_id(string $client_id = '') :Builder
-    {
-        if (strlen($client_id) == 0) {
-            return $this->builder;
-        }
-
-        $this->builder->where('client_id', $this->decodePrimaryKey($client_id));
-
-        return $this->builder;
-        
-    }
-
     public function number(string $number) :Builder
     {
         return $this->builder->where('number', $number);
diff --git a/app/Filters/QueryFilters.php b/app/Filters/QueryFilters.php
index a77a57b04521..c80c6b85ecd6 100644
--- a/app/Filters/QueryFilters.php
+++ b/app/Filters/QueryFilters.php
@@ -12,6 +12,7 @@
 namespace App\Filters;
 
 //use Illuminate\Database\Query\Builder;
+use App\Utils\Traits\MakesHash;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
 
@@ -20,6 +21,8 @@ use Illuminate\Http\Request;
  */
 abstract class QueryFilters
 {
+    use MakesHash;
+    
     /**
      * active status.
      */
@@ -177,6 +180,18 @@ abstract class QueryFilters
 
     }
 
+    public function client_id(string $client_id = '') :Builder
+    {
+        if (strlen($client_id) == 0) {
+            return $this->builder;
+        }
+
+        $this->builder->where('client_id', $this->decodePrimaryKey($client_id));
+
+        return $this->builder;
+        
+    }
+
     public function filter_deleted_clients($value)
     {