From 3873c23716087f607dbd4ba49baab034c5e6f6b7 Mon Sep 17 00:00:00 2001
From: Sneha <sneha.a@safelite.com>
Date: Mon, 13 Nov 2023 19:42:15 +0530
Subject: [PATCH 1/3] Removing toast

---
 src/layouts/payment-method/payment-method.vue |  1 -
 .../promo-modal-question.vue                  | 40 +++++++++----------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 0d6f338bb..d672dbd06 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -34,7 +34,6 @@
                         class="pb-3"
                         v-model="lineItems"
                         :availableVaps="availableVaps"
-                        @added-to-cart="showAlert"
                         linkWidgetName="PromoLinkWidget"
                         modalWidgetName="PromoModalWidget" />
 
diff --git a/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue b/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
index 91388396b..08a58d27e 100644
--- a/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
+++ b/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
@@ -24,6 +24,14 @@
                 cmsWidgetName="AlertInvalidPromoWidget"
                 alertClass="alert-danger"
                 v-bind:isDismissible="true" />
+                <alert
+                ref="alertInvalidPromoOnOrder"
+                v-if="displayInvalidOnOrderPromoAlert"
+                v-html="InvalidPromoOnOrderText"
+                class="my-4 alert"
+                cmsWidgetName="AlertInvalidPromoOnOrderWidget"
+                alertClass="alert-danger"
+                v-bind:isDismissible="true" />
             <div v-for="(promo, i) in this.getPromoList()" :key="i">
                 <span class="applied-promo">Promo code "{{ promo.promoCode }}" applied </span>
                 <textLink
@@ -42,7 +50,9 @@ import promoQuestion from "@/layouts/payment-method/promo-modal-question/promo-q
 import modal from "@/digital-components/modal/modal";
 import alert from "@/ux-components/alert/alert";
 import { storeActions } from "@/constants/store-actions.js";
-import { getVapsThatNeedToBeAddedToSatisfyPromos } from "@/helpers/promotions-helper";
+import {
+    getVapsThatNeedToBeAddedToSatisfyPromos,
+} from "@/helpers/promotions-helper";
 import { deepClone } from "@/helpers/object-helper";
 import baseMixin from "@/mixins/base-mixin.js";
 import { cartItemCategories } from "@/constants/cart-item-categories";
