developer/lk.zachem.info
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

исправил баг с выводом жк в таблице клиентов

Browse Source
This commit is contained in:
developer 2026-05-06 19:11:28 +08:00
parent 3f13943c4a
commit 1475bbed61
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Livewire/ClientsTable.php
View File

@ -117,7 +117,7 @@ function getClients()
if (array_key_exists('search', $this->filter) && $searchString = trim($this->filter['search'])) { if (array_key_exists('search', $this->filter) && $searchString = trim($this->filter['search'])) {
$searchString = mb_strtolower(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}%") $clients->orWhere('normalized_name', 'like', "%{$searchString}%")
->orWhere('normalized_phone', 'like', "%{$searchString}%") ->orWhere('normalized_phone', 'like', "%{$searchString}%")
->orWhere('email', 'like', "%{$searchString}%"); ->orWhere('email', 'like', "%{$searchString}%");

1
app/Modules/User/Models/User.php
View File

@ -115,6 +115,7 @@ protected static function booted()
$user->normalized_name = mb_strtolower($user->name); $user->normalized_name = mb_strtolower($user->name);
$user->normalized_phone = str_replace('+7', '8', $user->phone); $user->normalized_phone = str_replace('+7', '8', $user->phone);
$user->normalized_phone = str_replace([' ', '-', '+', '(', ')'], '', $user->normalized_phone); $user->normalized_phone = str_replace([' ', '-', '+', '(', ')'], '', $user->normalized_phone);
$user->normalized_phone = preg_replace("/[^0-9]/", "", $user->normalized_phone);
}); });
static::deleted(function (User $user) { static::deleted(function (User $user) {

4
resources/views/livewire/clients-table.blade.php
View File

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