From 1bd9ffecba11e18b2917597c93b33a2b7d7861f4 Mon Sep 17 00:00:00 2001
From: Jagad R R <jagadraya388@gmail.com>
Date: Thu, 26 Dec 2024 13:28:06 +0700
Subject: [PATCH] fix redirect

---
 .../Controllers/Backend/AdminsController.php  |  2 ++
 ...ormEntertainmentPresentationController.php |  1 +
 .../Forms/FormMeetingSeminarController.php    |  1 +
 .../Controllers/Forms/FormOtherController.php |  1 +
 .../Forms/FormUpCountryController.php         |  3 +-
 .../Forms/FormVehicleController.php           |  1 +
 .../layouts/partials/messages.blade.php       |  7 ++++-
 .../pages/forms/upcountry/edit.blade.php      | 30 -------------------
 8 files changed, 13 insertions(+), 33 deletions(-)

diff --git a/app/Http/Controllers/Backend/AdminsController.php b/app/Http/Controllers/Backend/AdminsController.php
index c25a3c6..679f6d0 100644
--- a/app/Http/Controllers/Backend/AdminsController.php
+++ b/app/Http/Controllers/Backend/AdminsController.php
@@ -143,6 +143,8 @@ class AdminsController extends Controller
             'form_meeting_seminar' => $formMeetingSeminar,
         ];
 
+        session()->put('redirect_url', route('admin.admins.expense', $user_id));
+
         // Pass the forms and page information to the view
         return view('backend.pages.admins.expense', [
             'pageInfo' => [
diff --git a/app/Http/Controllers/Forms/FormEntertainmentPresentationController.php b/app/Http/Controllers/Forms/FormEntertainmentPresentationController.php
index 48f43c8..f56d699 100644
--- a/app/Http/Controllers/Forms/FormEntertainmentPresentationController.php
+++ b/app/Http/Controllers/Forms/FormEntertainmentPresentationController.php
@@ -35,6 +35,7 @@ class FormEntertainmentPresentationController extends Controller
       $forms = FormEntertaimentPresentation::where('user_id', auth()->user()->id)->get();
     }
 
+    session()->put('redirect_url', route('forms.entertainment'));
 		return view('backend.pages.forms.entertainment.index', [
 			'forms' => $forms
 		]);
diff --git a/app/Http/Controllers/Forms/FormMeetingSeminarController.php b/app/Http/Controllers/Forms/FormMeetingSeminarController.php
index 363f486..a3a36ca 100644
--- a/app/Http/Controllers/Forms/FormMeetingSeminarController.php
+++ b/app/Http/Controllers/Forms/FormMeetingSeminarController.php
@@ -35,6 +35,7 @@ class FormMeetingSeminarController extends Controller
       $forms = FormMeetingSeminar::where('user_id', auth()->user()->id)->get();
     }
 
+    session()->put('redirect_url', route('forms.meeting'));
 		return view('backend.pages.forms.meeting.index', [
 			'forms' => $forms
 		]);
diff --git a/app/Http/Controllers/Forms/FormOtherController.php b/app/Http/Controllers/Forms/FormOtherController.php
index ba4ec54..a9141c6 100644
--- a/app/Http/Controllers/Forms/FormOtherController.php
+++ b/app/Http/Controllers/Forms/FormOtherController.php
@@ -35,6 +35,7 @@ class FormOtherController extends Controller
       $forms = FormOthers::where('user_id', auth()->user()->id)->get();
     }
 
+    session()->put('redirect_url', route('forms.other'));
 		return view('backend.pages.forms.other.index', [
 			'forms' => $forms
 		]);
diff --git a/app/Http/Controllers/Forms/FormUpCountryController.php b/app/Http/Controllers/Forms/FormUpCountryController.php
index 0697156..52f3cf8 100644
--- a/app/Http/Controllers/Forms/FormUpCountryController.php
+++ b/app/Http/Controllers/Forms/FormUpCountryController.php
@@ -35,6 +35,7 @@ class FormUpCountryController extends Controller
       $forms = FormUpCountry::with('rayon')->where('user_id', auth()->user()->id)->get();
     }
 
