Merge pull request #2327 from Safelite/CASH-132-tech-review-updates
CASH-132 tech review updates.
This commit is contained in:
commit
80e264afd0
6 changed files with 21 additions and 26 deletions
|
|
@ -2,6 +2,7 @@ const partNumberStrings = {
|
||||||
// Recalibration
|
// Recalibration
|
||||||
MOBILE_STATIC_RECAL_FEE: "RECAL MOBILE",
|
MOBILE_STATIC_RECAL_FEE: "RECAL MOBILE",
|
||||||
MOBILE_DUAL_RECAL_FEE: "RECAL MOBILEDUAL",
|
MOBILE_DUAL_RECAL_FEE: "RECAL MOBILEDUAL",
|
||||||
|
DONATION: "DONATION",
|
||||||
};
|
};
|
||||||
|
|
||||||
export { partNumberStrings };
|
export { partNumberStrings };
|
||||||
|
|
|
||||||
|
|
@ -130,10 +130,6 @@ export default {
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
handleDonationAction(submitEvent) {
|
handleDonationAction(submitEvent) {
|
||||||
console.log(
|
|
||||||
"running handleDonationAction(), submitEvent.target.elements.amount.value: ",
|
|
||||||
submitEvent.target.elements.amount.value
|
|
||||||
);
|
|
||||||
this.selectedValue = submitEvent.target.elements.amount.value;
|
this.selectedValue = submitEvent.target.elements.amount.value;
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -208,7 +208,7 @@ export default {
|
||||||
}
|
}
|
||||||
@include media-breakpoint-up(lg) {
|
@include media-breakpoint-up(lg) {
|
||||||
&:before {
|
&:before {
|
||||||
top: .5rem;
|
top: 0.5rem;
|
||||||
}
|
}
|
||||||
&:after {
|
&:after {
|
||||||
top: 1.4375rem;
|
top: 1.4375rem;
|
||||||
|
|
@ -223,7 +223,7 @@ export default {
|
||||||
|
|
||||||
+ .package-label.pricing-by-day-pkg-lbl-ins {
|
+ .package-label.pricing-by-day-pkg-lbl-ins {
|
||||||
&:before {
|
&:before {
|
||||||
top: .3125rem;
|
top: 0.3125rem;
|
||||||
}
|
}
|
||||||
&:after {
|
&:after {
|
||||||
top: 1.25rem;
|
top: 1.25rem;
|
||||||
|
|
@ -234,7 +234,7 @@ export default {
|
||||||
&:before {
|
&:before {
|
||||||
top: 0.9375rem;
|
top: 0.9375rem;
|
||||||
@include media-breakpoint-up(lg) {
|
@include media-breakpoint-up(lg) {
|
||||||
top: .3125rem;
|
top: 0.3125rem;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
&:after {
|
&:after {
|
||||||
|
|
|
||||||
|
|
@ -181,7 +181,7 @@ export default {
|
||||||
transition: background 0s 0s ease-in-out;
|
transition: background 0s 0s ease-in-out;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.modal.modal-component .modal-dialog .modal-content {
|
.modal.modal-component .modal-dialog .modal-content {
|
||||||
.modal-header {
|
.modal-header {
|
||||||
padding-top: 0;
|
padding-top: 0;
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,19 @@ import { experimentSettings } from "@/constants/experiments";
|
||||||
|
|
||||||
const mockExperimentSettings = experimentSettings;
|
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.
|
// Mock our module for promises.
|
||||||
jest.mock("@/helpers/layout-helper.js", () => ({
|
jest.mock("@/helpers/layout-helper.js", () => ({
|
||||||
settleAllPromises: jest.fn(),
|
settleAllPromises: jest.fn(),
|
||||||
|
|
@ -572,13 +585,6 @@ function setupMocks({ customMountOptions }) {
|
||||||
getCmsContent: jest.fn().mockImplementation(() => {
|
getCmsContent: jest.fn().mockImplementation(() => {
|
||||||
return wordingText;
|
return wordingText;
|
||||||
}),
|
}),
|
||||||
getSettingValue: jest.fn((settingName) => {
|
|
||||||
if (settingName === experimentSettings.RECAL_PRICE_REMOVE) {
|
|
||||||
return "true";
|
|
||||||
}
|
|
||||||
|
|
||||||
return "false";
|
|
||||||
}),
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@
|
||||||
:isItac="isItac"
|
:isItac="isItac"
|
||||||
:isNoComp="isNoComp" />
|
:isNoComp="isNoComp" />
|
||||||
|
|
||||||
<div class="mt-3" v-if="displayFosterLove">
|
<div class="mt-3" v-if="DisplayFosterLove">
|
||||||
<donationBlock
|
<donationBlock
|
||||||
cmsWidgetName="DonationWidget"
|
cmsWidgetName="DonationWidget"
|
||||||
v-model="donationAmount"
|
v-model="donationAmount"
|
||||||
|
|
@ -73,10 +73,6 @@
|
||||||
:showDonationError="showDonationError" />
|
:showDonationError="showDonationError" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- <button type="button" @click="addDonation(3)">
|
|
||||||
Add Donation of $3
|
|
||||||
</button> -->
|
|
||||||
|
|
||||||
<hr class="mb-5" />
|
<hr class="mb-5" />
|
||||||
|
|
||||||
<div class="emailtext" v-html="ConfirmationEmailText"></div>
|
<div class="emailtext" v-html="ConfirmationEmailText"></div>
|
||||||
|
|
@ -122,6 +118,7 @@ import { partTypeStrings } from "@/constants/part-type-strings";
|
||||||
import { containsLineItemWithPartType } from "@/helpers/service-package-helper";
|
import { containsLineItemWithPartType } from "@/helpers/service-package-helper";
|
||||||
import { containsRecalParts } from "@/helpers/recal-helper.js";
|
import { containsRecalParts } from "@/helpers/recal-helper.js";
|
||||||
import donationBlock from "@/experiment-components/donation-block.vue";
|
import donationBlock from "@/experiment-components/donation-block.vue";
|
||||||
|
import { partNumberStrings } from "@/constants/part-number-strings";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "confirmation",
|
name: "confirmation",
|
||||||
|
|
@ -219,7 +216,7 @@ export default {
|
||||||
};
|
};
|
||||||
|
|
||||||
const donationItems = lineItemsFromSubmittedOrder.supportingItems?.filter(
|
const donationItems = lineItemsFromSubmittedOrder.supportingItems?.filter(
|
||||||
(item) => item.partNumber === "DONATION"
|
(item) => item.partNumber === partNumberStrings.DONATION
|
||||||
);
|
);
|
||||||
const donationAmount = donationItems?.length > 0 ? donationItems[0].sellingPrice : 0;
|
const donationAmount = donationItems?.length > 0 ? donationItems[0].sellingPrice : 0;
|
||||||
|
|
||||||
|
|
@ -532,13 +529,9 @@ export default {
|
||||||
"test",
|
"test",
|
||||||
false
|
false
|
||||||
).catch((error) => {
|
).catch((error) => {
|
||||||
// this.$refs.navbar.removeLoader();
|
|
||||||
console.error("Error!!! error: ", error);
|
|
||||||
return error;
|
return error;
|
||||||
});
|
});
|
||||||
|
|
||||||
console.log("ran addDonation()... (*fake call*) donationResponse: ", donationResponse);
|
|
||||||
|
|
||||||
if (donationResponse?.status == "200") {
|
if (donationResponse?.status == "200") {
|
||||||
this.showDonationSuccess = true;
|
this.showDonationSuccess = true;
|
||||||
this.showDonationError = false;
|
this.showDonationError = false;
|
||||||
|
|
@ -561,7 +554,6 @@ export default {
|
||||||
watch: {
|
watch: {
|
||||||
donationAmount(newValue) {
|
donationAmount(newValue) {
|
||||||
newValue = parseInt(newValue);
|
newValue = parseInt(newValue);
|
||||||
console.log("WATCHED donationAmount changed: ", newValue);
|
|
||||||
|
|
||||||
// this.addDonation(newValue);
|
// this.addDonation(newValue);
|
||||||
// TODO - when backend code is final, then remove the below and restore the line above
|
// TODO - when backend code is final, then remove the below and restore the line above
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue