добавил возможность полного удаления агентства из корзины
This commit is contained in:
parent
fce9d7b532
commit
5eec61b4f9
@ -62,7 +62,11 @@ public function update(Request $request, Company $company)
|
|||||||
return to_route('admin.companies.edit', ['company' => $company]);
|
return to_route('admin.companies.edit', ['company' => $company]);
|
||||||
}
|
}
|
||||||
public function delete(Company $company) {
|
public function delete(Company $company) {
|
||||||
$company->delete();
|
if ($company->trashed()) {
|
||||||
|
$company->forceDelete();
|
||||||
|
} else {
|
||||||
|
$company->delete();
|
||||||
|
}
|
||||||
return back()->withSuccess('Агентство было перемещено в корзину. Все пользователи, прикрепленные к агентству не смогут войти на портал.');
|
return back()->withSuccess('Агентство было перемещено в корзину. Все пользователи, прикрепленные к агентству не смогут войти на портал.');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -39,7 +39,7 @@
|
|||||||
Route::get('/admin/companies', [Modules\Admin\Http\Controllers\AdminCompaniesController::class, 'index'])->name('admin.companies');
|
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::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}/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/{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::post('/admin/companies/agents/{agent}/delete', [Modules\Admin\Http\Controllers\AdminCompaniesController::class, 'deleteAgent'])->name('admin.companies.agents.delete');
|
||||||
|
|||||||
@ -70,6 +70,11 @@
|
|||||||
@csrf
|
@csrf
|
||||||
<button class="dropdown-item" type="submit">Восстановить</button>
|
<button class="dropdown-item" type="submit">Восстановить</button>
|
||||||
</form>
|
</form>
|
||||||
|
<form method="post"
|
||||||
|
action="{{ route('admin.companies.delete', ['company' => $company]) }}">
|
||||||
|
@csrf
|
||||||
|
<button class="dropdown-item" type="submit">Удалить полностью</button>
|
||||||
|
</form>
|
||||||
@else
|
@else
|
||||||
<form method="post"
|
<form method="post"
|
||||||
action="{{ route('admin.companies.delete', ['company' => $company]) }}">
|
action="{{ route('admin.companies.delete', ['company' => $company]) }}">
|
||||||
|
|||||||
@ -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');
|
||||||
|
}
|
||||||
|
};
|
||||||
Loading…
Reference in New Issue
Block a user