diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index c6228d67d..5affd481e 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -186,7 +186,7 @@ class AssetsController extends Controller } if (isset($target)) { - $asset->checkOut($target, Auth::user(), date('Y-m-d H:i:s'), '', 'Checked out on asset creation', e($request->get('name')), $location); + $asset->checkOut($target, Auth::user(), date('Y-m-d H:i:s'), $request->input('expected_checkin', null), 'Checked out on asset creation', e($request->get('name')), $location); } $success = true; @@ -295,6 +295,7 @@ class AssetsController extends Controller $asset->purchase_cost = Helper::ParseFloat($request->input('purchase_cost', null)); $asset->purchase_date = $request->input('purchase_date', null); $asset->supplier_id = $request->input('supplier_id', null); + $asset->expected_checkin = $request->input('expected_checkin', null); // If the box isn't checked, it's not in the request at all. $asset->requestable = $request->filled('requestable'); diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php index 228b7f544..1a6da89c9 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 857720dc6..508b368d6 100755 --- a/resources/views/hardware/bulk.blade.php +++ b/resources/views/hardware/bulk.blade.php @@ -32,11 +32,25 @@