From 2ca9a4b2e792e3b849c9597f2d1dd56c6ea0046b Mon Sep 17 00:00:00 2001
From: hiteshkumar87 <hitesh.kumar@safelite.com>
Date: Mon, 12 Feb 2024 13:52:18 +0530
Subject: [PATCH 1/6] addOptionalText

addOptionalText to make textbox-question more generic
---
 src/digital-components/textbox-question/textbox-question.vue | 5 +++--
 src/layouts/address-lookup/address-lookup.vue                | 2 +-
 .../address-lookup/customer-questions/customer-questions.vue | 2 +-
 src/layouts/estimate/estimate.vue                            | 2 +-
 src/layouts/license-plate-lookup/license-plate-lookup.vue    | 2 +-
 src/layouts/vin-lookup/vin-lookup.vue                        | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/digital-components/textbox-question/textbox-question.vue b/src/digital-components/textbox-question/textbox-question.vue
index da41fe10b..cc13231e1 100644
--- a/src/digital-components/textbox-question/textbox-question.vue
+++ b/src/digital-components/textbox-question/textbox-question.vue
@@ -121,9 +121,10 @@ export default {
         hideInput: Boolean,
         centerErrorMessage: Boolean,
         keyDownHandler: Function,
-        isEmailOptional: {
+        addOptionalText: {
             type: Boolean,
             default: false,
+            isRequired: false,
         },
     },
     setup(props) {
@@ -197,7 +198,7 @@ export default {
     },
     computed: {
         questionText() {
-            return this.isEmailOptional
+            return this.addOptionalText
                 ? this.getCmsContent(this.cmsWidgetName, "QuestionText") + " (optional)"
                 : this.getCmsContent(this.cmsWidgetName, "QuestionText");
         },
diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 807bdc5ce..079e3c5ca 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -24,7 +24,7 @@
                         ref="customerQuestions"
                         v-model="customerQuestions"
                         :validationRules="EmailValidationRules"
-                        :isEmailOptional="IsEmailOptional" />
+                        :addOptionalText="IsEmailOptional" />
 
                     <alert
                         ref="alertVinNotFound"
diff --git a/src/layouts/address-lookup/customer-questions/customer-questions.vue b/src/layouts/address-lookup/customer-questions/customer-questions.vue
index 299b2746a..d37f2bbae 100644
--- a/src/layouts/address-lookup/customer-questions/customer-questions.vue
+++ b/src/layouts/address-lookup/customer-questions/customer-questions.vue
@@ -29,7 +29,7 @@
                 customInputId="emailAddress"
                 :isRequired="!isEmailOptional"
                 :validationRules="validationRules"
-                :isEmailOptional="isEmailOptional" />
+                :addOptionalText="isEmailOptional" />
         </div>
     </div>
     <div class="row mb-0">
diff --git a/src/layouts/estimate/estimate.vue b/src/layouts/estimate/estimate.vue
index d2766f730..f1318e205 100644
--- a/src/layouts/estimate/estimate.vue
+++ b/src/layouts/estimate/estimate.vue
@@ -55,7 +55,7 @@
                             :isRequired="!IsEmailOptional"
                             disableAutoFill
                             :validationRules="EmailValidationRules"
-                            :isEmailOptional="IsEmailOptional" />
+                            :addOptionalText="IsEmailOptional" />
                         <textBlock cmsWidgetName="QuoteEmailTextBlockWidget" typeStyle="caption" />
 
                         <alert
diff --git a/src/layouts/license-plate-lookup/license-plate-lookup.vue b/src/layouts/license-plate-lookup/license-plate-lookup.vue
index 37d93cc8b..c0c94ecb7 100644
--- a/src/layouts/license-plate-lookup/license-plate-lookup.vue
+++ b/src/layouts/license-plate-lookup/license-plate-lookup.vue
@@ -36,7 +36,7 @@
                         customInputId="email"
                         :isRequired="!IsEmailOptional"
                         :validationRules="EmailValidationRules"
-                        :isEmailOptional="IsEmailOptional" />
+                        :addOptionalText="IsEmailOptional" />
 
                     <textBlock cmsWidgetName="QuoteEmailTextBlockWidget" typeStyle="caption" />
 
diff --git a/src/layouts/vin-lookup/vin-lookup.vue b/src/layouts/vin-lookup/vin-lookup.vue
index ae197aeb0..ce8365a53 100644
--- a/src/layouts/vin-lookup/vin-lookup.vue
+++ b/src/layouts/vin-lookup/vin-lookup.vue
@@ -55,7 +55,7 @@
                         customInputId="emailAddress"
                         :isRequired="!IsEmailOptional"
                         :validationRules="EmailValidationRules"
-                        :isEmailOptional="IsEmailOptional" />
+                        :addOptionalText="IsEmailOptional" />
 
                     <textBlock cmsWidgetName="QuoteEmailTextBlockWidget" typeStyle="caption" />
 

From 8a568dba69c74cde6e6d9ecca905deea18994b18 Mon Sep 17 00:00:00 2001
From: hiteshkumar87 <hitesh.kumar@safelite.com>
Date: Mon, 12 Feb 2024 15:45:15 +0530
Subject: [PATCH 2/6] Update address-lookup.vue

---
 src/layouts/address-lookup/address-lookup.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/address-lookup/address-lookup.vue b/src/layouts/address-lookup/address-lookup.vue
index 079e3c5ca..807bdc5ce 100644
--- a/src/layouts/address-lookup/address-lookup.vue
+++ b/src/layouts/address-lookup/address-lookup.vue
@@ -24,7 +24,7 @@
                         ref="customerQuestions"
                         v-model="customerQuestions"
                         :validationRules="EmailValidationRules"
-                        :addOptionalText="IsEmailOptional" />
+                        :isEmailOptional="IsEmailOptional" />
 
                     <alert
                         ref="alertVinNotFound"

From f713cb2bd205e252ac279f35452552b1bfa04f3a Mon Sep 17 00:00:00 2001
From: CarlNation <32103961+CarlNation@users.noreply.github.com>
Date: Mon, 12 Feb 2024 15:41:43 -0500
Subject: [PATCH 3/6] CSR-1952 revert

CSR-1952 see if revert fixes page hanging
---
 src/fmg-components/cart/cart.vue              | 195 +++++++-----------
 src/layouts/payment-method/payment-method.vue |  10 +-
 2 files changed, 82 insertions(+), 123 deletions(-)

diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue
index 0e6d993ee..65701db71 100644
--- a/src/fmg-components/cart/cart.vue
+++ b/src/fmg-components/cart/cart.vue
@@ -13,101 +13,78 @@
                     <span class="label amount-due">{{ getFormattedAmount("", amountDue) }}</span>
                 </a>
             </div>
-            <div class="cart-panel">
-                <div class="price-table">
-                    <div class="service-type">
-                        <textBlock :cmsWidgetName="servicePackageTitleWidget" />
-                        <span>
-                            {{ getFormattedAmount("", packagePrice) }}
-                        </span>
-                    </div>
-
-                    <!-- Packaged Cart Items -->
-                    <div
-                        v-for="(cartItem, i) in packageCartItems"
-                        :key="i"
-                        class="packaged-cart-item">
-                        <span
-                            ><span v-if="cartItem.category === 'promos'">&lt;</span
-                            >{{ cartItem.name
-                            }}<span v-if="cartItem.category === 'promos'">&gt;</span></span
-                        >
-                        <textLink
-                            v-if="allowItemRemoval"
-                            ref="removeLink"
-                            linkType="text"
-                            :text="removeLinkText"
-                            href="javascript:void(0)"
-                            @click-event="removeItem(cartItem.cartItemType, cartItem.category)">
-                            <template v-slot:after-text>
-                                <span class="sr-only">{{ cartItem.name }}</span>
-                            </template>
-                        </textLink>
-                    </div>
-
-                    <!-- Nonpackaged Cart Items -->
-                    <div
-                        v-for="(cartItem, i) in nonpackageCartItems"
-                        :key="i"
-                        class="non-packaged-cart-item"
-                        :class="[
-                            i % 2 == 0 ? 'even' : 'odd',
-                            cartItem.isRemovable ? 'removable-cart-item' : '',
-                        ]">
-                        <span v-if="cartItem != recycleFeeCartItem">{{ cartItem.name }}</span>
-                        <textLink
-                            v-if="allowItemRemoval && cartItem.isRemovable"
-                            ref="removeLink"
-                            linkType="text"
-                            :text="removeLinkText"
-                            href="javascript:void(0)"
-                            @click-event="removeItem(cartItem.cartItemType, cartItem.category)" />
-                        <textLink
-                            v-else-if="
-                                cartItem == recycleFeeCartItem && recyclingModalCmsWidgetName
-                            "
-                            linkType="text"
-                            :text="recycleFeeCartItem.name"
-                            href="javascript:void(0)"
-                            @click-event="openModal(recyclingModalCmsWidgetName)" />
-                        <span v-else-if="cartItem == recycleFeeCartItem">
-                            {{ recycleFeeCartItem.name }}
-                        </span>
-                        <span>{{ getFormattedAmount(cartItem.category, cartItem.subTotal) }}</span>
-                    </div>
-
-                    <!-- Sub total, sales tax, total columns -->
-                    <div class="sub-total">
-                        <span>{{ subtotalText }}</span
-                        ><span>{{ getFormattedAmount("", subTotal) }}</span>
-                    </div>
-                    <div class="sales-tax">
-                        <span>{{ salesTaxText }}</span
-                        ><span>{{ getFormattedAmount("", salesTax) }}</span>
-                    </div>
-                    <div v-if="showAsPaid" class="amount-paid">
-                        <span>{{ amountPaidText }}</span
-                        ><span>{{ getFormattedAmount("", amountPaid) }}</span>
-                    </div>
-                    <div class="amount-due">
-                        <span>{{ amountDueText }}</span
-                        ><span>{{ getFormattedAmount("", amountDue) }}</span>
-                    </div>
+            <div class="price-table">
+                <div class="service-type">
+                    <textBlock :cmsWidgetName="servicePackageTitleWidget" />
+                    <span>
+                        {{ getFormattedAmount("", packagePrice) }}
+                    </span>
+                </div>
+
+                <!-- Packaged Cart Items -->
+                <div v-for="(cartItem, i) in packageCartItems" :key="i" class="packaged-cart-item">
+                    <span>{{ cartItem.name }}</span>
+                    <textLink
+                        v-if="allowItemRemoval"
+                        ref="removeLink"
+                        linkType="text"
+                        :text="removeLinkText"
+                        href="javascript:void(0)"
+                        @click-event="removeItem(cartItem.cartItemType, cartItem.category)">
+                        <template v-slot:after-text>
+                            <span class="sr-only">{{ cartItem.name }}</span>
+                        </template>
+                    </textLink>
+                </div>
+
+                <!-- Nonpackaged Cart Items -->
+                <div
+                    v-for="(cartItem, i) in nonpackageCartItems"
+                    :key="i"
+                    class="non-packaged-cart-item"
+                    :class="[
+                        i % 2 == 0 ? 'even' : 'odd',
+                        cartItem.isRemovable ? 'removable-cart-item' : '',
+                    ]">
+                    <span v-if="cartItem != recycleFeeCartItem">{{ cartItem.name }}</span>
+                    <textLink
+                        v-if="allowItemRemoval && cartItem.isRemovable"
+                        ref="removeLink"
+                        linkType="text"
+                        :text="removeLinkText"
+                        href="javascript:void(0)"
+                        @click-event="removeItem(cartItem.cartItemType, cartItem.category)" />
+                    <textLink
+                        v-else-if="cartItem == recycleFeeCartItem && recyclingModalCmsWidgetName"
+                        linkType="text"
+                        :text="recycleFeeCartItem.name"
+                        href="javascript:void(0)"
+                        @click-event="openModal(recyclingModalCmsWidgetName)" />
+                    <span v-else-if="cartItem == recycleFeeCartItem">
+                        {{ recycleFeeCartItem.name }}
+                    </span>
+                    <span>{{ getFormattedAmount(cartItem.category, cartItem.subTotal) }}</span>
+                </div>
+
+                <!-- Sub total, sales tax, total columns -->
+                <div class="sub-total">
+                    <span>{{ subtotalText }}</span
+                    ><span>{{ getFormattedAmount("", subTotal) }}</span>
+                </div>
+                <div class="sales-tax">
+                    <span>{{ salesTaxText }}</span
+                    ><span>{{ getFormattedAmount("", salesTax) }}</span>
+                </div>
+                <div v-if="showAsPaid" class="amount-paid">
+                    <span>{{ amountPaidText }}</span
+                    ><span>{{ getFormattedAmount("", amountPaid) }}</span>
+                </div>
+                <div class="amount-due">
+                    <span>{{ amountDueText }}</span
+                    ><span>{{ getFormattedAmount("", amountDue) }}</span>
                 </div>
-                <promoModalQuestion
-                    ref="promoModalQuestion"
-                    class="small mt-4"
-                    v-model="lineItems"
-                    :availableVaps="availableVaps"
-                    modalWidgetName="PromoModalWidget" />
             </div>
         </div>
-        <div
-            class="my-2 lh-1 applied-promo"
-            v-for="(promoCode, i) in this.getPromoCodeList()"
-            :key="i">
-            <span class="caption">Promo code &lt;{{ promoCode }}&gt; applied </span>
-        </div>
         <contentGroupModal ref="RecycleModal" cmsWidgetName="RecycleModal">
             <textBlock cmsWidgetName="RecycleTextBlock" />
         </contentGroupModal>
@@ -119,7 +96,6 @@
 import textLink from "@/ux-components/text-link/text-link";
 import textBlock from "@/digital-components/text-block/text-block";
 import contentGroupModal from "@/fmg-components/content-group-modal/content-group-modal";
-import promoModalQuestion from "@/layouts/payment-method/promo-modal-question/promo-modal-question";
 
 // Mixins
 import baseMixin from "@/mixins/base-mixin.js";
@@ -222,12 +198,6 @@ export default {
 
             this.$emit("update:modelValue", this.lineItems);
         },
-        getPromoCodeList() {
-            if (this.$refs["promoModalQuestion"]) {
-                return this.$refs["promoModalQuestion"].getPromoCodeList();
-            }
-            return [];
-        },
     },
     computed: {
         screenReaderTotalAmountDueText() {
@@ -826,23 +796,16 @@ export default {
             },
             deep: true,
         },
-        lineItems: {
-            handler(newValue) {
-                this.$emit("update:modelValue", this.lineItems);
-            },
-            deep: true,
-        },
     },
     components: {
         textBlock,
         textLink,
         contentGroupModal,
-        promoModalQuestion,
     },
 };
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 .cart {
     margin-bottom: 1rem;
 
@@ -867,15 +830,12 @@ export default {
     .amount-due {
         color: $green;
     }
-    .cart-panel {
+    .price-table {
         max-height: 0;
         transition: all 350ms ease-in;
         overflow: hidden;
         visibility: hidden;
         color: $gray-600;
-    }
-
-    .price-table {
         div {
             display: flex;
             justify-content: space-between;
@@ -980,26 +940,17 @@ export default {
         &.expanded:after {
             transform: rotate(180deg);
         }
-        &.expanded + .cart-panel {
+        &.expanded + .price-table {
             max-height: 650px;
             transition: all 150ms ease-in;
             overflow: hidden;
-            padding: 1rem 0 0.5rem;
+            padding-top: 1rem;
             visibility: visible;
         }
         a {
             text-decoration: none;
         }
     }
-    .applied-promo {
-        span {
-            color: $green-700;
-            font-weight: 500;
-            padding: 2px 8px;
-            background-color: $green-100;
-            border-radius: 12px;
-        }
-    }
 }
 .payment-method-question {
     .question-text {
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index efdf02ff5..3bde800bf 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -29,7 +29,13 @@
                         servicePackageOptionsCmsName="ServicePackageTitle"
                         recyclingModalCmsWidgetName="RecycleModal" />
 
-                    <hr class="mb-5" />
+                    <promoModalQuestion
+                        class="small mt-4"
+                        v-model="lineItems"
+                        :availableVaps="availableVaps"
+                        modalWidgetName="PromoModalWidget" />
+
+                    <hr class="my-5" />
 
                     <div>
                         <alert
@@ -76,6 +82,7 @@ import paymentMethodQuestion from "@/layouts/payment-method/payment-method-quest
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 import cart from "@/fmg-components/cart/cart";
 import reviewDropdown from "@/layouts/payment-method/review-dropdown/review-dropdown";
+import promoModalQuestion from "@/layouts/payment-method/promo-modal-question/promo-modal-question";
 import { submitWorkOrder } from "@/helpers/heritage-integration/order-helper.js";
 import alert from "@/ux-components/alert/alert";
 
@@ -589,6 +596,7 @@ export default {
         cart,
         alert,
         paymentMethodQuestion,
+        promoModalQuestion,
         reviewDropdown,
     },
 };

From b8e788529f8463509d2a1aec6e984dd5163c765e Mon Sep 17 00:00:00 2001
From: Sneha <sneha.a@safelite.com>
Date: Tue, 13 Feb 2024 11:16:00 +0530
Subject: [PATCH 4/6] Unit test

---
 .../menu-modal/menu-modal.spec.js             |  67 ++++++-
 .../funnel-header/menu-modal/menu-modal.vue   |   1 +
 .../promo-modal-question.spec.js              | 175 ++++++++++++++++++
 .../promo-modal-question.vue                  |   2 +-
 .../promo-question/promo-question.spec.js     |   0
 .../promo-question/promo-question.vue         |   0
 src/layouts/payment-method/payment-method.vue |   2 +-
 src/layouts/quote/quote.vue                   |   2 +-
 8 files changed, 245 insertions(+), 4 deletions(-)
 rename src/{layouts/payment-method => fmg-components}/promo-modal-question/promo-modal-question.spec.js (54%)
 rename src/{layouts/payment-method => fmg-components}/promo-modal-question/promo-modal-question.vue (99%)
 rename src/{layouts/payment-method => fmg-components}/promo-modal-question/promo-question/promo-question.spec.js (100%)
 rename src/{layouts/payment-method => fmg-components}/promo-modal-question/promo-question/promo-question.vue (100%)

diff --git a/src/fmg-components/funnel-header/menu-modal/menu-modal.spec.js b/src/fmg-components/funnel-header/menu-modal/menu-modal.spec.js
index 3d0843e10..d0c59ba42 100644
--- a/src/fmg-components/funnel-header/menu-modal/menu-modal.spec.js
+++ b/src/fmg-components/funnel-header/menu-modal/menu-modal.spec.js
@@ -1 +1,66 @@
-test.todo("some test to be written in the future");
+import menuModal from "@/fmg-components/funnel-header/menu-modal/menu-modal.vue";
+import { mount, shallowMount } from "@vue/test-utils";
+
+describe("menu-modal.vue", () => {
+    it("Should return text Footer Navigation", async () => {
+        // Act
+        const wrapper = shallowMount(menuModal);
+
+        // Assert
+        const footerModalLabel = wrapper.find("h5");
+
+        // Expect
+        expect(footerModalLabel.text()).toContain("Footer Navigation");
+    });
+
+    it("Should return footer text as Safelite Group", async () => {
+        // Act
+        const wrapper = shallowMount(menuModal);
+
+        // Assert
+        const modalFooter = wrapper.find("div.modal-footer");
+
+        // Expect
+        expect(modalFooter.text()).toContain("Safelite Group");
+    });
+
+    it("Should return Terms of use text link text", async () => {
+        // Act
+        const wrapper = shallowMount(menuModal);
+
+        // Expect
+        expect(wrapper.html()).toContain("Terms of use");
+    });
+
+    it('Should return "Your privacy choices" text link text', async () => {
+        // Act
+        const wrapper = mount(menuModal);
+
+        // Expect
+        expect(wrapper.html()).toContain("Your privacy choices");
+    });
+
+    test('Icon for link to "Privacy Policies" page is displayed with the correct alternate text', () => {
+        // NOTE: We need a way to target a specific <textLink> component so we can be sure that
+        //   an icon is coming from a specific <textLink> component.
+        // That requires an additional prop in the <textLink> component. Will hold off on adding the prop
+        //   until there is more clarity on how we handle shared components.
+        // For now the test is below is the best we can do.
+
+        // Arrange
+        const wrapper = mount(menuModal);
+
+        // Expect
+        const icon = wrapper.find('[data-id="ccpa-icon"]');
+        expect(icon.isVisible()).toBe(true);
+        expect(icon.attributes("alt")).toBe("Your privacy choices");
+    });
+
+    it("Should return Warranty text link text", async () => {
+        // Act
+        const wrapper = shallowMount(menuModal);
+
+        // Expect
+        expect(wrapper.html()).toContain("Warranty");
+    });
+});
diff --git a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
index ef2dfc515..c3e9c5af5 100644
--- a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
+++ b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
@@ -53,6 +53,7 @@
                         <template v-slot:after-text>
                             <img
                                 class="ccpa-icon"
+                                data-id="ccpa-icon"
                                 src="~@/assets/img/icons/ccpa-icon.svg"
                                 alt="Your privacy choices" />
                         </template>
diff --git a/src/layouts/payment-method/promo-modal-question/promo-modal-question.spec.js b/src/fmg-components/promo-modal-question/promo-modal-question.spec.js
similarity index 54%
rename from src/layouts/payment-method/promo-modal-question/promo-modal-question.spec.js
rename to src/fmg-components/promo-modal-question/promo-modal-question.spec.js
index 1dcc2ac70..435a53277 100644
--- a/src/layouts/payment-method/promo-modal-question/promo-modal-question.spec.js
+++ b/src/fmg-components/promo-modal-question/promo-modal-question.spec.js
@@ -2,6 +2,12 @@ import { mount, shallowMount } from "@vue/test-utils";
 import promoModalQuestion from "./promo-modal-question";
 import { storeActions } from "@/constants/store-actions";
 import baseMixin from "@/mixins/base-mixin.js";
+import {
+    promoErrorCodes,
+    getPromoCodesFromPromoObjectsWithoutDuplicates,
+    getPromoCodeWithoutBundleIdentifier,
+} from "@/helpers/promotions-helper";
+import { cartItemCategories } from "@/constants/cart-item-categories";
 
 let mockReturnsForStoreActions = {};
 
@@ -222,4 +228,173 @@ describe("promo-modal-question.vue", () => {
 
         expect(taxedLineItems).toEqual(taxedlineItems);
     });
+    test("Get promoCode list will return the applied promos", async () => {
+        // Arrange
+        const promos = [
+            { promoCode: "duplicatePromo" },
+            { promoCode: "duplicatePromo" },
+            { promoCode: "bundlePromo/400" },
+            { promoCode: "bundlePromo/401" },
+        ];
+        const appliedPromos = ["duplicatePromo", "bundlePromo"];
+        const lineItems = {
+            glassParts: [],
+            supportingItems: [],
+            vaps: [],
+            promos: [],
+        };
+
+        const wrapper = mount(promoModalQuestion, {
+            mixins: [mockMixin],
+            props: {
+                modelValue: lineItems,
+                modalWidgetName: modalWidgetName,
+            },
+            attachTo: document.body,
+        });
+
+        // Act
+        wrapper.vm.getPromoCodeList();
+        const promoCodeToDisplay = getPromoCodesFromPromoObjectsWithoutDuplicates(promos);
+
+        // Assert
+        expect(promoCodeToDisplay).toEqual(appliedPromos);
+    });
+    test("On clicking remove the promo gets removed from the lineItems", async () => {
+        //Arrange
+        const lineItems = {
+            glassParts: [],
+            supportingItems: [],
+            vaps: [],
+            promos: [{ promoCode: "duplicatePromo" }, { promoCode: "duplicatePromo" }],
+        };
+
+        const wrapper = mount(promoModalQuestion, {
+            mixins: [mockMixin],
+            props: {
+                modelValue: lineItems,
+                modalWidgetName: modalWidgetName,
+            },
+            attachTo: document.body,
+        });
+        const promo = ["bundlePromo"];
+        //Act
+        wrapper.vm.removeItem(promo);
+        const existingPromo = (lineItems[cartItemCategories.PROMOS] = lineItems[
+            cartItemCategories.PROMOS
+        ].filter(
+            (lineItemsToKeep) =>
+                getPromoCodeWithoutBundleIdentifier(lineItemsToKeep.promoCode) != promo
+        ));
+
+        //Assert
+        expect(existingPromo).toEqual(lineItems.promos);
+    });
+    test("Getting stacking alert on stack promo error code", async () => {
+        // Arrange
+        const lineItems = {
+            glassParts: [],
+            supportingItems: [],
+            vaps: [],
+            promos: [],
+        };
+
+        const wrapper = mount(promoModalQuestion, {
+            mixins: [mockMixin],
+            props: {
+                modelValue: lineItems,
+                modalWidgetName: modalWidgetName,
+            },
+            attachTo: document.body,
+        });
+        const additionalInfo = ["testAdditionalInfo"];
+
+        const stackingErrorCode = promoErrorCodes.PROMO_STACKING_NOT_ALLOWED;
+
+        // Act
+        wrapper.vm.getErrorMessage(stackingErrorCode, additionalInfo);
+
+        // Assert
+        expect(wrapper.vm.displayStackingPromoAlert).toBe(true);
+    });
+    test("Getting invalid promo alert on invalid promoCode", async () => {
+        // Arrange
+        const lineItems = {
+            glassParts: [],
+            supportingItems: [],
+            vaps: [],
+            promos: [],
+        };
+
+        const wrapper = mount(promoModalQuestion, {
+            mixins: [mockMixin],
+            props: {
+                modelValue: lineItems,
+                modalWidgetName: modalWidgetName,
+            },
+            attachTo: document.body,
+        });
+        const additionalInfo = ["testAdditionalInfo"];
+
+        const invalidErrorCode = promoErrorCodes.INVALID_PROMO_ON_ORDER;
+
+        // Act
+        wrapper.vm.getErrorMessage(invalidErrorCode, additionalInfo);
+
+        // Assert
+        expect(wrapper.vm.displayInvalidPromoAlert).toBe(true);
+    });
+    test("Getting invalid promo alert on invalid promoCode", async () => {
+        // Arrange
+        const lineItems = {
+            glassParts: [],
+            supportingItems: [],
+            vaps: [],
+            promos: [],
+        };
+
+        const wrapper = mount(promoModalQuestion, {
+            mixins: [mockMixin],
+            props: {
+                modelValue: lineItems,
+                modalWidgetName: modalWidgetName,
+            },
+            attachTo: document.body,
+        });
+        const additionalInfo = ["APPOINTMENT_TYPE"];
+
+        const invalidErrorCode = promoErrorCodes.INVALID_PROMO_ON_ORDER;
+
+        // Act
+        wrapper.vm.getErrorMessage(invalidErrorCode, additionalInfo);
+
+        // Assert
+        expect(wrapper.vm.displayInShopPromoAlert).toBe(true);
+    });
+    test("Get conflicting promoCodes on applying more than one promo", async () => {
+        // Arrange
+        const lineItems = {
+            glassParts: [],
+            supportingItems: [],
+            vaps: [],
+            promos: [],
+        };
+
+        const wrapper = mount(promoModalQuestion, {
+            mixins: [mockMixin],
+            props: {
+                modelValue: lineItems,
+                modalWidgetName: modalWidgetName,
+            },
+            attachTo: document.body,
+        });
+        const additionalInfo = ["1wiper0", "Glass30"];
+        const conflictingCodes = ["1wiper0", "Glass30"];
+
+        //Act
+        wrapper.vm.getConflictingPromoCode(additionalInfo);
+
+        //Assert
+        expect(conflictingCodes).toEqual(additionalInfo);
+    });
 });
diff --git a/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue b/src/fmg-components/promo-modal-question/promo-modal-question.vue
similarity index 99%
rename from src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
rename to src/fmg-components/promo-modal-question/promo-modal-question.vue
index da8d344e9..aed1bba21 100644
--- a/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
+++ b/src/fmg-components/promo-modal-question/promo-modal-question.vue
@@ -64,7 +64,7 @@
 </template>
 <script>
 import textLink from "@/ux-components/text-link/text-link";
-import promoQuestion from "@/layouts/payment-method/promo-modal-question/promo-question/promo-question";
+import promoQuestion from "@/fmg-components/promo-modal-question/promo-question/promo-question";
 import modal from "@/digital-components/modal/modal";
 import alert from "@/ux-components/alert/alert";
 import { storeActions } from "@/constants/store-actions.js";
diff --git a/src/layouts/payment-method/promo-modal-question/promo-question/promo-question.spec.js b/src/fmg-components/promo-modal-question/promo-question/promo-question.spec.js
similarity index 100%
rename from src/layouts/payment-method/promo-modal-question/promo-question/promo-question.spec.js
rename to src/fmg-components/promo-modal-question/promo-question/promo-question.spec.js
diff --git a/src/layouts/payment-method/promo-modal-question/promo-question/promo-question.vue b/src/fmg-components/promo-modal-question/promo-question/promo-question.vue
similarity index 100%
rename from src/layouts/payment-method/promo-modal-question/promo-question/promo-question.vue
rename to src/fmg-components/promo-modal-question/promo-question/promo-question.vue
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index ee0eee749..95b549311 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -83,7 +83,7 @@ import paymentMethodQuestion from "@/layouts/payment-method/payment-method-quest
 import loadingModal from "@/fmg-components/loading-modal/loading-modal.vue";
 import cart from "@/fmg-components/cart/cart";
 import reviewDropdown from "@/layouts/payment-method/review-dropdown/review-dropdown";
-import promoModalQuestion from "@/layouts/payment-method/promo-modal-question/promo-modal-question";
+import promoModalQuestion from "@/fmg-components/promo-modal-question/promo-modal-question";
 import { submitWorkOrder } from "@/helpers/heritage-integration/order-helper.js";
 import alert from "@/ux-components/alert/alert";
 
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 8d3dbcee3..8c15b29ee 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -102,7 +102,7 @@ import {
 } from "@/helpers/promotions-helper";
 import { queryStrings } from "@/constants/query-strings";
 import { getQuerystringParameter } from "@/helpers/querystring-helper";
-import promoModalQuestion from "@/layouts/payment-method/promo-modal-question/promo-modal-question";
+import promoModalQuestion from "@/fmg-components/promo-modal-question/promo-modal-question";
 
 defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
 

From abe2ff5d36a73340c3378937fbd81cf8dc9c6c2a Mon Sep 17 00:00:00 2001
From: Sneha <sneha.a@safelite.com>
Date: Tue, 13 Feb 2024 11:54:30 +0530
Subject: [PATCH 5/6] removing menu modal changes

---
 .../menu-modal/menu-modal.spec.js             | 67 +------------------
 .../funnel-header/menu-modal/menu-modal.vue   |  1 -
 2 files changed, 1 insertion(+), 67 deletions(-)

diff --git a/src/fmg-components/funnel-header/menu-modal/menu-modal.spec.js b/src/fmg-components/funnel-header/menu-modal/menu-modal.spec.js
index d0c59ba42..3d0843e10 100644
--- a/src/fmg-components/funnel-header/menu-modal/menu-modal.spec.js
+++ b/src/fmg-components/funnel-header/menu-modal/menu-modal.spec.js
@@ -1,66 +1 @@
-import menuModal from "@/fmg-components/funnel-header/menu-modal/menu-modal.vue";
-import { mount, shallowMount } from "@vue/test-utils";
-
-describe("menu-modal.vue", () => {
-    it("Should return text Footer Navigation", async () => {
-        // Act
-        const wrapper = shallowMount(menuModal);
-
-        // Assert
-        const footerModalLabel = wrapper.find("h5");
-
-        // Expect
-        expect(footerModalLabel.text()).toContain("Footer Navigation");
-    });
-
-    it("Should return footer text as Safelite Group", async () => {
-        // Act
-        const wrapper = shallowMount(menuModal);
-
-        // Assert
-        const modalFooter = wrapper.find("div.modal-footer");
-
-        // Expect
-        expect(modalFooter.text()).toContain("Safelite Group");
-    });
-
-    it("Should return Terms of use text link text", async () => {
-        // Act
-        const wrapper = shallowMount(menuModal);
-
-        // Expect
-        expect(wrapper.html()).toContain("Terms of use");
-    });
-
-    it('Should return "Your privacy choices" text link text', async () => {
-        // Act
-        const wrapper = mount(menuModal);
-
-        // Expect
-        expect(wrapper.html()).toContain("Your privacy choices");
-    });
-
-    test('Icon for link to "Privacy Policies" page is displayed with the correct alternate text', () => {
-        // NOTE: We need a way to target a specific <textLink> component so we can be sure that
-        //   an icon is coming from a specific <textLink> component.
-        // That requires an additional prop in the <textLink> component. Will hold off on adding the prop
-        //   until there is more clarity on how we handle shared components.
-        // For now the test is below is the best we can do.
-
-        // Arrange
-        const wrapper = mount(menuModal);
-
-        // Expect
-        const icon = wrapper.find('[data-id="ccpa-icon"]');
-        expect(icon.isVisible()).toBe(true);
-        expect(icon.attributes("alt")).toBe("Your privacy choices");
-    });
-
-    it("Should return Warranty text link text", async () => {
-        // Act
-        const wrapper = shallowMount(menuModal);
-
-        // Expect
-        expect(wrapper.html()).toContain("Warranty");
-    });
-});
+test.todo("some test to be written in the future");
diff --git a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
index c3e9c5af5..ef2dfc515 100644
--- a/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
+++ b/src/fmg-components/funnel-header/menu-modal/menu-modal.vue
@@ -53,7 +53,6 @@
                         <template v-slot:after-text>
                             <img
                                 class="ccpa-icon"
-                                data-id="ccpa-icon"
                                 src="~@/assets/img/icons/ccpa-icon.svg"
                                 alt="Your privacy choices" />
                         </template>

From 69b62d17cb637a8177a2cec97b0887fc37edae60 Mon Sep 17 00:00:00 2001
From: Sneha <sneha.a@safelite.com>
Date: Tue, 13 Feb 2024 12:35:24 +0530
Subject: [PATCH 6/6] Update quote.vue

---
 src/layouts/quote/quote.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index 8c15b29ee..19fc39074 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -188,7 +188,7 @@ export default {
                 pricingResults,
                 "quote"
             );
-
+        lineItems.glassParts = nullSafeGlassParts;
         lineItems.promos = lineItems.promos ?? [];
         lineItems.vaps = lineItems.vaps ?? [];
         // End of promo logic