@@ -97,9 +107,6 @@ export default {
         InvalidPromoText() {
             return this.PromoText?.replaceAll("{custom:PROMOCODE}", this.promoCode);
         },
-        AddPromoSuccessMessageFromCms() {
-            return this.getCmsContent("PromoSuccessAlertWidget", "Text");
-        },
         removeLinkText() {
             return this.getCmsContent("RemoveCartItemTextWidget", "Text");
         },
@@ -165,6 +172,7 @@ export default {
         async addPromoCode() {
             if (this.promoCode) {
                 this.resetAlerts();
+                
                 const promoCodeData = await this.getPromoCodeData(
                     this.promoCode,
                     this.lineItems,
@@ -173,15 +181,6 @@ export default {
                 );
 
                 if (promoCodeData.isValid) {
-                    const addedPromo = this.lineItems?.promos.find(
-                        (promoItem) =>
-                            promoItem?.promoCode == promoCodeData.promoCode?.[0]?.promoCode
-                    );
-                    if (addedPromo) {
-                        this.displayInvalidPromoAlert = true;
-                        this.focusOnPromoInput();
-                        this.resetModalButtonStyle();
-                    } else {
                         const pricedLineItemsToTax = [];
                         pricedLineItemsToTax.push(...promoCodeData.promoCode);
                         const taxedLineItems =
@@ -221,17 +220,15 @@ export default {
                         this.lineItems?.promos.push(...promoCodeData.promoCode);
                         this.lineItems.vaps?.push(...getVaps);
                         this.closeModal();
-                        const message = this.getPromoAddedMessage();
                         this.$emit("update:modelValue", this.lineItems);
-                        this.$emit("added-to-cart", {
-                            messageHeadline: "Promo Applied!",
-                            messageCopy: message,
-                            type: "alert-success",
-                            isDismissible: true,
-                        });
                         this.promoCode = "";
-                    }
                 } else {
+                    if(promoCodeData.errorCode == "PromoStackingNotAllowed")
+                    {
+                        this.displayInvalidPromoOnOrderAlert = true;
+                    this.focusOnPromoInput();
+                    this.resetModalButtonStyle();
+                    }
                     this.displayInvalidPromoAlert = true;
                     this.focusOnPromoInput();
                     this.resetModalButtonStyle();
@@ -242,6 +239,7 @@ export default {
     watch: {
         promoCode() {
             this.displayInvalidPromoAlert = false;
+            this.displayInvalidOnOrderPromoAlert = false;
         },
         modelValue: {
             handler(newValue) {

From 33d2db26d7a89daee9fc79f050d73cec3807ce29 Mon Sep 17 00:00:00 2001
From: Sneha <sneha.a@safelite.com>
Date: Mon, 13 Nov 2023 19:44:38 +0530
Subject: [PATCH 2/3] Update promo-modal-question.vue

---
 .../promo-modal-question.vue                  | 89 +++++++++----------
 1 file changed, 40 insertions(+), 49 deletions(-)

diff --git a/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue b/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
index 08a58d27e..574d5356c 100644
--- a/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
+++ b/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
@@ -24,7 +24,7 @@
                 cmsWidgetName="AlertInvalidPromoWidget"
                 alertClass="alert-danger"
                 v-bind:isDismissible="true" />
-                <alert
+            <alert
                 ref="alertInvalidPromoOnOrder"
                 v-if="displayInvalidOnOrderPromoAlert"
                 v-html="InvalidPromoOnOrderText"
@@ -50,9 +50,7 @@ import promoQuestion from "@/layouts/payment-method/promo-modal-question/promo-q
 import modal from "@/digital-components/modal/modal";
 import alert from "@/ux-components/alert/alert";
 import { storeActions } from "@/constants/store-actions.js";
-import {
-    getVapsThatNeedToBeAddedToSatisfyPromos,
-} from "@/helpers/promotions-helper";
+import { getVapsThatNeedToBeAddedToSatisfyPromos } from "@/helpers/promotions-helper";
 import { deepClone } from "@/helpers/object-helper";
 import baseMixin from "@/mixins/base-mixin.js";
 import { cartItemCategories } from "@/constants/cart-item-categories";
@@ -172,7 +170,7 @@ export default {
         async addPromoCode() {
             if (this.promoCode) {
                 this.resetAlerts();
-                
+
                 const promoCodeData = await this.getPromoCodeData(
                     this.promoCode,
                     this.lineItems,
@@ -181,53 +179,46 @@ export default {
                 );
 
                 if (promoCodeData.isValid) {
-                        const pricedLineItemsToTax = [];
-                        pricedLineItemsToTax.push(...promoCodeData.promoCode);
-                        const taxedLineItems =
-                            await baseMixin.methods.dispatchStoreActionWithLogging(
-                                storeActions.TAX_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
-                                {
-                                    billToAccountNumber: "87291",
-                                    providerNumber:
-                                        store.getters.order.serviceLocation.provider.providerNumber,
-                                    appointmentType:
-                                        store.getters.order.serviceLocation.appointmentType,
-                                    serviceLocationCity: store.getters.order.serviceLocation.city,
-                                    serviceLocationState: store.getters.order.serviceLocation.state,
-                                    serviceLocationZipCode:
-                                        store.getters.order.serviceLocation.zipCode,
-                                    pricedLineItems: pricedLineItemsToTax,
-                                },
-                                "payment-method",
-                                false
-                            );
-                        // Match all line items to the line items as they are in the store
-                        // and rebuild the original structure.
-                        this.lineItems = mapTaxedLineItemsToStoreFormat(
-                            taxedLineItems,
-                            this.lineItems
-                        );
-                        const taxedVaps = mapTaxedLineItemsToStoreFormat(
-                            taxedLineItems,
-                            this.availableVaps
-                        );
+                    const pricedLineItemsToTax = [];
+                    pricedLineItemsToTax.push(...promoCodeData.promoCode);
+                    const taxedLineItems = await baseMixin.methods.dispatchStoreActionWithLogging(
+                        storeActions.TAX_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
+                        {
+                            billToAccountNumber: "87291",
+                            providerNumber:
+                                store.getters.order.serviceLocation.provider.providerNumber,
+                            appointmentType: store.getters.order.serviceLocation.appointmentType,
+                            serviceLocationCity: store.getters.order.serviceLocation.city,
+                            serviceLocationState: store.getters.order.serviceLocation.state,
+                            serviceLocationZipCode: store.getters.order.serviceLocation.zipCode,
+                            pricedLineItems: pricedLineItemsToTax,
+                        },
+                        "payment-method",
+                        false
+                    );
+                    // Match all line items to the line items as they are in the store
+                    // and rebuild the original structure.
+                    this.lineItems = mapTaxedLineItemsToStoreFormat(taxedLineItems, this.lineItems);
+                    const taxedVaps = mapTaxedLineItemsToStoreFormat(
+                        taxedLineItems,
+                        this.availableVaps
+                    );
 
-                        const getVaps = getVapsThatNeedToBeAddedToSatisfyPromos(
-                            promoCodeData.promoCode,
-                            taxedVaps,
-                            this.lineItems
-                        );
-                        this.lineItems?.promos.push(...promoCodeData.promoCode);
-                        this.lineItems.vaps?.push(...getVaps);
-                        this.closeModal();
-                        this.$emit("update:modelValue", this.lineItems);
-                        this.promoCode = "";
+                    const getVaps = getVapsThatNeedToBeAddedToSatisfyPromos(
+                        promoCodeData.promoCode,
+                        taxedVaps,
+                        this.lineItems
+                    );
+                    this.lineItems?.promos.push(...promoCodeData.promoCode);
+                    this.lineItems.vaps?.push(...getVaps);
+                    this.closeModal();
+                    this.$emit("update:modelValue", this.lineItems);
+                    this.promoCode = "";
                 } else {
-                    if(promoCodeData.errorCode == "PromoStackingNotAllowed")
-                    {
+                    if (promoCodeData.errorCode == "PromoStackingNotAllowed") {
                         this.displayInvalidPromoOnOrderAlert = true;
-                    this.focusOnPromoInput();
-                    this.resetModalButtonStyle();
+                        this.focusOnPromoInput();
+                        this.resetModalButtonStyle();
                     }
                     this.displayInvalidPromoAlert = true;
                     this.focusOnPromoInput();

From ae505070c27da80ba5004cbd0c963a4216d8682c Mon Sep 17 00:00:00 2001
From: Sneha <sneha.a@safelite.com>
Date: Mon, 13 Nov 2023 20:11:00 +0530
Subject: [PATCH 3/3] CSR-1393

---
 src/helpers/promotions-helper.js                  |  2 +-
 .../promo-modal-question/promo-modal-question.vue | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/helpers/promotions-helper.js b/src/helpers/promotions-helper.js
index d18a4aa17..996ca1aa6 100644
--- a/src/helpers/promotions-helper.js
+++ b/src/helpers/promotions-helper.js
@@ -16,7 +16,7 @@ export const addableVapsPromoPartNumbers = [
     promoPartNumberStrings.WIPER_DISCOUNT_PART_NUMBER,
 ];
 
-const promoErrorCodes = {
+export const promoErrorCodes = {
     UNKNOWN: "Unknown",
     PROMO_NOT_YET_IN_USE: "PromoNotYetInUse",
     PROMO_USAGE_COUNT_EXCEEDED: "PromoUsageCountExceeded",
diff --git a/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue b/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
index 574d5356c..db04dfb00 100644
--- a/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
+++ b/src/layouts/payment-method/promo-modal-question/promo-modal-question.vue
@@ -9,6 +9,7 @@
         <modal
             :ref="modalName"
             :headerText="modalHeaderText"
+            :onModalClosedCallback="onModalClosed"
             :footerButtonText="modalFooterText"
             @footer-button-event="addPromoCode">
             <promoQuestion
@@ -50,7 +51,10 @@ import promoQuestion from "@/layouts/payment-method/promo-modal-question/promo-q
 import modal from "@/digital-components/modal/modal";
 import alert from "@/ux-components/alert/alert";
 import { storeActions } from "@/constants/store-actions.js";
-import { getVapsThatNeedToBeAddedToSatisfyPromos } from "@/helpers/promotions-helper";
+import {
+    getVapsThatNeedToBeAddedToSatisfyPromos,
+    promoErrorCodes,
+} from "@/helpers/promotions-helper";
 import { deepClone } from "@/helpers/object-helper";
 import baseMixin from "@/mixins/base-mixin.js";
 import { cartItemCategories } from "@/constants/cart-item-categories";
@@ -125,6 +129,9 @@ export default {
         closeModal() {
             this.modal.closeModal();
         },
+        onModalClosed() {
+            this.$emit("update:modelValue", this.lineItems);
+        },
         focusOnPromoInput() {
             const input = document.getElementById(this.promoTextInputId);
             input?.focus();
@@ -160,12 +167,9 @@ export default {
             };
         },
         removeItem(promo) {
-            //let lineItems = this.modelValue;
             this.lineItems[cartItemCategories.PROMOS] = this.lineItems[
                 cartItemCategories.PROMOS
             ].filter((lineItemsToKeep) => lineItemsToKeep.promoCode != promo);
-
-            this.$emit("update:modelValue", this.lineItems);
         },
         async addPromoCode() {
             if (this.promoCode) {
@@ -212,10 +216,9 @@ export default {
                     this.lineItems?.promos.push(...promoCodeData.promoCode);
                     this.lineItems.vaps?.push(...getVaps);
                     this.closeModal();
-                    this.$emit("update:modelValue", this.lineItems);
                     this.promoCode = "";
                 } else {
-                    if (promoCodeData.errorCode == "PromoStackingNotAllowed") {
+                    if (promoCodeData.errorCode == promoErrorCodes.PROMO_STACKING_NOT_ALLOWED) {
                         this.displayInvalidPromoOnOrderAlert = true;
                         this.focusOnPromoInput();
                         this.resetModalButtonStyle();