diff --git a/src/constants/part-number-strings.js b/src/constants/part-number-strings.js index c32864a87..d21ab83ac 100644 --- a/src/constants/part-number-strings.js +++ b/src/constants/part-number-strings.js @@ -2,6 +2,7 @@ const partNumberStrings = { // Recalibration MOBILE_STATIC_RECAL_FEE: "RECAL MOBILE", MOBILE_DUAL_RECAL_FEE: "RECAL MOBILEDUAL", + DONATION: "DONATION", }; export { partNumberStrings }; diff --git a/src/experiment-components/donation-block.vue b/src/experiment-components/donation-block.vue index 10ebec7a5..1daeedc41 100644 --- a/src/experiment-components/donation-block.vue +++ b/src/experiment-components/donation-block.vue @@ -130,10 +130,6 @@ export default { }, methods: { handleDonationAction(submitEvent) { - console.log( - "running handleDonationAction(), submitEvent.target.elements.amount.value: ", - submitEvent.target.elements.amount.value - ); this.selectedValue = submitEvent.target.elements.amount.value; }, }, diff --git a/src/experiment-components/service-package-radio.vue b/src/experiment-components/service-package-radio.vue index c52a80121..d972a8433 100644 --- a/src/experiment-components/service-package-radio.vue +++ b/src/experiment-components/service-package-radio.vue @@ -208,7 +208,7 @@ export default { } @include media-breakpoint-up(lg) { &:before { - top: .5rem; + top: 0.5rem; } &:after { top: 1.4375rem; @@ -223,7 +223,7 @@ export default { + .package-label.pricing-by-day-pkg-lbl-ins { &:before { - top: .3125rem; + top: 0.3125rem; } &:after { top: 1.25rem; @@ -234,7 +234,7 @@ export default { &:before { top: 0.9375rem; @include media-breakpoint-up(lg) { - top: .3125rem; + top: 0.3125rem; } } &:after { diff --git a/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue b/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue index 3628a372c..ebaa5a8be 100644 --- a/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue +++ b/src/fmg-components/save-progress-modal-question/save-progress-modal-question.vue @@ -181,7 +181,7 @@ export default { transition: background 0s 0s ease-in-out; } } - + .modal.modal-component .modal-dialog .modal-content { .modal-header { padding-top: 0; diff --git a/src/layouts/confirmation/confirmation.spec.js b/src/layouts/confirmation/confirmation.spec.js index 45347491a..37ad71949 100644 --- a/src/layouts/confirmation/confirmation.spec.js +++ b/src/layouts/confirmation/confirmation.spec.js @@ -14,6 +14,19 @@ import { experimentSettings } from "@/constants/experiments"; const mockExperimentSettings = experimentSettings; +jest.mock("@/mixins/experiment-mixin.js", () => ({ + methods: { + getSettingValue(settingName) { + if (settingName === mockExperimentSettings.RECAL_PRICE_REMOVE) { + return true; + } + }, + hasSettingEqualTo(settingName, settingValue) { + return true; + }, + }, +})); + // Mock our module for promises. jest.mock("@/helpers/layout-helper.js", () => ({ settleAllPromises: jest.fn(), @@ -572,13 +585,6 @@ function setupMocks({ customMountOptions }) { getCmsContent: jest.fn().mockImplementation(() => { return wordingText; }), - getSettingValue: jest.fn((settingName) => { - if (settingName === experimentSettings.RECAL_PRICE_REMOVE) { - return "true"; - } - - return "false"; - }), }, }, ]; diff --git a/src/layouts/confirmation/confirmation.vue b/src/layouts/confirmation/confirmation.vue index c87da58dd..ac6ce2ed5 100644 --- a/src/layouts/confirmation/confirmation.vue +++ b/src/layouts/confirmation/confirmation.vue @@ -64,7 +64,7 @@ :isItac="isItac" :isNoComp="isNoComp" /> -
+
- -
@@ -122,6 +118,7 @@ import { partTypeStrings } from "@/constants/part-type-strings"; import { containsLineItemWithPartType } from "@/helpers/service-package-helper"; import { containsRecalParts } from "@/helpers/recal-helper.js"; import donationBlock from "@/experiment-components/donation-block.vue"; +import { partNumberStrings } from "@/constants/part-number-strings"; export default { name: "confirmation", @@ -219,7 +216,7 @@ export default { }; const donationItems = lineItemsFromSubmittedOrder.supportingItems?.filter( - (item) => item.partNumber === "DONATION" + (item) => item.partNumber === partNumberStrings.DONATION ); const donationAmount = donationItems?.length > 0 ? donationItems[0].sellingPrice : 0; @@ -532,13 +529,9 @@ export default { "test", false ).catch((error) => { - // this.$refs.navbar.removeLoader(); - console.error("Error!!! error: ", error); return error; }); - console.log("ran addDonation()... (*fake call*) donationResponse: ", donationResponse); - if (donationResponse?.status == "200") { this.showDonationSuccess = true; this.showDonationError = false; @@ -561,7 +554,6 @@ export default { watch: { donationAmount(newValue) { newValue = parseInt(newValue); - console.log("WATCHED donationAmount changed: ", newValue); // this.addDonation(newValue); // TODO - when backend code is final, then remove the below and restore the line above