From 47d9ccf573f5c39d9d7a1f4bf725096bef53ca59 Mon Sep 17 00:00:00 2001
From: paulwer <paul@wer-ner.de>
Date: Sun, 29 Jan 2023 09:52:40 +0100
Subject: [PATCH 01/11] adding filter methods for projects, tasks and vendors

---
 app/Filters/CreditFilters.php           | 5 +++++
 app/Filters/ExpenseFilters.php          | 5 +++++
 app/Filters/ProjectFilters.php          | 5 +++++
 app/Filters/PurchaseOrderFilters.php    | 5 +++++
 app/Filters/QuoteFilters.php            | 4 ++--
 app/Filters/RecurringExpenseFilters.php | 5 +++++
 app/Filters/RecurringInvoiceFilters.php | 5 +++++
 app/Filters/RecurringQuoteFilters.php   | 5 +++++
 app/Filters/TaskFilters.php             | 5 +++++
 app/Filters/VendorFilters.php           | 6 ++++++
 10 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/app/Filters/CreditFilters.php b/app/Filters/CreditFilters.php
index f09be79c7..8b172e854 100644
--- a/app/Filters/CreditFilters.php
+++ b/app/Filters/CreditFilters.php
@@ -127,6 +127,11 @@ class CreditFilters extends QueryFilters
         });
     }
 
+    public function number(string $number = ''):Builder
+    {
+        return $this->builder->where('number', $number);
+    }
+
     /**
      * Sorts the list based on $sort.
      *
diff --git a/app/Filters/ExpenseFilters.php b/app/Filters/ExpenseFilters.php
index 657680140..e6b24c632 100644
--- a/app/Filters/ExpenseFilters.php
+++ b/app/Filters/ExpenseFilters.php
@@ -146,6 +146,11 @@ class ExpenseFilters extends QueryFilters
         });
     }
 
+    public function number(string $number = ''):Builder
+    {
+        return $this->builder->where('number', $number);
+    }
+
     /**
      * Sorts the list based on $sort.
      *
diff --git a/app/Filters/ProjectFilters.php b/app/Filters/ProjectFilters.php
index f6202c25e..b6a758534 100644
--- a/app/Filters/ProjectFilters.php
+++ b/app/Filters/ProjectFilters.php
@@ -80,6 +80,11 @@ class ProjectFilters extends QueryFilters
             }
         });
     }
+    
+    public function number(string $number = ''):Builder
+    {
+        return $this->builder->where('number', $number);
+    }
 
     /**
      * Sorts the list based on $sort.
diff --git a/app/Filters/PurchaseOrderFilters.php b/app/Filters/PurchaseOrderFilters.php
index 77fd4ede6..7d0b298e5 100644
--- a/app/Filters/PurchaseOrderFilters.php
+++ b/app/Filters/PurchaseOrderFilters.php
@@ -132,6 +132,11 @@ class PurchaseOrderFilters extends QueryFilters
         });
     }
 
+    public function number(string $number = ''):Builder
+    {
+        return $this->builder->where('number', $number);
+    }
+
     /**
      * Sorts the list based on $sort.
      *
diff --git a/app/Filters/QuoteFilters.php b/app/Filters/QuoteFilters.php
index 116e3ca53..f939ca089 100644
--- a/app/Filters/QuoteFilters.php
+++ b/app/Filters/QuoteFilters.php
@@ -138,9 +138,9 @@ class QuoteFilters extends QueryFilters
         });
     }
 
-    public function number($number = '')
+    public function number(string $number = ''):Builder
     {
-        return $this->builder->where('number', 'like', '%'.$number.'%');
+        return $this->builder->where('number', $number);
     }
 
     /**
diff --git a/app/Filters/RecurringExpenseFilters.php b/app/Filters/RecurringExpenseFilters.php
index 2da8ab8d3..2c501a2b5 100644
--- a/app/Filters/RecurringExpenseFilters.php
+++ b/app/Filters/RecurringExpenseFilters.php
@@ -84,6 +84,11 @@ class RecurringExpenseFilters extends QueryFilters
         });
     }
 
+    public function number(string $number = ''):Builder
+    {
+        return $this->builder->where('number', $number);
+    }
+
     /**
      * Sorts the list based on $sort.
      *
diff --git a/app/Filters/RecurringInvoiceFilters.php b/app/Filters/RecurringInvoiceFilters.php
index 541f24c03..e0c7b7c1a 100644
--- a/app/Filters/RecurringInvoiceFilters.php
+++ b/app/Filters/RecurringInvoiceFilters.php
@@ -120,6 +120,11 @@ class RecurringInvoiceFilters extends QueryFilters
         });
     }
 
+    public function number(string $number = ''):Builder
+    {
+        return $this->builder->where('number', $number);
+    }
+
     /**
      * Sorts the list based on $sort.
      *
diff --git a/app/Filters/RecurringQuoteFilters.php b/app/Filters/RecurringQuoteFilters.php
index 9063a47a7..fc2750b3c 100644
--- a/app/Filters/RecurringQuoteFilters.php
+++ b/app/Filters/RecurringQuoteFilters.php
@@ -79,6 +79,11 @@ class RecurringQuoteFilters extends QueryFilters
         });
     }
 
+    public function number(string $number = ''):Builder
+    {
+        return $this->builder->where('number', $number);
+    }
+
     /**
      * Sorts the list based on $sort.
      *
diff --git a/app/Filters/TaskFilters.php b/app/Filters/TaskFilters.php
index 733f35880..2d20e2caf 100644
--- a/app/Filters/TaskFilters.php
+++ b/app/Filters/TaskFilters.php
@@ -123,6 +123,11 @@ class TaskFilters extends QueryFilters
 
         return $this->builder->where('project_id', $this->decodePrimaryKey($project));
     }
+    
+    public function number(string $number = ''):Builder
+    {
+        return $this->builder->where('number', $number);
+    }
 
     /**
      * Sorts the list based on $sort.
diff --git a/app/Filters/VendorFilters.php b/app/Filters/VendorFilters.php
index dd2c7e885..2dfa5a025 100644
--- a/app/Filters/VendorFilters.php
+++ b/app/Filters/VendorFilters.php
@@ -89,6 +89,12 @@ class VendorFilters extends QueryFilters
         });
     }
 
+    
+    public function number(string $number = ''):Builder
+    {
+        return $this->builder->where('number', $number);
+    }
+
     /**
      * Sorts the list based on $sort.
      *

From 6e712b32b227eb64390fc30a29b949018c945f04 Mon Sep 17 00:00:00 2001
From: paulwer <paul@wer-ner.de>
Date: Sun, 29 Jan 2023 10:21:54 +0100
Subject: [PATCH 02/11] spacing

---
 app/Filters/CreditFilters.php           | 2 +-
 app/Filters/ExpenseFilters.php          | 2 +-
 app/Filters/InvoiceFilters.php          | 2 +-
 app/Filters/ProjectFilters.php          | 2 +-
 app/Filters/PurchaseOrderFilters.php    | 2 +-
 app/Filters/QuoteFilters.php            | 2 +-
 app/Filters/RecurringExpenseFilters.php | 2 +-
 app/Filters/RecurringInvoiceFilters.php | 2 +-
 app/Filters/RecurringQuoteFilters.php   | 2 +-
 app/Filters/TaskFilters.php             | 2 +-
 app/Filters/VendorFilters.php           | 3 +--
 11 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/Filters/CreditFilters.php b/app/Filters/CreditFilters.php
index 8b172e854..f5aeca7fd 100644
--- a/app/Filters/CreditFilters.php
+++ b/app/Filters/CreditFilters.php
@@ -127,7 +127,7 @@ class CreditFilters extends QueryFilters
         });
     }
 
-    public function number(string $number = ''):Builder
+    public function number(string $number = '') : Builder
     {
         return $this->builder->where('number', $number);
     }
diff --git a/app/Filters/ExpenseFilters.php b/app/Filters/ExpenseFilters.php
index e6b24c632..c41802154 100644
--- a/app/Filters/ExpenseFilters.php
+++ b/app/Filters/ExpenseFilters.php
@@ -146,7 +146,7 @@ class ExpenseFilters extends QueryFilters
         });
     }
 
-    public function number(string $number = ''):Builder
+    public function number(string $number = '') : Builder
     {
         return $this->builder->where('number', $number);
     }
diff --git a/app/Filters/InvoiceFilters.php b/app/Filters/InvoiceFilters.php
index 8d4128535..7363cc99f 100644
--- a/app/Filters/InvoiceFilters.php
+++ b/app/Filters/InvoiceFilters.php
@@ -75,7 +75,7 @@ class InvoiceFilters extends QueryFilters
         return $this->builder;
     }
 
-    public function number(string $number = '') :Builder
+    public function number(string $number = '') : Builder
     {
         return $this->builder->where('number', $number);
     }
diff --git a/app/Filters/ProjectFilters.php b/app/Filters/ProjectFilters.php
index b6a758534..dba8dcec6 100644
--- a/app/Filters/ProjectFilters.php
+++ b/app/Filters/ProjectFilters.php
@@ -81,7 +81,7 @@ class ProjectFilters extends QueryFilters
         });
     }
     
-    public function number(string $number = ''):Builder
+    public function number(string $number = '') : Builder
     {
         return $this->builder->where('number', $number);
     }
diff --git a/app/Filters/PurchaseOrderFilters.php b/app/Filters/PurchaseOrderFilters.php
index 7d0b298e5..231e017b5 100644
--- a/app/Filters/PurchaseOrderFilters.php
+++ b/app/Filters/PurchaseOrderFilters.php
@@ -132,7 +132,7 @@ class PurchaseOrderFilters extends QueryFilters
         });
     }
 
-    public function number(string $number = ''):Builder
+    public function number(string $number = '') : Builder
     {
         return $this->builder->where('number', $number);
     }
diff --git a/app/Filters/QuoteFilters.php b/app/Filters/QuoteFilters.php
index f939ca089..e07c0dc85 100644
--- a/app/Filters/QuoteFilters.php
+++ b/app/Filters/QuoteFilters.php
@@ -138,7 +138,7 @@ class QuoteFilters extends QueryFilters
         });
     }
 
-    public function number(string $number = ''):Builder
+    public function number(string $number = '') : Builder
     {
         return $this->builder->where('number', $number);
     }
diff --git a/app/Filters/RecurringExpenseFilters.php b/app/Filters/RecurringExpenseFilters.php
index 2c501a2b5..68ae97bcf 100644
--- a/app/Filters/RecurringExpenseFilters.php
+++ b/app/Filters/RecurringExpenseFilters.php
@@ -84,7 +84,7 @@ class RecurringExpenseFilters extends QueryFilters
         });
     }
 
-    public function number(string $number = ''):Builder
+    public function number(string $number = '') : Builder
     {
         return $this->builder->where('number', $number);
     }
diff --git a/app/Filters/RecurringInvoiceFilters.php b/app/Filters/RecurringInvoiceFilters.php
index e0c7b7c1a..aa3e0120f 100644
--- a/app/Filters/RecurringInvoiceFilters.php
+++ b/app/Filters/RecurringInvoiceFilters.php
@@ -120,7 +120,7 @@ class RecurringInvoiceFilters extends QueryFilters
         });
     }
 
-    public function number(string $number = ''):Builder
+    public function number(string $number = '') : Builder
     {
         return $this->builder->where('number', $number);
     }
diff --git a/app/Filters/RecurringQuoteFilters.php b/app/Filters/RecurringQuoteFilters.php
index fc2750b3c..14190d82f 100644
--- a/app/Filters/RecurringQuoteFilters.php
+++ b/app/Filters/RecurringQuoteFilters.php
@@ -79,7 +79,7 @@ class RecurringQuoteFilters extends QueryFilters
         });
     }
 
-    public function number(string $number = ''):Builder
+    public function number(string $number = '') : Builder
     {
         return $this->builder->where('number', $number);
     }
diff --git a/app/Filters/TaskFilters.php b/app/Filters/TaskFilters.php
index 2d20e2caf..4e85485b4 100644
--- a/app/Filters/TaskFilters.php
+++ b/app/Filters/TaskFilters.php
@@ -124,7 +124,7 @@ class TaskFilters extends QueryFilters
         return $this->builder->where('project_id', $this->decodePrimaryKey($project));
     }
     
-    public function number(string $number = ''):Builder
+    public function number(string $number = '') : Builder
     {
         return $this->builder->where('number', $number);
     }
diff --git a/app/Filters/VendorFilters.php b/app/Filters/VendorFilters.php
index 2dfa5a025..585fbc7c9 100644
--- a/app/Filters/VendorFilters.php
+++ b/app/Filters/VendorFilters.php
@@ -89,8 +89,7 @@ class VendorFilters extends QueryFilters
         });
     }
 
-    
-    public function number(string $number = ''):Builder
+    public function number(string $number = '') : Builder
     {
         return $this->builder->where('number', $number);
     }

From 98d4d62f825b3a78e0f6ccb7f6ac2f8d2c36f9f4 Mon Sep 17 00:00:00 2001
From: paulwer <paul@wer-ner.de>
Date: Mon, 30 Jan 2023 07:08:26 +0100
Subject: [PATCH 03/11] spacing

---
 app/Filters/BankTransactionFilters.php     |  6 +++---
 app/Filters/BankTransactionRuleFilters.php |  6 +++---
 app/Filters/ClientFilters.php              | 12 ++++++------
 app/Filters/CompanyGatewayFilters.php      |  4 ++--
 app/Filters/CreditFilters.php              |  8 ++++----
 app/Filters/DocumentFilters.php            |  2 +-
 app/Filters/ExpenseCategoryFilters.php     |  4 ++--
 app/Filters/ExpenseFilters.php             |  6 +++---
 app/Filters/InvoiceFilters.php             |  4 ++--
 app/Filters/ProjectFilters.php             |  8 ++++----
 app/Filters/PurchaseOrderFilters.php       |  4 ++--
 app/Filters/QueryFilters.php               |  6 +++---
 app/Filters/RecurringExpenseFilters.php    |  2 +-
 app/Filters/RecurringInvoiceFilters.php    |  2 +-
 app/Filters/RecurringQuoteFilters.php      |  2 +-
 app/Filters/SystemLogFilters.php           | 10 +++++-----
 app/Filters/TaskFilters.php                |  2 +-
 app/Filters/TaxRateFilters.php             |  2 +-
 app/Filters/VendorFilters.php              |  2 +-
 19 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/app/Filters/BankTransactionFilters.php b/app/Filters/BankTransactionFilters.php
index 778d3ba4a..784d6efc5 100644
--- a/app/Filters/BankTransactionFilters.php
+++ b/app/Filters/BankTransactionFilters.php
@@ -40,7 +40,7 @@ class BankTransactionFilters extends QueryFilters
      * @return Builder
      * @deprecated
      */
