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 @@ @endif - @if (Session::has('success')) @@ -37,6 +39,9 @@ }).then(() => { if ("{{ Session::get('redirect_url') }}") { window.location.href = "{{ Session::get('redirect_url') }}"; + @php + Session::forget('redirect_url'); + @endphp } }); 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 @@ -