From 5eec61b4f98c6068ac21a7cb5327e8a443d262f0 Mon Sep 17 00:00:00 2001
From: developer <developer@zachem.info>
Date: Wed, 22 Apr 2026 12:40:23 +0800
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?=
 =?UTF-8?q?=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82?=
 =?UTF-8?q?=D1=8C=20=D0=BF=D0=BE=D0=BB=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=83?=
 =?UTF-8?q?=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B0=D0=B3=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=82=D1=81=D1=82=D0=B2=D0=B0=20=D0=B8=D0=B7=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B7=D0=B8=D0=BD=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/AdminCompaniesController.php  |  6 ++++-
 app/Modules/Admin/Routes/web.php              |  2 +-
 .../Admin/Views/companies/index.blade.php     |  5 ++++
 ...add_info_json_field_to_contracts_table.php | 27 +++++++++++++++++++
 4 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 app/Modules/Contracts/Database/Migrations/2026_04_22_000001_add_add_info_json_field_to_contracts_table.php

diff --git a/app/Modules/Admin/Http/Controllers/AdminCompaniesController.php b/app/Modules/Admin/Http/Controllers/AdminCompaniesController.php
index 23b20c6..6fb9701 100644
--- a/app/Modules/Admin/Http/Controllers/AdminCompaniesController.php
+++ b/app/Modules/Admin/Http/Controllers/AdminCompaniesController.php
@@ -62,7 +62,11 @@ public function update(Request $request, Company $company)
         return to_route('admin.companies.edit', ['company' => $company]);
     }
     public function delete(Company $company) {
-        $company->delete();
+        if ($company->trashed()) {
+            $company->forceDelete();
+        } else {
+            $company->delete();
+        }
         return back()->withSuccess('Агентство было перемещено в корзину. Все пользователи, прикрепленные к агентству не смогут войти на портал.');
     }
 
diff --git a/app/Modules/Admin/Routes/web.php b/app/Modules/Admin/Routes/web.php
index 763e86c..ff89fc1 100644
--- a/app/Modules/Admin/Routes/web.php
+++ b/app/Modules/Admin/Routes/web.php
@@ -39,7 +39,7 @@
     Route::get('/admin/companies', [Modules\Admin\Http\Controllers\AdminCompaniesController::class, 'index'])->name('admin.companies');
     Route::get('/admin/companies/{company}/edit', [Modules\Admin\Http\Controllers\AdminCompaniesController::class, 'edit'])->name('admin.companies.edit')->withTrashed();
     Route::post('/admin/companies/{company}/update', [Modules\Admin\Http\Controllers\AdminCompaniesController::class, 'update'])->name('admin.companies.update');
-    Route::post('/admin/companies/{company}/delete', [Modules\Admin\Http\Controllers\AdminCompaniesController::class, 'delete'])->name('admin.companies.delete');
+    Route::post('/admin/companies/{company}/delete', [Modules\Admin\Http\Controllers\AdminCompaniesController::class, 'delete'])->name('admin.companies.delete')->withTrashed();
     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');
diff --git a/app/Modules/Admin/Views/companies/index.blade.php b/app/Modules/Admin/Views/companies/index.blade.php
index 2c5ee6a..f5cb929 100644
--- a/app/Modules/Admin/Views/companies/index.blade.php
+++ b/app/Modules/Admin/Views/companies/index.blade.php
@@ -70,6 +70,11 @@
                                                 @csrf
                                                 <button class="dropdown-item" type="submit">Восстановить</button>
                                                 </form>
+                                                <form method="post"
+                                                    action="{{ route('admin.companies.delete', ['company' => $company]) }}">
+                                                    @csrf
+                                                    <button class="dropdown-item" type="submit">Удалить полностью</button>
+                                                </form>
                                             @else
                                                 <form method="post"
                                                     action="{{ route('admin.companies.delete', ['company' => $company]) }}">
diff --git a/app/Modules/Contracts/Database/Migrations/2026_04_22_000001_add_add_info_json_field_to_contracts_table.php b/app/Modules/Contracts/Database/Migrations/2026_04_22_000001_add_add_info_json_field_to_contracts_table.php
new file mode 100644
index 0000000..25d95c3
--- /dev/null
+++ b/app/Modules/Contracts/Database/Migrations/2026_04_22_000001_add_add_info_json_field_to_contracts_table.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('client_contract', function (Blueprint $table)
+        {
+            $table->json('add_info')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        //Schema::dropIfExists('contracts');
+    }
+};