diff --git a/app/Modules/Admin/Http/Controllers/AdminCitiesController.php b/app/Modules/Admin/Http/Controllers/AdminCitiesController.php index 7a595bb..0c8840c 100644 --- a/app/Modules/Admin/Http/Controllers/AdminCitiesController.php +++ b/app/Modules/Admin/Http/Controllers/AdminCitiesController.php @@ -10,7 +10,6 @@ class AdminCitiesController extends Controller public function index(Request $request) { $cities = City::orderBy('name'); - //if ($request->filter) { switch ( $request->filter ) { case 'trashed': diff --git a/app/Modules/Admin/Http/Controllers/AdminComplexesController.php b/app/Modules/Admin/Http/Controllers/AdminComplexesController.php index 791cb9d..38565e6 100644 --- a/app/Modules/Admin/Http/Controllers/AdminComplexesController.php +++ b/app/Modules/Admin/Http/Controllers/AdminComplexesController.php @@ -35,7 +35,8 @@ public function edit(Complex $complex) { return view('admin::complexes.edit', [ 'complex' => $complex, - 'cities' => City::orderBy('name')->get() + 'cities' => City::orderBy('name')->get(), + 'backUrl' => route(name: 'admin.complexes') ]); } diff --git a/app/Modules/Admin/Http/Controllers/AdminController.php b/app/Modules/Admin/Http/Controllers/AdminController.php index bf112ba..5fd70f4 100644 --- a/app/Modules/Admin/Http/Controllers/AdminController.php +++ b/app/Modules/Admin/Http/Controllers/AdminController.php @@ -14,7 +14,9 @@ public function index() { return $this->goToSuperAdminCreator(); } - return view('admin::index'); + return view('admin::index', [ + + ]); } public function superAdminExists() diff --git a/app/Modules/Admin/Http/Controllers/AdminUsersController.php b/app/Modules/Admin/Http/Controllers/AdminUsersController.php index 1ba1cc5..3a7ddb4 100644 --- a/app/Modules/Admin/Http/Controllers/AdminUsersController.php +++ b/app/Modules/Admin/Http/Controllers/AdminUsersController.php @@ -11,6 +11,8 @@ use Modules\User\Models\UserRole; use Modules\User\Models\Role; use Modules\User\Models\User; +use Modules\Main\Models\Company\CompanyAdmin; +use Modules\Main\Models\Agent\Agent; class AdminUsersController extends Controller { @@ -41,7 +43,10 @@ public function edit(User $user) return view('admin::users.edit', [ 'user' => $user, 'userRoles' => $roles, - 'roles' => Role::class + 'roles' => Role::class, + 'companyAdmins' => CompanyAdmin::where('user_id', $user->id)->get(), + 'companyAgents' => Agent::where('user_id', $user->id)->get(), + 'backUrl' => route(name: 'admin.users') ]); } public function store(Request $request) @@ -52,6 +57,18 @@ public function store(Request $request) return to_route('admin.users')->withSuccess('Учетная запись для ' . $request->name . ' создана. Пароль пользователя: ' . $password); } + public function delete(Request $request, User $user) + { + if ($request->confirmed) { + $user->delete(); + return to_route('admin.users'); + } else { + return view('admin::users.confirm-delete', + ['user' => $user] + ); + } + return to_route('admin.users'); + } public function update(Request $request, User $user) { $user->update($request->only('name', 'email', 'phone')); diff --git a/app/Modules/Admin/Views/users/confirm-delete.blade.php b/app/Modules/Admin/Views/users/confirm-delete.blade.php new file mode 100644 index 0000000..26753c0 --- /dev/null +++ b/app/Modules/Admin/Views/users/confirm-delete.blade.php @@ -0,0 +1,43 @@ +@php($title = 'Пользователи') +@extends('layouts.admin') +@section('content') +
+ +
+@endsection \ No newline at end of file diff --git a/app/Modules/Admin/Views/users/edit.blade.php b/app/Modules/Admin/Views/users/edit.blade.php index 9e04430..38f9a83 100644 --- a/app/Modules/Admin/Views/users/edit.blade.php +++ b/app/Modules/Admin/Views/users/edit.blade.php @@ -48,6 +48,20 @@ {{ __($userRole->role->name) }} + @if($userRole->role->id == $roles::COMPANY_ADMIN) +
+ @foreach($companyAdmins as $admin) + {{ $admin->company->name }} + @endforeach +
+ @endif + @if($userRole->role->id == $roles::AGENT) +
+ @foreach($companyAgents as $agent) + {{ $agent->company->name }} + @endforeach +
+ @endif {{ $userRole->created_at?->diffForHumans() }} diff --git a/app/Modules/Admin/Views/users/index.blade.php b/app/Modules/Admin/Views/users/index.blade.php index 3cbb10e..94c2943 100644 --- a/app/Modules/Admin/Views/users/index.blade.php +++ b/app/Modules/Admin/Views/users/index.blade.php @@ -2,9 +2,7 @@ @extends('layouts.admin') @section('content')
- @if ($users->count() == 0) -
Нет данных для отображения
- @else +
- + @if ($users->count() == 0) +
Нет данных для отображения
+ @else
@@ -62,7 +62,7 @@ Редактировать + action="{{ route('admin.users.delete', ['user' => $user]) }}"> @csrf @@ -75,6 +75,7 @@
@endif + @livewire('post.card')
@@ -85,7 +86,7 @@ enctype="multipart/form-data">