Create return routing fix

hlxsites · Dec 6, 2024 · fcbef3b · fcbef3b
1 parent 52d459b
commit fcbef3b
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/blocks/commerce-create-return/commerce-create-return.js b/blocks/commerce-create-return/commerce-create-return.js
@@ -10,6 +10,12 @@ import '../../scripts/initializers/order.js';
 
 export default async function decorate(block) {
   await orderRenderer.render(CreateReturn, {
-    routeReturnSuccess: (orderData) => (checkIsAuthenticated() ? `${CUSTOMER_ORDER_DETAILS_PATH}?orderRef=${orderData.number}` : `${ORDER_DETAILS_PATH}?orderRef=${orderData.token}`),
+    routeReturnSuccess: (orderData) => {
+      const orderRef = checkIsAuthenticated() ? orderData.number : orderData.token;
+      const encodedOrderRef = encodeURIComponent(orderRef);
+      const path = checkIsAuthenticated() ? CUSTOMER_ORDER_DETAILS_PATH : ORDER_DETAILS_PATH;
+
+      return `${path}?orderRef=${encodedOrderRef}`;
+    },
   })(block);
 }