@@ -548,7 +548,7 @@ public function destroy(Request $request) : RedirectResponse
548548 public function showCheckout () : View
549549 {
550550 $ this ->authorize ('checkout ' , Asset::class);
551- return view ('hardware/bulk-checkout ' );
551+ return view ('hardware/bulk-checkout ' )-> with ( ' statusLabel_list ' , Helper:: deployableStatusLabelList ()) ;
552552 }
553553
554554 /**
@@ -577,6 +577,7 @@ public function storeCheckout(AssetCheckoutRequest $request) : RedirectResponse
577577 }
578578 }
579579 }
580+
580581 $ checkout_at = date ('Y-m-d H:i:s ' );
581582 if (($ request ->filled ('checkout_at ' )) && ($ request ->get ('checkout_at ' ) != date ('Y-m-d ' ))) {
582583 $ checkout_at = e ($ request ->get ('checkout_at ' ));
@@ -589,11 +590,15 @@ public function storeCheckout(AssetCheckoutRequest $request) : RedirectResponse
589590 }
590591
591592 $ errors = [];
592- DB ::transaction (function () use ($ target , $ admin , $ checkout_at , $ expected_checkin , &$ errors , $ asset_ids , $ request ) { //NOTE: $errors is passsed by reference!
593+ DB ::transaction (function () use ($ target , $ admin , $ checkout_at , $ expected_checkin , &$ errors , $ asset_ids , $ request ) { //NOTE: $errors is passed by reference!
593594 foreach ($ asset_ids as $ asset_id ) {
594595 $ asset = Asset::findOrFail ($ asset_id );
595596 $ this ->authorize ('checkout ' , $ asset );
596597
598+ if ($ request ->filled ('status_id ' )) {
599+ $ asset ->status_id = $ request ->input ('status_id ' );
600+ }
601+
597602 $ checkout_success = $ asset ->checkOut ($ target , $ admin , $ checkout_at , $ expected_checkin , e ($ request ->get ('note ' )), $ asset ->name , null );
598603
599604 //TODO - I think this logic is duplicated in the checkOut method?
0 commit comments