diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php index bcaa3900b..7f9e812ab 100644 --- a/app/Http/Controllers/Assets/BulkAssetsController.php +++ b/app/Http/Controllers/Assets/BulkAssetsController.php @@ -102,8 +102,11 @@ class BulkAssetsController extends Controller || ($request->filled('company_id')) || ($request->filled('status_id')) || ($request->filled('model_id')) + || ($request->filled('next_audit_date')) || ($request->filled('null_purchase_date')) || ($request->filled('null_expected_checkin_date')) + || ($request->filled('null_next_audit_date')) + ) { foreach ($assets as $assetId) { @@ -116,7 +119,8 @@ class BulkAssetsController extends Controller ->conditionallyAddItem('requestable') ->conditionallyAddItem('status_id') ->conditionallyAddItem('supplier_id') - ->conditionallyAddItem('warranty_months'); + ->conditionallyAddItem('warranty_months') + ->conditionallyAddItem('next_audit_date'); if ($request->input('null_purchase_date')=='1') { $this->update_array['purchase_date'] = null; @@ -126,6 +130,10 @@ class BulkAssetsController extends Controller $this->update_array['expected_checkin'] = null; } + if ($request->input('null_next_audit_date')=='1') { + $this->update_array['next_audit_date'] = null; + } + if ($request->filled('purchase_cost')) { $this->update_array['purchase_cost'] = Helper::ParseCurrency($request->input('purchase_cost')); } diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php index f6e94028b..a8515ab81 100755 --- a/resources/views/hardware/bulk.blade.php +++ b/resources/views/hardware/bulk.blade.php @@ -144,6 +144,25 @@ + +
+ +
+
+ + +
+ + {!! $errors->first('next_audit_date', '') !!} +
+
+ +
+
+