diff --git a/app/Filters/BankIntegrationFilters.php b/app/Filters/BankIntegrationFilters.php index 95646a3f09ea..1932b0995dba 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 20aeed293c21..4830277be8aa 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 5cfe21f7eff9..ce8d1c58d8e9 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 9278ff2a393f..0c89b7e44251 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 14656aa7d250..fd7ec9c5f14c 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 c1f1f89cf8c0..b95e18b1433f 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 9fcd17677ff6..3985fb6a1688 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 9dd9c54d5fe4..3ed24beac66a 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 cb2fa31815e6..e04cc216e93d 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 e51f0cbfead3..f3c21072d1ef 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 dea2ab36375e..26400394c935 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 03dc74f155b5..5357073f34a4 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 fb32fd6913da..c1545464480d 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 7b766ca9230e..7fb0c759490c 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 9c87a2b72a9a..23bb09ba8cb7 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 ffd82427e57b..f8e0c2ba667a 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 0291200b4f8d..07884685e7fc 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 b551c5eba734..eb9d593aa221 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 e8f137558b11..d9722e46ce2a 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 aa3c88ac974a..3fb6c80b082e 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 88efbc430abc..9e732fcf978d 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 3e1baab6ee78..35ef91a0288b 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 9fd81df73264..8d225d3db268 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 e775c6601cd3..60e43faec44f 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 a1faf9a27f7b..a53b2eded078 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 0c7a647ac875..4937a7513326 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 38554a21305e..6ab092749584 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);