Merge remote-tracking branch 'origin/develop'

app/Http/Controllers/Assets/BulkAssetsController.php

@@ -281,6 +281,7 @@ class BulkAssetsController extends Controller
             || ($request->filled('null_expected_checkin_date'))
             || ($request->filled('null_next_audit_date'))
             || ($request->filled('null_asset_eol_date'))
+            || ($request->filled('null_notes'))
             || ($request->anyFilled($custom_field_columns))
             || ($request->anyFilled(array_keys($null_custom_fields_inputs)))
 
@@ -305,7 +306,8 @@ class BulkAssetsController extends Controller
                     ->conditionallyAddItem('supplier_id')
                     ->conditionallyAddItem('warranty_months')
                     ->conditionallyAddItem('next_audit_date')
-                    ->conditionallyAddItem('asset_eol_date');
+                    ->conditionallyAddItem('asset_eol_date')
+                    ->conditionallyAddItem('notes');
                     foreach ($custom_field_columns as $key => $custom_field_column) {
                         $this->conditionallyAddItem($custom_field_column); 
                    }
@@ -362,6 +364,10 @@ class BulkAssetsController extends Controller
                     }
                 }
 
+                if ($request->input('null_notes')=='1') {
+                    $this->update_array['notes'] = null;
+                }
+
 
 
                 if ($request->filled('purchase_cost')) {

resources/views/hardware/bulk.blade.php

@@ -251,6 +251,17 @@
             </div>
           </div>
 
+          @include ('partials.forms.edit.notes')
+          <div class="form-group {{ $errors->has('null_notes') ? ' has-error' : '' }}">
+            <div class="col-md-8 col-md-offset-3">
+              <label class="form-control">
+                <input type="checkbox" name="null_notes" value="1">
+                {{ trans_choice('general.set_to_null', count($assets),['selection_count' => count($assets)]) }}
+              </label>
+            </div>
+          </div>
+
+
           @include("models/custom_fields_form_bulk_edit",["models" => $models])
 
           @foreach($assets as $asset)

resources/views/hardware/view.blade.php

@@ -399,7 +399,7 @@
                                             @if (isset($asset->expected_checkin))
                                                 <li>
                                                     <x-icon type="calendar" class="fa-fw" />
-                                                    {{ trans('admin/hardware/form.expected_checkin') }}: {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }}
+                                                    {{ trans('general.expected_checkin') }}: {{ Helper::getFormattedDateObject($asset->expected_checkin, 'date', false) }}
                                                 </li>
                                             @endif
                                         </ul>
@@ -1094,7 +1094,7 @@
                                         <div class="row">
                                             <div class="col-md-3">
                                                 <strong>
-                                                    {{ trans('admin/hardware/form.expected_checkin') }}
+                                                    {{ trans('general.expected_checkin') }}
                                                 </strong>
                                             </div>
                                             <div class="col-md-9">

resources/views/partials/forms/edit/notes.blade.php

@@ -2,7 +2,7 @@
 <div class="form-group{{ $errors->has('notes') ? ' has-error' : '' }}">
     <label for="notes" class="col-md-3 control-label">{{ trans('general.notes') }}</label>
     <div class="col-md-7 col-sm-12">
-        <textarea class="col-md-6 form-control" id="notes" aria-label="notes" name="notes" style="min-width:100%;">{{ old('notes', $item->notes) }}</textarea>
+        <textarea class="col-md-6 form-control" id="notes" aria-label="notes" name="notes" style="min-width:100%;">{{ old('notes', (isset($item) ? $item->notes : '')) }}</textarea>
         {!! $errors->first('notes', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>