diff --git a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php index 7eb9b39a46..6144bb6f92 100644 --- a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php +++ b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php @@ -63,7 +63,7 @@ class AccessoryCheckoutController extends Controller $this->authorize('checkout', $accessory); if (! $user = User::find($request->input('assigned_to'))) { - return redirect()->route('checkout/accessory', $accessory->id)->with('error', trans('admin/accessories/message.checkout.user_does_not_exist')); + return redirect()->route('accessories.checkout.show', $accessory->id)->with('error', trans('admin/accessories/message.checkout.user_does_not_exist')); } // Update the accessory data diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index 7132e7ede0..f00bee3e61 100644 --- a/resources/views/accessories/view.blade.php +++ b/resources/views/accessories/view.blade.php @@ -24,13 +24,13 @@ @if ($accessory->assigned_to != '') @can('checkin', \App\Models\Accessory::class)
  • - {{ trans('admin/accessories/general.checkin') }} + {{ trans('admin/accessories/general.checkin') }}
  • @endcan @else @can('checkout', \App\Models\Accessory::class)
  • - {{ trans('admin/accessories/general.checkout') }} + {{ trans('admin/accessories/general.checkout') }}
  • @endcan @endif @@ -171,7 +171,7 @@ @can('checkout', \App\Models\Accessory::class)
    - numRemaining() > 0 ) ? '' : ' disabled') }}>{{ trans('general.checkout') }} + numRemaining() > 0 ) ? '' : ' disabled') }}>{{ trans('general.checkout') }}
    @endcan diff --git a/routes/web/accessories.php b/routes/web/accessories.php index c0df305985..c250c122d2 100644 --- a/routes/web/accessories.php +++ b/routes/web/accessories.php @@ -10,22 +10,22 @@ Route::group(['prefix' => 'accessories', 'middleware' => ['auth']], function () Route::get( '{accessoryID}/checkout', [Accessories\AccessoryCheckoutController::class, 'create'] - )->name('checkout/accessory'); + )->name('accessories.checkout.show'); Route::post( '{accessoryID}/checkout', [Accessories\AccessoryCheckoutController::class, 'store'] - )->name('checkout/accessory'); + )->name('accessories.checkout.store'); Route::get( '{accessoryID}/checkin/{backto?}', [Accessories\AccessoryCheckinController::class, 'create'] - )->name('checkin/accessory'); + )->name('accessories.checkin.show'); Route::post( '{accessoryID}/checkin/{backto?}', [Accessories\AccessoryCheckinController::class, 'store'] - )->name('checkin/accessory'); + )->name('accessories.checkin.store'); });