Merge remote-tracking branch 'origin/master' into develop

Author: snipe

app/Http/Controllers/Assets/AssetsController.php

@@ -865,8 +865,8 @@ public function getRestore($assetId = null)
     public function quickScan()
     {
         $this->authorize('audit', Asset::class);
-        $dt = Carbon::now()->addMonths(12)->toDateString();
-
+        $settings = Setting::getSettings();
+        $dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString();
         return view('hardware/quickscan')->with('next_audit_date', $dt);
     }
 
@@ -883,7 +883,6 @@ public function audit($id)
         $this->authorize('audit', Asset::class);
         $dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString();
         $asset = Asset::findOrFail($id);
-
         return view('hardware/audit')->with('asset', $asset)->with('next_audit_date', $dt)->with('locations_list');
     }
 

resources/views/settings/alerts.blade.php

@@ -135,7 +135,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('audit_warning_days', trans('admin/settings/general.audit_warning_days')) }}
                             </div>
-                            <div class="input-group col-md-2">
+                            <div class="input-group col-md-3">
                                 {{ Form::text('audit_warning_days', old('audit_warning_days', $setting->audit_warning_days), array('class' => 'form-control','placeholder' => '14', 'maxlength'=>'3')) }}
                                 <span class="input-group-addon">{{ trans('general.days') }}</span>
                             </div>
@@ -150,7 +150,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('due_checkin_days', trans('admin/settings/general.due_checkin_days')) }}
                             </div>
-                            <div class="input-group col-md-2">
+                            <div class="input-group col-md-3">
                                 {{ Form::text('due_checkin_days', old('due_checkin_days', $setting->due_checkin_days), array('class' => 'form-control','placeholder' => '14', 'maxlength'=>'3')) }}
                                 <span class="input-group-addon">{{ trans('general.days') }}</span>
                             </div>