From f7452e8638e816bffff909a22aa0d4835c927d86 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Fri, 15 Nov 2024 15:50:21 -0500 Subject: [PATCH 1/6] CSR-2352 style changes for hop CSR-2352 style changes for hop --- public/css/README.md | 2 ++ public/css/hop-styling.css | 1 + public/scss/hop-styling.scss | 1 + 3 files changed, 4 insertions(+) diff --git a/public/css/README.md b/public/css/README.md index 0b09019ec..5e3f74a73 100644 --- a/public/css/README.md +++ b/public/css/README.md @@ -14,6 +14,8 @@ This will compile and output .css files (into the public/css folder) that can be From a windows machine, I ran an install for sass even though it is listed in node_modules. It would not run unless I did an install: npm install -g sass + +Then from \git\DigitalConsumer.FixMyGlass\public sass --no-source-map --watch scss:css Then committed the css files and reverted the package.json file so I didn't commit an upgraded version of sass \ No newline at end of file diff --git a/public/css/hop-styling.css b/public/css/hop-styling.css index dcaeba151..20a6b2149 100644 --- a/public/css/hop-styling.css +++ b/public/css/hop-styling.css @@ -300,6 +300,7 @@ body .cc-error-container #alert-message { } #fmg-checkout-shared #other-payments-container .italicSmall { margin-top: 10px; + margin-bottom: 16px; } @media only screen and (max-device-width: 767px) { #fmg-checkout-shared #applepay-and-paypal-container { diff --git a/public/scss/hop-styling.scss b/public/scss/hop-styling.scss index 786d11834..1847cc5f0 100644 --- a/public/scss/hop-styling.scss +++ b/public/scss/hop-styling.scss @@ -380,6 +380,7 @@ body { .italicSmall { margin-top: 10px; + margin-bottom: 16px; } } From c9411788de81d946b0c652efd0c05ebdfbe1c203 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Fri, 15 Nov 2024 18:42:34 -0500 Subject: [PATCH 2/6] CSR-2352 Color and spacing CSR-2352 Color and spacing --- public/css/hop-styling.css | 11 +++++++++-- public/scss/hop-styling.scss | 12 ++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/public/css/hop-styling.css b/public/css/hop-styling.css index 20a6b2149..abe8a4599 100644 --- a/public/css/hop-styling.css +++ b/public/css/hop-styling.css @@ -299,8 +299,15 @@ body .cc-error-container #alert-message { width: 100%; } #fmg-checkout-shared #other-payments-container .italicSmall { - margin-top: 10px; - margin-bottom: 16px; + margin-top: 24px; + margin-bottom: 24px; + font-size: 14px; + color: #525656; +} +#fmg-checkout-shared #other-payments-container .disclaimerContainerv2 { + margin-bottom: 24px; + font-size: 14px; + color: #525656; } @media only screen and (max-device-width: 767px) { #fmg-checkout-shared #applepay-and-paypal-container { diff --git a/public/scss/hop-styling.scss b/public/scss/hop-styling.scss index 1847cc5f0..e721af1d2 100644 --- a/public/scss/hop-styling.scss +++ b/public/scss/hop-styling.scss @@ -379,9 +379,17 @@ body { } .italicSmall { - margin-top: 10px; - margin-bottom: 16px; + margin-top: 24px; + margin-bottom: 24px; + font-size: 14px; + color: #525656; } + + .disclaimerContainerv2 { + margin-bottom: 24px; + font-size: 14px; + color: #525656; + } } @media only screen and (max-device-width: 767px) { From fa9adade46d8ec3747a83ef0058d492a17b9cf51 Mon Sep 17 00:00:00 2001 From: Sneha Date: Mon, 18 Nov 2024 10:51:00 +0530 Subject: [PATCH 3/6] Update quote.vue Removing discount line item for insurance --- src/layouts/quote/quote.vue | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue index a2ed0f542..25826714c 100644 --- a/src/layouts/quote/quote.vue +++ b/src/layouts/quote/quote.vue @@ -533,11 +533,23 @@ export default { false ); } - this.dispatchStoreAction( - this.storeActions.SAVE_SUPPORTING_ITEMS, - this.lineItems.supportingItems, - false - ); + if (this.isInsuranceSelected && this.isServicePackageDiscountOnOrder) { + let supportingItems = this.lineItems.supportingItems; + supportingItems = supportingItems.filter((item) => { + return item.partType != this.servicePackageDiscountParts[0].partType; + }); + this.dispatchStoreAction( + this.storeActions.SAVE_SUPPORTING_ITEMS, + supportingItems, + false + ); + } else { + this.dispatchStoreAction( + this.storeActions.SAVE_SUPPORTING_ITEMS, + this.lineItems.supportingItems, + false + ); + } this.dispatchStoreAction(this.storeActions.SAVE_VAPS, this.lineItems.vaps, false); this.dispatchStoreAction( storeActions.SAVE_ACTIVE_AND_OR_INACTIVE_PROMOS, From 5aeaeda00c97cdf0aec48752d3d1b451bd5f6a34 Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Mon, 18 Nov 2024 10:32:19 -0500 Subject: [PATCH 4/6] CSR-2394: fix css --- .../add-to-calendar/add-to-calendar.vue | 7 +-- src/layouts/confirmation/confirmation.vue | 45 ++++--------------- 2 files changed, 12 insertions(+), 40 deletions(-) diff --git a/src/layouts/confirmation/add-to-calendar/add-to-calendar.vue b/src/layouts/confirmation/add-to-calendar/add-to-calendar.vue index a4cdcbb6f..c2cb5ea00 100644 --- a/src/layouts/confirmation/add-to-calendar/add-to-calendar.vue +++ b/src/layouts/confirmation/add-to-calendar/add-to-calendar.vue @@ -294,8 +294,8 @@ export default { margin: 0 0 0 7px; color: #1574a1; vertical-align: middle; - font-weight: 500; - font-family: "Roboto"; + font-weight: 600; + text-decoration: underline; } .add-to-calendar button { border: 0; @@ -307,7 +307,8 @@ export default { margin: 0 auto; } .calendar-section .add-to-calendar { - padding-top: 15px; + padding: 1rem 0; + text-align: center; } .calendar-section .add-to-calendar .add-to-calendar-span { cursor: pointer; diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue index a42e724f0..c15eb2995 100644 --- a/src/layouts/confirmation/confirmation.vue +++ b/src/layouts/confirmation/confirmation.vue @@ -36,7 +36,7 @@ :scheduleStartTime="ScheduleStartTime" :scheduleEndTime="ScheduleEndTime" /> -
+
Date: Mon, 18 Nov 2024 14:59:52 -0500 Subject: [PATCH 5/6] CSR-2370: add new getter var to use in CMS for payment-method subheader logic --- src/layouts/confirmation/confirmation.vue | 4 +++- src/store/index.js | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue index a42e724f0..190d47769 100644 --- a/src/layouts/confirmation/confirmation.vue +++ b/src/layouts/confirmation/confirmation.vue @@ -344,7 +344,9 @@ export default { } if (this.AppointmentType == AppointmentTypeStrings.DROP_OFF) { if ( - this.submittedOrder?.schedule?.routeCode.includes(RouteCodeFlags.OVERNIGHT_DROP_OFF) + this.submittedOrder?.schedule?.routeCode.includes( + RouteCodeFlags.OVERNIGHT_DROP_OFF + ) ) { return `Drop off before 5:30 PM`; } else { diff --git a/src/store/index.js b/src/store/index.js index ca10f8f62..a5d1f4e68 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -939,7 +939,7 @@ export const getters = { .reduce((r, c) => Object.assign(r, c), {}) ?? {}, isVerifiedAndDeductibleZeroConfirmed: (state) => { - // used as a CMS variable on /payment-method, needed for FunnelSubHeaderWidget on cart pages + // used in CMS on /payment-method in Header Sub Text, for FunnelSubHeaderWidget on cart pages if ( state.order.policy.currentDeductible === 0 && getters.coverageIsVerified(state) && @@ -949,6 +949,14 @@ export const getters = { } return false; }, + isItacOrNoComp: (state) => { + // used in CMS on /payment-method in Header Sub Text, for FunnelSubHeaderWidget on cart pages + if (state.order.policy.isNoComp || state.order.policy.isItac) { + return true; + } else { + return false; + } + }, requiresVerifiedRedirecting: (state) => { return state.order?.referralNumber?.length === 6; }, From 44abc67fb32a4656b6a1f8086e0f2c9c32959a93 Mon Sep 17 00:00:00 2001 From: Sneha Date: Tue, 19 Nov 2024 18:17:54 +0530 Subject: [PATCH 6/6] CSR-2395 --- src/fmg-components/cart/cart.spec.js | 6 ------ src/fmg-components/cart/cart.vue | 19 +++++++++++++++++-- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/fmg-components/cart/cart.spec.js b/src/fmg-components/cart/cart.spec.js index 10207c8bb..178dcfdf4 100644 --- a/src/fmg-components/cart/cart.spec.js +++ b/src/fmg-components/cart/cart.spec.js @@ -341,12 +341,6 @@ describe("cart.vue", () => { expect(wrapper.vm.servicePackageDiscountCartItem).not.toBeNull(); expect(wrapper.vm.servicePackageDiscountCartItem.subTotal).toEqual(-70); expect(wrapper.vm.servicePackageDiscountCartItem.salesTax).toEqual(0); - - const found = - wrapper.vm.cartItems.findIndex( - (cartItem) => cartItem == wrapper.vm.servicePackageDiscountCartItem - ) >= 0; - expect(found).toBe(true); }); // Other Supporting Items Cart Item diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index 95d9cc239..a26821646 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -162,10 +162,15 @@ import promoModalQuestion from "@/fmg-components/promo-modal-question/promo-moda // Mixins import baseMixin from "@/mixins/base-mixin.js"; +import experimentMixin from "@/mixins/experiment-mixin.js"; // Helpers import { deepClone } from "@/helpers/object-helper"; -import { getHighestFullySatisfiedTier, getPackageContents } from "@/helpers/service-package-helper"; +import { + getHighestFullySatisfiedTier, + getPackageContents, + getDiscountPackageName, +} from "@/helpers/service-package-helper"; import { getPromoCodeWithoutBundleIdentifier } from "@/helpers/promotions-helper"; import { storeActions } from "@/constants/store-actions"; @@ -174,6 +179,7 @@ import { partTypeStrings } from "@/constants/part-type-strings"; import { cartItemCategories } from "@/constants/cart-item-categories"; import { cartItemTypes } from "@/constants/cart-item-types"; import { coverageStatus, cartItemTypesCoveredByInsurance } from "@/constants/insurance"; +import { experimentSettings } from "@/constants/experiments"; export default { name: "cart", @@ -424,7 +430,10 @@ export default { cartItems.push(this.mobileFeeCartItem); } - if (this.servicePackageDiscountCartItem) { + if ( + this.servicePackageDiscountCartItem && + this.discountPackageNames == this.packageLevel + ) { cartItems.push(this.servicePackageDiscountCartItem); } @@ -441,6 +450,12 @@ export default { return cartItems; }, }, + discountPackageNames() { + const discountServicePackage = experimentMixin.methods.getSettingValue( + experimentSettings.PROMO_ON_PACKAGE + ); + return getDiscountPackageName(discountServicePackage); + }, servicePackageTitleWidget() { const servicePackageNames = this.getCmsContent( this.servicePackageOptionsCmsName,