Merge remote-tracking branch 'origin/release/2024.02.22' into feature/CSR-1971

src/layouts/address-vehicles/address-vehicles.vue

@@ -164,7 +164,6 @@ export default {
             if (
                 store.getters.order.vehicle.carId &&
                 store.getters.order.serviceLocation.zipCode &&
-                store.getters.order.customer.emailAddress &&
                 store.getters.pageData(fmgPageValues.ADDRESS_VEHICLES)
             ) {
                 return true;

src/layouts/quote/quote.vue

@@ -43,7 +43,6 @@
                         class="small mt-4"
                         v-model="lineItems"
                         :availableVaps="availableVaps"
-                        :availableLineItems="availableLineItems"
                         pageName="quote"
                         :taxPromos="false"
                         modalWidgetName="PromoModalWidget" />

src/store/index.js

@@ -2310,6 +2310,9 @@ export const actions = {
     ) {
         const order = context.getters.order;
         lineItemsToUse = lineItemsToUse ?? order.lineItems;
+        addGuidToLineItemsIfNotAlreadyThere(lineItemsToUse.vaps);
+        syncLineItemIds(addableVaps, lineItemsToUse.vaps);
+        // addableVaps still won't have IDs if they weren't already in lineItemsToUse
         addGuidToLineItemsIfNotAlreadyThere(addableVaps);
         const requestObject = {
             promoCode: promoCode,

src/store/store.spec.js

@@ -2933,7 +2933,7 @@ describe("Actions", () => {
             // Arrange
             const context = state;
             const promoCode = "testPromo";
-            const lineItemsToUse = { vaps: [1], promos: [2] };
+            const lineItemsToUse = { vaps: [{ partNumber: 1 }], promos: [2] };
             const addableVaps = [{ partNumber: "addableVap" }];
 
             context["getters"] = {
@@ -3013,7 +3013,7 @@ describe("Actions", () => {
                     },
                     referralSequenceNumber: "test",
                     lineItems: {
-                        vaps: [1],
+                        vaps: [{ partNumber: 1 }],
                         promos: [2],
                         serverData: "test",
                     },
@@ -3026,7 +3026,7 @@ describe("Actions", () => {
 
             crypto.randomUUID = jest.fn(() => "GUID");
 
-            const expectedLineItemsOnOrder = [1, 2];
+            const expectedLineItemsOnOrder = [{ partNumber: 1, id: "GUID" }, 2];
 
             // Act
             actions.validateOrderPromoAndSaveServerData(context, {
@@ -3073,7 +3073,7 @@ describe("Actions", () => {
                     },
                     referralSequenceNumber: "test",
                     lineItems: {
-                        vaps: [1],
+                        vaps: [{ partNumber: 1 }],
                         promos: [2],
                         serverData: "test",
                     },
@@ -3131,7 +3131,7 @@ describe("Actions", () => {
                     },
                     referralSequenceNumber: "test",
                     lineItems: {
-                        vaps: [1],
+                        vaps: [{ partNumber: 1 }],
                         promos: [2],
                         serverData: "test",
                     },