From 6eac65394a7b94dbb36cc6d333af179a7653da87 Mon Sep 17 00:00:00 2001
From: Pete Eveleigh <pete@fostercommerce.com>
Date: Tue, 17 Sep 2024 11:26:47 +0100
Subject: [PATCH] If order page requested with a number and cart is not empty
 then do not redirect to cart

---
 src/templates/_layouts/default.twig | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/templates/_layouts/default.twig b/src/templates/_layouts/default.twig
index 20bc19c..e857e5a 100644
--- a/src/templates/_layouts/default.twig
+++ b/src/templates/_layouts/default.twig
@@ -10,8 +10,10 @@
 		{% set cart = craft.commerce.carts.cart %}
 	{% endif %}
 
-	{% if craft.app.request.getSegment(1) != craft.fostercheckout.getPath('cart')
-		and cart.lineItems|length == 0 %}
+	{% if
+		(craft.app.request.getSegment(1) != craft.checkout.paths.cart and craft.app.request.getSegment(-1) != 'order' and cart.lineItems|length == 0)
+		or (craft.app.request.getSegment(-1) == 'order' and craft.app.request.getParam('number') == null)
+	%}
 		{% redirect craft.fostercheckout.getPath('cart') %}
 	{% endif %}