diff --git a/app/Filters/ClientFilters.php b/app/Filters/ClientFilters.php index b2462be0f12a..e68aaaa9c383 100644 --- a/app/Filters/ClientFilters.php +++ b/app/Filters/ClientFilters.php @@ -132,6 +132,8 @@ class ClientFilters extends QueryFilters return $this->builder->where(function ($query) use ($filter) { $query->where('name', 'like', '%'.$filter.'%') ->orWhere('id_number', 'like', '%'.$filter.'%') + ->orWhere('number', 'like', '%'.$filter.'%') + ->orWhereHas('contacts', function ($query) use ($filter) { $query->where('first_name', 'like', '%'.$filter.'%'); $query->orWhere('last_name', 'like', '%'.$filter.'%'); diff --git a/app/Filters/RecurringInvoiceFilters.php b/app/Filters/RecurringInvoiceFilters.php index 8c3bb10936fc..480fb38404b2 100644 --- a/app/Filters/RecurringInvoiceFilters.php +++ b/app/Filters/RecurringInvoiceFilters.php @@ -36,6 +36,7 @@ class RecurringInvoiceFilters extends QueryFilters return $this->builder->where(function ($query) use ($filter) { $query->where('date', 'like', '%'.$filter.'%') ->orWhere('amount', 'like', '%'.$filter.'%') + ->orWhere('number', 'like', '%'.$filter.'%') ->orWhere('custom_value1', 'like', '%'.$filter.'%') ->orWhere('custom_value2', 'like', '%'.$filter.'%') ->orWhere('custom_value3', 'like', '%'.$filter.'%') diff --git a/app/Services/Subscription/SubscriptionService.php b/app/Services/Subscription/SubscriptionService.php index 9aaf3f47d391..d8dc3aa58d3d 100644 --- a/app/Services/Subscription/SubscriptionService.php +++ b/app/Services/Subscription/SubscriptionService.php @@ -1492,10 +1492,10 @@ class SubscriptionService private function handleRedirect($default_redirect) { if (array_key_exists('return_url', $this->subscription->webhook_configuration) && strlen($this->subscription->webhook_configuration['return_url']) >=1) { - return redirect($this->subscription->webhook_configuration['return_url'])->send(); + return method_exists(redirect(), "send") ? redirect($this->subscription->webhook_configuration['return_url'])->send() : redirect($this->subscription->webhook_configuration['return_url']); } - return redirect($default_redirect)->send(); + return method_exists(redirect(), "send") ? redirect($default_redirect)->send() : redirect($default_redirect); } /**