From 76f59f7b8550f409c837ba2f58591df1fdb81d14 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 1 Jul 2025 12:52:16 -0700 Subject: [PATCH] fix variables --- app/Helpers/Helper.php | 4 ++-- tests/Unit/Helpers/HelperTest.php | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index 31596f5a18..9a3a1f123c 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -1484,8 +1484,8 @@ class Helper static public function getRedirectOption($request, $id, $table, $item_id = null) : RedirectResponse { - $redirect_option = Session::get('redirect_option') ?? $request->input('redirect_option'); - $checkout_to_type = Session::get('checkout_to_type') ?? $request->input('checkout_to_type'); + $redirect_option = Session::get('redirect_option') ?? $request->redirect_option; + $checkout_to_type = Session::get('checkout_to_type') ?? null; $checkedInFrom = Session::get('checkedInFrom'); $other_redirect = Session::get('other_redirect'); $backUrl = Session::pull('back_url', route('home')); diff --git a/tests/Unit/Helpers/HelperTest.php b/tests/Unit/Helpers/HelperTest.php index 2fb1c58e26..c92ad3d1e9 100644 --- a/tests/Unit/Helpers/HelperTest.php +++ b/tests/Unit/Helpers/HelperTest.php @@ -167,7 +167,8 @@ class HelperTest extends TestCase Session::put('redirect_option', $data['redirect_option']); Session::put('checkout_to_type', $data['checkout_to_type']); - $redirect = redirect()->to(Helper::getRedirectOption($data['request'],$data['id'], $data['table'])); + $redirect = Helper::getRedirectOption($data['request'], $data['id'], $data['table']); + $this->assertInstanceOf(RedirectResponse::class, $redirect); $this->assertEquals($data['route'], $redirect->getTargetUrl(), $scenario.'failed.');