Skip to content

Commit 6928b1b

Browse files
committed
Added eol date to bulk asset edit
Signed-off-by: snipe <[email protected]>
1 parent 000f317 commit 6928b1b

File tree

2 files changed

+29
-1
lines changed

2 files changed

+29
-1
lines changed

app/Http/Controllers/Assets/BulkAssetsController.php

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,12 @@ public function update(Request $request) : RedirectResponse
245245
|| ($request->filled('status_id'))
246246
|| ($request->filled('model_id'))
247247
|| ($request->filled('next_audit_date'))
248+
|| ($request->filled('asset_eol_date'))
248249
|| ($request->filled('null_name'))
249250
|| ($request->filled('null_purchase_date'))
250251
|| ($request->filled('null_expected_checkin_date'))
251252
|| ($request->filled('null_next_audit_date'))
253+
|| ($request->filled('null_asset_eol_date'))
252254
|| ($request->anyFilled($custom_field_columns))
253255

254256
) {
@@ -271,7 +273,8 @@ public function update(Request $request) : RedirectResponse
271273
->conditionallyAddItem('requestable')
272274
->conditionallyAddItem('supplier_id')
273275
->conditionallyAddItem('warranty_months')
274-
->conditionallyAddItem('next_audit_date');
276+
->conditionallyAddItem('next_audit_date')
277+
->conditionallyAddItem('asset_eol_date');
275278
foreach ($custom_field_columns as $key => $custom_field_column) {
276279
$this->conditionallyAddItem($custom_field_column);
277280
}
@@ -316,6 +319,13 @@ public function update(Request $request) : RedirectResponse
316319
$this->update_array['next_audit_date'] = null;
317320
}
318321

322+
if ($request->input('null_asset_eol_date')=='1') {
323+
$this->update_array['asset_eol_date'] = null;
324+
$this->update_array['eol_explicit'] = 1;
325+
}
326+
327+
328+
319329
if ($request->filled('purchase_cost')) {
320330
$this->update_array['purchase_cost'] = $request->input('purchase_cost');
321331
}

resources/views/hardware/bulk.blade.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,24 @@
9191
</div>
9292
</div>
9393

94+
<!-- Purchase Date -->
95+
<div class="form-group {{ $errors->has('asset_eol_date') ? ' has-error' : '' }}">
96+
<label for="eol_date" class="col-md-3 control-label">{{ trans('admin/hardware/form.eol_date') }}</label>
97+
<div class="col-md-4">
98+
<div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-autoclose="true">
99+
<input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="asset_eol_date" id="asset_eol_date" value="{{ old('asset_eol_date') }}">
100+
<span class="input-group-addon"><x-icon type="calendar" /></span>
101+
</div>
102+
{!! $errors->first('asset_eol_date', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
103+
</div>
104+
<div class="col-md-5">
105+
<label class="form-control">
106+
{{ Form::checkbox('null_asset_eol_date', '1', false) }}
107+
{{ trans_choice('general.set_to_null', count($assets),['selection_count' => count($assets)]) }}
108+
</label>
109+
</div>
110+
</div>
111+
94112

95113
<!-- Status -->
96114
<div class="form-group {{ $errors->has('status_id') ? ' has-error' : '' }}">

0 commit comments

Comments
 (0)