diff --git a/app/Livewire/ClientsTable.php b/app/Livewire/ClientsTable.php index 62c537c..1462f18 100644 --- a/app/Livewire/ClientsTable.php +++ b/app/Livewire/ClientsTable.php @@ -117,7 +117,7 @@ function getClients() if (array_key_exists('search', $this->filter) && $searchString = trim($this->filter['search'])) { $searchString = mb_strtolower(trim($this->filter['search'])); - $clients->whereFullText(['name', 'phone', 'email'], $searchString); + // $clients->whereFullText(['name', 'phone', 'email', 'normalized_name', 'normalized_phone'], $searchString); $clients->orWhere('normalized_name', 'like', "%{$searchString}%") ->orWhere('normalized_phone', 'like', "%{$searchString}%") ->orWhere('email', 'like', "%{$searchString}%"); diff --git a/app/Modules/User/Models/User.php b/app/Modules/User/Models/User.php index db93a05..b6620bd 100644 --- a/app/Modules/User/Models/User.php +++ b/app/Modules/User/Models/User.php @@ -115,6 +115,7 @@ protected static function booted() $user->normalized_name = mb_strtolower($user->name); $user->normalized_phone = str_replace('+7', '8', $user->phone); $user->normalized_phone = str_replace([' ', '-', '+', '(', ')'], '', $user->normalized_phone); + $user->normalized_phone = preg_replace("/[^0-9]/", "", $user->normalized_phone); }); static::deleted(function (User $user) { diff --git a/resources/views/livewire/clients-table.blade.php b/resources/views/livewire/clients-table.blade.php index 32aeaa0..10b0487 100644 --- a/resources/views/livewire/clients-table.blade.php +++ b/resources/views/livewire/clients-table.blade.php @@ -87,8 +87,8 @@ class="d-none d-flex position-absolute w-100 h-100 top-0 start-0 align-items-cen {{ count($complexesNames) - 1 }} - @else - + @elseif(count($complexesNames) == 1) + {!! $complexesNames[0] !!} @endif @if (auth()->user()->isCityManager())