From 4886817adf356cec1d7d4855db3e970d26748848 Mon Sep 17 00:00:00 2001 From: developer Date: Tue, 21 Apr 2026 14:59:21 +0800 Subject: [PATCH] =?UTF-8?q?=D0=B2=20=D0=B0=D0=B4=D0=BC=D0=B8=D0=BD=D0=BA?= =?UTF-8?q?=D0=B5=20=D0=B2=20=D1=82=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D1=83=20?= =?UTF-8?q?=D0=B0=D0=B3=D0=B5=D0=BD=D1=82=D0=BE=D0=B2=20=D0=B2=D1=8B=D0=B2?= =?UTF-8?q?=D0=B5=D0=BB=20=D0=BD=D0=B0=D0=B7=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=20=D0=B0=D0=B3=D0=B5=D0=BD=D1=82=D1=81=D1=82=D0=B2=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Modules/Admin/Views/users/index.blade.php | 6 ++++++ app/Modules/Main/Helpers/helper.php | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/Modules/Admin/Views/users/index.blade.php b/app/Modules/Admin/Views/users/index.blade.php index bb309ab..e0d888e 100644 --- a/app/Modules/Admin/Views/users/index.blade.php +++ b/app/Modules/Admin/Views/users/index.blade.php @@ -33,6 +33,9 @@ ФИО + @if($role == 3) + Агентство + @endif Email Телефон Создан @@ -45,6 +48,9 @@ {{ $user->name }} + @if($role == 3) + {{ AgentCompanyOfUser($user)?->name }} + @endif {{ $user->email }} diff --git a/app/Modules/Main/Helpers/helper.php b/app/Modules/Main/Helpers/helper.php index f65a8a5..623cb94 100644 --- a/app/Modules/Main/Helpers/helper.php +++ b/app/Modules/Main/Helpers/helper.php @@ -7,6 +7,7 @@ use Modules\Main\Models\Agent\Agent; use Modules\Main\Models\Complex; use Modules\User\Models\Role; +use Modules\User\Models\User; use Modules\User\Models\UserRole; if (!function_exists('AdminCompanyOfUser')) { @@ -21,10 +22,13 @@ function AdminCompanyOfUser() } if (!function_exists(function: 'AgentCompanyOfUser')) { - function AgentCompanyOfUser() + function AgentCompanyOfUser(User $user = null) { + if (!$user) { + $user = auth()->user(); + } $city = false; - if ($adminAccount = Agent::where('user_id', auth()->user()->id)->first()) { + if ($adminAccount = Agent::where('user_id', $user->id)->first()) { return $adminAccount->company; } else { return false;