A free open source IT asset/license management system
Set session to remember checkout type
snipe3094e007ee50
diff --git a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php b/app/Http/Controllers/Accessories/AccessoryCheckoutController.phpindex 05d60fcbfe..9ed8c0fe45 100644--- a/app/Http/Controllers/Accessories/AccessoryCheckoutController.php+++ b/app/Http/Controllers/Accessories/AccessoryCheckoutController.php@@ -71,6 +71,7 @@ class AccessoryCheckoutController extends Controller$this->authorize('checkout', $accessory);$target = $this->determineCheckoutTarget();+ session()->put(['checkout_to_type' => $target]);$accessory->checkout_qty = $request->input('checkout_qty', 1);diff --git a/app/Http/Controllers/Assets/AssetCheckoutController.php b/app/Http/Controllers/Assets/AssetCheckoutController.phpindex 0ea9b36418..bfbbbfcad4 100644--- a/app/Http/Controllers/Assets/AssetCheckoutController.php+++ b/app/Http/Controllers/Assets/AssetCheckoutController.php@@ -65,6 +65,8 @@ class AssetCheckoutController extends Controller*/public function store(AssetCheckoutRequest $request, $assetId) : RedirectResponse{++try {// Check if the asset existsif (! $asset = Asset::find($assetId)) {@@ -81,6 +83,7 @@ class AssetCheckoutController extends Controller$admin = auth()->user();$target = $this->determineCheckoutTarget();+ session()->put(['checkout_to_type' => $target]);$asset = $this->updateAssetLocation($asset, $target);diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.phpindex 9f9f06c2ba..6c75ae06db 100644--- a/app/Http/Controllers/Assets/BulkAssetsController.php+++ b/app/Http/Controllers/Assets/BulkAssetsController.php@@ -637,6 +637,7 @@ class BulkAssetsController extends Controller$admin = auth()->user();$target = $this->determineCheckoutTarget();+ session()->put(['checkout_to_type' => $target]);if (! is_array($request->get('selected_assets'))) {return redirect()->route('hardware.bulkcheckout.show')->withInput()->with('error', trans('admin/hardware/message.checkout.no_assets_selected'));diff --git a/app/Http/Controllers/Licenses/LicenseCheckoutController.php b/app/Http/Controllers/Licenses/LicenseCheckoutController.phpindex e2225442b3..5b2d344ba5 100644--- a/app/Http/Controllers/Licenses/LicenseCheckoutController.php+++ b/app/Http/Controllers/Licenses/LicenseCheckoutController.php@@ -39,6 +39,11 @@ class LicenseCheckoutController extends Controllerreturn redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.checkout.not_enough_seats'));}+ // We don't currently allow checking out licenses to locations, so we'll reset that to user if needed+ if (session()->get('checkout_to_type') == 'location') {+ session()->put(['checkout_to_type' => 'user']);+ }+// Return the checkout viewreturn view('licenses/checkout', compact('license'));}@@ -70,17 +75,15 @@ class LicenseCheckoutController extends Controller$licenseSeat = $this->findLicenseSeatToCheckout($license, $seatId);$licenseSeat->created_by = auth()->id();$licenseSeat->notes = $request->input('notes');--- $checkoutMethod = 'checkoutTo'.ucwords(request('checkout_to_type'));if ($request->filled('asset_id')) {-+ session()->put(['checkout_to_type' => 'asset']);$checkoutTarget = $this->checkoutToAsset($licenseSeat);$request->request->add(['assigned_asset' => $checkoutTarget->id]);session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => 'asset']);} elseif ($request->filled('assigned_to')) {+ session()->put(['checkout_to_type' => 'user']);$checkoutTarget = $this->checkoutToUser($licenseSeat);$request->request->add(['assigned_user' => $checkoutTarget->id]);session()->put(['redirect_option' => $request->get('redirect_option'), 'checkout_to_type' => 'user']);@@ -89,6 +92,7 @@ class LicenseCheckoutController extends Controllerif ($checkoutTarget) {+return Helper::getRedirectOption($request, $license->id, 'Licenses')->with('success', trans('admin/licenses/message.checkout.success'));}diff --git a/resources/views/partials/forms/checkout-selector.blade.php b/resources/views/partials/forms/checkout-selector.blade.phpindex 4fb4ccbd8c..f516433ab9 100644--- a/resources/views/partials/forms/checkout-selector.blade.php+++ b/resources/views/partials/forms/checkout-selector.blade.php@@ -1,20 +1,27 @@<div class="form-group" id="assignto_selector"{!! (isset($style)) ? ' style="'.e($style).'"' : '' !!}><label for="checkout_to_type" class="col-md-3 control-label">{{ trans('admin/hardware/form.checkout_to') }}</label><div class="col-md-8">+<div class="btn-group" data-toggle="buttons">@if ((isset($user_select)) && ($user_select!='false'))- <label class="btn btn-default active">- <input name="checkout_to_type" value="user" aria-label="checkout_to_type" type="radio" checked="checked"><x-icon type="user" /> {{ trans('general.user') }}+ <label class="btn btn-default{{ session('checkout_to_type') == 'user' ? ' active' : '' }}">+ <input name="checkout_to_type" value="user" aria-label="checkout_to_type" type="radio" checked="checked">+ <x-icon type="user" />+ {{ trans('general.user') }}</label>@endif@if ((isset($asset_select)) && ($asset_select!='false'))- <label class="btn btn-default">- <input name="checkout_to_type" value="asset" aria-label="checkout_to_type" type="radio"><i class="fas fa-barcode" aria-hidden="true"></i> {{ trans('general.asset') }}+ <label class="btn btn-default{{ session('checkout_to_type') == 'asset' ? ' active' : '' }}">+ <input name="checkout_to_type" value="asset" aria-label="checkout_to_type" type="radio">+ <i class="fas fa-barcode" aria-hidden="true"></i>+ {{ trans('general.asset') }}</label>@endif@if ((isset($location_select)) && ($location_select!='false'))- <label class="btn btn-default">- <input name="checkout_to_type" value="location" aria-label="checkout_to_type" class="active" type="radio"><i class="fas fa-map-marker-alt" aria-hidden="true"></i> {{ trans('general.location') }}+ <label class="btn btn-default{{ session('checkout_to_type') == 'location' ? ' active' : '' }}">+ <input name="checkout_to_type" value="location" aria-label="checkout_to_type" class="active" type="radio">+ <i class="fas fa-map-marker-alt" aria-hidden="true"></i>+ {{ trans('general.location') }}</label>@endif