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..abe8a4599 100644 --- a/public/css/hop-styling.css +++ b/public/css/hop-styling.css @@ -299,7 +299,15 @@ body .cc-error-container #alert-message { width: 100%; } #fmg-checkout-shared #other-payments-container .italicSmall { - margin-top: 10px; + 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 786d11834..e721af1d2 100644 --- a/public/scss/hop-styling.scss +++ b/public/scss/hop-styling.scss @@ -379,8 +379,17 @@ body { } .italicSmall { - margin-top: 10px; + 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) { 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, 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..09b666920 100644 --- a/src/layouts/confirmation/confirmation.vue +++ b/src/layouts/confirmation/confirmation.vue @@ -36,7 +36,7 @@ :scheduleStartTime="ScheduleStartTime" :scheduleEndTime="ScheduleEndTime" /> -
+