fix! корректировка удаления агентов
This commit is contained in:
parent
9f435e0816
commit
3dfd5038e7
@ -65,4 +65,8 @@ public function deleteAdmin(CompanyAdmin $companyAdmin) {
|
|||||||
$companyAdmin->delete();
|
$companyAdmin->delete();
|
||||||
return back();
|
return back();
|
||||||
}
|
}
|
||||||
|
public function deleteAgent(Agent $agent) {
|
||||||
|
$agent->delete();
|
||||||
|
return back();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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}/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/{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/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');
|
Route::get('/admin/cities', [Modules\Admin\Http\Controllers\AdminCitiesController::class, 'index'])->name('admin.cities');
|
||||||
|
|||||||
@ -130,7 +130,10 @@
|
|||||||
<i class="bi bi-three-dots-vertical"></i>
|
<i class="bi bi-three-dots-vertical"></i>
|
||||||
</button>
|
</button>
|
||||||
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
|
<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
|
@csrf
|
||||||
<button class="dropdown-item" type="submit">Удалить</button>
|
<button class="dropdown-item" type="submit">Удалить</button>
|
||||||
</form>
|
</form>
|
||||||
|
|||||||
@ -49,11 +49,11 @@
|
|||||||
<td class="align-middle">
|
<td class="align-middle">
|
||||||
{{ __($userRole->role->name) }}
|
{{ __($userRole->role->name) }}
|
||||||
@if($userRole->role->id == $roles::COMPANY_ADMIN)
|
@if($userRole->role->id == $roles::COMPANY_ADMIN)
|
||||||
<div class="fs-6 hstack gap-1">
|
<div class="fs-6 hstack gap-1">
|
||||||
@foreach($companyAdmins as $admin)
|
@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
|
@endforeach
|
||||||
</div>
|
</div>
|
||||||
@endif
|
@endif
|
||||||
@if($userRole->role->id == $roles::AGENT)
|
@if($userRole->role->id == $roles::AGENT)
|
||||||
<div class="fs-6 hstack gap-1">
|
<div class="fs-6 hstack gap-1">
|
||||||
|
|||||||
@ -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()
|
private function notify()
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user