From f5e03b264fc58176d7f4cc46fd7dcd92e19fb0e2 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 May 2024 14:14:58 +0100
Subject: [PATCH 01/18] Show additional help text if help text is given

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/partials/forms/edit/image-upload.blade.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/views/partials/forms/edit/image-upload.blade.php b/resources/views/partials/forms/edit/image-upload.blade.php
index 2e9ac38558..fca1068844 100644
--- a/resources/views/partials/forms/edit/image-upload.blade.php
+++ b/resources/views/partials/forms/edit/image-upload.blade.php
@@ -32,7 +32,10 @@
         </label>
         <span class='label label-default' id="uploadFile-info"></span>
 
-        <p class="help-block" id="uploadFile-status">{{ trans('general.image_filetypes_help', ['size' => Helper::file_upload_max_size_readable()]) }}</p>
+        <p class="help-block" id="uploadFile-status">{{ trans('general.image_filetypes_help', ['size' => Helper::file_upload_max_size_readable()]) }} {{ $help_text ?? '' }}</p>
+
+
+
         {!! $errors->first('image', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
     </div>
     <div class="col-md-4 col-md-offset-3" aria-hidden="true">

From 8841e21dc9abfcb534ab64418c42eee1d5d94596 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 May 2024 14:15:13 +0100
Subject: [PATCH 02/18] Removed quickscan header

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/hardware/quickscan.blade.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/resources/views/hardware/quickscan.blade.php b/resources/views/hardware/quickscan.blade.php
index 1745d74f38..4ba4321c63 100644
--- a/resources/views/hardware/quickscan.blade.php
+++ b/resources/views/hardware/quickscan.blade.php
@@ -23,9 +23,7 @@
         <!-- left column -->
         <div class="col-md-6">
             <div class="box box-default">
-                    <div class="box-header with-border">
-                        <h2 class="box-title"> {{ trans('general.bulkaudit') }} </h2>
-                    </div>
+
                     <div class="box-body">
                     {{csrf_field()}}
 
@@ -185,7 +183,7 @@
             } else {
                 var messages = '';
             }
-            $('#audited tbody').prepend("<tr class='danger'><td>" + asset_tag + "</td><td>" + messages + "</td><td><i class='fas fa-times text-danger'></i></td></tr>");
+            $('#audited tbody').prepend("<tr class='danger'><td>" + data.payload.asset_tag + "</td><td>" + messages + "</td><td><i class='fas fa-times text-danger'></i></td></tr>");
         }
 
         function incrementOnSuccess() {

From 3c4098038dcd51a6051905ffeb9804a2c41f1ef8 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 May 2024 14:19:50 +0100
Subject: [PATCH 03/18] Fail early if no tag

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Api/AssetsController.php | 38 +++++++++++++------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index b234e9cbf1..95aff31fff 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -1032,20 +1032,19 @@ class AssetsController extends Controller
 
     {
         $this->authorize('audit', Asset::class);
-        $rules = [
-            'asset_tag' => 'required',
-            'location_id' => 'exists:locations,id|nullable|numeric',
-            'next_audit_date' => 'date|nullable',
-        ];
-
-        $validator = Validator::make($request->all(), $rules);
-        if ($validator->fails()) {
-            return response()->json(Helper::formatStandardApiResponse('error', null, $validator->errors()->all()));
-        }
 
         $settings = Setting::getSettings();
         $dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString();
 
+        // No tag passed
+        if (!$request->filled('asset_tag')) {
+            return response()->json(Helper::formatStandardApiResponse('error', [
+                'asset_tag'=> '',
+                'error'=> trans('admin/hardware/message.no_tag'),
+            ], trans('admin/hardware/message.no_tag')), 200);
+        }
+
+
         $asset = Asset::where('asset_tag', '=', $request->input('asset_tag'))->first();
 
 
@@ -1066,7 +1065,8 @@ class AssetsController extends Controller
 
             $asset->last_audit_date = date('Y-m-d H:i:s');
 
-            if ($asset->save()) {
+            // Asset is valid and the save was successful
+            if ($asset->isValid() && $asset->save()) {
                 $log = $asset->logAudit(request('note'), request('location_id'));
 
                 return response()->json(Helper::formatStandardApiResponse('success', [
@@ -1075,9 +1075,23 @@ class AssetsController extends Controller
                     'next_audit_date' => Helper::getFormattedDateObject($asset->next_audit_date),
                 ], trans('admin/hardware/message.audit.success')));
             }
+
+            // Asset was not valid
+            return response()->json(Helper::formatStandardApiResponse('error', [
+                'asset_tag'=> e($asset->asset_tag),
+                'error'=> $asset->getErrors()->first(),
+            ], trans('admin/hardware/message.audit.error', ['error' => $asset->getErrors()->first()])), 200);
+
         }
 
-        return response()->json(Helper::formatStandardApiResponse('error', ['asset_tag'=> e($request->input('asset_tag'))], 'Asset with tag '.e($request->input('asset_tag')).' not found'));
+
+        // Asset not found
+        return response()->json(Helper::formatStandardApiResponse('error', [
+            'asset_tag'=> e($request->input('asset_tag')),
+            'error'=> trans('admin/hardware/message.audit.error'),
+        ], trans('admin/hardware/message.audit.error', ['error' => trans('admin/hardware/message.does_not_exist')])), 200);
+
+
     }
 
 

From e5653eaa93b2f7ba2f590205ac85650334d34af9 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 May 2024 14:21:01 +0100
Subject: [PATCH 04/18] Save new data

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Assets/AssetsController.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index 20a5564a44..c1386f81f1 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -308,7 +308,8 @@ class AssetsController extends Controller
         $asset->status_id = $request->input('status_id', null);
         $asset->warranty_months = $request->input('warranty_months', null);
         $asset->purchase_cost = $request->input('purchase_cost', null);
-        $asset->purchase_date = $request->input('purchase_date', null); 
+        $asset->purchase_date = $request->input('purchase_date', null);
+        $asset->next_audit_date = $request->input('next_audit_date', null);
         if ($request->filled('purchase_date') && !$request->filled('asset_eol_date') && ($asset->model->eol > 0)) {
             $asset->purchase_date = $request->input('purchase_date', null); 
             $asset->asset_eol_date = Carbon::parse($request->input('purchase_date'))->addMonths($asset->model->eol)->format('Y-m-d');
@@ -888,12 +889,12 @@ class AssetsController extends Controller
         // Check to see if they checked the box to update the physical location,
         // not just note it in the audit notes
         if ($request->input('update_location') == '1') {
-            Log::debug('update location in audit');
             $asset->location_id = $request->input('location_id');
         }
 
 
-        if ($asset->save()) {
+        if ($asset->isValid() && $asset->save()) {
+
             $file_name = '';
             // Upload an image, if attached
             if ($request->hasFile('image')) {
@@ -911,6 +912,8 @@ class AssetsController extends Controller
             $asset->logAudit($request->input('note'), $request->input('location_id'), $file_name);
             return redirect()->route('assets.audit.due')->with('success', trans('admin/hardware/message.audit.success'));
         }
+
+        return redirect()->back()->withInput()->withErrors($asset->getErrors());
     }
 
     public function getRequestedIndex($user_id = null)

From bdbfb0f2a174a7f1a147ce0b6ab11a45e5efda38 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 May 2024 14:21:16 +0100
Subject: [PATCH 05/18] Added accessor and mutator for next_audit_date

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Models/Asset.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index c5373a04e2..b2c84497a4 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -944,6 +944,25 @@ class Asset extends Depreciable
      * -----------------------------------------------
      **/
 
+    /**
+     * Make sure the next_audit_date is formatted as Y-m-d.
+     *
+     * This is kind of dumb and confusing, since we already cast it that way AND it's a date field
+     * in the database, but here we are.
+     *
+     * @param $value
+     * @return void
+     */
+    public function getNextAuditDateAttribute($value)
+    {
+        return $this->attributes['next_audit_date'] = $value ? Carbon::parse($value)->format('Y-m-d') : null;
+    }
+
+    public function setNextAuditDateAttribute($value)
+    {
+        $this->attributes['next_audit_date'] = $value ? Carbon::parse($value)->format('Y-m-d') : null;
+    }
+
     /**
      * This sets the requestable to a boolean 0 or 1. This accounts for forms or API calls that
      * explicitly pass the requestable field but it has a null or empty value.

From f158a369a495116717987b1f31789a0c18d0e529 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 May 2024 14:21:29 +0100
Subject: [PATCH 06/18] Added/updated string

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en-US/admin/hardware/message.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/resources/lang/en-US/admin/hardware/message.php b/resources/lang/en-US/admin/hardware/message.php
index 96b4b6c949..a9466f4451 100644
--- a/resources/lang/en-US/admin/hardware/message.php
+++ b/resources/lang/en-US/admin/hardware/message.php
@@ -5,6 +5,8 @@ return [
     'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
                         If this status has changed, please update the asset status.',
     'does_not_exist' 	=> 'Asset does not exist.',
+    'does_not_exist_var'=> 'Asset with tag :asset_tag not found.',
+    'no_tag' 	        => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
     'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
 
@@ -31,7 +33,7 @@ return [
     ],
 
     'audit' => [
-        'error'   		=> 'Asset audit was unsuccessful. Please try again.',
+        'error'   		=> 'Asset audit unsuccessful: :error ',
         'success' 		=> 'Asset audit successfully logged.',
     ],
 

From 0734d5b0b600c19481c6ad54a2a3ba1f3ba9b286 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 May 2024 14:21:42 +0100
Subject: [PATCH 07/18] Added help text

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/lang/en-US/general.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index 0b6f613399..b491023f13 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -202,6 +202,8 @@ return [
     'new_password'          => 'New Password',
     'next'					=> 'Next',
     'next_audit_date'		=> 'Next Audit Date',
+    'next_audit_date_help'  => 'If you use auditing in your organization, this is usually automatically calculated based on the asset&apos;s last audit date and audit frequency (in <code>Admin Settings &gt; Alerts</code>) and you can leave this blank. You can manually set this date here if you need to, but it must be later than the last audit date. ',
+    'audit_images_help'     => 'You can find audit images in the asset\'s history tab.',
     'no_email'              => 'No email address associated with this user',
     'last_audit'		    => 'Last Audit',
     'new'					=> 'new!',

From 556d0b44a3330db2376bfad84835f5e4fb3ea7e3 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 May 2024 14:22:52 +0100
Subject: [PATCH 08/18] Added asset

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/hardware/audit.blade.php | 38 ++++++++++++++++--------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/resources/views/hardware/audit.blade.php b/resources/views/hardware/audit.blade.php
index 8b859a40a3..9713b6fc1e 100644
--- a/resources/views/hardware/audit.blade.php
+++ b/resources/views/hardware/audit.blade.php
@@ -34,7 +34,7 @@
                     {{csrf_field()}}
                     @if ($asset->model->name)
                         <!-- Asset name -->
-                            <div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
+                            <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
                                 {{ Form::label('name', trans('admin/hardware/form.model'), array('class' => 'col-md-3 control-label')) }}
                                 <div class="col-md-8">
                                     <p class="form-control-static">{{ $asset->model->name }}</p>
@@ -43,7 +43,7 @@
                     @endif
 
                     <!-- Asset Name -->
-                        <div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
+                        <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}">
                             {{ Form::label('name', trans('admin/hardware/form.name'), array('class' => 'col-md-3 control-label')) }}
                             <div class="col-md-8">
                                 <p class="form-control-static">{{ $asset->name }}</p>
@@ -66,21 +66,40 @@
                         </div>
 
 
+                        <!-- Show last audit date -->
+                        <div class="form-group">
+                            <label class="control-label col-md-3">
+                                {{ trans('general.last_audit') }}
+                            </label>
+                            <div class="col-md-8">
+
+                                <p class="form-control-static">
+                                    @if ($asset->last_audit_date)
+                                        {{ Helper::getFormattedDateObject($asset->last_audit_date, 'datetime', false) }}
+                                    @else
+                                        {{ trans('admin/settings/general.none') }}
+                                    @endif
+                                </p>
+                            </div>
+                        </div>
+
+
                         <!-- Next Audit -->
-                        <div class="form-group {{ $errors->has('next_audit_date') ? 'error' : '' }}">
+                        <div class="form-group{{ $errors->has('next_audit_date') ? ' has-error' : '' }}">
                             {{ Form::label('name', trans('general.next_audit_date'), array('class' => 'col-md-3 control-label')) }}
-                            <div class="col-md-9">
+                            <div class="col-md-8">
                                 <div class="input-group date col-md-5" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-clear-btn="true">
                                     <input type="text" class="form-control" placeholder="{{ trans('general.next_audit_date') }}" name="next_audit_date" id="next_audit_date" value="{{ old('next_audit_date', $next_audit_date) }}">
                                     <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
                                 </div>
                                 {!! $errors->first('next_audit_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                                 <p class="help-block">{!! trans('general.next_audit_date_help') !!}</p>
                             </div>
                         </div>
 
 
                         <!-- Note -->
-                        <div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
+                        <div class="form-group{{ $errors->has('note') ? ' has-error' : '' }}">
                             {{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }}
                             <div class="col-md-8">
                                 <textarea class="col-md-6 form-control" id="note" name="note">{{ old('note', $asset->note) }}</textarea>
@@ -88,13 +107,8 @@
                             </div>
                         </div>
 
-
-                        <!-- Images -->
-                        @include ('partials.forms.edit.image-upload')
-
-
-
-
+                        <!-- Audit Image -->
+                        @include ('partials.forms.edit.image-upload', ['help_text' => trans('general.audit_images_help')])
 
 
                     </div> <!--/.box-body-->

From 16ec47573bc610198308406faceb3d0c17b983f3 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 May 2024 14:23:08 +0100
Subject: [PATCH 09/18] Added help text to bulk edit blade

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/hardware/bulk.blade.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php
index d4f0544851..371f0c2549 100755
--- a/resources/views/hardware/bulk.blade.php
+++ b/resources/views/hardware/bulk.blade.php
@@ -164,6 +164,8 @@
 
               {!! $errors->first('next_audit_date', '<span class="alert-msg" aria-hidden="true">
                 <i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+
+
             </div>
             <div class="col-md-5">
               <label class="form-control">
@@ -171,6 +173,9 @@
                 {{ trans_choice('general.set_to_null', count($assets), ['asset_count' => count($assets)]) }}
               </label>
             </div>
+            <div class="col-md-8 col-md-offset-3">
+              <p class="help-block">{!! trans('general.next_audit_date_help') !!}</p>
+            </div>
           </div>
 
           <!-- Requestable -->

From ab8b40745edf09a8dc3e56d1eb96c077d9cfbbab Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 May 2024 14:24:42 +0100
Subject: [PATCH 10/18] Added next audit date to create/edit asset screen

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/hardware/edit.blade.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php
index 4c1c1457b6..b585db2135 100755
--- a/resources/views/hardware/edit.blade.php
+++ b/resources/views/hardware/edit.blade.php
@@ -109,6 +109,29 @@
             @include ('partials.forms.edit.name', ['translated_name' => trans('admin/hardware/form.name')])
             @include ('partials.forms.edit.warranty')
 
+            <!-- Datepicker -->
+            <div class="form-group{{ $errors->has('next_audit_date') ? ' has-error' : '' }}">
+
+                <label class="col-md-3 control-label">
+                    {{ trans('general.next_audit_date') }}
+                </label>
+
+                <div class="input-group col-md-4">
+                    <div class="input-group date" data-provide="datepicker" data-date-clear-btn="true" data-date-format="yyyy-mm-dd"  data-autoclose="true">
+                        <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="next_audit_date" id="next_audit_date" value="{{ old('next_audit_date', $item->next_audit_date) }}" readonly style="background-color:inherit" maxlength="10">
+                        <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
+                    </div>
+                </div>
+                <div class="col-md-8 col-md-offset-3">
+                    {!! $errors->first('next_audit_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                    <p class="help-block">{!! trans('general.next_audit_date_help') !!}</p>
+                </div>
+
+            </div>
+
+
+
+
             <!-- byod checkbox -->
             <div class="form-group">
                 <div class="col-md-7 col-md-offset-3">

From 71b5bf2eefb3669c72b77b61930c1f81b2951dd4 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 May 2024 14:56:52 +0100
Subject: [PATCH 11/18] Added visual on the hardware view screen

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Models/Asset.php                          | 17 +++++++++++++++
 .../lang/en-US/admin/hardware/message.php     |  1 +
 resources/views/hardware/view.blade.php       | 21 ++++++++++++++++++-
 3 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index b2c84497a4..b0ad2e0332 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -907,6 +907,23 @@ class Asset extends Depreciable
 
     }
 
+
+    /**
+     * Determine whether this asset's next audit date is before the last audit date
+     *
+     * @return bool
+     * @since [v6.4.1]
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * */
+    public function checkInvalidNextAuditDate()
+    {
+        if (($this->last_audit_date) && ($this->next_audit_date) && ($this->last_audit_date > $this->next_audit_date)) {
+            return true;
+        }
+        return false;
+    }
+
+
     /**
      * Checks for a category-specific EULA, and if that doesn't exist,
      * checks for a settings level EULA
diff --git a/resources/lang/en-US/admin/hardware/message.php b/resources/lang/en-US/admin/hardware/message.php
index a9466f4451..32698b1c07 100644
--- a/resources/lang/en-US/admin/hardware/message.php
+++ b/resources/lang/en-US/admin/hardware/message.php
@@ -9,6 +9,7 @@ return [
     'no_tag' 	        => 'No asset tag provided.',
     'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
     'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'warning_audit_date_mismatch' 	=> 'This asset\'s next audit date (:next_audit_date) is before the last audit date (:last_audit_date). Please update the next audit date.',
 
     'create' => [
         'error'   		=> 'Asset was not created, please try again. :(',
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index dfb1513936..589803d96c 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -19,6 +19,23 @@
             </div>
         @endif
 
+        @if ($asset->checkInvalidNextAuditDate())
+            <div class="col-md-12">
+                <div class="callout callout-warning">
+                    <p><strong>{{ trans('general.warning',
+                        [
+                            'warning' => trans('admin/hardware/message.warning_audit_date_mismatch',
+                                    [
+                                        'last_audit_date' => Helper::getFormattedDateObject($asset->last_audit_date, 'date', false),
+                                        'next_audit_date' => Helper::getFormattedDateObject($asset->next_audit_date, 'date', false)
+                                    ]
+                                    )
+                        ]
+                        ) }}</strong></p>
+                </div>
+            </div>
+        @endif
+
         @if ($asset->deleted_at!='')
             <div class="col-md-12">
                 <div class="alert alert-danger">
@@ -237,7 +254,8 @@
                                                 </strong>
                                             </div>
                                             <div class="col-md-6">
-                                                {{ \App\Helpers\Helper::getFormattedDateObject($audit_log->created_at, 'date', false) }}
+                                                {!! $asset->checkInvalidNextAuditDate() ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
+                                                {{ Helper::getFormattedDateObject($audit_log->created_at, 'date', false) }}
                                                 @if ($audit_log->user)
                                                     (by {{ link_to_route('users.show', $audit_log->user->present()->fullname(), [$audit_log->user->id]) }})
                                                 @endif
@@ -254,6 +272,7 @@
                                                 </strong>
                                             </div>
                                             <div class="col-md-6">
+                                                {!! $asset->checkInvalidNextAuditDate() ? '<i class="fas fa-exclamation-triangle text-orange" aria-hidden="true"></i>' : '' !!}
                                                 {{ Helper::getFormattedDateObject($asset->next_audit_date, 'date', false) }}
                                             </div>
                                         </div>

From 8310b91e0015b02b0fcc76983e53ec67f79db4ee Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 May 2024 15:43:38 +0100
Subject: [PATCH 12/18] Use UploadFileRequest for audit files

Signed-off-by: snipe <snipe@snipe.net>
---
 .../Controllers/Assets/AssetsController.php     | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index c1386f81f1..734314b112 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -6,7 +6,7 @@ use App\Helpers\Helper;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ImageUploadRequest;
 use App\Models\Actionlog;
-use App\Models\Manufacturer;
+use App\Http\Requests\UploadFileRequest;
 use Illuminate\Support\Facades\Log;
 use App\Models\Asset;
 use App\Models\AssetModel;
@@ -863,7 +863,7 @@ class AssetsController extends Controller
     }
 
 
-    public function auditStore(Request $request, $id)
+    public function auditStore(UploadFileRequest $request, $id)
     {
         $this->authorize('audit', Asset::class);
 
@@ -895,20 +895,11 @@ class AssetsController extends Controller
 
         if ($asset->isValid() && $asset->save()) {
 
-            $file_name = '';
-            // Upload an image, if attached
+            // Create the image (if one was chosen.)
             if ($request->hasFile('image')) {
-                $path = 'private_uploads/audits';
-                if (! Storage::exists($path)) {
-                    Storage::makeDirectory($path, 775);
-                }
-                $upload = $image = $request->file('image');
-                $ext = $image->getClientOriginalExtension();
-                $file_name = 'audit-'.str_random(18).'.'.$ext;
-                Storage::putFileAs($path, $upload, $file_name);
+                $file_name = $request->handleFile('private_uploads/audits/', 'audit-'.$asset->id, $request->file('image'));
             }
 
-
             $asset->logAudit($request->input('note'), $request->input('location_id'), $file_name);
             return redirect()->route('assets.audit.due')->with('success', trans('admin/hardware/message.audit.success'));
         }

From c1d5b8713b1be61c9890d8abc8726694a7594677 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 May 2024 15:43:43 +0100
Subject: [PATCH 13/18] Removed debugging

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/AssetModelsFilesController.php  | 1 -
 app/Http/Controllers/Assets/AssetFilesController.php | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/Http/Controllers/AssetModelsFilesController.php b/app/Http/Controllers/AssetModelsFilesController.php
index a4472c3504..91cb525d77 100644
--- a/app/Http/Controllers/AssetModelsFilesController.php
+++ b/app/Http/Controllers/AssetModelsFilesController.php
@@ -70,7 +70,6 @@ class AssetModelsFilesController extends Controller
             }
 
             $file = 'private_uploads/assetmodels/'.$log->filename;
-            \Log::debug('Checking for '.$file);
 
 
             if (! Storage::exists($file)) {
diff --git a/app/Http/Controllers/Assets/AssetFilesController.php b/app/Http/Controllers/Assets/AssetFilesController.php
index 7debfb479c..ca7a72e3ae 100644
--- a/app/Http/Controllers/Assets/AssetFilesController.php
+++ b/app/Http/Controllers/Assets/AssetFilesController.php
@@ -70,7 +70,6 @@ class AssetFilesController extends Controller
             }
 
             $file = 'private_uploads/assets/'.$log->filename;
-            \Log::debug('Checking for '.$file);
 
             if ($log->action_type == 'audit') {
                 $file = 'private_uploads/audits/'.$log->filename;

From 72c85f93b6f1224060861cd9deabc3060456be0c Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 May 2024 16:47:45 +0100
Subject: [PATCH 14/18] Fixed test

Signed-off-by: snipe <snipe@snipe.net>
---
 tests/Feature/Assets/AssetsBulkEditTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Feature/Assets/AssetsBulkEditTest.php b/tests/Feature/Assets/AssetsBulkEditTest.php
index ee684d7676..70918b3595 100644
--- a/tests/Feature/Assets/AssetsBulkEditTest.php
+++ b/tests/Feature/Assets/AssetsBulkEditTest.php
@@ -103,7 +103,7 @@ class AssetsBulkEditTest extends TestCase
             $this->assertEquals($company2->id, $asset->company_id);
             $this->assertEquals(7890, $asset->order_number);
             $this->assertEquals(36, $asset->warranty_months);
-            $this->assertEquals('2025-01-01', $asset->next_audit_date->format('Y-m-d'));
+            $this->assertEquals('2025-01-01', $asset->next_audit_date);
             // shouldn't requestable be cast as a boolean??? it's not.
             $this->assertEquals(1, $asset->requestable);
         });

From c7accb4599e0cdf398f00798f06d5f42a64111ad Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 May 2024 17:38:42 +0100
Subject: [PATCH 15/18] Added comments

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Api/AssetsController.php | 22 +++++++++++++++----
 .../Controllers/Assets/AssetsController.php   | 16 +++++++++++++-
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index 95aff31fff..4710187f1a 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -1036,7 +1036,7 @@ class AssetsController extends Controller
         $settings = Setting::getSettings();
         $dt = Carbon::now()->addMonths($settings->audit_interval)->toDateString();
 
-        // No tag passed
+        // No tag passed - return an error
         if (!$request->filled('asset_tag')) {
             return response()->json(Helper::formatStandardApiResponse('error', [
                 'asset_tag'=> '',
@@ -1049,7 +1049,18 @@ class AssetsController extends Controller
 
 
         if ($asset) {
-            // We don't want to log this as a normal update, so let's bypass that
+
+            /**
+             * We don't want to log this as a normal update, so let's bypass that using unsetEventDispatcher(),
+             * otherwise the audit will create an action_log entry and so will be saving of the asset model
+             * with the de-normed fields (next_audit_date, etc.) But invoking unsetEventDispatcher() will bypass
+             * normal model-level validation that's usually handled at the observer )
+             *
+             * We handle validation on the save by checking if the asset is valid via the ->isValid() method,
+             * which manually invokes Watson Validating to make sure the asset's model is valid.
+             *
+             * @see App\Observers\AssetObserver::updating()
+             */
             $asset->unsetEventDispatcher();
             $asset->next_audit_date = $dt;
 
@@ -1065,9 +1076,12 @@ class AssetsController extends Controller
 
             $asset->last_audit_date = date('Y-m-d H:i:s');
 
-            // Asset is valid and the save was successful
+            /**
+             * Invoke Watson Validating to check the asset itself and check to make sure it saved correctly.
+             * We have to invoke this manually because of the unsetEventDispatcher() above.)
+             */
             if ($asset->isValid() && $asset->save()) {
-                $log = $asset->logAudit(request('note'), request('location_id'));
+                $asset->logAudit(request('note'), request('location_id'));
 
                 return response()->json(Helper::formatStandardApiResponse('success', [
                     'asset_tag'=> e($asset->asset_tag),
diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index 734314b112..dcfad4f219 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -880,7 +880,17 @@ class AssetsController extends Controller
 
         $asset = Asset::findOrFail($id);
 
-        // We don't want to log this as a normal update, so let's bypass that
+        /**
+         * We don't want to log this as a normal update, so let's bypass that using unsetEventDispatcher(),
+         * otherwise the audit will create an action_log entry and so will be saving of the asset model
+         * with the de-normed fields (next_audit_date, etc.) But invoking unsetEventDispatcher() will bypass
+         * normal model-level validation that's usually handled at the observer )
+         *
+         * We handle validation on the save by checking if the asset is valid via the ->isValid() method,
+         * which manually invokes Watson Validating to make sure the asset's model is valid.
+         *
+         * @see \App\Observers\AssetObserver::updating()
+         */
         $asset->unsetEventDispatcher();
 
         $asset->next_audit_date = $request->input('next_audit_date');
@@ -893,6 +903,10 @@ class AssetsController extends Controller
         }
 
 
+        /**
+         * Invoke Watson Validating to check the asset itself and check to make sure it saved correctly.
+         * We have to invoke this manually because of the unsetEventDispatcher() above.)
+         */
         if ($asset->isValid() && $asset->save()) {
 
             // Create the image (if one was chosen.)

From cb22a3d55638a4334009a7cc70cd8beaad4ee5b4 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 May 2024 17:52:50 +0100
Subject: [PATCH 16/18] Updated comments again :-/

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Api/AssetsController.php    | 16 ++++++++++------
 app/Http/Controllers/Assets/AssetsController.php | 14 +++++++++-----
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index 4710187f1a..4aa7b353ca 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -1051,15 +1051,19 @@ class AssetsController extends Controller
         if ($asset) {
 
             /**
-             * We don't want to log this as a normal update, so let's bypass that using unsetEventDispatcher(),
-             * otherwise the audit will create an action_log entry and so will be saving of the asset model
-             * with the de-normed fields (next_audit_date, etc.) But invoking unsetEventDispatcher() will bypass
-             * normal model-level validation that's usually handled at the observer )
+             * Even though we do a save() further down, we don't want to log this as a "normal" asset update,
+             * which would trigger the Asset Observer and would log an asset *update* log entry (because the
+             * de-normed fields like next_audit_date on the asset itself will change on save()) *in addition* to
+             * the audit log entry we're creating through this controller.
              *
-             * We handle validation on the save by checking if the asset is valid via the ->isValid() method,
+             * To prevent this double-logging (one for update and one for audit), we skip the observer and bypass
+             * that de-normed update log entry by using unsetEventDispatcher(), BUT invoking unsetEventDispatcher()
+             * will bypass normal model-level validation that's usually handled at the observer )
+             *
+             * We handle validation on the save() by checking if the asset is valid via the ->isValid() method,
              * which manually invokes Watson Validating to make sure the asset's model is valid.
              *
-             * @see App\Observers\AssetObserver::updating()
+             * @see \App\Observers\AssetObserver::updating()
              */
             $asset->unsetEventDispatcher();
             $asset->next_audit_date = $dt;
diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index dcfad4f219..e817e72410 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -881,12 +881,16 @@ class AssetsController extends Controller
         $asset = Asset::findOrFail($id);
 
         /**
-         * We don't want to log this as a normal update, so let's bypass that using unsetEventDispatcher(),
-         * otherwise the audit will create an action_log entry and so will be saving of the asset model
-         * with the de-normed fields (next_audit_date, etc.) But invoking unsetEventDispatcher() will bypass
-         * normal model-level validation that's usually handled at the observer )
+         * Even though we do a save() further down, we don't want to log this as a "normal" asset update,
+         * which would trigger the Asset Observer and would log an asset *update* log entry (because the
+         * de-normed fields like next_audit_date on the asset itself will change on save()) *in addition* to
+         * the audit log entry we're creating through this controller.
          *
-         * We handle validation on the save by checking if the asset is valid via the ->isValid() method,
+         * To prevent this double-logging (one for update and one for audit), we skip the observer and bypass
+         * that de-normed update log entry by using unsetEventDispatcher(), BUT invoking unsetEventDispatcher()
+         * will bypass normal model-level validation that's usually handled at the observer )
+         *
+         * We handle validation on the save() by checking if the asset is valid via the ->isValid() method,
          * which manually invokes Watson Validating to make sure the asset's model is valid.
          *
          * @see \App\Observers\AssetObserver::updating()

From c137fafa97af2f6c37e7d2f406a1e076688b5deb Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 15 May 2024 18:10:43 +0100
Subject: [PATCH 17/18] Updated language

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Http/Controllers/Api/AssetsController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index 4aa7b353ca..5f901ef490 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -1094,7 +1094,7 @@ class AssetsController extends Controller
                 ], trans('admin/hardware/message.audit.success')));
             }
 
-            // Asset was not valid
+            // Asset failed validation or was not able to be saved
             return response()->json(Helper::formatStandardApiResponse('error', [
                 'asset_tag'=> e($asset->asset_tag),
                 'error'=> $asset->getErrors()->first(),
@@ -1103,7 +1103,7 @@ class AssetsController extends Controller
         }
 
 
-        // Asset not found
+        // No matching asset for the asset tag that was passed.
         return response()->json(Helper::formatStandardApiResponse('error', [
             'asset_tag'=> e($request->input('asset_tag')),
             'error'=> trans('admin/hardware/message.audit.error'),

From eb0fd2f5197ca2d022ac9d93ac9ca3380b730e3b Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 16 May 2024 16:29:11 +0100
Subject: [PATCH 18/18] Removed stricter validation :(

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Models/Asset.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index b0ad2e0332..f31b872841 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -99,7 +99,8 @@ class Asset extends Depreciable
         'last_checkin'     => 'nullable|date_format:Y-m-d H:i:s',
         'expected_checkin' => 'nullable|date',
         'last_audit_date'  => 'nullable|date_format:Y-m-d H:i:s',
-        'next_audit_date'  => 'nullable|date|after:last_audit_date',
+        // 'next_audit_date'  => 'nullable|date|after:last_audit_date',
+        'next_audit_date'  => 'nullable|date',
         'location_id'      => 'nullable|exists:locations,id',
         'rtd_location_id'  => 'nullable|exists:locations,id',
         'purchase_date'    => 'nullable|date|date_format:Y-m-d',