A free open source IT asset/license management system
Fix to the checkout-selector issue
Brady Wetheringtonc46227ee945c
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.phpindex a881bf041a..1b2bc3b83b 100755--- a/resources/views/hardware/checkout.blade.php+++ b/resources/views/hardware/checkout.blade.php@@ -94,7 +94,7 @@</div>@include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'true'])- @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.user'), 'fieldname' => 'assigned_user', 'style' => session('checkout_to_type') == 'user' ? '' : 'display: none;'])+ @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.user'), 'fieldname' => 'assigned_user', 'style' => (session('checkout_to_type') ?? 'user') == 'user' ? '' : 'display: none;'])<!-- We have to pass unselect here so that we don't default to the asset that's being checked out. We want that asset to be pre-selected everywhere else. -->@include ('partials.forms.edit.asset-select', ['translated_name' => trans('general.select_asset'), 'fieldname' => 'assigned_asset', 'company_id' => $asset->company_id, 'unselect' => 'true', 'style' => session('checkout_to_type') == 'asset' ? '' : 'display: none;'])@include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'assigned_location', 'style' => session('checkout_to_type') == 'location' ? '' : 'display: none;'])diff --git a/resources/views/partials/forms/checkout-selector.blade.php b/resources/views/partials/forms/checkout-selector.blade.phpindex f516433ab9..dc27bc191f 100644--- a/resources/views/partials/forms/checkout-selector.blade.php+++ b/resources/views/partials/forms/checkout-selector.blade.php@@ -4,22 +4,25 @@<div class="btn-group" data-toggle="buttons">@if ((isset($user_select)) && ($user_select!='false'))- <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">+ <label class="btn btn-default{{ (session('checkout_to_type') ?? 'user') == 'user' ? ' active' : '' }}">+ <input name="checkout_to_type" value="user" aria-label="checkout_to_type"+ type="radio" {{ (session('checkout_to_type') ?? 'user') == 'user' ? 'checked' : '' }}><x-icon type="user" />{{ trans('general.user') }}</label>@endif@if ((isset($asset_select)) && ($asset_select!='false'))- <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">+ <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" {{ session('checkout_to_type') == 'asset' ? 'checked': '' }}><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{{ session('checkout_to_type') == 'location' ? ' active' : '' }}">- <input name="checkout_to_type" value="location" aria-label="checkout_to_type" class="active" type="radio">+ <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" {{ session('checkout_to_type') == 'location' ? 'checked' : '' }}><i class="fas fa-map-marker-alt" aria-hidden="true"></i>{{ trans('general.location') }}</label>