From ffd829cee9b94994996e8e0ded78dd93e8466b6a Mon Sep 17 00:00:00 2001 From: Leah Schumann Date: Fri, 13 Oct 2023 13:16:51 -0400 Subject: [PATCH 01/27] WIP --- src/fmg-components/cart/cart.vue | 74 ++++++++++++++++++- src/layouts/payment-method/payment-method.vue | 22 +++--- 2 files changed, 83 insertions(+), 13 deletions(-) diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index 7107e64e8..cb31df843 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -22,7 +22,7 @@ @@ -35,7 +35,7 @@ {{ lineItem.price }} @@ -45,7 +45,10 @@ >{{ recycleFee }} -
Subtotal$320
+
+ Subtotal + {{ subTotal }} +
Sales tax$1
Amount due$321
@@ -63,10 +66,12 @@ import { } from "@/helpers/service-package-helper"; import textLink from "@/ux-components/text-link/text-link"; import textBlock from "@/digital-components/text-block/text-block"; +import { deepClone } from "@/helpers/object-helper"; export default { name: "modal", props: { + modelValue: Object, damage: Object, servicePackageOptionsCmsName: String, availableLineItems: Object, @@ -76,7 +81,6 @@ export default { return { isActive: false, packageWithVAPS: false, - amountDue: this.getAmountDue(), }; }, methods: { @@ -130,6 +134,7 @@ export default { ...findLineItemsWithPartType(vapType, this.availableLineItems) ); }); + return vapsLineItemsForSelectedPackage; }, }, @@ -167,9 +172,18 @@ export default { return packagePriceString; // return (packagePriceString.length > 0) ? packagePriceString : "Test String"; }, + // cartItems: { + // get: function () { + // return this.answersToDisplay; + // }, + // set: function (newValue) { + + // }, + // }, displayedPackageLineItems() { const displayedPackageLineItems = []; const packageLineItems = this.getVapsLineItemsForSelectedPackage(this.packageLevel); + // TODO Determine if we could get the same list from this.lineItems? packageLineItems?.forEach((item) => { let price = item.sellingPrice + item.kitPrice + item.laborAmount; @@ -181,6 +195,7 @@ export default { }; displayedPackageLineItems.push(packageLineItem); }); + return displayedPackageLineItems; }, displayedNonPackageLineItems() { @@ -244,12 +259,63 @@ export default { // } return true; }, + removeLinkText() { + // TODO: retrieve from CMS + return "Remove"; + }, + cartLineItems() { + const cartLineItems = []; + + + + const glassParts = this.lineItems.glassParts?.flat(); + if (glassParts) { + glassParts.forEach((glassPart) => { + cartLineItems.push(glassPart); + }); + } + + const supportingItems = this.lineItems.supportingItems; + if (supportingItems) { + supportingItems.forEach((supportingItem) => { + cartLineItems.push(supportingItem); + }); + } + + const vaps = this.lineItems.vaps; + if (vaps) { + vaps.forEach((vap) => { + cartLineItems.push(vap); + }); + } + + return cartLineItems; + }, + subTotal() { + let subTotal = 0; + const pricedLineItems = this.cartLineItems.filter(i => Object.hasOwn(i, "sellingPrice")); + + pricedLineItems.forEach((lineItem) => { + + subTotal += (lineItem.sellingPrice ?? 0) + + (lineItem.kitPrice ?? 0) + + (lineItem.laborAmount ?? 0); + }); + return subTotal + this.getVapsPrice(this.packageLevel); + }, + salesTax() { + return "$2.50"; + }, + amountDue() { + return this.getAmountDue(); + }, }, components: { textBlock, textLink, }, }; + From 4bbc508aade4af1fe95bb85f518aac7e5bb257ac Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Fri, 27 Oct 2023 16:40:24 -0400 Subject: [PATCH 18/27] CSR-1384: minor alts to insure against console errors --- .../add-vaps-modal-buttons.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue b/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue index d2195c5e5..0c7976ea8 100644 --- a/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue +++ b/src/layouts/payment-method/add-vaps-modal-buttons/add-vaps-modal-buttons.vue @@ -215,17 +215,17 @@ export default { if (!rainDefenseInCart) { // NO RAIN DEFENSE IN CART; SHOW RAIN DEFENSE BUTTON const modalData = getAnswer("RainDefenseModal", this.answersCmsData); - modalData.SubText = "+$" + this.rainDefenseModal.listPrice; + modalData.SubText = "+$" + this.rainDefenseModal?.listPrice; buttons.push(modalData); } const modalData = getAnswer("WipersModal", this.answersCmsData); if (!frontWipersInCart) { - if (!rearWipersInCart && this.wipersModal.rearWiperLineItems.length > 0) { + if (!rearWipersInCart && this.wipersModal?.rearWiperLineItems.length > 0) { // NO REAR WIPERS or FRONT WIPERS IN CART; SHOW COMBO BUTTON const prices = [ - this.wipersModal.totalFrontPrice, - this.wipersModal.totalRearPrice, + this.wipersModal?.totalFrontPrice, + this.wipersModal?.totalRearPrice, ]; prices.sort((a, b) => a - b); modalData.SubText = "+$" + prices[0] + " - $" + prices[prices.length - 1]; @@ -233,13 +233,13 @@ export default { buttons.push(modalData); } else { // NO FRONT WIPERS IN CART; SHOW ONLY FRONT WIPERS BUTTON - modalData.SubText = "+$" + this.wipersModal.totalFrontPrice; + modalData.SubText = "+$" + this.wipersModal?.totalFrontPrice; this.updateWipersToDisplay(wipersToDisplayStrings.FRONT); buttons.push(modalData); } - } else if (!rearWipersInCart && this.wipersModal.rearWiperLineItems.length > 0) { + } else if (!rearWipersInCart && this.wipersModal?.rearWiperLineItems.length > 0) { // NO REAR WIPERS IN CART; SHOW ONLY REAR WIPERS BUTTON - modalData.SubText = "+$" + this.wipersModal.totalRearPrice; + modalData.SubText = "+$" + this.wipersModal?.totalRearPrice; this.updateWipersToDisplay(wipersToDisplayStrings.REAR); buttons.push(modalData); } From 166940db044aaec4f461ab2e419247bfdc03e8e6 Mon Sep 17 00:00:00 2001 From: CarlNation <32103961+CarlNation@users.noreply.github.com> Date: Sun, 29 Oct 2023 08:28:32 -0400 Subject: [PATCH 19/27] CSR-1392 removed work order flags for submitting a pia in delete substatus and the final submit flag from the store and pass it as a parameter to save session instead. --- src/constants/store-actions.js | 2 - src/constants/store-mutations.js | 2 - .../heritage-integration/order-helper.js | 38 ++++++++++++++++--- src/layouts/payment-method/payment-method.vue | 26 +++++++++---- .../payment-pia-return/payment-pia-return.vue | 20 ++++++++-- src/store/index.js | 26 ++++--------- src/store/store.spec.js | 11 ------ 7 files changed, 74 insertions(+), 51 deletions(-) diff --git a/src/constants/store-actions.js b/src/constants/store-actions.js index ee67ff77d..bb2ef16a0 100644 --- a/src/constants/store-actions.js +++ b/src/constants/store-actions.js @@ -89,8 +89,6 @@ const storeActions = { SAVE_PROMOS: "savePromos", SAVE_CUSTOMER_DETAILS: "saveCustomerDetails", SAVE_SERVICE_LOCATION_TECH_NOTES: "saveServiceLocationTechNotes", - SAVE_WORK_ORDER_FLAG: "saveWorkOrderFlag", - SAVE_PIA_WORK_ORDER: "savePiaWorkOrder", SAVE_CCTOKEN: "saveCCToken", SAVE_PAYPAL_TOKEN: "savePaypalToken", }; diff --git a/src/constants/store-mutations.js b/src/constants/store-mutations.js index ca0afadf2..b7ac47d38 100644 --- a/src/constants/store-mutations.js +++ b/src/constants/store-mutations.js @@ -1,7 +1,5 @@ const storeMutations = { // PAYMENT MUTATIONS - UPDATE_WORK_ORDER_FLAG: "updateWorkOrderFlag", - UPDATE_PIA_WORK_ORDER: "updatePiaWorkOrder", UPDATE_CCTOKEN: "updateCCToken", UPDATE_PAYPAL_TOKEN: "updatePaypalToken", diff --git a/src/helpers/heritage-integration/order-helper.js b/src/helpers/heritage-integration/order-helper.js index 91f4768f3..01a5a780f 100644 --- a/src/helpers/heritage-integration/order-helper.js +++ b/src/helpers/heritage-integration/order-helper.js @@ -53,17 +53,30 @@ export async function loadSessionIfPresent(isConceptInsurance, pageNameToLog) { This will also set Referral information in the store after saving, and then update the cookie. To force synchronous behavior pass in 'true' for shouldAwaitSaveSessionQueue */ -export async function saveSession({ pageNameToLog, shouldAwaitSaveSessionQueue = false }) { +export async function saveSession({ + pageNameToLog, + shouldAwaitSaveSessionQueue = false, + submitAfterSave = false, + createDeleteStatusWorkOrderForPia = false, +}) { var saveSessionPromise; if (store.getters.applicationUser.saveSessionPromise) { // queue newest request after current saveSessionPromise resolves saveSessionPromise = store.getters.applicationUser.saveSessionPromise.then(() => { // get a new saveSessionPromise - return saveSessionHelper(pageNameToLog); + return saveSessionHelper( + pageNameToLog, + submitAfterSave, + createDeleteStatusWorkOrderForPia + ); }); } else { // create an initial saveSessionPromise - saveSessionPromise = saveSessionHelper(pageNameToLog); + saveSessionPromise = saveSessionHelper( + pageNameToLog, + submitAfterSave, + createDeleteStatusWorkOrderForPia + ); } store.commit(storeMutations.UPDATE_SAVE_SESSION_PROMISE, saveSessionPromise); // await here to allow for a caller to await and make the function synchronous @@ -72,10 +85,16 @@ export async function saveSession({ pageNameToLog, shouldAwaitSaveSessionQueue = } } -export async function submitWorkOrder({ pageNameToLog }) { +export async function submitWorkOrder({ + pageNameToLog, + submitAfterSave = false, + createDeleteStatusWorkOrderForPia = false, +}) { await saveSession({ pageNameToLog: pageNameToLog, shouldAwaitSaveSessionQueue: true, + submitAfterSave: submitAfterSave, + createDeleteStatusWorkOrderForPia: createDeleteStatusWorkOrderForPia, }); } @@ -117,10 +136,17 @@ async function loadSession( /* Encapsulates asynchronous Save Session logic inside a promise to allow for Save Session queuing */ -async function saveSessionHelper(pageNameToLog) { +async function saveSessionHelper( + pageNameToLog, + submitAfterSave = false, + createDeleteStatusWorkOrderForPia = false +) { const savedSessionInfo = await baseMixin.methods.dispatchStoreActionWithLogging( storeActions.SAVE_SESSION, - null, + { + submitAfterSave: submitAfterSave, + createDeleteStatusWorkOrderForPia: createDeleteStatusWorkOrderForPia, + }, pageNameToLog ); // Update the store with information received from the saveSession response diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index a3044994b..5d013c97d 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -266,7 +266,6 @@ export default { const matchedIndices = []; this.cartItems.forEach((cartItem, i) => { if (cartItem.partType === item.partType) { - // console.log("adding this to matchedIndices: ", i); matchedIndices.push(i); } }); @@ -289,8 +288,8 @@ export default { await this.dispatchStoreAction(storeActions.SAVE_PROMOS, this.lineItems.promos, false); if (this.paymentMethod == paymentMethods.LATER) { - this.dispatchStoreAction(this.storeActions.SAVE_WORK_ORDER_FLAG, true, false); - await submitWorkOrder({ pageNameToLog: "payment-method" }); + // this creates the final work order + await submitWorkOrder({ pageNameToLog: "payment-method", submitAfterSave: true }); this.$router.navigateWithoutSaving( this.navigationScenarios.CLICKED_FORWARD, this.$route @@ -302,14 +301,25 @@ export default { async setupPia() { this.$refs.loadingModal.showModal(); - // if we don't have a work order in delete substatus, set the flag and submit + // if we don't have a work order in delete substatus, set the flag and submit. + // we need a work order number for pia so we can pass it to safeliteHop. if (!store.getters.order.workOrderNumber) { - this.dispatchStoreAction(storeActions.SAVE_PIA_WORK_ORDER, true); - await submitWorkOrder({ pageNameToLog: "payment-method" }); - this.dispatchStoreAction(storeActions.SAVE_PIA_WORK_ORDER, false); - this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE); + try { + await submitWorkOrder({ + pageNameToLog: "payment-method", + submitAfterSave: false, + createDeleteStatusWorkOrderForPia: true, + }); + } catch (error) { + console.log( + "error: response from pia submit work order:" + error.message); + this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE); + this.$route.params[this.routerParams.DISPLAY_PIA_ALERT] = true; + return; + } } + this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE); this.$router.navigateWithoutSaving( this.navigationScenarios.CLICKED_PAY_NOW, this.$route diff --git a/src/layouts/payment-pia-return/payment-pia-return.vue b/src/layouts/payment-pia-return/payment-pia-return.vue index 3eb819810..54e49c620 100644 --- a/src/layouts/payment-pia-return/payment-pia-return.vue +++ b/src/layouts/payment-pia-return/payment-pia-return.vue @@ -58,14 +58,12 @@ export default { async processPaypalResponse() { const token = getQuerystringParameter(queryStrings.TOKEN); const payerId = getQuerystringParameter(queryStrings.PAYERID); - baseMixin.methods.dispatchStoreAction(storeActions.SAVE_WORK_ORDER_FLAG, true, false); baseMixin.methods.dispatchStoreAction(storeActions.SAVE_PAYPAL_TOKEN, token, false); await this.saveAndSubmitWorkOrder(); }, async processCreditCardResponse() { const subscriptionID = getQuerystringParameter(queryStrings.SUBSCRIPTIONID); - baseMixin.methods.dispatchStoreAction(storeActions.SAVE_WORK_ORDER_FLAG, true, false); const referralSeqNum = getQuerystringParameter(queryStrings.REFERRAL_SEQ_NUM); if (referralSeqNum != store.getters.order.referralSequenceNumber) { @@ -115,7 +113,23 @@ export default { async saveAndSubmitWorkOrder() { // Final work order submit after returning from PIA. await this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE); - await submitWorkOrder({ pageNameToLog: "payment-pia-return" }); + try { + await submitWorkOrder({ + pageNameToLog: "payment-pia-return", + submitAfterSave: true, + }); + } catch (error) { + console.log("error: response from submit work order:" + error.message); + this.$router.navigateWithoutSaving( + this.navigationScenarios.PIA_ERROR, + this.$route, + {}, + { [routerParams.DISPLAY_PIA_ALERT]: true } + ); + this.$refs.loadingModal.isModalVisible = false; + return; + } + this.$refs.loadingModal.isModalVisible = false; this.$router.navigateWithoutSaving(this.navigationScenarios.PIA_SUCCESS, this.$route); }, diff --git a/src/store/index.js b/src/store/index.js index 64640bca2..72fcb264e 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -28,7 +28,6 @@ import { getDateDifferenceInDays } from "@/helpers/date-helper"; // Export State const getDefaultState = () => { return { - submitAfterSave: false, order: { vehicle: { year: null, @@ -127,7 +126,6 @@ const getDefaultState = () => { referralCorrelationId: null, eon: null, workOrderNumber: null, - createDeleteStatusWorkOrderForPia: false, }, applicationUser: { eventBus: [], @@ -147,10 +145,6 @@ export const state = getDefaultState(); // Export Mutations export const mutations = { - updateWorkOrderFlag(state, submitAfterSave) { - state.submitAfterSave = submitAfterSave; - }, - // VEHICLE MUTATIONS updateYear(state, year) { state.order.vehicle.year = year; @@ -248,9 +242,6 @@ export const mutations = { updatePiaType(state, piaType) { state.order.payment.piaType = piaType; }, - updatePiaWorkOrder(state, piaWorkOrder) { - state.order.createDeleteStatusWorkOrderForPia = piaWorkOrder; - }, updateWorkOrderNumber(state, workOrderNumber) { state.order.workOrderNumber = workOrderNumber; }, @@ -566,7 +557,6 @@ export const mutations = { // Export Getters export const getters = { - submitAfterSave: (state) => state.submitAfterSave, vehicle: (state) => state.order.vehicle, eventBusItem: (state) => (eventCategory, eventSubCategory) => { const matchedEvent = state.applicationUser.eventBus.find( @@ -1577,13 +1567,17 @@ export const actions = { }, // Session API Actions - saveSession(context, { pageNameToLog }) { + saveSession(context, { pageNameToLog, payload }) { const vehicle = context.getters.vehicle; const damage = context.getters.damage; const order = context.state.order; const applicationUser = context.getters.applicationUser; const lineItems = context.state.order.lineItems; + const submitAfterSave = payload?.submitAfterSave === "true"; + const createDeleteStatusWorkOrderForPia = + payload?.createDeleteStatusWorkOrderForPia === "true"; + // create a new array to avoid mutating state const newGlassToReplace = convertGlassPieceNamingForApi(damage.glassToReplace); @@ -1591,7 +1585,7 @@ export const actions = { method: endpoints.SaveSession.method, endpoint: endpoints.SaveSession.url, payload: { - submitAfterSave: context.state.submitAfterSave, + submitAfterSave: submitAfterSave, userAgent: navigator.userAgent, applicationUser: { crmCustomerId: applicationUser.crmCustomerId, @@ -1702,7 +1696,7 @@ export const actions = { referralNumber: order.referralNumber?.toString(), referralSequenceNumber: order.referralSequenceNumber, eon: order.eon, - createDeleteStatusWorkOrderForPia: order.createDeleteStatusWorkOrderForPia, + createDeleteStatusWorkOrderForPia: createDeleteStatusWorkOrderForPia, }, }, logApiCall: true, @@ -1773,12 +1767,6 @@ export const actions = { ); }, - saveWorkOrderFlag(context, submitAfterSave) { - context.commit(storeMutations.UPDATE_WORK_ORDER_FLAG, submitAfterSave); - }, - savePiaWorkOrder(context, piaWorkOrder) { - context.commit(storeMutations.UPDATE_PIA_WORK_ORDER, piaWorkOrder); - }, saveCCToken(context, ccToken) { context.commit(storeMutations.UPDATE_CCTOKEN, ccToken); }, diff --git a/src/store/store.spec.js b/src/store/store.spec.js index b0cd5154a..e7c004090 100644 --- a/src/store/store.spec.js +++ b/src/store/store.spec.js @@ -2791,17 +2791,6 @@ describe("Actions", () => { }); describe("Getters", () => { - it("submitAfterSave, should return true", () => { - // Arrange - const storeState = state; - - // Act - mutations.updateWorkOrderFlag(storeState, true); - - // Assert - expect(getters.submitAfterSave(storeState)).toEqual(true); - }); - it("Vehicle getter, should return vehicle data", () => { // Arrange const storeState = state; From 0d9373cae72d6144f765e71fd90659dcc031c609 Mon Sep 17 00:00:00 2001 From: CarlNation <32103961+CarlNation@users.noreply.github.com> Date: Sun, 29 Oct 2023 08:33:17 -0400 Subject: [PATCH 20/27] CSR-1392 prettier --- src/layouts/payment-method/payment-method.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index 5d013c97d..46fc1b55e 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -311,8 +311,7 @@ export default { createDeleteStatusWorkOrderForPia: true, }); } catch (error) { - console.log( - "error: response from pia submit work order:" + error.message); + console.log("error: response from pia submit work order:" + error.message); this.dispatchStoreAction(storeActions.RESET_SAVE_SESSION_PROMISE); this.$route.params[this.routerParams.DISPLAY_PIA_ALERT] = true; return; From df0c0435af700871e16015e52c49e6d140352ea1 Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Sun, 29 Oct 2023 10:16:02 -0400 Subject: [PATCH 21/27] CSR-1390 add .hide to hide modal on load. --- public/css/site-2020Styling.css | 3 +++ public/scss/site-2020Styling.scss | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/public/css/site-2020Styling.css b/public/css/site-2020Styling.css index 05232bd31..4aacb297d 100644 --- a/public/css/site-2020Styling.css +++ b/public/css/site-2020Styling.css @@ -73,6 +73,9 @@ opacity: 0; filter: alpha(opacity=0); } +#pageLoadingModal.hide { + display: none; +} @keyframes rotate { 0% { diff --git a/public/scss/site-2020Styling.scss b/public/scss/site-2020Styling.scss index 3f52f4b9e..4630bfdfc 100644 --- a/public/scss/site-2020Styling.scss +++ b/public/scss/site-2020Styling.scss @@ -79,6 +79,10 @@ filter: alpha(opacity=0); } } + + &.hide { + display: none; + } } @keyframes rotate { From 4723eb8098a096f2a2a04ee2b703c27371521c3d Mon Sep 17 00:00:00 2001 From: CarlNation <32103961+CarlNation@users.noreply.github.com> Date: Sun, 29 Oct 2023 10:25:05 -0400 Subject: [PATCH 22/27] CSR-1392 associated tests --- src/helpers/heritage-integration/order-helper.spec.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/helpers/heritage-integration/order-helper.spec.js b/src/helpers/heritage-integration/order-helper.spec.js index 322d9237d..daf9af6bb 100644 --- a/src/helpers/heritage-integration/order-helper.spec.js +++ b/src/helpers/heritage-integration/order-helper.spec.js @@ -179,7 +179,7 @@ describe("saveSession", () => { // Assert expect(mocks.baseMixin.methods.dispatchStoreActionWithLogging).toHaveBeenCalledWith( storeActions.SAVE_SESSION, - null, + { createDeleteStatusWorkOrderForPia: false, submitAfterSave: false }, "test" ); expect(mocks.baseMixin.methods.dispatchStoreAction).toHaveBeenCalledWith( @@ -282,12 +282,12 @@ describe("submitWorkOrder", () => { const mocks = setupMocksForJsFiles(mockData); // Act - await submitWorkOrder({ pageNameToLog: "test" }); + await submitWorkOrder({ pageNameToLog: "test", submitAfterSave: true }); // Assert expect(mocks.baseMixin.methods.dispatchStoreActionWithLogging).toHaveBeenCalledWith( storeActions.SAVE_SESSION, - null, + { createDeleteStatusWorkOrderForPia: false, submitAfterSave: true }, "test" ); expect(mocks.baseMixin.methods.dispatchStoreAction).toHaveBeenCalledWith( @@ -345,7 +345,7 @@ describe("submitWorkOrder", () => { setupCookies({ funnelCookieValue: JSON.stringify(testCookieValue) }); // Act - await submitWorkOrder({ pageNameToLog: "test" }); + await submitWorkOrder({ pageNameToLog: "test", submitAfterSave: true }); // Assert expect(cookieHelper.getFunnelCookie().DidHeritageFunnelUpdateLast).toEqual(false); From d39870f2ca314a0907b3fb7e8b77181ef8ba9a5d Mon Sep 17 00:00:00 2001 From: Leah Schumann Date: Mon, 30 Oct 2023 06:44:02 -0400 Subject: [PATCH 23/27] Merging changes committed to wrong branch --- src/constants/cart-categories.js | 8 ++++++++ src/constants/cart-item-types.js | 11 +++++++++++ 2 files changed, 19 insertions(+) create mode 100644 src/constants/cart-categories.js create mode 100644 src/constants/cart-item-types.js diff --git a/src/constants/cart-categories.js b/src/constants/cart-categories.js new file mode 100644 index 000000000..ed2f5a81a --- /dev/null +++ b/src/constants/cart-categories.js @@ -0,0 +1,8 @@ +const cartCategories = { + VAPS: "vaps", + GLASS_PARTS: "glassParts", + SUPPORTING_ITEMS: "supportingItems", + PROMOS: "promos", +}; + +export { cartCategories }; diff --git a/src/constants/cart-item-types.js b/src/constants/cart-item-types.js new file mode 100644 index 000000000..62bc40012 --- /dev/null +++ b/src/constants/cart-item-types.js @@ -0,0 +1,11 @@ +const cartItemTypes = { + FRONT_WIPER: "FRONT WIPER", + REAR_WIPER: "REAR WIPER", + SUPPORTING_ITEMS: "SUPPORTING ITEMS", + GLASS_PARTS: "GLASS PARTS", + RAIN_DEFENSE: "RAIN DEFENSE", + RECYCLE_FEE: "RECYCLE FEE", + MOBILE_FEE: "MOBILE FEE", +}; + +export { cartItemTypes }; From acc533e42c2d22637362fd78b8a14eaca127def1 Mon Sep 17 00:00:00 2001 From: Leah Schumann Date: Mon, 30 Oct 2023 07:15:56 -0400 Subject: [PATCH 24/27] Fixing the commits to the wrong branch --- ...-categories.js => cart-item-categories.js} | 4 +- src/constants/part-type-strings.js | 2 + src/fmg-components/cart/cart.vue | 227 +++++++++++------- src/layouts/payment-method/payment-method.vue | 4 +- 4 files changed, 142 insertions(+), 95 deletions(-) rename src/constants/{cart-categories.js => cart-item-categories.js} (65%) diff --git a/src/constants/cart-categories.js b/src/constants/cart-item-categories.js similarity index 65% rename from src/constants/cart-categories.js rename to src/constants/cart-item-categories.js index ed2f5a81a..509cc626b 100644 --- a/src/constants/cart-categories.js +++ b/src/constants/cart-item-categories.js @@ -1,8 +1,8 @@ -const cartCategories = { +const cartItemCategories = { VAPS: "vaps", GLASS_PARTS: "glassParts", SUPPORTING_ITEMS: "supportingItems", PROMOS: "promos", }; -export { cartCategories }; +export { cartItemCategories }; diff --git a/src/constants/part-type-strings.js b/src/constants/part-type-strings.js index 2dfab2071..50d92832c 100644 --- a/src/constants/part-type-strings.js +++ b/src/constants/part-type-strings.js @@ -3,6 +3,8 @@ const partTypeStrings = { REAR_WIPER: "REAR WIPER", RAIN_DEFENSE: "RAIN DEFENSE", RECALIBRATION: "RECALIBRATION", + RECYCLE_FEE: "RECYCLE FEE", + MOBILE_FEE: "MOBILE FEE", }; export { partTypeStrings }; diff --git a/src/fmg-components/cart/cart.vue b/src/fmg-components/cart/cart.vue index 5a2ea7a70..c48f48582 100644 --- a/src/fmg-components/cart/cart.vue +++ b/src/fmg-components/cart/cart.vue @@ -1,6 +1,6 @@