From 42de43b5746841e6b54b293497a9888f49e3d9fa Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 26 Jul 2021 20:25:07 +1000 Subject: [PATCH] Fixes for client queries --- app/Filters/ClientFilters.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Filters/ClientFilters.php b/app/Filters/ClientFilters.php index a47fbb9c8f8b..4d4102e0379c 100644 --- a/app/Filters/ClientFilters.php +++ b/app/Filters/ClientFilters.php @@ -92,9 +92,11 @@ class ClientFilters extends QueryFilters return $this->builder->where(function ($query) use ($filter) { $query->where('clients.name', 'like', '%'.$filter.'%') ->orWhere('clients.id_number', 'like', '%'.$filter.'%') - ->orWhere('client_contacts.first_name', 'like', '%'.$filter.'%') - ->orWhere('client_contacts.last_name', 'like', '%'.$filter.'%') - ->orWhere('client_contacts.email', 'like', '%'.$filter.'%') + ->orWhereHas('contacts', function ($query) use($filter){ + $query->where('first_name', 'like', '%'.$filter.'%'); + $query->orWhere('last_name', 'like', '%'.$filter.'%'); + $query->orWhere('email', 'like', '%'.$filter.'%'); + }) ->orWhere('clients.custom_value1', 'like', '%'.$filter.'%') ->orWhere('clients.custom_value2', 'like', '%'.$filter.'%') ->orWhere('clients.custom_value3', 'like', '%'.$filter.'%')