+    session()->put('redirect_url', route('forms.up-country'));
 		return view('backend.pages.forms.upcountry.index', [
 			'forms' => $forms
 		]);
@@ -137,8 +138,6 @@ class FormUpCountryController extends Controller
     ]);
 
     session()->flash('success', 'Form has been created.');
-    session()->flash('redirect_url', route('forms.up-country'));
-    
     return redirect()->back();
 	}
 
diff --git a/app/Http/Controllers/Forms/FormVehicleController.php b/app/Http/Controllers/Forms/FormVehicleController.php
index cc2d535..b7f3b3b 100644
--- a/app/Http/Controllers/Forms/FormVehicleController.php
+++ b/app/Http/Controllers/Forms/FormVehicleController.php
@@ -35,6 +35,7 @@ class FormVehicleController extends Controller
       $forms = FormVehicleRunningCost::where('user_id', auth()->user()->id)->get();
     }
 
+    session()->put('redirect_url', route('forms.vehicle'));
 		return view('backend.pages.forms.vehicle.index', [
 			'forms' => $forms
 		]);
diff --git a/resources/views/backend/layouts/partials/messages.blade.php b/resources/views/backend/layouts/partials/messages.blade.php
index 4c582f8..db13ad7 100644
--- a/resources/views/backend/layouts/partials/messages.blade.php
+++ b/resources/views/backend/layouts/partials/messages.blade.php
@@ -11,7 +11,6 @@
     </div>
 @endif
 
-
 <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
 @if (Session::has('success'))
     <script>
@@ -22,6 +21,9 @@
         }).then(() => {
             if ("{{ Session::get('redirect_url') }}") {
                 window.location.href = "{{ Session::get('redirect_url') }}";
+                @php
+                    Session::forget('redirect_url');
+                @endphp
             }
         });
     </script>
@@ -37,6 +39,9 @@
         }).then(() => {
             if ("{{ Session::get('redirect_url') }}") {
                 window.location.href = "{{ Session::get('redirect_url') }}";
+                @php
+                    Session::forget('redirect_url');
+                @endphp
             }
         });
     </script>
diff --git a/resources/views/backend/pages/forms/upcountry/edit.blade.php b/resources/views/backend/pages/forms/upcountry/edit.blade.php
index 5e1279b..158f4ac 100644
--- a/resources/views/backend/pages/forms/upcountry/edit.blade.php
+++ b/resources/views/backend/pages/forms/upcountry/edit.blade.php
@@ -70,10 +70,6 @@
                                     <label class="form-label">Hotel</label>
                                     <input type="number" class="form-control" name="hotel" id="hotel" required value="{{ $form->hotel }}">
                                 </div>
-                                <div class="mb-3">
-                                    <label class="form-label">Total</label>
-                                    <input type="number" class="form-control" name="total" id="total" required value="{{ $form->total }}" readonly>
-                                </div>
                                 <div class="mb-3">
                                     <label class="form-label">Bukti 1</label>
                                     <input type="file" class="form-control" name="bukti1" value="{{ old('bukti1') }}">
@@ -95,30 +91,4 @@
             </div>
         </div>
     </section>
-
-    <script>
-        const allowance = document.getElementById('allowance');
-        const transportDalkot = document.getElementById('transport_dalkot');
-        const transportAnkot = document.getElementById('transport_ankot');
-        const hotel = document.getElementById('hotel');
-        const total = document.getElementById('total');
-
-        // Function to calculate total
-        function calculateTotal() {
-            const allowanceValue = parseInt(allowance.value) || 0;
-            const transportDalkotValue = parseInt(transportDalkot.value) || 0;
-            const transportAnkotValue = parseInt(transportAnkot.value) || 0;
-            const hotelValue = parseInt(hotel.value) || 0;
-
-            total.value = allowanceValue + transportDalkotValue + transportAnkotValue + hotelValue;
-        }
-
-        // Attach event listeners
-        [allowance, transportDalkot, transportAnkot, hotel].forEach(input => {
-            input.addEventListener('input', calculateTotal);
-        });
-
-        // Initial calculation on page load
-        calculateTotal();
-    </script>
 @endsection