From 6019c80c7be7907d61a62249080eeb8ed196e981 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 28 May 2025 20:50:59 +0100 Subject: [PATCH 1/2] Added blade element Signed-off-by: snipe --- .../views/hardware/bulk-checkout.blade.php | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/resources/views/hardware/bulk-checkout.blade.php b/resources/views/hardware/bulk-checkout.blade.php index 39e2cdf10c..6a1cbacf6a 100644 --- a/resources/views/hardware/bulk-checkout.blade.php +++ b/resources/views/hardware/bulk-checkout.blade.php @@ -39,6 +39,23 @@ ]) + +
+ +
+ + {!! $errors->first('status_id', '') !!} +
+
+ @include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'true']) From 1b5525c51f4d157c51ca31513e00a31c582651d4 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 28 May 2025 20:51:21 +0100 Subject: [PATCH 2/2] Added status label to view blade, variable to controller method Signed-off-by: snipe --- .../Controllers/Assets/BulkAssetsController.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php index e433475d39..6fc25224f9 100644 --- a/app/Http/Controllers/Assets/BulkAssetsController.php +++ b/app/Http/Controllers/Assets/BulkAssetsController.php @@ -562,7 +562,10 @@ class BulkAssetsController extends Controller public function showCheckout() : View { $this->authorize('checkout', Asset::class); - return view('hardware/bulk-checkout'); + + $do_not_change = ['' => trans('general.do_not_change')]; + $status_label_list = $do_not_change + Helper::deployableStatusLabelList(); + return view('hardware/bulk-checkout')->with('statusLabel_list', $status_label_list); } /** @@ -594,13 +597,13 @@ class BulkAssetsController extends Controller } $checkout_at = date('Y-m-d H:i:s'); if (($request->filled('checkout_at')) && ($request->get('checkout_at') != date('Y-m-d'))) { - $checkout_at = e($request->get('checkout_at')); + $checkout_at = $request->get('checkout_at'); } $expected_checkin = ''; if ($request->filled('expected_checkin')) { - $expected_checkin = e($request->get('expected_checkin')); + $expected_checkin = $request->get('expected_checkin'); } $errors = []; @@ -608,6 +611,12 @@ class BulkAssetsController extends Controller foreach ($assets as $asset) { $this->authorize('checkout', $asset); + // See if there is a status label passed + if ($request->filled('status_id')) { + \Log::error('status id: ' . $request->get('status_id')); + $asset->status_id = $request->get('status_id'); + } + $checkout_success = $asset->checkOut($target, $admin, $checkout_at, $expected_checkin, e($request->get('note')), $asset->name, null); //TODO - I think this logic is duplicated in the checkOut method?