Merge branch 'release/2024.02.15' into feature/CSR-1952-ajc-try2

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");
         },

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="price-table">
+                <div class="service-type">
-                    <div class="service-type">
+                    <textBlock :cmsWidgetName="servicePackageTitleWidget" />
-                        <textBlock :cmsWidgetName="servicePackageTitleWidget" />
+                    <span>
-                        <span>
+                        {{ getFormattedAmount("", packagePrice) }}
-                            {{ getFormattedAmount("", packagePrice) }}
+                    </span>
-                        </span>
+                </div>
-                    </div>
+
-
+                <!-- Packaged Cart Items -->
-                    <!-- Packaged Cart Items -->
+                <div v-for="(cartItem, i) in packageCartItems" :key="i" class="packaged-cart-item">
-                    <div
+                    <span>{{ cartItem.name }}</span>
-                        v-for="(cartItem, i) in packageCartItems"
+                    <textLink
-                        :key="i"
+                        v-if="allowItemRemoval"
-                        class="packaged-cart-item">
+                        ref="removeLink"
-                        <span
+                        linkType="text"
-                            ><span v-if="cartItem.category === 'promos'">&lt;</span
+                        :text="removeLinkText"
-                            >{{ cartItem.name
+                        href="javascript:void(0)"
-                            }}<span v-if="cartItem.category === 'promos'">&gt;</span></span
+                        @click-event="removeItem(cartItem.cartItemType, cartItem.category)">
-                        >
+                        <template v-slot:after-text>
-                        <textLink
+                            <span class="sr-only">{{ cartItem.name }}</span>
-                            v-if="allowItemRemoval"
+                        </template>
-                            ref="removeLink"
+                    </textLink>
-                            linkType="text"
+                </div>
-                            :text="removeLinkText"
+
-                            href="javascript:void(0)"
+                <!-- Nonpackaged Cart Items -->
-                            @click-event="removeItem(cartItem.cartItemType, cartItem.category)">
+                <div
-                            <template v-slot:after-text>
+                    v-for="(cartItem, i) in nonpackageCartItems"
-                                <span class="sr-only">{{ cartItem.name }}</span>
+                    :key="i"
-                            </template>
+                    class="non-packaged-cart-item"
-                        </textLink>
+                    :class="[
-                    </div>
+                        i % 2 == 0 ? 'even' : 'odd',
-
+                        cartItem.isRemovable ? 'removable-cart-item' : '',
-                    <!-- Nonpackaged Cart Items -->
+                    ]">
-                    <div
+                    <span v-if="cartItem != recycleFeeCartItem">{{ cartItem.name }}</span>
-                        v-for="(cartItem, i) in nonpackageCartItems"
+                    <textLink
-                        :key="i"
+                        v-if="allowItemRemoval && cartItem.isRemovable"
-                        class="non-packaged-cart-item"
+                        ref="removeLink"
-                        :class="[
+                        linkType="text"
-                            i % 2 == 0 ? 'even' : 'odd',
+                        :text="removeLinkText"
-                            cartItem.isRemovable ? 'removable-cart-item' : '',
+                        href="javascript:void(0)"
-                        ]">
+                        @click-event="removeItem(cartItem.cartItemType, cartItem.category)" />
-                        <span v-if="cartItem != recycleFeeCartItem">{{ cartItem.name }}</span>
+                    <textLink
-                        <textLink
+                        v-else-if="cartItem == recycleFeeCartItem && recyclingModalCmsWidgetName"
-                            v-if="allowItemRemoval && cartItem.isRemovable"
+                        linkType="text"
-                            ref="removeLink"
+                        :text="recycleFeeCartItem.name"
-                            linkType="text"
+                        href="javascript:void(0)"
-                            :text="removeLinkText"
+                        @click-event="openModal(recyclingModalCmsWidgetName)" />
-                            href="javascript:void(0)"
+                    <span v-else-if="cartItem == recycleFeeCartItem">
-                            @click-event="removeItem(cartItem.cartItemType, cartItem.category)" />
+                        {{ recycleFeeCartItem.name }}
-                        <textLink
+                    </span>
-                            v-else-if="
+                    <span>{{ getFormattedAmount(cartItem.category, cartItem.subTotal) }}</span>
-                                cartItem == recycleFeeCartItem && recyclingModalCmsWidgetName
+                </div>
-                            "
+
-                            linkType="text"
+                <!-- Sub total, sales tax, total columns -->
-                            :text="recycleFeeCartItem.name"
+                <div class="sub-total">
-                            href="javascript:void(0)"
+                    <span>{{ subtotalText }}</span
-                            @click-event="openModal(recyclingModalCmsWidgetName)" />
+                    ><span>{{ getFormattedAmount("", subTotal) }}</span>
-                        <span v-else-if="cartItem == recycleFeeCartItem">
+                </div>
-                            {{ recycleFeeCartItem.name }}
+                <div class="sales-tax">
-                        </span>
+                    <span>{{ salesTaxText }}</span
-                        <span>{{ getFormattedAmount(cartItem.category, cartItem.subTotal) }}</span>
+                    ><span>{{ getFormattedAmount("", salesTax) }}</span>
-                    </div>
+                </div>
-
+                <div v-if="showAsPaid" class="amount-paid">
-                    <!-- Sub total, sales tax, total columns -->
+                    <span>{{ amountPaidText }}</span
-                    <div class="sub-total">
+                    ><span>{{ getFormattedAmount("", amountPaid) }}</span>
-                        <span>{{ subtotalText }}</span
+                </div>
-                        ><span>{{ getFormattedAmount("", subTotal) }}</span>
+                <div class="amount-due">
-                    </div>
+                    <span>{{ amountDueText }}</span
-                    <div class="sales-tax">
+                    ><span>{{ getFormattedAmount("", amountDue) }}</span>
-                        <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>
-                <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 {

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);
+    });
 });

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";

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">

src/layouts/estimate/estimate.vue

@@ -55,7 +55,7 @@
                             :isRequired="!IsEmailOptional"
                             disableAutoFill
                             :validationRules="EmailValidationRules"
-                            :isEmailOptional="IsEmailOptional" />
+                            :addOptionalText="IsEmailOptional" />
                         <textBlock cmsWidgetName="QuoteEmailTextBlockWidget" typeStyle="caption" />
 
                         <alert

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" />
 

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 "@/fmg-components/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,
     },
 };

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));
 
@@ -188,7 +188,7 @@ export default {
                 pricingResults,
                 "quote"
             );
-
+        lineItems.glassParts = nullSafeGlassParts;
         lineItems.promos = lineItems.promos ?? [];
         lineItems.vaps = lineItems.vaps ?? [];
         // End of promo logic

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" />