+
supportingItem.partType == partTypeStrings.REPLACE_FEE
);
+ if (!recycleFeeLineItem && this.requiresRecycleFeeCartItem) {
+ recycleFeeLineItem = {
+ partNumber: partTypeStrings.RECYCLE_FEE,
+ partType: partTypeStrings.REPLACE_FEE,
+ laborAmount: 0,
+ kitPrice: 0,
+ sellingPrice: 0,
+ salesTax: 0,
+ };
+ }
+
if (recycleFeeLineItem) {
cartItem = {
name: this.recycleFeeCartItemName,
@@ -744,44 +756,6 @@ export default {
return cartItem;
},
- mobileFeeCartItemName() {
- return this.getCmsContent("MobileServiceTextWidget", "Text");
- },
- mobileFeeCartItem() {
- let cartItem = null;
-
- const mobileFeeLineItem = this.supportingItems.find(
- (lineItem) => lineItem.partType == partTypeStrings.MOBILE_FEE
- );
-
- if (mobileFeeLineItem) {
- cartItem = {
- name: this.mobileFeeCartItemName,
- category: cartItemCategories.SUPPORTING_ITEMS,
- cartItemType: cartItemTypes.MOBILE_FEE,
- isDisplayed: true,
- isRemovable: false,
- subTotal: 0,
- salesTax: 0,
- lineItems: [],
- isCoveredByInsurance: cartItemTypesCoveredByInsurance.includes(
- cartItemTypes.MOBILE_FEE
- ),
- };
-
- mobileFeeLineItem.cartItemType = cartItem.cartItemType;
- cartItem.lineItems.push(mobileFeeLineItem);
-
- cartItem.subTotal +=
- (mobileFeeLineItem.kitPrice ?? 0) +
- (mobileFeeLineItem.laborAmount ?? 0) +
- (mobileFeeLineItem.sellingPrice ?? 0);
-
- cartItem.salesTax += mobileFeeLineItem.salesTax ?? 0;
- }
-
- return cartItem;
- },
servicePackageDiscountCartItemName() {
return this.getCmsContent("ServicePackageDiscountTextWidget", "Text");
},
diff --git a/src/helpers/heritage-integration/navigation-helper.js b/src/helpers/heritage-integration/navigation-helper.js
index a0d3bb92c..21585b247 100644
--- a/src/helpers/heritage-integration/navigation-helper.js
+++ b/src/helpers/heritage-integration/navigation-helper.js
@@ -5,6 +5,9 @@ import { lazyLoadComponent } from "@/router/dynamic-routing/component-loader.js"
import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
import { fmgPageValues } from "@/router/router-constants/fmgPage-values";
import { storeActions } from "@/constants/store-actions.js";
+import { settleAllPromises } from "@/helpers/layout-helper";
+import experimentMixin from "@/mixins/experiment-mixin";
+import { experimentSettings } from "@/constants/experiments";
import { includesWindshieldReplacement } from "@/helpers/damage-helper";
import store from "@/store";
import router from "@/router";
@@ -139,7 +142,11 @@ export async function skipVinLookup() {
? await store.dispatch(storeActions.IS_VIN_OPTIONAL_VEHICLE)
: false;
- return isVinOptionalVehicle || !includesWindshieldReplacement();
+ return (
+ isVinOptionalVehicle ||
+ !includesWindshieldReplacement() ||
+ experimentMixin.methods.hasSettingEqualTo(experimentSettings.SUPPRESS_VIN_CAPTURE, "true")
+ );
}
export async function skipVinLookupNotRepair() {
@@ -151,7 +158,11 @@ export async function skipVinLookupNotRepair() {
? await store.dispatch(storeActions.IS_VIN_OPTIONAL_VEHICLE)
: false;
- return isVinOptionalVehicle || !includesWindshieldReplacement();
+ return (
+ isVinOptionalVehicle ||
+ !includesWindshieldReplacement() ||
+ experimentMixin.methods.hasSettingEqualTo(experimentSettings.SUPPRESS_VIN_CAPTURE, "true")
+ );
}
async function getLazyLoadedComponent(pageName) {
diff --git a/src/helpers/heritage-integration/navigation-helper.spec.js b/src/helpers/heritage-integration/navigation-helper.spec.js
index 671a1b46e..2af724828 100644
--- a/src/helpers/heritage-integration/navigation-helper.spec.js
+++ b/src/helpers/heritage-integration/navigation-helper.spec.js
@@ -115,6 +115,16 @@ describe("getPageToRouteExistingOrderTo", () => {
store.commit(storeMutations.UPDATE_IS_REPAIR, false);
store.commit(storeMutations.UPDATE_MAKE, "acura");
+ const mockExperimentsList = [
+ {
+ universeName: "ConceptFunnel",
+ settings: {
+ SuppressVinCapture: false,
+ },
+ },
+ ];
+ store.commit(storeMutations.UPDATE_EXPERIMENTS, mockExperimentsList);
+
// Mock out the lazy load calls for all components.
mockLazyLoadComponentReturnValues({
[fmgPageValues.VEHICLE]: true,
diff --git a/src/layouts/payment-method/payment-method-question/payment-method-question.spec.js b/src/layouts/payment-method/payment-method-question/payment-method-question.spec.js
index d3a486d57..96a9d02b9 100644
--- a/src/layouts/payment-method/payment-method-question/payment-method-question.spec.js
+++ b/src/layouts/payment-method/payment-method-question/payment-method-question.spec.js
@@ -108,6 +108,9 @@ describe("Payment Method Question", () => {
function generateDefaultProps() {
return {
modelValue: "modelValue",
+ hasRecal: false,
+ isApplePay: true,
+ isInsurance: false,
};
}
diff --git a/src/layouts/payment-method/payment-method-question/payment-method-question.vue b/src/layouts/payment-method/payment-method-question/payment-method-question.vue
index b960f60f5..e8122d0ef 100644
--- a/src/layouts/payment-method/payment-method-question/payment-method-question.vue
+++ b/src/layouts/payment-method/payment-method-question/payment-method-question.vue
@@ -9,6 +9,9 @@
:answers="paymentMethodAnswerData"
isRequired
:validationRules="validationRules"
+ :hasRecal="hasRecal"
+ :isApplePay="isApplePay"
+ :isInsurance="isInsurance"
v-model="selectedMethod"
textPosition="text-start" />
@@ -29,6 +32,9 @@ export default {
props: {
modelValue: String,
validationRules: String,
+ hasRecal: Boolean,
+ isApplePay: Boolean,
+ isInsurance: Boolean,
},
methods: {
getAnswersNullSafe(widgetName) {
@@ -54,7 +60,30 @@ export default {
return this.getCmsContent("PaymentMethodWidget", "QuestionText");
},
paymentMethodAnswerData() {
- const cmsData = this.getAnswersNullSafe("PaymentMethodWidget");
+ var cmsData;
+ if (this.hasRecal) {
+ cmsData = this.getAnswersNullSafe("PaymentMethodHasRecalWidget");
+ } else {
+ if (this.isApplePay) {
+ cmsData = this.getAnswersNullSafe("PaymentMethodWidget");
+ } else {
+ cmsData = this.getAnswersNullSafe("PaymentMethodHasRecalWidget");
+ }
+ }
+
+ if (this.hasRecal || this.isInsurance) {
+ var tempItems = cmsData.map((answer) => {
+ return {
+ buttonLabel: answer.Text,
+ altText: answer.Text,
+ groupName: "payment-method",
+ value: answer.Name,
+ buttonImage: answer.AnswerImageUrl,
+ };
+ });
+
+ return tempItems.filter((a) => a.value != "Insurance");
+ }
return cmsData.map((answer) => {
return {
diff --git a/src/layouts/payment-method/payment-method.spec.js b/src/layouts/payment-method/payment-method.spec.js
index ab0a0df99..c9f67bca1 100644
--- a/src/layouts/payment-method/payment-method.spec.js
+++ b/src/layouts/payment-method/payment-method.spec.js
@@ -47,10 +47,29 @@ describe("payment-method.vue", () => {
function setupMocks() {
store.getters = {
damage: {},
- lineItems: [],
+ lineItems: {
+ glassParts: [],
+ supportingItems: [],
+ vaps: [],
+ promos: [],
+ },
order: {
payment: {
isPia: false,
+ insuranceCoverage: {
+ isVerified: true,
+ },
+ },
+ lineItems: {
+ glassParts: [],
+ supportingItems: [],
+ vaps: [],
+ promos: [],
+ },
+ policy: {
+ currentDeductible: 123,
+ isNoComp: false,
+ isItac: false,
},
},
policy: {
diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue
index 29f36306d..9c663cc1b 100644
--- a/src/layouts/payment-method/payment-method.vue
+++ b/src/layouts/payment-method/payment-method.vue
@@ -1,7 +1,7 @@
@@ -192,6 +193,7 @@
+
@@ -256,7 +258,6 @@ export default {
piaLineItems: "",
lineItems: [],
availableVaps: [],
-
shouldBlockInteraction: false,
};
},
@@ -405,6 +406,13 @@ export default {
});
},
computed: {
+ parentNomainName() {
+ var a = document.createElement("a");
+ a.href = applicationConfig.HERITAGE_FUNNEL;
+
+ const protocol = window.location.protocol;
+ return `${protocol}//${a.hostname}`;
+ },
dynamicCSSUrl() {
const { protocol, hostname, port } = window.location;
return `${protocol}//${hostname}:${port}/fmg/css/site-2020Styling.css`;
@@ -650,14 +658,26 @@ export default {
this.$nextTick(() => {
this.$refs.hopForm.submit();
+ var isApplePayAvailable = false;
+ if (window.ApplePaySession && window.ApplePaySession.canMakePayments()) {
+ isApplePayAvailable = true;
+ }
+
const iframe = this.$refs.paymentFrame;
if (iframe) {
iframe.onload = () => {
if (iframe.contentWindow) {
+ if (isApplePayAvailable) {
+ iframe.contentWindow.postMessage("hybrid-with-applepay", "*");
+ console.log(new Date() + ": Sent applepay");
+ }
+
if (this.paymentType == "cc") {
iframe.contentWindow.postMessage("CreditCardChosen", "*");
+ console.log(new Date() + ": Sent creditcard");
} else if (this.paymentType == "ap") {
iframe.contentWindow.postMessage("afterpay", "*");
+ console.log(new Date() + ": Sent afterpay");
}
}
};
@@ -681,8 +701,38 @@ export default {
this.backButtonAction();
}
if (event.data.indexOf("creditCardSubmit") > -1) {
+ console.log(new Date() + ": Payment method credit card selected");
+ this.dispatchStoreAction(
+ storeActions.SAVE_PAYMENT_METHOD_CHOICE,
+ paymentMethods.CREDIT_CARD,
+ false
+ );
this.setUIBlock(true);
}
+ if (event.data.indexOf("afterpayPaymentReceived") > -1) {
+ console.log(new Date() + ": Payment method afterpay selected");
+ this.dispatchStoreAction(
+ storeActions.SAVE_PAYMENT_METHOD_CHOICE,
+ paymentMethods.AFTERPAY,
+ false
+ );
+ }
+ if (event.data.indexOf("applepayOpened") > -1) {
+ console.log(new Date() + ": Payment method applepay selected");
+ this.dispatchStoreAction(
+ storeActions.SAVE_PAYMENT_METHOD_CHOICE,
+ paymentMethods.APPLE_PAY,
+ false
+ );
+ }
+ if (event.data.indexOf("showLoaderForPaypal") > -1) {
+ console.log(new Date() + ": Payment method paypal selected");
+ this.dispatchStoreAction(
+ storeActions.SAVE_PAYMENT_METHOD_CHOICE,
+ paymentMethods.PAYPAL,
+ false
+ );
+ }
}
},
setIFrameListener() {
diff --git a/src/layouts/quote/quote.vue b/src/layouts/quote/quote.vue
index f06827739..463442470 100644
--- a/src/layouts/quote/quote.vue
+++ b/src/layouts/quote/quote.vue
@@ -20,7 +20,10 @@
cmsWidgetName="CashOrInsuranceQuestionWidget"
v-model="isInsuranceSelected"
groupName="CashOrInsuranceQuestion" />
-
+
+
+
+
+
+ class="mt-6" />
@@ -194,6 +200,18 @@ export default {
...servicePackageDiscountPart,
];
+ // When calling pricing from the quote page, always use the cash parent account
+ baseMixin.methods.dispatchStoreAction(
+ storeActions.SAVE_PARENT_ACCOUNT_NUMBER,
+ applicationConfig.CASH_PARENT_ACCOUNT_NUMBER,
+ false
+ );
+ baseMixin.methods.dispatchStoreAction(
+ storeActions.SAVE_BILL_TO_ACCOUNT_NUMBER,
+ applicationConfig.CASH_DEFAULT_BILL_TO_ACCOUNT_NUMBER,
+ false
+ );
+
const pricingResults = await baseMixin.methods.dispatchStoreActionWithLogging(
storeActions.PRICE_ORDER_ITEMS_AND_SAVE_SERVER_DATA,
{
diff --git a/src/layouts/quote/service-package-question/service-package-question.vue b/src/layouts/quote/service-package-question/service-package-question.vue
index c18b2fb76..e06733dd7 100644
--- a/src/layouts/quote/service-package-question/service-package-question.vue
+++ b/src/layouts/quote/service-package-question/service-package-question.vue
@@ -238,7 +238,7 @@ export default {
getPackagePrice(packageName, { discountedPrice = false, servicePackageDiscount = false }) {
var lineItemsToPrice = [...this.nullSafeAvailableLineItems];
if (this.isRecalibrationOnOrder) {
- lineItemsToPrice = this.nullSafeAvailableLineItems.filter((item) => {
+ lineItemsToPrice = lineItemsToPrice.filter((item) => {
return item.partType != partTypeStrings.RECALIBRATION;
});
}
diff --git a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
index b355bbb32..eb72aeedc 100644
--- a/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
+++ b/src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
@@ -136,24 +136,26 @@ export default {
diff --git a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
index 4558c3294..96b12d240 100644
--- a/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
+++ b/src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
@@ -24,11 +24,6 @@
{{ errorMessage }}
-
@@ -81,7 +87,6 @@
v-if="selectedAppointmentType === 'Mobile'"
v-model="mobileLocationQuestions"
:mobileFeePart="mobileFeePart"
- :mobileFeeApplies="mobileFeeApplies"
@updated-mobile-fee-part="setMobileFeePart"
@updated-serviceability="setServiceabilityDetails"
@updated-contains-military-base="setContainsMilitaryBase"
@@ -355,6 +360,9 @@ export default {
recalibrationInformationModal() {
return this.$refs.recalibrationInformationModal;
},
+ isInsurance() {
+ return store.getters.payment.isInsurance;
+ },
},
methods: {
arePagePrerequisitesValid() {
diff --git a/src/layouts/service-zip/service-zip.spec.js b/src/layouts/service-zip/service-zip.spec.js
index b52fdc1a4..2a858548a 100644
--- a/src/layouts/service-zip/service-zip.spec.js
+++ b/src/layouts/service-zip/service-zip.spec.js
@@ -10,6 +10,7 @@ import router from "@/router";
import { navigationScenarios } from "@/router/router-constants/navigation-scenarios";
import { saveSession } from "@/helpers/heritage-integration/order-helper.js";
import vinPagesMixin from "@/mixins/vin-pages-mixin";
+import { experimentSettings } from "../../constants/experiments";
// Constants
@@ -23,6 +24,16 @@ let mockCmsContent = {
let mockStoreActionData = {};
let mockStoreData = {};
+let mockExperimentSettings = {
+ experiments: [
+ {
+ universeName: "ConceptFunnel",
+ settings: {
+ SuppressVinCapture: false,
+ },
+ },
+ ],
+};
function resetMockStoreData() {
mockStoreData = {
@@ -163,6 +174,7 @@ function resetMockStoreData() {
function applyMockStoreDataToGetters() {
store.getters = {
+ experimentSettings: mockExperimentSettings,
order: mockStoreData,
damage: mockStoreData.damage,
payment: mockStoreData.payment,
@@ -170,6 +182,7 @@ function applyMockStoreDataToGetters() {
leadGenServiceZip: mockStoreData.leadGenServiceZip,
};
store.state.order = mockStoreData;
+ store.state.applicationUser.experiments = mockExperimentSettings;
}
async function mockDispatchStoreAction(actionName) {
diff --git a/src/router/router-constants/navigation-scenarios.js b/src/router/router-constants/navigation-scenarios.js
index 5181b9879..56a40926a 100644
--- a/src/router/router-constants/navigation-scenarios.js
+++ b/src/router/router-constants/navigation-scenarios.js
@@ -49,6 +49,7 @@ const navigationScenarios = {
CLICKED_CHANGE_LOCATION: "CLICKED_CHANGE_LOCATION",
// Payment
+ CLICKED_INSURANCE: "CLICKED_INSURANCE",
CLICKED_PAY_NOW: "CLICKED_PAY_NOW",
PIA_ERROR: "PIA_ERROR",
PIA_CC_ERROR: "PIA_CC_ERROR",
diff --git a/src/router/router-constants/routing-table.js b/src/router/router-constants/routing-table.js
index 94c4217d8..d1a89897d 100644
--- a/src/router/router-constants/routing-table.js
+++ b/src/router/router-constants/routing-table.js
@@ -487,6 +487,10 @@ const routingTable = function (store) {
scenario: navigationScenarios.CLICKED_PAY_NOW,
destinationFmgPageValue: fmgPageValues.PAYMENT,
},
+ {
+ scenario: navigationScenarios.CLICKED_INSURANCE,
+ destinationFmgPageValue: fmgPageValues.INSURANCE_COMPANY,
+ },
],
},
{
diff --git a/src/store/index.js b/src/store/index.js
index 67bc30df7..fdfba35a1 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1864,6 +1864,8 @@ export const actions = {
order.payment.piaType == paymentMethods.CREDIT_CARD ? true : false,
isPaypal: order.payment.piaType == paymentMethods.PAYPAL ? true : false,
isAfterPay: order.payment.piaType == paymentMethods.AFTERPAY ? true : false,
+ isApplePay:
+ order.payment.piaType == paymentMethods.APPLE_PAY ? true : false,
paypalToken: order.payment.paypalToken,
nextGenSettledAmount: order.payment.nextGenSettledAmount,
ccToken: {
diff --git a/src/styles/common-styles.scss b/src/styles/common-styles.scss
index 197655db1..730712297 100644
--- a/src/styles/common-styles.scss
+++ b/src/styles/common-styles.scss
@@ -37,6 +37,10 @@ body {
max-width: 100%;
}
}
+ //Quote page max-width for service packages
+ .col-xl-8 {
+ max-width: 1200px;
+ }
//END set max-width on columns
}
.pointer {
diff --git a/vue.config.js b/vue.config.js
index fec376da7..b111f079d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -5,8 +5,8 @@ process.env.VUE_APP_GOOGLE_PLACES_API_KEY = "AIzaSyDptGCkOPgN2uWJOy4ou4M33phRD4M
process.env.VUE_APP_CURRENT_ENVIRONMENT = "Localhost";
process.env.VUE_APP_MY_ACCOUNT = "https://myaccountdev.safelite.com/";
-//process.env.VUE_APP_SAFELITE_HOP = "http://localhost:60966/fmgCheckoutEmbedded.aspx";
-process.env.VUE_APP_SAFELITE_HOP = "https://sv2-safelitehop-sys.safelite.com/fmgCheckoutEmbedded.aspx";
+//process.env.VUE_APP_SAFELITE_HOP = "http://localhost:60966/fmgCheckoutShared.aspx";
+process.env.VUE_APP_SAFELITE_HOP = "https://sv2-safelitehop-sys.safelite.com/fmgCheckoutShared.aspx";
// GA & GTM
process.env.VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY =