From b44502a91ebf77b18ebdffe3363eb0123eadc1ad Mon Sep 17 00:00:00 2001 From: Bob Date: Tue, 4 Mar 2025 13:09:40 +0100 Subject: [PATCH 1/2] Skip login step when logged in --- src/Http/Controllers/CheckoutController.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Http/Controllers/CheckoutController.php b/src/Http/Controllers/CheckoutController.php index fb75f6304..c3b7b31f9 100644 --- a/src/Http/Controllers/CheckoutController.php +++ b/src/Http/Controllers/CheckoutController.php @@ -15,6 +15,10 @@ public function __invoke(Request $request, ?string $step = null) $step = $checkoutSteps[0]; } + if (auth('magento-customer')->user()) { + $step = $checkoutSteps[array_search($step, $checkoutSteps) + 1]; + } + abort_if(! in_array($step, $checkoutSteps), 404); return view('rapidez::checkout.pages.' . $step, [ From 82f3582ff97fe64239578ddedb80e5c9c4a9f947 Mon Sep 17 00:00:00 2001 From: Bob Date: Tue, 4 Mar 2025 13:12:05 +0100 Subject: [PATCH 2/2] Added extra step for login --- src/Http/Controllers/CheckoutController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Http/Controllers/CheckoutController.php b/src/Http/Controllers/CheckoutController.php index c3b7b31f9..7701679f3 100644 --- a/src/Http/Controllers/CheckoutController.php +++ b/src/Http/Controllers/CheckoutController.php @@ -15,7 +15,7 @@ public function __invoke(Request $request, ?string $step = null) $step = $checkoutSteps[0]; } - if (auth('magento-customer')->user()) { + if ($step === 'login' && auth('magento-customer')->user()) { $step = $checkoutSteps[array_search($step, $checkoutSteps) + 1]; }