From 67a605c9a5cf01f6028bf981a35664a399b43347 Mon Sep 17 00:00:00 2001
From: Brady Wetherington <bwetherington@grokability.com>
Date: Wed, 9 Oct 2024 17:01:26 +0100
Subject: [PATCH] Fix bulk checkout to users, assets, and locations

---
 resources/views/hardware/bulk-checkout.blade.php     |  4 +++-
 .../views/partials/forms/edit/asset-select.blade.php | 12 +++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/resources/views/hardware/bulk-checkout.blade.php b/resources/views/hardware/bulk-checkout.blade.php
index 84dcdc2bb1..405e5e47cd 100644
--- a/resources/views/hardware/bulk-checkout.blade.php
+++ b/resources/views/hardware/bulk-checkout.blade.php
@@ -34,6 +34,8 @@
            'required' => true,
            'asset_status_type' => 'RTD',
            'select_id' => 'assigned_assets_select',
+           'asset_selector_div_id' => 'assets_to_checkout_div',
+           'asset_ids' => old('selected_assets')
          ])
 
 
@@ -42,7 +44,7 @@
           @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'])
-          @include ('partials.forms.edit.asset-select', ['translated_name' => trans('general.asset'), 'fieldname' => 'assigned_asset', 'unselect' => 'true', 'style' => 'display:none;'])
+            @include ('partials.forms.edit.asset-select', ['translated_name' => trans('general.asset'), 'asset_selector_div_id' => 'assigned_asset', 'fieldname' => 'assigned_asset', 'unselect' => 'true', 'style' => 'display:none;'])
           @include ('partials.forms.edit.location-select', ['translated_name' => trans('general.location'), 'fieldname' => 'assigned_location', 'style' => 'display:none;'])
 
           <!-- Checkout/Checkin Date -->
diff --git a/resources/views/partials/forms/edit/asset-select.blade.php b/resources/views/partials/forms/edit/asset-select.blade.php
index 3be85091ed..9867a8e552 100644
--- a/resources/views/partials/forms/edit/asset-select.blade.php
+++ b/resources/views/partials/forms/edit/asset-select.blade.php
@@ -1,5 +1,6 @@
 <!-- Asset -->
-<div id="assigned_asset" class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
+<div id="{{ $asset_selector_div_id ?? "assigned_asset" }}"
+     class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}"{!!  (isset($style)) ? ' style="'.e($style).'"' : ''  !!}>
     {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
     <div class="col-md-7">
         <select class="js-data-ajax select2" data-endpoint="hardware" data-placeholder="{{ trans('general.select_asset') }}" aria-label="{{ $fieldname }}" name="{{ $fieldname }}" style="width: 100%" id="{{ (isset($select_id)) ? $select_id : 'assigned_asset_select' }}"{{ (isset($multiple)) ? ' multiple' : '' }}{!! (!empty($asset_status_type)) ? ' data-asset-status-type="' . $asset_status_type . '"' : '' !!}{{  ((isset($required) && ($required =='true'))) ?  ' required' : '' }}>
@@ -11,6 +12,15 @@
             @else
                 @if(!isset($multiple))
                     <option value=""  role="option">{{ trans('general.select_asset') }}</option>
+                @else
+                    @if(isset($asset_ids))
+                        @foreach($asset_ids as $asset_id)
+                            <option value="{{ $asset_id }}" selected="selected" role="option" aria-selected="true"
+                                    role="option">
+                                {{ (\App\Models\Asset::find($asset_id)) ? \App\Models\Asset::find($asset_id)->present()->fullName : '' }}
+                            </option>
+                        @endforeach
+                    @endif
                 @endif
             @endif
         </select>