Fix merge issue when duplicate cart lines present

Ryan Workman · Ryan Workman · commit 1d76068ac3a9 · 2023-03-24T10:16:26.000-06:00
diff --git a/checkout/rust/cart-transform/bundles/src/main.rs b/checkout/rust/cart-transform/bundles/src/main.rs
@@ -132,7 +132,8 @@ fn get_components_in_cart(
                   } else {
                       0
                   };
-                  maximum_available_component.push(maximum_available)
+                  maximum_available_component.push(maximum_available);
+                  break;
               }
             }
         }
diff --git a/sample-apps/bundles-cart-transform/extensions/cart-merge-expand/src/main.rs b/sample-apps/bundles-cart-transform/extensions/cart-merge-expand/src/main.rs
@@ -132,7 +132,8 @@ fn get_components_in_cart(
                   } else {
                       0
                   };
-                  maximum_available_component.push(maximum_available)
+                  maximum_available_component.push(maximum_available);
+                  break;
               }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,8 @@ fn get_components_in_cart(`
`132`	`132`	`} else {`
`133`	`133`	`0`
`134`	`134`	`};`
`135`		`- maximum_available_component.push(maximum_available)`
	`135`	`+ maximum_available_component.push(maximum_available);`
	`136`	`+ break;`
`136`	`137`	`}`
`137`	`138`	`}`
`138`	`139`	`}`