From 34e6a42f8d7379ff6db7be9977ecc2b6ff7fc9cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Fri, 10 Sep 2021 15:56:01 +0200 Subject: [PATCH] Fix customer search --- app/Http/Controllers/CustomerController.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index a005c0f..58b5299 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -25,7 +25,7 @@ class CustomerController extends Controller $modelTable = (new CustomerInfo())->getTable(); $modelClass = CustomerInfo::class; $brands = Brand::select('id', 'name')->get(); - $columns = ['lastname', 'firstname', 'opt_in']; + $columns = ['customer_infos.lastname', 'customer_infos.firstname']; // Jointure pour pouvoir trier les colonnes /** @var \Illuminate\Database\Eloquent\Builder */ @@ -45,11 +45,13 @@ class CustomerController extends Controller // Search on crud Label column if ($request->search) { - foreach ($columns as $column) { - $query = $query->orWhere($column, 'LIKE', "%$request->search%"); - } - $query = $query->orWhere('customers.email', 'LIKE', "%$request->search%"); - $query = $query->orWhere('customer_logins.last_connection', 'LIKE', "%$request->search%"); + $query->where(function ($q) use ($columns, $request) { + foreach ($columns as $column) { + $q = $q->orWhere($column, 'LIKE', "%$request->search%"); + } + $q = $q->orWhere('customers.email', 'LIKE', "%$request->search%"); + $q = $q->orWhere('customer_logins.last_connection', 'LIKE', "%$request->search%"); + }); } // Sort columns