diff --git a/app/Http/Controllers/Kits/CheckoutKitController.php b/app/Http/Controllers/Kits/CheckoutKitController.php index bf4f64a8d6..f34dbdc2c0 100644 --- a/app/Http/Controllers/Kits/CheckoutKitController.php +++ b/app/Http/Controllers/Kits/CheckoutKitController.php @@ -4,10 +4,8 @@ namespace App\Http\Controllers\Kits; use App\Http\Controllers\CheckInOutRequest; use App\Http\Controllers\Controller; -use App\Models\PredefinedKit; use App\Models\Asset; -use App\Models\PredefinedLicence; -use App\Models\PredefinedModel; +use App\Models\PredefinedKit; use App\Models\User; use App\Services\PredefinedKitCheckoutService; use Illuminate\Http\Request; @@ -35,12 +33,9 @@ class CheckoutKitController extends Controller * @author [D. Minaev.] [] * @return \Illuminate\Contracts\View\View View to checkout */ - public function showCheckout($kit_id) + public function showCheckout(PredefinedKit $kit) { $this->authorize('checkout', Asset::class); - - $kit = PredefinedKit::findOrFail($kit_id); - return view('kits/checkout')->with('kit', $kit); } diff --git a/routes/web/kits.php b/routes/web/kits.php index 6b687f0bff..ff27a771c3 100644 --- a/routes/web/kits.php +++ b/routes/web/kits.php @@ -1,13 +1,9 @@ ['auth'], - 'parameters' => ['kit' => 'kit_id'], -]); +use Tabuna\Breadcrumbs\Trail; Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function () { @@ -23,9 +19,11 @@ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function ( [Kits\PredefinedKitsController::class, 'updateLicense'] )->name('kits.licenses.update'); - Route::get('licenses/{license_id}/edit', - [Kits\PredefinedKitsController::class, 'editLicense'] - )->name('kits.licenses.edit'); + Route::get('licenses/{license_id}/edit', [Kits\PredefinedKitsController::class, 'editLicense']) + ->name('kits.licenses.edit') + ->breadcrumbs(fn (Trail $trail) => + $trail->parent('settings.index') + ->push(trans('admin/settings/general.backups'), route('kits.licenses.edit'))); Route::delete('licenses/{license_id}', [Kits\PredefinedKitsController::class, 'detachLicense'] @@ -63,18 +61,24 @@ Route::group(['prefix' => 'kits/{kit_id}', 'middleware' => ['auth']], function ( [Kits\PredefinedKitsController::class, 'updateAccessory'] )/*->parameters([2 => 'kit_id', 1 => 'accessory_id'])*/->name('kits.accessories.update'); - Route::get('accessories/{accessory_id}/edit', - [Kits\PredefinedKitsController::class, 'editAccessory'] - )->name('kits.accessories.edit'); + Route::get('accessories/{accessory_id}/edit', [Kits\PredefinedKitsController::class, 'editAccessory']) + ->name('kits.accessories.edit'); - Route::delete('accessories/{accessory_id}', - [Kits\PredefinedKitsController::class, 'detachAccessory'] - )->name('kits.accessories.detach'); - Route::get('checkout', - [Kits\CheckoutKitController::class, 'showCheckout'] - )->name('kits.checkout.show'); + Route::delete('accessories/{accessory_id}', [Kits\PredefinedKitsController::class, 'detachAccessory']) + ->name('kits.accessories.detach'); - Route::post('checkout', - [Kits\CheckoutKitController::class, 'store'] - )->name('kits.checkout.store'); + Route::get('checkout', [Kits\CheckoutKitController::class, 'showCheckout']) + ->name('kits.checkout.show') + ->breadcrumbs(fn (Trail $trail, PredefinedKit $kit) => + $trail->parent('kits.index') + ->push(trans('general.checkout'), route('kits.checkout.show', $kit)));; + + Route::post('checkout', [Kits\CheckoutKitController::class, 'store']) + ->name('kits.checkout.store'); }); // kits + +// Predefined Kit Management +Route::resource('kits', Kits\PredefinedKitsController::class, [ + 'middleware' => ['auth'], +]); +