From 5c11a8c1e035180436f3b6c1c0d7b8a04ae4ae82 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 6 May 2025 16:12:06 +0100
Subject: [PATCH] Modified helper

Signed-off-by: snipe <snipe@snipe.net>
---
 app/Helpers/Helper.php                        | 11 +++++++++++
 .../Controllers/Assets/AssetsController.php   |  6 +++++-
 resources/views/hardware/audit.blade.php      | 19 ++++++++++++-------
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index 5ab19bf61d..dc54b296c4 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -1487,6 +1487,7 @@ class Helper
         $redirect_option = Session::get('redirect_option');
         $checkout_to_type = Session::get('checkout_to_type');
         $checkedInFrom = Session::get('checkedInFrom');
+        $other_redirect = Session::get('other_redirect');
 
         // return to index
         if ($redirect_option == 'index') {
@@ -1535,6 +1536,16 @@ class Helper
                     return route('hardware.show', $request->assigned_asset ?? $checkedInFrom);
             }
         }
+
+        // return to somewhere else
+        if ($redirect_option == 'other_redirect') {
+            switch ($other_redirect) {
+                case 'audit':
+                    return route('assets.audit.due');
+            }
+
+        }
+
         return redirect()->back()->with('error', trans('admin/hardware/message.checkout.error'));
     }
 
diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index 50810b0434..56b9d94ffa 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -899,6 +899,10 @@ class AssetsController extends Controller
 
         $this->authorize('audit', Asset::class);
 
+        session()->put('redirect_option', $request->get('redirect_option'));
+        session()->put('other_redirect', 'audit');
+
+
         $originalValues = $asset->getRawOriginal();
 
         $asset->next_audit_date = $request->input('next_audit_date');
@@ -974,7 +978,7 @@ class AssetsController extends Controller
             }
 
             $asset->logAudit($request->input('note'), $request->input('location_id'), $file_name, $originalValues);
-            return redirect()->route('assets.audit.due')->with('success', trans('admin/hardware/message.audit.success'));
+            return redirect()->to(Helper::getRedirectOption($request, $asset->id, 'Assets'))->with('success', trans('admin/hardware/message.audit.success'));
         }
 
         return redirect()->back()->withInput()->withErrors($asset->getErrors());
diff --git a/resources/views/hardware/audit.blade.php b/resources/views/hardware/audit.blade.php
index d3560a9a0d..ea8b1673ea 100644
--- a/resources/views/hardware/audit.blade.php
+++ b/resources/views/hardware/audit.blade.php
@@ -138,13 +138,18 @@
 
 
                     </div> <!--/.box-body-->
-                    <div class="box-footer">
-                        <a class="btn btn-link" href="{{ URL::previous() }}"> {{ trans('button.cancel') }}</a>
-                        <button type="submit" class="btn btn-success pull-right{{ (!$asset->model ? ' disabled' : '') }}"{!! (!$asset->model ? ' data-tooltip="true" title="'.trans('admin/hardware/general.model_invalid_fix').'" disabled' : '') !!}>
-                            <x-icon type="checkmark" />
-                            {{ trans('general.audit') }}
-                        </button>
-                    </div>
+
+                    <x-redirect_submit_options
+                            index_route="hardware.index"
+                            :button_label="trans('general.audit')"
+                            :disabled_select="!$asset->model"
+                            :options="[
+                                'index' => trans('admin/hardware/form.redirect_to_all', ['type' => trans('general.assets')]),
+                                'item' => trans('admin/hardware/form.redirect_to_type', ['type' => trans('general.asset')]),
+                                'other_redirect' => trans('general.audit_due')
+                               ]"
+                    />
+
                 </form>
             </div>
         </div> <!--/.col-md-7-->