From 567a9639f4462b5de08fc0749b658199c1301dfe Mon Sep 17 00:00:00 2001 From: Sean Borg Date: Thu, 9 Jul 2020 21:08:35 +0100 Subject: [PATCH] Enhanced #5762 Able to bulk edit expected checkin date In light of the need to edit 500+ devices #5762 (comment) I added the expected checkin date to the bulk edit page for assets --- app/Http/Controllers/Assets/BulkAssetsController.php | 2 ++ resources/views/hardware/bulk.blade.php | 12 ++++++++++++ 2 files changed, 14 insertions(+) diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php index 228b7f544d..1a6da89c96 100644 --- a/app/Http/Controllers/Assets/BulkAssetsController.php +++ b/app/Http/Controllers/Assets/BulkAssetsController.php @@ -78,6 +78,7 @@ class BulkAssetsController extends Controller $assets = array_keys($request->input('ids')); if (($request->filled('purchase_date')) + || ($request->filled('expected_checkin')) || ($request->filled('purchase_cost')) || ($request->filled('supplier_id')) || ($request->filled('order_number')) @@ -92,6 +93,7 @@ class BulkAssetsController extends Controller $this->update_array = []; $this->conditionallyAddItem('purchase_date') + ->conditionallyAddItem('expected_checkin') ->conditionallyAddItem('model_id') ->conditionallyAddItem('order_number') ->conditionallyAddItem('requestable') diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php index 5cbe68a6ce..508b368d6f 100755 --- a/resources/views/hardware/bulk.blade.php +++ b/resources/views/hardware/bulk.blade.php @@ -39,6 +39,18 @@ {!! $errors->first('purchase_date', ' :message') !!} + +
+ +
+
+ + +
+ {!! $errors->first('expected_checkin', '') !!} +
+
+