Fix: Product index incorrect when PER_ORDER checkout enabled

daveearley · daveearley · commit 43b7260527d1 · 2025-11-27T11:59:14.000Z
diff --git a/frontend/src/components/routes/product-widget/CollectInformation/index.tsx b/frontend/src/components/routes/product-widget/CollectInformation/index.tsx
@@ -547,11 +547,14 @@ export const CollectInformation = () => {
                     const productHasQuestions = productQuestions?.some(question => question.product_ids?.includes(orderItem.product_id));
 
                     if (!product) {
-                        return;
+                        return null;
                     }
 
                     if (!productRequiresDetails && !productHasQuestions) {
-                        return;
+                        // Still increment productIndex for each item in the quantity
+                        // to maintain correct form field indices
+                        productIndex += orderItem.quantity ?? 0;
+                        return null;
                     }
 
                     return (

Original file line number	Diff line number	Diff line change
`@@ -547,11 +547,14 @@ export const CollectInformation = () => {`
`547`	`547`	`const productHasQuestions = productQuestions?.some(question => question.product_ids?.includes(orderItem.product_id));`
`548`	`548`
`549`	`549`	`if (!product) {`
`550`		`- return;`
	`550`	`+ return null;`
`551`	`551`	`}`
`552`	`552`
`553`	`553`	`if (!productRequiresDetails && !productHasQuestions) {`
`554`		`- return;`
	`554`	`+ // Still increment productIndex for each item in the quantity`
	`555`	`+ // to maintain correct form field indices`
	`556`	`+ productIndex += orderItem.quantity ?? 0;`
	`557`	`+ return null;`
`555`	`558`	`}`
`556`	`559`
`557`	`560`	`return (`