From 1475bbed616b7f82c40a300bf92b1e1232278190 Mon Sep 17 00:00:00 2001
From: developer <developer@zachem.info>
Date: Wed, 6 May 2026 19:11:28 +0800
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=B1=D0=B0=D0=B3=20=D1=81=20=D0=B2=D1=8B=D0=B2=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=BC=20=D0=B6=D0=BA=20=D0=B2=20=D1=82=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=BB=D0=B8=D1=86=D0=B5=20=D0=BA=D0=BB=D0=B8=D0=B5=D0=BD=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Livewire/ClientsTable.php                    | 2 +-
 app/Modules/User/Models/User.php                 | 1 +
 resources/views/livewire/clients-table.blade.php | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

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 }}
                                                     </span>
                                                 </div>
-                                            @else
-                                                
+                                            @elseif(count($complexesNames) == 1)
+                                                {!! $complexesNames[0] !!}
                                             @endif
                                         </td>
                                         @if (auth()->user()->isCityManager())