From d8dd23e2c9a00d22f93bbaf4bcff5fafda4f1845 Mon Sep 17 00:00:00 2001 From: Leah Schumann Date: Wed, 25 Oct 2023 11:39:32 -0400 Subject: [PATCH] Merged from develop, prettified --- src/layouts/payment-method/payment-method.vue | 6 ++++-- src/store/index.js | 11 +++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/layouts/payment-method/payment-method.vue b/src/layouts/payment-method/payment-method.vue index 3e69a25d7..2bc01dac5 100644 --- a/src/layouts/payment-method/payment-method.vue +++ b/src/layouts/payment-method/payment-method.vue @@ -92,7 +92,6 @@ import { errorMessages } from "@/constants/error-messages"; import { AppointmentTypeStrings } from "@/constants/schedule-constants"; import { LineItemUtilities, mapTaxedAvailableLineItemsToStoreFormat } from "../../store"; - defineRule("option-required", required(errorMessages.OPTION_REQUIRED)); export default { @@ -177,7 +176,10 @@ export default { const lineItemUtilities = new LineItemUtilities(); lineItemUtilities.addGuidToLineItemsIfNotAlreadyThere(availableLineItems); - const cartLineItems = mapTaxedAvailableLineItemsToStoreFormat(availableLineItems, lineItems); + const cartLineItems = mapTaxedAvailableLineItemsToStoreFormat( + availableLineItems, + lineItems + ); // Call the "next" function to complete the transition to this page. next((vm) => { diff --git a/src/store/index.js b/src/store/index.js index 1f03566c2..163249775 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -1298,7 +1298,7 @@ export const actions = { }); syncLineItemIds(response.data, context.getters.order.lineItems.vaps); - console.log(response.data) + console.log(response.data); return response; }, @@ -2571,8 +2571,7 @@ export class LineItemUtilities { } } -export function mapTaxedAvailableLineItemsToStoreFormat(availableLineItems, storeLineItems) -{ +export function mapTaxedAvailableLineItemsToStoreFormat(availableLineItems, storeLineItems) { // clone the lineItems array because what we're passing in is referencing the store directly const lineItems = deepClone(storeLineItems); @@ -2580,8 +2579,9 @@ export function mapTaxedAvailableLineItemsToStoreFormat(availableLineItems, stor lineItemsInCategory = lineItemsInCategory ?? []; for (let lineItemIndex = 0; lineItemIndex < lineItemsInCategory.length; lineItemIndex++) { - - const availableLineItem = availableLineItems.find(ali => ali.partNumber == lineItemsInCategory[lineItemIndex].partNumber); + const availableLineItem = availableLineItems.find( + (ali) => ali.partNumber == lineItemsInCategory[lineItemIndex].partNumber + ); if (availableLineItem) { lineItemsInCategory[lineItemIndex].salesTax = availableLineItem.salesTax; } @@ -2663,7 +2663,6 @@ function addGuidToLineItemsIfNotAlreadyThere(lineItems) { } function syncLineItemIds(lineItemsWithoutIds, lineItemsWithIds) { - if (!lineItemsWithIds || !lineItemsWithoutIds) { return; }