Improve sort filters

app/Filters/BankIntegrationFilters.php

@@ -97,7 +97,9 @@ class BankIntegrationFilters extends QueryFilters
             return $this->builder;
         }
         
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
+
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
 
     /**

app/Filters/BankTransactionFilters.php

@@ -128,13 +128,15 @@ class BankTransactionFilters extends QueryFilters
         if (!is_array($sort_col) || count($sort_col) != 2) {
             return $this->builder;
         }
-        
+
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
+
         if ($sort_col[0] == 'deposit') {
-            return $this->builder->where('base_type', 'CREDIT')->orderBy('amount', $sort_col[1]);
+            return $this->builder->where('base_type', 'CREDIT')->orderBy('amount', $dir);
         }
 
         if ($sort_col[0] == 'withdrawal') {
-            return $this->builder->where('base_type', 'DEBIT')->orderBy('amount', $sort_col[1]);
+            return $this->builder->where('base_type', 'DEBIT')->orderBy('amount', $dir);
         }
 
         if ($sort_col[0] == 'status') {
@@ -145,7 +147,7 @@ class BankTransactionFilters extends QueryFilters
             return $this->builder;
         }
 
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
 
     /**

app/Filters/BankTransactionRuleFilters.php

@@ -65,7 +65,9 @@ class BankTransactionRuleFilters extends QueryFilters
             return $this->builder;
         }
         
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
+
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
 
     /**

app/Filters/ClientFilters.php

@@ -161,8 +161,10 @@ class ClientFilters extends QueryFilters
         if ($sort_col[0] == 'display_name') {
             $sort_col[0] = 'name';
         }
+
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
         
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
     
     /**

app/Filters/CompanyGatewayFilters.php

@@ -49,8 +49,10 @@ class CompanyGatewayFilters extends QueryFilters
         if (!is_array($sort_col) || count($sort_col) != 2) {
             return $this->builder;
         }
+        
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
 
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
 
     /**

app/Filters/CreditFilters.php

@@ -139,12 +139,14 @@ class CreditFilters extends QueryFilters
             return $this->builder;
         }
 
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
+
         if ($sort_col[0] == 'client_id') {
             return $this->builder->orderBy(\App\Models\Client::select('name')
-                    ->whereColumn('clients.id', 'credits.client_id'), $sort_col[1]);
+                    ->whereColumn('clients.id', 'credits.client_id'), $dir);
         }
 
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
 
     /**

app/Filters/DesignFilters.php

@@ -51,7 +51,9 @@ class DesignFilters extends QueryFilters
             return $this->builder;
         }
 
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
+
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
 
     public function entities(string $entities = ''): Builder

app/Filters/DocumentFilters.php

@@ -12,6 +12,7 @@
 namespace App\Filters;
 
 use App\Models\Company;
+use App\Filters\QueryFilters;
 use Illuminate\Database\Eloquent\Builder;
 
 /**
@@ -63,7 +64,9 @@ class DocumentFilters extends QueryFilters
             return $this->builder;
         }
 
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
+
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
 
 

app/Filters/ExpenseCategoryFilters.php

@@ -47,7 +47,7 @@ class ExpenseCategoryFilters extends QueryFilters
         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]);
         }

app/Filters/GroupSettingFilters.php

@@ -64,8 +64,10 @@ class GroupSettingFilters extends QueryFilters
         if (!is_array($sort_col) || count($sort_col) != 2) {
             return $this->builder;
         }
+
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
         
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
 
     /**

app/Filters/InvoiceFilters.php

@@ -286,14 +286,16 @@ class InvoiceFilters extends QueryFilters
             return $this->builder;
         }
 
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
+
         if ($sort_col[0] == 'client_id') {
 
             return $this->builder->orderBy(\App\Models\Client::select('name')
-                             ->whereColumn('clients.id', 'invoices.client_id'), $sort_col[1]);
+                             ->whereColumn('clients.id', 'invoices.client_id'), $dir);
             
         }
 
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
 
     /**

app/Filters/ProjectFilters.php

@@ -69,9 +69,11 @@ class ProjectFilters extends QueryFilters
             return $this->builder;
         }
 
-        if (is_array($sort_col)) {
+        if (is_array($sort_col) && in_array($sort_col[1], ['asc','desc'])) {
             return $this->builder->orderBy($sort_col[0], $sort_col[1]);
         }
+
+        return $this->builder;
     }
 
     /**

app/Filters/PurchaseOrderFilters.php

@@ -123,12 +123,14 @@ class PurchaseOrderFilters extends QueryFilters
             return $this->builder;
         }
 
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
+
         if ($sort_col[0] == 'vendor_id') {
             return $this->builder->orderBy(\App\Models\Vendor::select('name')
-                    ->whereColumn('vendors.id', 'purchase_orders.vendor_id'), $sort_col[1]);
+                    ->whereColumn('vendors.id', 'purchase_orders.vendor_id'), $dir);
         }
 
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
 
     /**

app/Filters/QuoteFilters.php

@@ -146,10 +146,12 @@ class QuoteFilters extends QueryFilters
             return $this->builder;
         }
 
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
+
         if($sort_col[0] == 'client_id') {
 
             return $this->builder->orderBy(\App\Models\Client::select('name')
-                    ->whereColumn('clients.id', 'quotes.client_id'), $sort_col[1]);
+                    ->whereColumn('clients.id', 'quotes.client_id'), $dir);
 
         }
 
@@ -157,7 +159,7 @@ class QuoteFilters extends QueryFilters
             $sort_col[0] = 'due_date';
         }
 
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
 
     /**

app/Filters/RecurringExpenseFilters.php

@@ -63,7 +63,9 @@ class RecurringExpenseFilters extends QueryFilters
             return $this->builder;
         }
 
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
+
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
 
     /**

app/Filters/RecurringQuoteFilters.php

@@ -62,7 +62,9 @@ class RecurringQuoteFilters extends QueryFilters
             return $this->builder;
         }
 
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
+
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
 
     /**

app/Filters/SchedulerFilters.php

@@ -50,7 +50,9 @@ class SchedulerFilters extends QueryFilters
             return $this->builder;
         }
 
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
+
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
 
     /**

app/Filters/SubscriptionFilters.php

@@ -50,7 +50,9 @@ class SubscriptionFilters extends QueryFilters
             return $this->builder;
         }
 
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
+
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
 
     /**

app/Filters/SystemLogFilters.php

@@ -75,7 +75,9 @@ class SystemLogFilters extends QueryFilters
             return $this->builder;
         }
 
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
+
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
 
     /**

app/Filters/TaskFilters.php

@@ -131,17 +131,19 @@ class TaskFilters extends QueryFilters
             return $this->builder;
         }
 
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
+
         if ($sort_col[0] == 'client_id') {
             return $this->builder->orderBy(\App\Models\Client::select('name')
-                    ->whereColumn('clients.id', 'tasks.client_id'), $sort_col[1]);
+                    ->whereColumn('clients.id', 'tasks.client_id'), $dir);
         }
 
         if ($sort_col[0] == 'user_id') {
             return $this->builder->orderBy(\App\Models\User::select('first_name')
-                    ->whereColumn('users.id', 'tasks.user_id'), $sort_col[1]);
+                    ->whereColumn('users.id', 'tasks.user_id'), $dir);
         }
 
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
 
     public function task_status(string $value = ''): Builder

app/Filters/TaskStatusFilters.php

@@ -50,7 +50,9 @@ class TaskStatusFilters extends QueryFilters
             return $this->builder;
         }
 
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
+
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
 
     /**

app/Filters/TaxRateFilters.php

@@ -50,7 +50,9 @@ class TaxRateFilters extends QueryFilters
             return $this->builder;
         }
 
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
+
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
 
     /**

app/Filters/TokenFilters.php

@@ -56,7 +56,9 @@ class TokenFilters extends QueryFilters
             return $this->builder;
         }
 
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
+
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
     
     /**

app/Filters/UserFilters.php

@@ -54,7 +54,9 @@ class UserFilters extends QueryFilters
             return $this->builder;
         }
 
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
+
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
 
     /**

app/Filters/VendorFilters.php

@@ -69,7 +69,9 @@ class VendorFilters extends QueryFilters
             return $this->builder;
         }
 
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
+
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
 
     /**

app/Filters/WebhookFilters.php

@@ -50,7 +50,9 @@ class WebhookFilters extends QueryFilters
             return $this->builder;
         }
 
-        return $this->builder->orderBy($sort_col[0], $sort_col[1]);
+        $dir = ($sort_col[1] == 'asc') ? 'asc' : 'desc';
+
+        return $this->builder->orderBy($sort_col[0], $dir);
     }
 
     /**