diff --git a/src/store/index.js b/src/store/index.js
index efa767ddd..1ed491bd4 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1487,17 +1487,9 @@ export const actions = {
         const order = context.state.order;
         const vehicle = context.state.order.vehicle;
         const payment = context.state.order.payment;
-        let lineItems = [
-            ...(order.lineItems.supportingItems ?? []),
-            ...(order.lineItems.vaps ?? []),
-            ...getFlattenedArrayOfLineItemsWithChildParts(order.lineItems.glassParts),
-        ];
-        lineItems = lineItems.map((lineItem) => {
-            return {
-                partNumber: lineItem.partNumber,
-                partType: lineItem.partType,
-            };
-        });
+
+        const lineItems = getFlattenedLineItemsWithGlassPartTag(order.lineItems);
+
         const glassPieces = order.damage.glassToReplace
             ? convertGlassPieceToBackEndCompatibleFormat(order.damage.glassToReplace)
             : [];
@@ -1556,17 +1548,7 @@ export const actions = {
         const order = context.state.order;
         const vehicle = context.state.order.vehicle;
         const payment = context.state.order.payment;
-        let lineItems = [
-            ...(order.lineItems.supportingItems ?? []),
-            ...(order.lineItems.vaps ?? []),
-            ...getFlattenedArrayOfLineItemsWithChildParts(order.lineItems.glassParts),
-        ];
-        lineItems = lineItems.map((lineItem) => {
-            return {
-                partNumber: lineItem.partNumber,
-                partType: lineItem.partType,
-            };
-        });
+        const lineItems = getFlattenedLineItemsWithGlassPartTag(order.lineItems);
         const glassPieces = order.damage.glassToReplace
             ? convertGlassPieceToBackEndCompatibleFormat(order.damage.glassToReplace)
             : [];
@@ -2882,6 +2864,28 @@ function getFlattenedArrayOfLineItemsWithChildParts(lineItems) {
     return flattenedArray;
 }
 
+function getFlattenedLineItemsWithGlassPartTag(lineItems) {
+    const nonGlassLineItems = [...(lineItems.supportingItems ?? []), ...(lineItems.vaps ?? [])];
+    const mappedNonGlassLineItems = nonGlassLineItems.map((lineItem) => {
+        return {
+            partNumber: lineItem.partNumber,
+            partType: lineItem.partType,
+            isGlassPart: false,
+        };
+    });
+
+    const glassLineItems = [...getFlattenedArrayOfLineItemsWithChildParts(lineItems.glassParts)];
+    const mappedGlassLineItems = glassLineItems.map((lineItem) => {
+        return {
+            partNumber: lineItem.partNumber,
+            partType: lineItem.partType,
+            isGlassPart: true,
+        };
+    });
+
+    return [...mappedNonGlassLineItems, ...mappedGlassLineItems];
+}
+
 function buildQueryStringParameterFromArrayOfComplexObjects(arrayOfObjects, parameterName) {
     let queryStringParameter = "";
     for (let i = 0; i < arrayOfObjects.length; i++) {