From 9f435e081651a9d827d4495807f663b4213060ac Mon Sep 17 00:00:00 2001
From: developer <developer@zachem.info>
Date: Thu, 22 Jan 2026 16:32:54 +0800
Subject: [PATCH] =?UTF-8?q?fix!=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B8=D0=B2=D1=8F=D0=B7=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20?=
 =?UTF-8?q?=D0=B0=D0=B3=D0=B5=D0=BD=D1=82=D1=81=D0=B2=20=D0=B2=20=D0=BA?=
 =?UTF-8?q?=D0=B0=D1=80=D1=82=D0=BE=D1=87=D0=BA=D0=B5=20=D1=80=D0=B5=D0=B4?=
 =?UTF-8?q?=D0=B0=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B5=D0=BB=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Modules/Admin/Views/users/edit.blade.php |  4 ++--
 app/Modules/User/Models/UserRole.php         | 23 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/app/Modules/Admin/Views/users/edit.blade.php b/app/Modules/Admin/Views/users/edit.blade.php
index 38f9a83..812b36f 100644
--- a/app/Modules/Admin/Views/users/edit.blade.php
+++ b/app/Modules/Admin/Views/users/edit.blade.php
@@ -51,14 +51,14 @@
                             @if($userRole->role->id == $roles::COMPANY_ADMIN)
                             <div class="fs-6 hstack gap-1">
                                 @foreach($companyAdmins as $admin) 
-                                <span class="badge text-bg-secondary">{{ $admin->company->name }}</span>
+                                <span class="badge text-bg-secondary">{{ $admin->company?->name }}</span>
                                 @endforeach
                             </div>
                             @endif
                             @if($userRole->role->id == $roles::AGENT)
                             <div class="fs-6 hstack gap-1">
                                 @foreach($companyAgents as $agent) 
-                                <span class="badge text-bg-secondary">{{ $agent->company->name }}</span>
+                                <span class="badge text-bg-secondary">{{ $agent->company?->name }}</span>
                                 @endforeach
                             </div>
                             @endif
diff --git a/app/Modules/User/Models/UserRole.php b/app/Modules/User/Models/UserRole.php
index 4ad17ad..1798327 100644
--- a/app/Modules/User/Models/UserRole.php
+++ b/app/Modules/User/Models/UserRole.php
@@ -7,6 +7,10 @@
 use Modules\User\Models\User;
 use Modules\User\Models\Role;
 
+use Modules\Main\Models\Company\CompanyAdmin;
+use Modules\Main\Models\Agent\Agent;
+use Modules\CityManager\Models\CityManager;
+
 class UserRole extends Model
 {
     use HasFactory;
@@ -24,4 +28,23 @@ public static function create(array $attributes = [])
     {
         return parent::updateOrCreate($attributes);
     }
+
+    protected static function booted()
+    {
+        static::deleted(function (UserRole $userRole)
+        {
+            $userId = $userRole->user_id;
+            switch ($userRole->role_id) {
+                case Role::AGENT :
+                    Agent::where('user_id', $userId)->delete();
+                    break;
+                case Role::COMPANY_ADMIN :
+                    CompanyAdmin::where('user_id', $userId)->delete();
+                    break;
+                case Role::CITY_MANAGER :
+                    CityManager::where('user_id', $userId)->delete();
+                    break;
+            }
+        });
+    }
 }