From c2501e8a29b7106b2cdb12dc2c9abda9099afcb3 Mon Sep 17 00:00:00 2001
From: Thekindbull <thekindbull@gmail.com>
Date: Fri, 25 Apr 2025 10:45:50 +0800
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=B8?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=96=D0=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Models/Complex.php                        |  4 ++
 .../Controllers/AdminComplexesController.php  |  4 +-
 app/Modules/Admin/Routes/web.php              |  1 +
 .../Admin/Views/complexes/edit.blade.php      | 72 ++++---------------
 .../Admin/Views/payments/companies.blade.php  |  2 +-
 5 files changed, 23 insertions(+), 60 deletions(-)

diff --git a/app/Models/Complex.php b/app/Models/Complex.php
index f640ed3..c335bb8 100644
--- a/app/Models/Complex.php
+++ b/app/Models/Complex.php
@@ -10,6 +10,10 @@ class Complex extends Model
 {
     use HasFactory;
     use SoftDeletes;
+    protected $fillable = [
+        'name',
+        'city_id'
+    ];
     public function city()
     {
         return $this->belongsTo(\App\Models\City::class, 'city_id')->withTrashed();
diff --git a/app/Modules/Admin/Http/Controllers/AdminComplexesController.php b/app/Modules/Admin/Http/Controllers/AdminComplexesController.php
index a05abc0..c266a68 100644
--- a/app/Modules/Admin/Http/Controllers/AdminComplexesController.php
+++ b/app/Modules/Admin/Http/Controllers/AdminComplexesController.php
@@ -6,6 +6,7 @@
 use Illuminate\Http\Request;
 
 use App\Models\Complex;
+use App\Models\City;
 
 class AdminComplexesController extends Controller
 {
@@ -34,12 +35,13 @@ public function edit(Complex $complex)
     {
         return view('admin::complexes.edit', [
             'complex' => $complex,
+            'cities'  => City::orderBy('name')->get()
         ]);
     }
 
     public function update(Request $request, Complex $complex)
     {
-        $complex->update($request->only('name'));
+        $complex->update($request->only('name', 'city_id'));
         return to_route('admin.complexes');
     }
 
diff --git a/app/Modules/Admin/Routes/web.php b/app/Modules/Admin/Routes/web.php
index ecce70e..86c1f1c 100644
--- a/app/Modules/Admin/Routes/web.php
+++ b/app/Modules/Admin/Routes/web.php
@@ -37,6 +37,7 @@
     Route::get('/admin/complexes/{complex}/edit', [Modules\Admin\Http\Controllers\AdminComplexesController::class, 'edit'])->name('admin.complexes.edit');
     Route::post('/admin/complexes/create', [Modules\Admin\Http\Controllers\AdminComplexesController::class, 'create'])->name('admin.complexes.create');
     Route::post('/admin/complexes/{complex}/delete', [Modules\Admin\Http\Controllers\AdminComplexesController::class, 'delete'])->name('admin.complexes.delete');
+    Route::post('/admin/complexes/{complex}/update', [Modules\Admin\Http\Controllers\AdminComplexesController::class, 'update'])->withTrashed()->name('admin.complexes.update');
     Route::post('/admin/complexes/{complex}/restore', [Modules\Admin\Http\Controllers\AdminComplexesController::class, 'restore'])->withTrashed()->name('admin.complexes.restore');
 
     Route::get('/admin/payments', [Modules\Admin\Http\Controllers\AdminPaymentsController::class, 'index'])->name('admin.payments');
diff --git a/app/Modules/Admin/Views/complexes/edit.blade.php b/app/Modules/Admin/Views/complexes/edit.blade.php
index 464f2d6..5eefab7 100644
--- a/app/Modules/Admin/Views/complexes/edit.blade.php
+++ b/app/Modules/Admin/Views/complexes/edit.blade.php
@@ -2,7 +2,7 @@
 @extends('layouts.admin')
 @section('content')
     <div class="fs-5 bg-light p-0 m-0 border border-1 rounded-4 p-3">
-        <h4 class="fw-bold my-3">Жилой комплекс</h4>
+        <h4 class="fw-bold my-3">{{ $complex->name }}</h4>
         <form action="{{ route('admin.complexes.update', ['complex' => $complex]) }}" method="post"
             enctype="multipart/form-data">
             @csrf
@@ -13,65 +13,21 @@
                     <div class="text-danger">{{ $message }}</div>
                 @enderror
             </div>
-            <div class="row">
-                <div class="mb-3">
-                    <label for="emailFormControl" class="form-label">Email</label>
-                    <input type="text" class="form-control" id="emailFormControl" name="email"
-                        value="{{ $user->email }}">
-                    @error('email')
-                        <div class="text-danger">{{ $message }}</div>
-                    @enderror
-                </div>
-                <div class="mb-3">
-                    <label for="phoneFormControl" class="form-label">телефон</label>
-                    <input type="text" class="form-control" id="phoneFormControl" name="phone"
-                        value="{{ $user->phone }}">
-                    @error('phone')
-                        <div class="text-danger">{{ $message }}</div>
-                    @enderror
-                </div>
+
+            <div class="mb-3">
+                <label for="cityFormControl" class="form-label">Город</label>
+                <select class="form-select" name="city_id" id="cityFormControl">
+                    @foreach ($cities as $city)
+                        <option value="{{ $city->id }}" @if ($city->id == $complex->city_id) selected @endif>
+                            {{ $city->name }}</option>
+                    @endforeach
+                </select>
+                @error('city_id')
+                    <div class="text-danger">{{ $message }}</div>
+                @enderror
             </div>
+
             <button type="submit" class="btn btn-primary">Сохранить</button>
         </form>
     </div>
-
-    <div class="fs-5 bg-light p-0 m-0 border border-1 rounded-4 mt-3 pb-3">
-        <h4 class="fw-bold m-3">Роли пользователя</h4>
-        <table class="table m-0">
-            <thead>
-                <tr scope="col">
-                    <th>Роль
-                    <th>Когда назначена
-                    <th>
-                </tr>
-            </thead>
-            <tbody class=" ">
-                @foreach ($userRoles as $userRole)
-                    <tr scope="row">
-                        <td class="align-middle">
-                            {{ __($userRole->role->name) }}
-                        </td>
-                        <td class="align-middle">
-                            {{ $userRole->created_at->diffForHumans() }}
-                        </td>
-                        <td class="text-end">
-                            <div class="dropdown" style="">
-                                <button class="btn btn-light" type="button" id="dropdownMenuButton"
-                                    data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                    <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' => $userRole]) }}">
-                                        @csrf
-                                        <button class="dropdown-item" type="submit">Удалить</button>
-                                    </form>
-                                </div>
-                            </div>
-                        </td>
-                    </tr>
-                @endforeach
-            </tbody>
-        </table>
-    </div>
 @endsection
diff --git a/app/Modules/Admin/Views/payments/companies.blade.php b/app/Modules/Admin/Views/payments/companies.blade.php
index 99e73e9..331e9b6 100644
--- a/app/Modules/Admin/Views/payments/companies.blade.php
+++ b/app/Modules/Admin/Views/payments/companies.blade.php
@@ -3,7 +3,7 @@
         <table class="table m-0 table-striped-columns ">
             <thead>
                 <tr scope="col">
-                    <th>Компания</th>
+                    <th>Агентство</th>
                     @foreach ($complexes as $complex)
                         <th>{{ $complex->name }}
                             <div>