From 3dfd5038e7bf142e3ccc79a256dfe1b87128a666 Mon Sep 17 00:00:00 2001
From: developer <developer@zachem.info>
Date: Thu, 22 Jan 2026 16:47:01 +0800
Subject: [PATCH] =?UTF-8?q?fix!=20=D0=BA=D0=BE=D1=80=D1=80=D0=B5=D0=BA?=
 =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=BA=D0=B0=20=D1=83=D0=B4=D0=B0?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B0=D0=B3=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

---
 .../Http/Controllers/AdminCompaniesController.php      |  4 ++++
 app/Modules/Admin/Routes/web.php                       |  1 +
 app/Modules/Admin/Views/companies/edit.blade.php       |  5 ++++-
 app/Modules/Admin/Views/users/edit.blade.php           | 10 +++++-----
 app/Modules/Main/Models/Agent/Agent.php                |  8 ++++++++
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/app/Modules/Admin/Http/Controllers/AdminCompaniesController.php b/app/Modules/Admin/Http/Controllers/AdminCompaniesController.php
index 51688f5..3881557 100644
--- a/app/Modules/Admin/Http/Controllers/AdminCompaniesController.php
+++ b/app/Modules/Admin/Http/Controllers/AdminCompaniesController.php
@@ -65,4 +65,8 @@ public function deleteAdmin(CompanyAdmin $companyAdmin) {
         $companyAdmin->delete();
         return back();
     }
+    public function deleteAgent(Agent $agent) {
+        $agent->delete();
+        return back();
+    }
 }
diff --git a/app/Modules/Admin/Routes/web.php b/app/Modules/Admin/Routes/web.php
index c47e935..12eb37a 100644
--- a/app/Modules/Admin/Routes/web.php
+++ b/app/Modules/Admin/Routes/web.php
@@ -38,6 +38,7 @@
     Route::post('/admin/companies/{company}/delete', [Modules\Admin\Http\Controllers\AdminCompaniesController::class, 'delete'])->name('admin.companies.delete');
     Route::post('/admin/companies/{company}/restore', [Modules\Admin\Http\Controllers\AdminCompaniesController::class, 'restore'])->name('admin.companies.restore')->withTrashed();
     Route::post('/admin/companies/admins/{companyAdmin}/delete', [Modules\Admin\Http\Controllers\AdminCompaniesController::class, 'deleteAdmin'])->name('admin.companies.admins.delete');
+    Route::post('/admin/companies/agents/{agent}/delete', [Modules\Admin\Http\Controllers\AdminCompaniesController::class, 'deleteAgent'])->name('admin.companies.agents.delete');
 
     
     Route::get('/admin/cities', [Modules\Admin\Http\Controllers\AdminCitiesController::class, 'index'])->name('admin.cities');
diff --git a/app/Modules/Admin/Views/companies/edit.blade.php b/app/Modules/Admin/Views/companies/edit.blade.php
index 5e47e83..e6d7b40 100644
--- a/app/Modules/Admin/Views/companies/edit.blade.php
+++ b/app/Modules/Admin/Views/companies/edit.blade.php
@@ -130,7 +130,10 @@
                                     <i class="bi bi-three-dots-vertical"></i>
                                 </button>
                                 <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-                                    <form method="post" action="{{ route('admin.users.role.delete', ['userRole' => 999]) }}">
+                                    <form method="post" 
+                                    action="{{ route('admin.companies.agents.delete', [
+                                            'agent' => $companyAgent
+                                        ]) }}">
                                         @csrf
                                         <button class="dropdown-item" type="submit">Удалить</button>
                                     </form>
diff --git a/app/Modules/Admin/Views/users/edit.blade.php b/app/Modules/Admin/Views/users/edit.blade.php
index 812b36f..0b7e1ee 100644
--- a/app/Modules/Admin/Views/users/edit.blade.php
+++ b/app/Modules/Admin/Views/users/edit.blade.php
@@ -49,11 +49,11 @@
                         <td class="align-middle">
                             {{ __($userRole->role->name) }}
                             @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>
-                                @endforeach
-                            </div>
+                                <div class="fs-6 hstack gap-1">
+                                    @foreach($companyAdmins as $admin) 
+                                    <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">
diff --git a/app/Modules/Main/Models/Agent/Agent.php b/app/Modules/Main/Models/Agent/Agent.php
index 0a319e0..3eb096e 100644
--- a/app/Modules/Main/Models/Agent/Agent.php
+++ b/app/Modules/Main/Models/Agent/Agent.php
@@ -78,6 +78,14 @@ protected static function booted(): void
                 ]);
             }
         });
+
+        static::deleted(function (Agent $agent)
+        {
+            UserRole::where([
+                'user_id' => $agent->user_id,
+                'role_id' => Role::AGENT
+            ])->delete();
+        });
     }
     private function notify()
     {