-    public function filter(string $filter = '') : Builder
+    public function filter(string $filter = ''): Builder
     {
         if (strlen($filter) == 0) {
             return $this->builder;
@@ -66,7 +66,7 @@ class BankTransactionFilters extends QueryFilters
      *
      * @return Builder
      */
-    public function client_status(string $value = '') :Builder
+    public function client_status(string $value = ''): Builder
     {
         if (strlen($value) == 0) {
             return $this->builder;
@@ -123,7 +123,7 @@ class BankTransactionFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort) : Builder
+    public function sort(string $sort): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/BankTransactionRuleFilters.php b/app/Filters/BankTransactionRuleFilters.php
index 0ec8773d4..c928ca156 100644
--- a/app/Filters/BankTransactionRuleFilters.php
+++ b/app/Filters/BankTransactionRuleFilters.php
@@ -43,7 +43,7 @@ class BankTransactionRuleFilters extends QueryFilters
      * @return Builder
      * @deprecated
      */
-    public function filter(string $filter = '') : Builder
+    public function filter(string $filter = ''): Builder
     {
         if (strlen($filter) == 0) {
             return $this->builder;
@@ -61,7 +61,7 @@ class BankTransactionRuleFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort) : Builder
+    public function sort(string $sort): Builder
     {
         $sort_col = explode('|', $sort);
         
@@ -76,7 +76,7 @@ class BankTransactionRuleFilters extends QueryFilters
      * @return Builder
      * @deprecated
      */
-    public function baseQuery(int $company_id, User $user) : Builder
+    public function baseQuery(int $company_id, User $user): Builder
     {
 
     }
diff --git a/app/Filters/ClientFilters.php b/app/Filters/ClientFilters.php
index d34bc2b80..834540061 100644
--- a/app/Filters/ClientFilters.php
+++ b/app/Filters/ClientFilters.php
@@ -66,7 +66,7 @@ class ClientFilters extends QueryFilters
         return $this->builder->whereBetween('balance', [$parts[0], $parts[1]]);
     }
 
-    public function email(string $email = ''):Builder
+    public function email(string $email = ''): Builder
     {
         return
 
@@ -75,7 +75,7 @@ class ClientFilters extends QueryFilters
         });
     }
 
-    public function client_id(string $client_id = '') :Builder
+    public function client_id(string $client_id = ''): Builder
     {
         if (strlen($client_id) == 0) {
             return $this->builder;
@@ -84,12 +84,12 @@ class ClientFilters extends QueryFilters
         return $this->builder->where('id', $this->decodePrimaryKey($client_id));
     }
 
-    public function id_number(string $id_number = ''):Builder
+    public function id_number(string $id_number = ''): Builder
     {
         return $this->builder->where('id_number', $id_number);
     }
 
-    public function number(string $number = ''):Builder
+    public function number(string $number = ''): Builder
     {
         return $this->builder->where('number', $number);
     }
@@ -101,7 +101,7 @@ class ClientFilters extends QueryFilters
      * @return Builder
      * @deprecated
      */
-    public function filter(string $filter = '') : Builder
+    public function filter(string $filter = ''): Builder
     {
         if (strlen($filter) == 0) {
             return $this->builder;
@@ -128,7 +128,7 @@ class ClientFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort) : Builder
+    public function sort(string $sort): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/CompanyGatewayFilters.php b/app/Filters/CompanyGatewayFilters.php
index fcb44bec9..9722e9124 100644
--- a/app/Filters/CompanyGatewayFilters.php
+++ b/app/Filters/CompanyGatewayFilters.php
@@ -26,7 +26,7 @@ class CompanyGatewayFilters extends QueryFilters
      * @return Builder
      * @deprecated
      */
-    public function filter(string $filter = '') : Builder
+    public function filter(string $filter = ''): Builder
     {
         if (strlen($filter) == 0) {
             return $this->builder;
@@ -43,7 +43,7 @@ class CompanyGatewayFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort) : Builder
+    public function sort(string $sort): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/CreditFilters.php b/app/Filters/CreditFilters.php
index 73edde19f..47f5e69b1 100644
--- a/app/Filters/CreditFilters.php
+++ b/app/Filters/CreditFilters.php
@@ -30,7 +30,7 @@ class CreditFilters extends QueryFilters
      * @param string credit_status The credit status as seen by the client
      * @return Builder
      */
-    public function credit_status(string $value = '') :Builder
+    public function credit_status(string $value = ''): Builder
     {
         if (strlen($value) == 0) {
             return $this->builder;
@@ -66,7 +66,7 @@ class CreditFilters extends QueryFilters
      * @return Builder
      * @deprecated
      */
-    public function filter(string $filter = '') : Builder
+    public function filter(string $filter = ''): Builder
     {
         if (strlen($filter) == 0) {
             return $this->builder;
@@ -96,7 +96,7 @@ class CreditFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort) : Builder
+    public function sort(string $sort): Builder
     {
         $sort_col = explode('|', $sort);
 
@@ -128,7 +128,7 @@ class CreditFilters extends QueryFilters
      *
      * @return Builder
      */
-    private function contactViewFilter() : Builder
+    private function contactViewFilter(): Builder
     {
         return $this->builder
                     ->whereCompanyId(auth()->guard('contact')->user()->company->id)
diff --git a/app/Filters/DocumentFilters.php b/app/Filters/DocumentFilters.php
index d36e4ead4..bcdcd9e09 100644
--- a/app/Filters/DocumentFilters.php
+++ b/app/Filters/DocumentFilters.php
@@ -54,7 +54,7 @@ class DocumentFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort = '') : Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/ExpenseCategoryFilters.php b/app/Filters/ExpenseCategoryFilters.php
index 33e7e05b4..53ed1e987 100644
--- a/app/Filters/ExpenseCategoryFilters.php
+++ b/app/Filters/ExpenseCategoryFilters.php
@@ -25,7 +25,7 @@ class ExpenseCategoryFilters extends QueryFilters
      * @return Builder
      * @deprecated
      */
-    public function filter(string $filter = '') : Builder
+    public function filter(string $filter = ''): Builder
     {
         if (strlen($filter) == 0) {
             return $this->builder;
@@ -41,7 +41,7 @@ class ExpenseCategoryFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort) : Builder
+    public function sort(string $sort): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/ExpenseFilters.php b/app/Filters/ExpenseFilters.php
index 96ee21a03..2520ae58e 100644
--- a/app/Filters/ExpenseFilters.php
+++ b/app/Filters/ExpenseFilters.php
@@ -25,7 +25,7 @@ class ExpenseFilters extends QueryFilters
      * @return Builder
      * @deprecated
      */
-    public function filter(string $filter = '') : Builder
+    public function filter(string $filter = ''): Builder
     {
         if (strlen($filter) == 0) {
             return $this->builder;
@@ -53,7 +53,7 @@ class ExpenseFilters extends QueryFilters
      *
      * @return Builder
      */
-    public function client_status(string $value = '') :Builder
+    public function client_status(string $value = ''): Builder
     {
         if (strlen($value) == 0) {
             return $this->builder;
@@ -143,7 +143,7 @@ class ExpenseFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort) : Builder
+    public function sort(string $sort): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/InvoiceFilters.php b/app/Filters/InvoiceFilters.php
index 8613856a2..f76f178f6 100644
--- a/app/Filters/InvoiceFilters.php
+++ b/app/Filters/InvoiceFilters.php
@@ -77,7 +77,7 @@ class InvoiceFilters extends QueryFilters
         return $this->builder;
     }
 
-    public function number(string $number = '') : Builder
+    public function number(string $number = ''): Builder
     {
         if(strlen($number) == 0)
             return $this->builder;
@@ -224,7 +224,7 @@ class InvoiceFilters extends QueryFilters
      *
      * @return Builder
      */
-    private function contactViewFilter() : Builder
+    private function contactViewFilter(): Builder
     {
         return $this->builder
                     ->whereCompanyId(auth()->guard('contact')->user()->company->id)
diff --git a/app/Filters/ProjectFilters.php b/app/Filters/ProjectFilters.php
index 3d9442e47..55ca4f14c 100644
--- a/app/Filters/ProjectFilters.php
+++ b/app/Filters/ProjectFilters.php
@@ -25,7 +25,7 @@ class ProjectFilters extends QueryFilters
      * @return Illuminate\Eloquent\Query\Builder
      * @deprecated
      */
-    public function filter(string $filter = '') :Builder
+    public function filter(string $filter = ''): Builder
     {
         if (strlen($filter) == 0) {
             return $this->builder;
@@ -38,7 +38,7 @@ class ProjectFilters extends QueryFilters
         });
     }
     
-    public function number(string $number = '') : Builder
+    public function number(string $number = ''): Builder
     {
         return $this->builder->where('number', $number);
     }
@@ -49,7 +49,7 @@ class ProjectFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Illuminate\Eloquent\Query\Builder
      */
-    public function sort(string $sort) :Builder
+    public function sort(string $sort): Builder
     {
         $sort_col = explode('|', $sort);
 
@@ -62,7 +62,7 @@ class ProjectFilters extends QueryFilters
      *
      * @return Illuminate\Eloquent\Query\Builder
      */
-    public function entityFilter() :Builder
+    public function entityFilter(): Builder
     {
         return $this->builder->company();
     }
diff --git a/app/Filters/PurchaseOrderFilters.php b/app/Filters/PurchaseOrderFilters.php
index 4e4955cea..cd6c6b1da 100644
--- a/app/Filters/PurchaseOrderFilters.php
+++ b/app/Filters/PurchaseOrderFilters.php
@@ -100,7 +100,7 @@ class PurchaseOrderFilters extends QueryFilters
         });
     }
 
-    public function number(string $number = '') : Builder
+    public function number(string $number = ''): Builder
     {
         return $this->builder->where('number', $number);
     }
@@ -141,7 +141,7 @@ class PurchaseOrderFilters extends QueryFilters
      *
      * @return Builder
      */
-    private function contactViewFilter() : Builder
+    private function contactViewFilter(): Builder
     {
         return $this->builder
             ->whereCompanyId(auth()->guard('contact')->user()->company->id)
diff --git a/app/Filters/QueryFilters.php b/app/Filters/QueryFilters.php
index a0ab3e9a8..3eb1b8964 100644
--- a/app/Filters/QueryFilters.php
+++ b/app/Filters/QueryFilters.php
@@ -136,7 +136,7 @@ abstract class QueryFilters
      * @param string filter
      * @return Builder
      */
-    public function status(string $filter = '') : Builder
+    public function status(string $filter = ''): Builder
     {
         if (strlen($filter) == 0) {
             return $this->builder;
@@ -241,7 +241,7 @@ abstract class QueryFilters
         return $this->builder->where('is_deleted', $value);
     }
 
-    public function client_id(string $client_id = '') :Builder
+    public function client_id(string $client_id = ''): Builder
     {
         if (strlen($client_id) == 0) {
             return $this->builder;
@@ -250,7 +250,7 @@ abstract class QueryFilters
         return $this->builder->where('client_id', $this->decodePrimaryKey($client_id));
     }
 
-    public function vendor_id(string $vendor_id = '') :Builder
+    public function vendor_id(string $vendor_id = ''): Builder
     {
         if (strlen($vendor_id) == 0) {
             return $this->builder;
diff --git a/app/Filters/RecurringExpenseFilters.php b/app/Filters/RecurringExpenseFilters.php
index 8883f15c2..45ed9f122 100644
--- a/app/Filters/RecurringExpenseFilters.php
+++ b/app/Filters/RecurringExpenseFilters.php
@@ -40,7 +40,7 @@ class RecurringExpenseFilters extends QueryFilters
         });
     }
 
-    public function number(string $number = '') : Builder
+    public function number(string $number = ''): Builder
     {
         return $this->builder->where('number', $number);
     }
diff --git a/app/Filters/RecurringInvoiceFilters.php b/app/Filters/RecurringInvoiceFilters.php
index d8e57bc98..fc0a721b5 100644
--- a/app/Filters/RecurringInvoiceFilters.php
+++ b/app/Filters/RecurringInvoiceFilters.php
@@ -83,7 +83,7 @@ class RecurringInvoiceFilters extends QueryFilters
 
     }
 
-    public function number(string $number = '') : Builder
+    public function number(string $number = ''): Builder
     {
         return $this->builder->where('number', $number);
     }
diff --git a/app/Filters/RecurringQuoteFilters.php b/app/Filters/RecurringQuoteFilters.php
index 20affea95..799a1831f 100644
--- a/app/Filters/RecurringQuoteFilters.php
+++ b/app/Filters/RecurringQuoteFilters.php
@@ -39,7 +39,7 @@ class RecurringQuoteFilters extends QueryFilters
         });
     }
 
-    public function number(string $number = '') : Builder
+    public function number(string $number = ''): Builder
     {
         return $this->builder->where('number', $number);
     }
diff --git a/app/Filters/SystemLogFilters.php b/app/Filters/SystemLogFilters.php
index 0a9796863..8360f1d1d 100644
--- a/app/Filters/SystemLogFilters.php
+++ b/app/Filters/SystemLogFilters.php
@@ -18,17 +18,17 @@ use Illuminate\Database\Eloquent\Builder;
  */
 class SystemLogFilters extends QueryFilters
 {
-    public function type_id(int $type_id) :Builder
+    public function type_id(int $type_id): Builder
     {
         return $this->builder->where('type_id', $type_id);
     }
 
-    public function category_id(int $category_id) :Builder
+    public function category_id(int $category_id): Builder
     {
         return $this->builder->where('category_id', $category_id);
     }
 
-    public function event_id(int $event_id) :Builder
+    public function event_id(int $event_id): Builder
     {
         return $this->builder->where('event_id', $event_id);
     }
@@ -40,7 +40,7 @@ class SystemLogFilters extends QueryFilters
      * @return Builder
      * @deprecated
      */
-    public function filter(string $filter = '') : Builder
+    public function filter(string $filter = ''): Builder
     {
         if (strlen($filter) == 0) {
             return $this->builder;
@@ -55,7 +55,7 @@ class SystemLogFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort) : Builder
+    public function sort(string $sort): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/TaskFilters.php b/app/Filters/TaskFilters.php
index d0dce0961..e7a455f89 100644
--- a/app/Filters/TaskFilters.php
+++ b/app/Filters/TaskFilters.php
@@ -82,7 +82,7 @@ class TaskFilters extends QueryFilters
         return $this->builder->where('project_id', $this->decodePrimaryKey($project));
     }
     
-    public function number(string $number = '') : Builder
+    public function number(string $number = ''): Builder
     {
         return $this->builder->where('number', $number);
     }
diff --git a/app/Filters/TaxRateFilters.php b/app/Filters/TaxRateFilters.php
index 2f5bc51e2..482c9ed94 100644
--- a/app/Filters/TaxRateFilters.php
+++ b/app/Filters/TaxRateFilters.php
@@ -25,7 +25,7 @@ class TaxRateFilters extends QueryFilters
      * @return Builder
      * @deprecated
      */
-    public function filter(string $filter = '') : Builder
+    public function filter(string $filter = ''): Builder
     {
         if (strlen($filter) == 0) {
             return $this->builder;
diff --git a/app/Filters/VendorFilters.php b/app/Filters/VendorFilters.php
index a16ca5ee3..feb0b339c 100644
--- a/app/Filters/VendorFilters.php
+++ b/app/Filters/VendorFilters.php
@@ -46,7 +46,7 @@ class VendorFilters extends QueryFilters
         });
     }
 
-    public function number(string $number = '') : Builder
+    public function number(string $number = ''): Builder
     {
         return $this->builder->where('number', $number);
     }

From 8274aadd059e9d73cde9e90d78c8cd8eed3fbd67 Mon Sep 17 00:00:00 2001
From: paulwer <paul@wer-ner.de>
Date: Mon, 30 Jan 2023 10:36:13 +0100
Subject: [PATCH 04/11] fixes

---
 app/Filters/ClientFilters.php           | 14 ++++++++++++--
 app/Filters/CreditFilters.php           |  4 ++++
 app/Filters/ExpenseFilters.php          |  4 ++++
 app/Filters/PaymentFilters.php          |  4 ++++
 app/Filters/ProjectFilters.php          |  4 ++++
 app/Filters/PurchaseOrderFilters.php    |  4 ++++
 app/Filters/QuoteFilters.php            |  4 ++++
 app/Filters/RecurringExpenseFilters.php |  4 ++++
 app/Filters/RecurringInvoiceFilters.php |  4 ++++
 app/Filters/RecurringQuoteFilters.php   |  4 ++++
 app/Filters/SystemLogFilters.php        | 12 ++++++++++++
 app/Filters/TaskFilters.php             |  4 ++++
 app/Filters/VendorFilters.php           |  4 ++++
 13 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/app/Filters/ClientFilters.php b/app/Filters/ClientFilters.php
index 834540061..2cf72b638 100644
--- a/app/Filters/ClientFilters.php
+++ b/app/Filters/ClientFilters.php
@@ -68,9 +68,11 @@ class ClientFilters extends QueryFilters
 
     public function email(string $email = ''): Builder
     {
-        return
+        if (strlen($email) == 0) {
+            return $this->builder;
+        }
 
-        $this->builder->whereHas('contacts', function ($query) use ($email) {
+        return $this->builder->whereHas('contacts', function ($query) use ($email) {
             $query->where('email', $email);
         });
     }
@@ -86,11 +88,19 @@ class ClientFilters extends QueryFilters
 
     public function id_number(string $id_number = ''): Builder
     {
+        if (strlen($id_number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('id_number', $id_number);
     }
 
     public function number(string $number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 
diff --git a/app/Filters/CreditFilters.php b/app/Filters/CreditFilters.php
index 47f5e69b1..61247aad1 100644
--- a/app/Filters/CreditFilters.php
+++ b/app/Filters/CreditFilters.php
@@ -87,6 +87,10 @@ class CreditFilters extends QueryFilters
 
     public function number(string $number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 
diff --git a/app/Filters/ExpenseFilters.php b/app/Filters/ExpenseFilters.php
index 2520ae58e..1e3a622b7 100644
--- a/app/Filters/ExpenseFilters.php
+++ b/app/Filters/ExpenseFilters.php
@@ -134,6 +134,10 @@ class ExpenseFilters extends QueryFilters
 
     public function number(string $number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 
diff --git a/app/Filters/PaymentFilters.php b/app/Filters/PaymentFilters.php
index 09aafd288..c98cb9bd4 100644
--- a/app/Filters/PaymentFilters.php
+++ b/app/Filters/PaymentFilters.php
@@ -80,6 +80,10 @@ class PaymentFilters extends QueryFilters
 
     public function number(string $number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 
diff --git a/app/Filters/ProjectFilters.php b/app/Filters/ProjectFilters.php
index 55ca4f14c..4d1cb2199 100644
--- a/app/Filters/ProjectFilters.php
+++ b/app/Filters/ProjectFilters.php
@@ -40,6 +40,10 @@ class ProjectFilters extends QueryFilters
     
     public function number(string $number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 
diff --git a/app/Filters/PurchaseOrderFilters.php b/app/Filters/PurchaseOrderFilters.php
index cd6c6b1da..f99a7f3a8 100644
--- a/app/Filters/PurchaseOrderFilters.php
+++ b/app/Filters/PurchaseOrderFilters.php
@@ -102,6 +102,10 @@ class PurchaseOrderFilters extends QueryFilters
 
     public function number(string $number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 
diff --git a/app/Filters/QuoteFilters.php b/app/Filters/QuoteFilters.php
index 1c6e7625b..950d6bc00 100644
--- a/app/Filters/QuoteFilters.php
+++ b/app/Filters/QuoteFilters.php
@@ -113,6 +113,10 @@ class QuoteFilters extends QueryFilters
 
     public function number($number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 
diff --git a/app/Filters/RecurringExpenseFilters.php b/app/Filters/RecurringExpenseFilters.php
index 45ed9f122..fa30dc401 100644
--- a/app/Filters/RecurringExpenseFilters.php
+++ b/app/Filters/RecurringExpenseFilters.php
@@ -42,6 +42,10 @@ class RecurringExpenseFilters extends QueryFilters
 
     public function number(string $number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 
diff --git a/app/Filters/RecurringInvoiceFilters.php b/app/Filters/RecurringInvoiceFilters.php
index fc0a721b5..7b981f2cd 100644
--- a/app/Filters/RecurringInvoiceFilters.php
+++ b/app/Filters/RecurringInvoiceFilters.php
@@ -85,6 +85,10 @@ class RecurringInvoiceFilters extends QueryFilters
 
     public function number(string $number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 
diff --git a/app/Filters/RecurringQuoteFilters.php b/app/Filters/RecurringQuoteFilters.php
index 799a1831f..8c35c25b5 100644
--- a/app/Filters/RecurringQuoteFilters.php
+++ b/app/Filters/RecurringQuoteFilters.php
@@ -41,6 +41,10 @@ class RecurringQuoteFilters extends QueryFilters
 
     public function number(string $number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 
diff --git a/app/Filters/SystemLogFilters.php b/app/Filters/SystemLogFilters.php
index 8360f1d1d..1bef963a1 100644
--- a/app/Filters/SystemLogFilters.php
+++ b/app/Filters/SystemLogFilters.php
@@ -20,16 +20,28 @@ class SystemLogFilters extends QueryFilters
 {
     public function type_id(int $type_id): Builder
     {
+        if (isset($event_id) == 0) {
+            return $this->builder;
+        }
+        
         return $this->builder->where('type_id', $type_id);
     }
 
     public function category_id(int $category_id): Builder
     {
+        if (isset($event_id) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('category_id', $category_id);
     }
 
     public function event_id(int $event_id): Builder
     {
+        if (isset($event_id) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('event_id', $event_id);
     }
 
diff --git a/app/Filters/TaskFilters.php b/app/Filters/TaskFilters.php
index e7a455f89..d3e7c77c6 100644
--- a/app/Filters/TaskFilters.php
+++ b/app/Filters/TaskFilters.php
@@ -84,6 +84,10 @@ class TaskFilters extends QueryFilters
     
     public function number(string $number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 
diff --git a/app/Filters/VendorFilters.php b/app/Filters/VendorFilters.php
index feb0b339c..4b5c45687 100644
--- a/app/Filters/VendorFilters.php
+++ b/app/Filters/VendorFilters.php
@@ -48,6 +48,10 @@ class VendorFilters extends QueryFilters
 
     public function number(string $number = ''): Builder
     {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
         return $this->builder->where('number', $number);
     }
 

From 6e9a420bea92185bddc064f46b570b9b82b50a32 Mon Sep 17 00:00:00 2001
From: paulwer <paul@wer-ner.de>
Date: Mon, 30 Jan 2023 10:46:05 +0100
Subject: [PATCH 05/11] unify code + fixes

---
 app/Filters/BankIntegrationFilters.php     | 7 ++++---
 app/Filters/BankTransactionFilters.php     | 9 +++++----
 app/Filters/BankTransactionRuleFilters.php | 9 +++++----
 app/Filters/ClientFilters.php              | 7 ++++---
 app/Filters/DesignFilters.php              | 2 +-
 app/Filters/SystemLogFilters.php           | 8 ++++----
 6 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/app/Filters/BankIntegrationFilters.php b/app/Filters/BankIntegrationFilters.php
index 85924f463..6701f59bf 100644
--- a/app/Filters/BankIntegrationFilters.php
+++ b/app/Filters/BankIntegrationFilters.php
@@ -26,10 +26,11 @@ class BankIntegrationFilters extends QueryFilters
      */
     public function name(string $name = ''): Builder
     {
-        if(strlen($name) >=1)
-            return $this->builder->where('bank_account_name', 'like', '%'.$name.'%');
+        if (strlen($filter) == 0) {
+            return $this->builder;
+        }
 
-        return $this->builder;
+        return $this->builder->where('bank_account_name', 'like', '%'.$name.'%');
     }
 
     /**
diff --git a/app/Filters/BankTransactionFilters.php b/app/Filters/BankTransactionFilters.php
index 784d6efc5..2aabb67f0 100644
--- a/app/Filters/BankTransactionFilters.php
+++ b/app/Filters/BankTransactionFilters.php
@@ -27,10 +27,11 @@ class BankTransactionFilters extends QueryFilters
      */
     public function name(string $name = ''): Builder
     {
-        if(strlen($name) >=1)
-            return $this->builder->where('bank_account_name', 'like', '%'.$name.'%');
-
-        return $this->builder;
+        if (strlen($filter) == 0) {
+            return $this->builder;
+        }
+        
+        return $this->builder->where('bank_account_name', 'like', '%'.$name.'%');
     }
 
     /**
diff --git a/app/Filters/BankTransactionRuleFilters.php b/app/Filters/BankTransactionRuleFilters.php
index c928ca156..76d3f936d 100644
--- a/app/Filters/BankTransactionRuleFilters.php
+++ b/app/Filters/BankTransactionRuleFilters.php
@@ -30,10 +30,11 @@ class BankTransactionRuleFilters extends QueryFilters
      */
     public function name(string $name = ''): Builder
     {
-        if(strlen($name) >=1)
-            return $this->builder->where('name', 'like', '%'.$name.'%');
-
-        return $this->builder;
+        if (strlen($filter) == 0) {
+            return $this->builder;
+        }
+        
+        return $this->builder->where('name', 'like', '%'.$name.'%');
     }
 
     /**
diff --git a/app/Filters/ClientFilters.php b/app/Filters/ClientFilters.php
index 2cf72b638..762e4384a 100644
--- a/app/Filters/ClientFilters.php
+++ b/app/Filters/ClientFilters.php
@@ -30,10 +30,11 @@ class ClientFilters extends QueryFilters
      */
     public function name(string $name = ''): Builder
     {
-        if(strlen($name) >=1)
-            return $this->builder->where('name', 'like', '%'.$name.'%');
+        if (strlen($filter) == 0) {
+            return $this->builder;
+        }
 
-        return $this->builder;
+        return $this->builder->where('name', 'like', '%'.$name.'%');
     }
 
     /**
diff --git a/app/Filters/DesignFilters.php b/app/Filters/DesignFilters.php
index 7cd323ef8..3a2ae7edd 100644
--- a/app/Filters/DesignFilters.php
+++ b/app/Filters/DesignFilters.php
@@ -32,7 +32,7 @@ class DesignFilters extends QueryFilters
             return $this->builder;
         }
 
-        return  $this->builder->where(function ($query) use ($filter) {
+        return $this->builder->where(function ($query) use ($filter) {
             $query->where('designs.name', 'like', '%'.$filter.'%');
         });
     }
diff --git a/app/Filters/SystemLogFilters.php b/app/Filters/SystemLogFilters.php
index 1bef963a1..8c79691e3 100644
--- a/app/Filters/SystemLogFilters.php
+++ b/app/Filters/SystemLogFilters.php
@@ -20,7 +20,7 @@ class SystemLogFilters extends QueryFilters
 {
     public function type_id(int $type_id): Builder
     {
-        if (isset($event_id) == 0) {
+        if (isset($event_id)) {
             return $this->builder;
         }
         
@@ -29,7 +29,7 @@ class SystemLogFilters extends QueryFilters
 
     public function category_id(int $category_id): Builder
     {
-        if (isset($event_id) == 0) {
+        if (isset($event_id)) {
             return $this->builder;
         }
 
@@ -38,7 +38,7 @@ class SystemLogFilters extends QueryFilters
 
     public function event_id(int $event_id): Builder
     {
-        if (isset($event_id) == 0) {
+        if (isset($event_id)) {
             return $this->builder;
         }
 
@@ -54,7 +54,7 @@ class SystemLogFilters extends QueryFilters
      */
     public function filter(string $filter = ''): Builder
     {
-        if (strlen($filter) == 0) {
+        if (strlen($filter)) {
             return $this->builder;
         }
 

From e8d19abf7ab9f7261267dbc08bdd8a6e3195c70d Mon Sep 17 00:00:00 2001
From: paulwer <paul@wer-ner.de>
Date: Mon, 30 Jan 2023 11:04:55 +0100
Subject: [PATCH 06/11] sort early returns + type_id/category_id&event_id as
 strings

---
 app/Filters/BankIntegrationFilters.php     |  4 ++++
 app/Filters/BankTransactionFilters.php     |  3 ++-
 app/Filters/BankTransactionRuleFilters.php |  4 ++++
 app/Filters/ClientFilters.php              |  4 ++++
 app/Filters/CompanyGatewayFilters.php      |  4 ++++
 app/Filters/CreditFilters.php              |  4 ++++
 app/Filters/DesignFilters.php              |  7 ++++---
 app/Filters/DocumentFilters.php            |  7 ++++---
 app/Filters/ExpenseCategoryFilters.php     |  4 ++++
 app/Filters/ExpenseFilters.php             |  4 ++++
 app/Filters/InvoiceFilters.php             |  3 +--
 app/Filters/PaymentTermFilters.php         |  4 ++++
 app/Filters/ProductFilters.php             |  3 ++-
 app/Filters/ProjectFilters.php             |  4 ++++
 app/Filters/PurchaseOrderFilters.php       |  4 ++++
 app/Filters/QuoteFilters.php               |  4 ++++
 app/Filters/RecurringExpenseFilters.php    |  4 ++++
 app/Filters/RecurringInvoiceFilters.php    |  4 ++++
 app/Filters/RecurringQuoteFilters.php      |  4 ++++
 app/Filters/SubscriptionFilters.php        |  4 ++++
 app/Filters/SystemLogFilters.php           | 16 ++++++++++------
 app/Filters/TaskFilters.php                |  4 ++++
 app/Filters/TaskStatusFilters.php          |  4 ++++
 app/Filters/TaxRateFilters.php             |  4 ++++
 app/Filters/TokenFilters.php               |  4 ++++
 app/Filters/UserFilters.php                |  4 ++++
 app/Filters/VendorFilters.php              |  4 ++++
 app/Filters/WebhookFilters.php             |  4 ++++
 28 files changed, 111 insertions(+), 16 deletions(-)

diff --git a/app/Filters/BankIntegrationFilters.php b/app/Filters/BankIntegrationFilters.php
index 6701f59bf..3149394ee 100644
--- a/app/Filters/BankIntegrationFilters.php
+++ b/app/Filters/BankIntegrationFilters.php
@@ -94,6 +94,10 @@ class BankIntegrationFilters extends QueryFilters
     public function sort(string $sort): Builder
     {
         $sort_col = explode('|', $sort);
+
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
         
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
diff --git a/app/Filters/BankTransactionFilters.php b/app/Filters/BankTransactionFilters.php
index 2aabb67f0..5f613174d 100644
--- a/app/Filters/BankTransactionFilters.php
+++ b/app/Filters/BankTransactionFilters.php
@@ -128,8 +128,9 @@ class BankTransactionFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
-        if(!is_array($sort_col))
+        if (!is_array($sort_col) || count($sort_col) != 2) {
             return $this->builder;
+        }
         
         if($sort_col[0] == 'deposit')
             return $this->builder->where('base_type', 'CREDIT')->orderBy('amount', $sort_col[1]);
diff --git a/app/Filters/BankTransactionRuleFilters.php b/app/Filters/BankTransactionRuleFilters.php
index 76d3f936d..55b95b0da 100644
--- a/app/Filters/BankTransactionRuleFilters.php
+++ b/app/Filters/BankTransactionRuleFilters.php
@@ -65,6 +65,10 @@ class BankTransactionRuleFilters extends QueryFilters
     public function sort(string $sort): Builder
     {
         $sort_col = explode('|', $sort);
+
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
         
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
diff --git a/app/Filters/ClientFilters.php b/app/Filters/ClientFilters.php
index 762e4384a..3846de9d3 100644
--- a/app/Filters/ClientFilters.php
+++ b/app/Filters/ClientFilters.php
@@ -143,6 +143,10 @@ class ClientFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
+
         if($sort_col[0] == 'display_name')
             $sort_col[0] = 'name';
         
diff --git a/app/Filters/CompanyGatewayFilters.php b/app/Filters/CompanyGatewayFilters.php
index 9722e9124..14656aa7d 100644
--- a/app/Filters/CompanyGatewayFilters.php
+++ b/app/Filters/CompanyGatewayFilters.php
@@ -47,6 +47,10 @@ class CompanyGatewayFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
+
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
 
diff --git a/app/Filters/CreditFilters.php b/app/Filters/CreditFilters.php
index 61247aad1..c1f1f89cf 100644
--- a/app/Filters/CreditFilters.php
+++ b/app/Filters/CreditFilters.php
@@ -104,6 +104,10 @@ class CreditFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
+
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
 
diff --git a/app/Filters/DesignFilters.php b/app/Filters/DesignFilters.php
index 3a2ae7edd..9fcd17677 100644
--- a/app/Filters/DesignFilters.php
+++ b/app/Filters/DesignFilters.php
@@ -48,10 +48,11 @@ class DesignFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
-        if(is_array($sort_col))
-            return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
 
-        return $this->builder;
+        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
 
     /**
diff --git a/app/Filters/DocumentFilters.php b/app/Filters/DocumentFilters.php
index bcdcd9e09..575e471bf 100644
--- a/app/Filters/DocumentFilters.php
+++ b/app/Filters/DocumentFilters.php
@@ -58,10 +58,11 @@ class DocumentFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
-        if(is_array($sort_col))
-            return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
 
-        return $this->builder;
+        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
 
 
diff --git a/app/Filters/ExpenseCategoryFilters.php b/app/Filters/ExpenseCategoryFilters.php
index 53ed1e987..9dd9c54d5 100644
--- a/app/Filters/ExpenseCategoryFilters.php
+++ b/app/Filters/ExpenseCategoryFilters.php
@@ -45,6 +45,10 @@ class ExpenseCategoryFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
+
         if (is_array($sort_col) && in_array($sort_col[1], ['asc', 'desc']) && in_array($sort_col[0], ['name']))
             return $this->builder->orderBy($sort_col[0], $sort_col[1]);
         
diff --git a/app/Filters/ExpenseFilters.php b/app/Filters/ExpenseFilters.php
index 1e3a622b7..cb2fa3181 100644
--- a/app/Filters/ExpenseFilters.php
+++ b/app/Filters/ExpenseFilters.php
@@ -151,6 +151,10 @@ class ExpenseFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
+
         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'])) {
             return $this->builder->orderBy($sort_col[0], $sort_col[1]);
         }
diff --git a/app/Filters/InvoiceFilters.php b/app/Filters/InvoiceFilters.php
index f76f178f6..55d2d2097 100644
--- a/app/Filters/InvoiceFilters.php
+++ b/app/Filters/InvoiceFilters.php
@@ -179,8 +179,7 @@ class InvoiceFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
-        //catch invalid explode array count
-        if (count($sort_col) == 1) {
+        if (!is_array($sort_col) || count($sort_col) != 2) {
             return $this->builder;
         }
 
diff --git a/app/Filters/PaymentTermFilters.php b/app/Filters/PaymentTermFilters.php
index f9d87955d..dea2ab363 100644
--- a/app/Filters/PaymentTermFilters.php
+++ b/app/Filters/PaymentTermFilters.php
@@ -46,6 +46,10 @@ class PaymentTermFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
+
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
 
diff --git a/app/Filters/ProductFilters.php b/app/Filters/ProductFilters.php
index 3a976a9c9..03dc74f15 100644
--- a/app/Filters/ProductFilters.php
+++ b/app/Filters/ProductFilters.php
@@ -62,8 +62,9 @@ class ProductFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
-        if(!is_array($sort_col))
+        if (!is_array($sort_col) || count($sort_col) != 2) {
             return $this->builder;
+        }
 
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
diff --git a/app/Filters/ProjectFilters.php b/app/Filters/ProjectFilters.php
index 4d1cb2199..fb32fd691 100644
--- a/app/Filters/ProjectFilters.php
+++ b/app/Filters/ProjectFilters.php
@@ -57,6 +57,10 @@ class ProjectFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
+
         if(is_array($sort_col))
             return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
diff --git a/app/Filters/PurchaseOrderFilters.php b/app/Filters/PurchaseOrderFilters.php
index f99a7f3a8..7b766ca92 100644
--- a/app/Filters/PurchaseOrderFilters.php
+++ b/app/Filters/PurchaseOrderFilters.php
@@ -119,6 +119,10 @@ class PurchaseOrderFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
+
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
 
diff --git a/app/Filters/QuoteFilters.php b/app/Filters/QuoteFilters.php
index 950d6bc00..9c87a2b72 100644
--- a/app/Filters/QuoteFilters.php
+++ b/app/Filters/QuoteFilters.php
@@ -130,6 +130,10 @@ class QuoteFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
+
         if($sort_col[0] == 'valid_until')
             $sort_col[0] = 'due_date';
 
diff --git a/app/Filters/RecurringExpenseFilters.php b/app/Filters/RecurringExpenseFilters.php
index fa30dc401..ffd82427e 100644
--- a/app/Filters/RecurringExpenseFilters.php
+++ b/app/Filters/RecurringExpenseFilters.php
@@ -59,6 +59,10 @@ class RecurringExpenseFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
+
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
 
diff --git a/app/Filters/RecurringInvoiceFilters.php b/app/Filters/RecurringInvoiceFilters.php
index 7b981f2cd..0291200b4 100644
--- a/app/Filters/RecurringInvoiceFilters.php
+++ b/app/Filters/RecurringInvoiceFilters.php
@@ -102,6 +102,10 @@ class RecurringInvoiceFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
+
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
 
diff --git a/app/Filters/RecurringQuoteFilters.php b/app/Filters/RecurringQuoteFilters.php
index 8c35c25b5..b551c5eba 100644
--- a/app/Filters/RecurringQuoteFilters.php
+++ b/app/Filters/RecurringQuoteFilters.php
@@ -58,6 +58,10 @@ class RecurringQuoteFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
+
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
 
diff --git a/app/Filters/SubscriptionFilters.php b/app/Filters/SubscriptionFilters.php
index 1ff2051c6..e8f137558 100644
--- a/app/Filters/SubscriptionFilters.php
+++ b/app/Filters/SubscriptionFilters.php
@@ -46,6 +46,10 @@ class SubscriptionFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
+
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
 
diff --git a/app/Filters/SystemLogFilters.php b/app/Filters/SystemLogFilters.php
index 8c79691e3..aa3c88ac9 100644
--- a/app/Filters/SystemLogFilters.php
+++ b/app/Filters/SystemLogFilters.php
@@ -18,27 +18,27 @@ use Illuminate\Database\Eloquent\Builder;
  */
 class SystemLogFilters extends QueryFilters
 {
-    public function type_id(int $type_id): Builder
+    public function type_id(string $type_id = ''): Builder
     {
-        if (isset($event_id)) {
+        if (strlen($type_id)) {
             return $this->builder;
         }
         
         return $this->builder->where('type_id', $type_id);
     }
 
-    public function category_id(int $category_id): Builder
+    public function category_id(string $category_id = ''): Builder
     {
-        if (isset($event_id)) {
+        if (strlen($category_id)) {
             return $this->builder;
         }
 
         return $this->builder->where('category_id', $category_id);
     }
 
-    public function event_id(int $event_id): Builder
+    public function event_id(string $event_id = ''): Builder
     {
-        if (isset($event_id)) {
+        if (strlen($event_id)) {
             return $this->builder;
         }
 
@@ -71,6 +71,10 @@ class SystemLogFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
+
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
 
diff --git a/app/Filters/TaskFilters.php b/app/Filters/TaskFilters.php
index d3e7c77c6..88efbc430 100644
--- a/app/Filters/TaskFilters.php
+++ b/app/Filters/TaskFilters.php
@@ -101,6 +101,10 @@ class TaskFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
+
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
 
diff --git a/app/Filters/TaskStatusFilters.php b/app/Filters/TaskStatusFilters.php
index ee2d87a10..3e1baab6e 100644
--- a/app/Filters/TaskStatusFilters.php
+++ b/app/Filters/TaskStatusFilters.php
@@ -46,6 +46,10 @@ class TaskStatusFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
+
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
 
diff --git a/app/Filters/TaxRateFilters.php b/app/Filters/TaxRateFilters.php
index 482c9ed94..9fd81df73 100644
--- a/app/Filters/TaxRateFilters.php
+++ b/app/Filters/TaxRateFilters.php
@@ -46,6 +46,10 @@ class TaxRateFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
+
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
 
diff --git a/app/Filters/TokenFilters.php b/app/Filters/TokenFilters.php
index c98601dc2..e775c6601 100644
--- a/app/Filters/TokenFilters.php
+++ b/app/Filters/TokenFilters.php
@@ -46,6 +46,10 @@ class TokenFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
+
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
     
diff --git a/app/Filters/UserFilters.php b/app/Filters/UserFilters.php
index ef2e257d5..a1faf9a27 100644
--- a/app/Filters/UserFilters.php
+++ b/app/Filters/UserFilters.php
@@ -50,6 +50,10 @@ class UserFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
+
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
 
diff --git a/app/Filters/VendorFilters.php b/app/Filters/VendorFilters.php
index 4b5c45687..0c7a647ac 100644
--- a/app/Filters/VendorFilters.php
+++ b/app/Filters/VendorFilters.php
@@ -65,6 +65,10 @@ class VendorFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
+
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
 
diff --git a/app/Filters/WebhookFilters.php b/app/Filters/WebhookFilters.php
index 606a9984f..38554a213 100644
--- a/app/Filters/WebhookFilters.php
+++ b/app/Filters/WebhookFilters.php
@@ -46,6 +46,10 @@ class WebhookFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
+
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
 

From cccf7a3cc21ffc15610c98fd9804a229b57e95cb Mon Sep 17 00:00:00 2001
From: paulwer <paul@wer-ner.de>
Date: Mon, 30 Jan 2023 11:06:01 +0100
Subject: [PATCH 07/11] fixes

---
 app/Filters/PaymentFilters.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Filters/PaymentFilters.php b/app/Filters/PaymentFilters.php
index c98cb9bd4..8df7cd192 100644
--- a/app/Filters/PaymentFilters.php
+++ b/app/Filters/PaymentFilters.php
@@ -72,10 +72,11 @@ class PaymentFilters extends QueryFilters
     {
         $sort_col = explode('|', $sort);
 
-        if(is_array($sort_col))
-            return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        if (!is_array($sort_col) || count($sort_col) != 2) {
+            return $this->builder;
+        }
 
-        return true;
+        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
 
     public function number(string $number = ''): Builder

From ae5b9c0dd47d27d9b3c726fc7195046093b31c9e Mon Sep 17 00:00:00 2001
From: paulwer <paul@wer-ner.de>
Date: Mon, 30 Jan 2023 11:13:44 +0100
Subject: [PATCH 08/11] code quality + param-name fixes

---
 app/Filters/BankIntegrationFilters.php     |  2 +-
 app/Filters/BankTransactionFilters.php     |  2 +-
 app/Filters/BankTransactionRuleFilters.php |  2 +-
 app/Filters/ClientFilters.php              |  2 +-
 app/Filters/PaymentFilters.php             | 18 +++++++++---------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/Filters/BankIntegrationFilters.php b/app/Filters/BankIntegrationFilters.php
index 3149394ee..95646a3f0 100644
--- a/app/Filters/BankIntegrationFilters.php
+++ b/app/Filters/BankIntegrationFilters.php
@@ -26,7 +26,7 @@ class BankIntegrationFilters extends QueryFilters
      */
     public function name(string $name = ''): Builder
     {
-        if (strlen($filter) == 0) {
+        if (strlen($name) == 0) {
             return $this->builder;
         }
 
diff --git a/app/Filters/BankTransactionFilters.php b/app/Filters/BankTransactionFilters.php
index 5f613174d..20aeed293 100644
--- a/app/Filters/BankTransactionFilters.php
+++ b/app/Filters/BankTransactionFilters.php
@@ -27,7 +27,7 @@ class BankTransactionFilters extends QueryFilters
      */
     public function name(string $name = ''): Builder
     {
-        if (strlen($filter) == 0) {
+        if (strlen($name) == 0) {
             return $this->builder;
         }
         
diff --git a/app/Filters/BankTransactionRuleFilters.php b/app/Filters/BankTransactionRuleFilters.php
index 55b95b0da..5cfe21f7e 100644
--- a/app/Filters/BankTransactionRuleFilters.php
+++ b/app/Filters/BankTransactionRuleFilters.php
@@ -30,7 +30,7 @@ class BankTransactionRuleFilters extends QueryFilters
      */
     public function name(string $name = ''): Builder
     {
-        if (strlen($filter) == 0) {
+        if (strlen($name) == 0) {
             return $this->builder;
         }
         
diff --git a/app/Filters/ClientFilters.php b/app/Filters/ClientFilters.php
index 3846de9d3..9278ff2a3 100644
--- a/app/Filters/ClientFilters.php
+++ b/app/Filters/ClientFilters.php
@@ -30,7 +30,7 @@ class ClientFilters extends QueryFilters
      */
     public function name(string $name = ''): Builder
     {
-        if (strlen($filter) == 0) {
+        if (strlen($name) == 0) {
             return $this->builder;
         }
 
diff --git a/app/Filters/PaymentFilters.php b/app/Filters/PaymentFilters.php
index 8df7cd192..e51f0cbfe 100644
--- a/app/Filters/PaymentFilters.php
+++ b/app/Filters/PaymentFilters.php
@@ -62,6 +62,15 @@ class PaymentFilters extends QueryFilters
         return $this->builder;
     }
 
+    public function number(string $number = ''): Builder
+    {
+        if (strlen($number) == 0) {
+            return $this->builder;
+        }
+
+        return $this->builder->where('number', $number);
+    }
+
     /**
      * Sorts the list based on $sort.
      *
@@ -79,15 +88,6 @@ class PaymentFilters extends QueryFilters
         return $this->builder->orderBy($sort_col[0], $sort_col[1]);
     }
 
-    public function number(string $number = ''): Builder
-    {
-        if (strlen($number) == 0) {
-            return $this->builder;
-        }
-
-        return $this->builder->where('number', $number);
-    }
-
     /**
      * Filters the query by the users company ID.
      *

From f27cca7f0941753f36063e9d5ee44c9643dd4d35 Mon Sep 17 00:00:00 2001
From: paulwer <paul@wer-ner.de>
Date: Mon, 30 Jan 2023 12:08:39 +0100
Subject: [PATCH 09/11] default value for sort input & fixes for strlen

---
 app/Filters/BankIntegrationFilters.php     |  2 +-
 app/Filters/BankTransactionFilters.php     |  2 +-
 app/Filters/BankTransactionRuleFilters.php |  2 +-
 app/Filters/ClientFilters.php              |  4 ++--
 app/Filters/CompanyGatewayFilters.php      |  2 +-
 app/Filters/CreditFilters.php              |  2 +-
 app/Filters/DesignFilters.php              |  2 +-
 app/Filters/ExpenseCategoryFilters.php     |  2 +-
 app/Filters/ExpenseFilters.php             |  2 +-
 app/Filters/PaymentFilters.php             |  2 +-
 app/Filters/PaymentTermFilters.php         |  2 +-
 app/Filters/ProductFilters.php             |  2 +-
 app/Filters/ProjectFilters.php             |  2 +-
 app/Filters/PurchaseOrderFilters.php       |  2 +-
 app/Filters/QuoteFilters.php               |  2 +-
 app/Filters/RecurringExpenseFilters.php    |  2 +-
 app/Filters/RecurringInvoiceFilters.php    |  2 +-
 app/Filters/RecurringQuoteFilters.php      |  2 +-
 app/Filters/SubscriptionFilters.php        |  2 +-
 app/Filters/SystemLogFilters.php           | 10 +++++-----
 app/Filters/TaskFilters.php                |  2 +-
 app/Filters/TaskStatusFilters.php          |  2 +-
 app/Filters/TaxRateFilters.php             |  2 +-
 app/Filters/TokenFilters.php               |  2 +-
 app/Filters/UserFilters.php                |  5 +++--
 app/Filters/VendorFilters.php              |  2 +-
 app/Filters/WebhookFilters.php             |  2 +-
 27 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/app/Filters/BankIntegrationFilters.php b/app/Filters/BankIntegrationFilters.php
index 95646a3f0..1932b0995 100644
--- a/app/Filters/BankIntegrationFilters.php
+++ b/app/Filters/BankIntegrationFilters.php
@@ -91,7 +91,7 @@ class BankIntegrationFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/BankTransactionFilters.php b/app/Filters/BankTransactionFilters.php
index 20aeed293..4830277be 100644
--- a/app/Filters/BankTransactionFilters.php
+++ b/app/Filters/BankTransactionFilters.php
@@ -124,7 +124,7 @@ class BankTransactionFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/BankTransactionRuleFilters.php b/app/Filters/BankTransactionRuleFilters.php
index 5cfe21f7e..ce8d1c58d 100644
--- a/app/Filters/BankTransactionRuleFilters.php
+++ b/app/Filters/BankTransactionRuleFilters.php
@@ -62,7 +62,7 @@ class BankTransactionRuleFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/ClientFilters.php b/app/Filters/ClientFilters.php
index 9278ff2a3..0c89b7e44 100644
--- a/app/Filters/ClientFilters.php
+++ b/app/Filters/ClientFilters.php
@@ -60,7 +60,7 @@ class ClientFilters extends QueryFilters
     {
         $parts = explode(':', $balance);
 
-        if (! is_array($parts)) {
+        if (!is_array($sort_col) || count($sort_col) != 2) {
             return $this->builder;
         }
 
@@ -139,7 +139,7 @@ class ClientFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/CompanyGatewayFilters.php b/app/Filters/CompanyGatewayFilters.php
index 14656aa7d..fd7ec9c5f 100644
--- a/app/Filters/CompanyGatewayFilters.php
+++ b/app/Filters/CompanyGatewayFilters.php
@@ -43,7 +43,7 @@ class CompanyGatewayFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/CreditFilters.php b/app/Filters/CreditFilters.php
index c1f1f89cf..b95e18b14 100644
--- a/app/Filters/CreditFilters.php
+++ b/app/Filters/CreditFilters.php
@@ -100,7 +100,7 @@ class CreditFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/DesignFilters.php b/app/Filters/DesignFilters.php
index 9fcd17677..3985fb6a1 100644
--- a/app/Filters/DesignFilters.php
+++ b/app/Filters/DesignFilters.php
@@ -44,7 +44,7 @@ class DesignFilters extends QueryFilters
      * 
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/ExpenseCategoryFilters.php b/app/Filters/ExpenseCategoryFilters.php
index 9dd9c54d5..3ed24beac 100644
--- a/app/Filters/ExpenseCategoryFilters.php
+++ b/app/Filters/ExpenseCategoryFilters.php
@@ -41,7 +41,7 @@ class ExpenseCategoryFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/ExpenseFilters.php b/app/Filters/ExpenseFilters.php
index cb2fa3181..e04cc216e 100644
--- a/app/Filters/ExpenseFilters.php
+++ b/app/Filters/ExpenseFilters.php
@@ -147,7 +147,7 @@ class ExpenseFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/PaymentFilters.php b/app/Filters/PaymentFilters.php
index e51f0cbfe..f3c21072d 100644
--- a/app/Filters/PaymentFilters.php
+++ b/app/Filters/PaymentFilters.php
@@ -77,7 +77,7 @@ class PaymentFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/PaymentTermFilters.php b/app/Filters/PaymentTermFilters.php
index dea2ab363..26400394c 100644
--- a/app/Filters/PaymentTermFilters.php
+++ b/app/Filters/PaymentTermFilters.php
@@ -42,7 +42,7 @@ class PaymentTermFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/ProductFilters.php b/app/Filters/ProductFilters.php
index 03dc74f15..5357073f3 100644
--- a/app/Filters/ProductFilters.php
+++ b/app/Filters/ProductFilters.php
@@ -58,7 +58,7 @@ class ProductFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/ProjectFilters.php b/app/Filters/ProjectFilters.php
index fb32fd691..c15454644 100644
--- a/app/Filters/ProjectFilters.php
+++ b/app/Filters/ProjectFilters.php
@@ -53,7 +53,7 @@ class ProjectFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Illuminate\Eloquent\Query\Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/PurchaseOrderFilters.php b/app/Filters/PurchaseOrderFilters.php
index 7b766ca92..7fb0c7594 100644
--- a/app/Filters/PurchaseOrderFilters.php
+++ b/app/Filters/PurchaseOrderFilters.php
@@ -115,7 +115,7 @@ class PurchaseOrderFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/QuoteFilters.php b/app/Filters/QuoteFilters.php
index 9c87a2b72..23bb09ba8 100644
--- a/app/Filters/QuoteFilters.php
+++ b/app/Filters/QuoteFilters.php
@@ -126,7 +126,7 @@ class QuoteFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/RecurringExpenseFilters.php b/app/Filters/RecurringExpenseFilters.php
index ffd82427e..f8e0c2ba6 100644
--- a/app/Filters/RecurringExpenseFilters.php
+++ b/app/Filters/RecurringExpenseFilters.php
@@ -55,7 +55,7 @@ class RecurringExpenseFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/RecurringInvoiceFilters.php b/app/Filters/RecurringInvoiceFilters.php
index 0291200b4..07884685e 100644
--- a/app/Filters/RecurringInvoiceFilters.php
+++ b/app/Filters/RecurringInvoiceFilters.php
@@ -98,7 +98,7 @@ class RecurringInvoiceFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/RecurringQuoteFilters.php b/app/Filters/RecurringQuoteFilters.php
index b551c5eba..eb9d593aa 100644
--- a/app/Filters/RecurringQuoteFilters.php
+++ b/app/Filters/RecurringQuoteFilters.php
@@ -54,7 +54,7 @@ class RecurringQuoteFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Illuminate\Database\Eloquent\Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/SubscriptionFilters.php b/app/Filters/SubscriptionFilters.php
index e8f137558..d9722e46c 100644
--- a/app/Filters/SubscriptionFilters.php
+++ b/app/Filters/SubscriptionFilters.php
@@ -42,7 +42,7 @@ class SubscriptionFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/SystemLogFilters.php b/app/Filters/SystemLogFilters.php
index aa3c88ac9..3fb6c80b0 100644
--- a/app/Filters/SystemLogFilters.php
+++ b/app/Filters/SystemLogFilters.php
@@ -20,7 +20,7 @@ class SystemLogFilters extends QueryFilters
 {
     public function type_id(string $type_id = ''): Builder
     {
-        if (strlen($type_id)) {
+        if (strlen($type_id) == 0) {
             return $this->builder;
         }
         
@@ -29,7 +29,7 @@ class SystemLogFilters extends QueryFilters
 
     public function category_id(string $category_id = ''): Builder
     {
-        if (strlen($category_id)) {
+        if (strlen($category_id) == 0) {
             return $this->builder;
         }
 
@@ -38,7 +38,7 @@ class SystemLogFilters extends QueryFilters
 
     public function event_id(string $event_id = ''): Builder
     {
-        if (strlen($event_id)) {
+        if (strlen($event_id) == 0) {
             return $this->builder;
         }
 
@@ -54,7 +54,7 @@ class SystemLogFilters extends QueryFilters
      */
     public function filter(string $filter = ''): Builder
     {
-        if (strlen($filter)) {
+        if (strlen($filter) == 0) {
             return $this->builder;
         }
 
@@ -67,7 +67,7 @@ class SystemLogFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/TaskFilters.php b/app/Filters/TaskFilters.php
index 88efbc430..9e732fcf9 100644
--- a/app/Filters/TaskFilters.php
+++ b/app/Filters/TaskFilters.php
@@ -97,7 +97,7 @@ class TaskFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/TaskStatusFilters.php b/app/Filters/TaskStatusFilters.php
index 3e1baab6e..35ef91a02 100644
--- a/app/Filters/TaskStatusFilters.php
+++ b/app/Filters/TaskStatusFilters.php
@@ -42,7 +42,7 @@ class TaskStatusFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/TaxRateFilters.php b/app/Filters/TaxRateFilters.php
index 9fd81df73..8d225d3db 100644
--- a/app/Filters/TaxRateFilters.php
+++ b/app/Filters/TaxRateFilters.php
@@ -42,7 +42,7 @@ class TaxRateFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/TokenFilters.php b/app/Filters/TokenFilters.php
index e775c6601..60e43faec 100644
--- a/app/Filters/TokenFilters.php
+++ b/app/Filters/TokenFilters.php
@@ -42,7 +42,7 @@ class TokenFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/UserFilters.php b/app/Filters/UserFilters.php
index a1faf9a27..a53b2eded 100644
--- a/app/Filters/UserFilters.php
+++ b/app/Filters/UserFilters.php
@@ -46,7 +46,7 @@ class UserFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
@@ -80,8 +80,9 @@ class UserFilters extends QueryFilters
     public function with(string $value = ''): Builder
     {
 
-        if(strlen($value) == 0)
+        if(strlen($value) == 0) {
             return $this->builder;
+        }
 
         return $this->builder
             ->orWhere($this->with_property, $value)
diff --git a/app/Filters/VendorFilters.php b/app/Filters/VendorFilters.php
index 0c7a647ac..4937a7513 100644
--- a/app/Filters/VendorFilters.php
+++ b/app/Filters/VendorFilters.php
@@ -61,7 +61,7 @@ class VendorFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 
diff --git a/app/Filters/WebhookFilters.php b/app/Filters/WebhookFilters.php
index 38554a213..6ab092749 100644
--- a/app/Filters/WebhookFilters.php
+++ b/app/Filters/WebhookFilters.php
@@ -42,7 +42,7 @@ class WebhookFilters extends QueryFilters
      * @param string sort formatted as column|asc
      * @return Builder
      */
-    public function sort(string $sort): Builder
+    public function sort(string $sort = ''): Builder
     {
         $sort_col = explode('|', $sort);
 

From 64af473b8891b5e5735dd68050ae5b912ee59001 Mon Sep 17 00:00:00 2001
From: paulwer <paul@wer-ner.de>
Date: Mon, 30 Jan 2023 12:21:17 +0100
Subject: [PATCH 10/11] fixes

---
 app/Filters/ClientFilters.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Filters/ClientFilters.php b/app/Filters/ClientFilters.php
index 0c89b7e44..988c81e29 100644
--- a/app/Filters/ClientFilters.php
+++ b/app/Filters/ClientFilters.php
@@ -60,7 +60,7 @@ class ClientFilters extends QueryFilters
     {
         $parts = explode(':', $balance);
 
-        if (!is_array($sort_col) || count($sort_col) != 2) {
+        if (!is_array($parts) || count($parts) != 2) {
             return $this->builder;
         }
 

From f380e77f48e5fea80e42ff086113897facf87d45 Mon Sep 17 00:00:00 2001
From: paulwer <paul@wer-ner.de>
Date: Mon, 30 Jan 2023 12:23:37 +0100
Subject: [PATCH 11/11] fixes

---
 app/Filters/ClientFilters.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/Filters/ClientFilters.php b/app/Filters/ClientFilters.php
index 988c81e29..513551b2e 100644
--- a/app/Filters/ClientFilters.php
+++ b/app/Filters/ClientFilters.php
@@ -43,8 +43,12 @@ class ClientFilters extends QueryFilters
      * @param string $balance
      * @return Builder
      */
-    public function balance(string $balance): Builder
+    public function balance(string $balance = ''): Builder
     {
+        if (strlen($balance) == 0) {
+            return $this->builder;
+        }
+
         $parts = $this->split($balance);
 
         return $this->builder->where('balance', $parts->operator, $parts->value);
@@ -56,7 +60,7 @@ class ClientFilters extends QueryFilters
      * @param string balance
      * @return Builder
      */
-    public function between_balance(string $balance): Builder
+    public function between_balance(string $balance = ''): Builder
     {
         $parts = explode(':', $balance);