diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d2a61a5d3..a7b9b705a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -97,9 +97,7 @@ stages: __VUE_APP_CONSUMER_CF_DISTRO__: $(__VUE_APP_CONSUMER_CF_DISTRO__) __VUE_APP_GOOGLE_PLACES_API_KEY__: $(__VUE_APP_GOOGLE_PLACES_API_KEY__) __VUE_APP_HERITAGE_FUNNEL__: $(__VUE_APP_HERITAGE_FUNNEL__) - __VUE_APP_SAFELITE_HOP___: $(__VUE_APP_SAFELITE_HOP__) - __VUE_APP_PAYPAL_SUCCESS_URL__: $(__VUE_APP_PAYPAL_SUCCESS_URL__) - __VUE_APP_PAYPAL_CANCEL_URL__: $(__VUE_APP_PAYPAL_CANCEL_URL__) + __VUE_APP_SAFELITE_HOP__: $(__VUE_APP_SAFELITE_HOP__) __VUE_APP_CURRENT_ENVIRONMENT__: $(__VUE_APP_CURRENT_ENVIRONMENT__) __VUE_APP_MY_ACCOUNT__: $(__VUE_APP_MY_ACCOUNT__) indexDeployVariables: @@ -158,9 +156,7 @@ stages: __VUE_APP_CONSUMER_CF_DISTRO__: $(__VUE_APP_CONSUMER_CF_DISTRO__) __VUE_APP_GOOGLE_PLACES_API_KEY__: $(__VUE_APP_GOOGLE_PLACES_API_KEY__) __VUE_APP_HERITAGE_FUNNEL__: $(__VUE_APP_HERITAGE_FUNNEL__) - __VUE_APP_SAFELITE_HOP___: $(__VUE_APP_SAFELITE_HOP__) - __VUE_APP_PAYPAL_SUCCESS_URL__: $(__VUE_APP_PAYPAL_SUCCESS_URL__) - __VUE_APP_PAYPAL_CANCEL_URL__: $(__VUE_APP_PAYPAL_CANCEL_URL__) + __VUE_APP_SAFELITE_HOP__: $(__VUE_APP_SAFELITE_HOP__) __VUE_APP_CURRENT_ENVIRONMENT__: $(__VUE_APP_CURRENT_ENVIRONMENT__) __VUE_APP_MY_ACCOUNT__: $(__VUE_APP_MY_ACCOUNT__) indexDeployVariables: @@ -219,9 +215,7 @@ stages: __VUE_APP_CONSUMER_CF_DISTRO__: $(__VUE_APP_CONSUMER_CF_DISTRO__) __VUE_APP_GOOGLE_PLACES_API_KEY__: $(__VUE_APP_GOOGLE_PLACES_API_KEY__) __VUE_APP_HERITAGE_FUNNEL__: $(__VUE_APP_HERITAGE_FUNNEL__) - __VUE_APP_SAFELITE_HOP___: $(__VUE_APP_SAFELITE_HOP__) - __VUE_APP_PAYPAL_SUCCESS_URL__: $(__VUE_APP_PAYPAL_SUCCESS_URL__) - __VUE_APP_PAYPAL_CANCEL_URL__: $(__VUE_APP_PAYPAL_CANCEL_URL__) + __VUE_APP_SAFELITE_HOP__: $(__VUE_APP_SAFELITE_HOP__) __VUE_APP_CURRENT_ENVIRONMENT__: $(__VUE_APP_CURRENT_ENVIRONMENT__) indexDeployVariables: __VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__: $(__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__) @@ -279,9 +273,7 @@ stages: __VUE_APP_CONSUMER_CF_DISTRO__: $(__VUE_APP_CONSUMER_CF_DISTRO__) __VUE_APP_GOOGLE_PLACES_API_KEY__: $(__VUE_APP_GOOGLE_PLACES_API_KEY__) __VUE_APP_HERITAGE_FUNNEL__: $(__VUE_APP_HERITAGE_FUNNEL__) - __VUE_APP_SAFELITE_HOP___: $(__VUE_APP_SAFELITE_HOP__) - __VUE_APP_PAYPAL_SUCCESS_URL__: $(__VUE_APP_PAYPAL_SUCCESS_URL__) - __VUE_APP_PAYPAL_CANCEL_URL__: $(__VUE_APP_PAYPAL_CANCEL_URL__) + __VUE_APP_SAFELITE_HOP__: $(__VUE_APP_SAFELITE_HOP__) __VUE_APP_CURRENT_ENVIRONMENT__: $(__VUE_APP_CURRENT_ENVIRONMENT__) indexDeployVariables: __VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__: $(__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__) diff --git a/jest.config.js b/jest.config.js index 0f45a8a97..f114ef2c3 100644 --- a/jest.config.js +++ b/jest.config.js @@ -27,7 +27,7 @@ module.exports = { testMatch: ["**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)"], coverageThreshold: { global: { - statements: 78, + statements: 77, }, }, // Uncomment this to avoid the massive amount of warnings we are getting for onSubmit and onInvalidSubmit diff --git a/src/constants/application-config.js b/src/constants/application-config.js index 808acfe0a..b4c0d9a1e 100644 --- a/src/constants/application-config.js +++ b/src/constants/application-config.js @@ -11,6 +11,16 @@ const applicationConfig = { SITE_ENTRY_TRIGGER_VALUE: "FixMyGlass", CASH_PARENT_ACCOUNT_NUMBER: 167132, MY_ACCOUNT: process.env.VUE_APP_MY_ACCOUNT, + PAYPAL_SUCCESS_URL: + location.protocol + + "//" + + location.host + + "/fmg/?fmgPage=payment-pia-return&src=concept-funnel", + PAYPAL_CANCEL_URL: + location.protocol + + "//" + + location.host + + "/fmg/?fmgPage=payment-method&src=concept-funnel", }; export { applicationConfig }; diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js index 420e8a2de..288ceb67b 100644 --- a/src/constants/store-actions.js +++ b/src/constants/store-actions.js @@ -87,6 +87,7 @@ const storeActions = { SAVE_SERVICE_LOCATION_TECH_NOTES: "saveServiceLocationTechNotes", SAVE_WORK_ORDER_FLAG: "saveWorkOrderFlag", SAVE_PIA_ERROR_CODE: "savePiaErrorCode", + SAVE_PIA_WORK_ORDER: "savePiaWorkOrder", }; export { storeActions }; diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js index f3f4a3c53..632379de3 100644 --- a/src/constants/store-mutations.js +++ b/src/constants/store-mutations.js @@ -1,6 +1,7 @@ const storeMutations = { UPDATE_WORK_ORDER_FLAG: "updateWorkOrderFlag", UPDATE_PIA_ERROR_CODE: "updatePiaErrorCode", + UPDATE_PIA_WORK_ORDER: "updatePiaWorkOrder", // VEHICLE MUTATIONS UPDATE_YEAR: "updateYear", diff --git a/src/digital-components/button-question/button-question.vue b/src/digital-components/button-question/button-question.vue index 441ed6e0b..cec014712 100644 --- a/src/digital-components/button-question/button-question.vue +++ b/src/digital-components/button-question/button-question.vue @@ -223,6 +223,10 @@ export default { classes = "package-wrapper"; } + if (this.buttonTypeString == "listCard" && this.buttonsInfo.length > 2) { + classes += " two-list-card-width"; + } + return classes; }, buttonsInfo() { @@ -304,18 +308,9 @@ export default { diff --git a/src/layouts/vehicle-parts/vehicle-parts.vue b/src/layouts/vehicle-parts/vehicle-parts.vue index 785992148..08432bab9 100644 --- a/src/layouts/vehicle-parts/vehicle-parts.vue +++ b/src/layouts/vehicle-parts/vehicle-parts.vue @@ -31,7 +31,7 @@
-
+
diff --git a/src/layouts/vehicle/vehicle.vue b/src/layouts/vehicle/vehicle.vue index da31110eb..e064250bd 100644 --- a/src/layouts/vehicle/vehicle.vue +++ b/src/layouts/vehicle/vehicle.vue @@ -7,7 +7,7 @@
-
+
-
+
diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js index d87b3cc85..74b44c983 100644 --- a/src/mixins/base-mixin.js +++ b/src/mixins/base-mixin.js @@ -115,6 +115,25 @@ export default { getTotalLineItemPrice(lineItem) { return lineItem.kitPrice + lineItem.laborAmount + lineItem.sellingPrice; }, + getDisplayAmountDue(lineItems) { + return this.getAmountDue(lineItems).toLocaleString("en-US", { + style: "currency", + currency: "USD", + }); + }, + getAmountDue(lineItems) { + // TODO: verify tax is included in lineitems + // Price everything in lineitems except the server data string + var amountDue = 0; + const itemsClone = { ...lineItems }; + delete itemsClone.serverData; + for (var propertyName in itemsClone) { + amountDue += this.getTotalPriceOfAllLineItemsAndChildParts( + itemsClone[propertyName] + ); + } + return amountDue; + }, scrollToPageTop() { const container = document.getElementsByClassName("page-container-grouped-styles")[0]; container.scrollTo({ top: 0, left: 0, behavior: "smooth" }); diff --git a/src/router/router-constants/externalUrl-values.js b/src/router/router-constants/externalUrl-values.js index 98b894036..5516095c4 100644 --- a/src/router/router-constants/externalUrl-values.js +++ b/src/router/router-constants/externalUrl-values.js @@ -1,8 +1,6 @@ const externalUrls = { HERITAGE_FUNNEL: process.env.VUE_APP_HERITAGE_FUNNEL, SAFELITE_HOP: process.env.VUE_APP_SAFELITE_HOP, - PAYPAL_SUCCESS_URL: process.env.VUE_APP_PAYPAL_SUCCESS_URL, - PAYPAL_CANCEL_URL: process.env.VUE_APP_PAYPAL_CANCEL_URL, }; export { externalUrls }; diff --git a/src/store/index.js b/src/store/index.js index 431fce721..add9f355f 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -109,6 +109,7 @@ const getDefaultState = () => { referralCorrelationId: null, eon: null, workOrderNumber: null, + createDeleteStatusWorkOrderForPia: false, }, applicationUser: { eventBus: [], @@ -223,6 +224,9 @@ export const mutations = { updatePiaErrorCode(state, piaErrorCode) { state.order.payment.piaErrorCode = piaErrorCode; }, + updatePiaWorkOrder(state, piaWorkOrder) { + state.order.createDeleteStatusWorkOrderForPia = piaWorkOrder; + }, updateWorkOrderNumber(state, workOrderNumber) { state.order.workOrderNumber = workOrderNumber; }, @@ -1618,6 +1622,7 @@ export const actions = { referralNumber: order.referralNumber?.toString(), referralSequenceNumber: order.referralSequenceNumber, eon: order.eon, + createDeleteStatusWorkOrderForPia: order.createDeleteStatusWorkOrderForPia, }, }, logApiCall: true, @@ -1694,6 +1699,9 @@ export const actions = { savePiaErrorCode(context, piaErrorCode) { context.commit(storeMutations.UPDATE_PIA_ERROR_CODE, piaErrorCode); }, + savePiaWorkOrder(context, piaWorkOrder) { + context.commit(storeMutations.UPDATE_PIA_WORK_ORDER, piaWorkOrder); + }, // Business domain actions diff --git a/src/styles/common-styles.scss b/src/styles/common-styles.scss index 7ffaa0c4f..6bb1bd64c 100644 --- a/src/styles/common-styles.scss +++ b/src/styles/common-styles.scss @@ -5,6 +5,7 @@ body { background-color: #fff; color: #4d5151; .container-fluid { + padding: 0 1.5rem; .prevent-squish { overflow-x: unset; } @@ -40,9 +41,11 @@ body { overflow: hidden; } } -//Disable scroll of main container when modal is open .modal-open { - .page-container-grouped-styles { - overflow: hidden; + .container-fluid { + &.page-container-grouped-styles { + overflow: hidden; + height: auto; + } } } diff --git a/vue.config.js b/vue.config.js index 1a402ced1..a8c6ee8f8 100644 --- a/vue.config.js +++ b/vue.config.js @@ -6,8 +6,6 @@ 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_PAYPAL_SUCCESS_URL = "http://localhost:8080/fmg/?fmgPage=payment-pia-return&src=concept-funnel"; -process.env.VUE_APP_PAYPAL_CANCEL_URL = "http://localhost:8080/fmg/?fmgPage=payment-method&src=concept-funnel"; // GA & GTM process.env.VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY = diff --git a/vue.release.config.js b/vue.release.config.js index 4cad6611a..ec84c2d2a 100644 --- a/vue.release.config.js +++ b/vue.release.config.js @@ -5,8 +5,6 @@ process.env.VUE_APP_CURRENT_ENVIRONMENT = "__VUE_APP_CURRENT_ENVIRONMENT__"; process.env.VUE_APP_MY_ACCOUNT = "__VUE_APP_MY_ACCOUNT__"; process.env.VUE_APP_SAFELITE_HOP = "__VUE_APP_SAFELITE_HOP__"; -process.env.VUE_APP_PAYPAL_SUCCESS_URL = "__VUE_APP_PAYPAL_SUCCESS_URL__"; -process.env.VUE_APP_PAYPAL_CANCEL_URL = "__VUE_APP_PAYPAL_CANCEL_URL__"; // GA & GTM process.env.VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY = "__VUE_APP_GOOGLE_TAG_MANAGER_SCRIPT_BODY__";