jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged from develop, prettified

Browse source
This commit is contained in:
Leah Schumann 2023-10-25 11:39:32 -04:00
parent 0b63dfca88
commit d8dd23e2c9
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/layouts/payment-method/payment-method.vue
View file

@ -92,7 +92,6 @@ import { errorMessages } from "@/constants/error-messages";
import { AppointmentTypeStrings } from "@/constants/schedule-constants"; import { AppointmentTypeStrings } from "@/constants/schedule-constants";
import { LineItemUtilities, mapTaxedAvailableLineItemsToStoreFormat } from "../../store"; import { LineItemUtilities, mapTaxedAvailableLineItemsToStoreFormat } from "../../store";
defineRule("option-required", required(errorMessages.OPTION_REQUIRED)); defineRule("option-required", required(errorMessages.OPTION_REQUIRED));
export default { export default {
@ -177,7 +176,10 @@ export default {
const lineItemUtilities = new LineItemUtilities(); const lineItemUtilities = new LineItemUtilities();
lineItemUtilities.addGuidToLineItemsIfNotAlreadyThere(availableLineItems); lineItemUtilities.addGuidToLineItemsIfNotAlreadyThere(availableLineItems);
const cartLineItems = mapTaxedAvailableLineItemsToStoreFormat(availableLineItems, lineItems); const cartLineItems = mapTaxedAvailableLineItemsToStoreFormat(
availableLineItems,
lineItems
);
// Call the "next" function to complete the transition to this page. // Call the "next" function to complete the transition to this page.
next((vm) => { next((vm) => {

11
src/store/index.js
View file

@ -1298,7 +1298,7 @@ export const actions = {
}); });
syncLineItemIds(response.data, context.getters.order.lineItems.vaps); syncLineItemIds(response.data, context.getters.order.lineItems.vaps);
console.log(response.data) console.log(response.data);
return response; 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 // clone the lineItems array because what we're passing in is referencing the store directly
const lineItems = deepClone(storeLineItems); const lineItems = deepClone(storeLineItems);
@ -2580,8 +2579,9 @@ export function mapTaxedAvailableLineItemsToStoreFormat(availableLineItems, stor
lineItemsInCategory = lineItemsInCategory ?? []; lineItemsInCategory = lineItemsInCategory ?? [];
for (let lineItemIndex = 0; lineItemIndex < lineItemsInCategory.length; lineItemIndex++) { for (let lineItemIndex = 0; lineItemIndex < lineItemsInCategory.length; lineItemIndex++) {
const availableLineItem = availableLineItems.find(
const availableLineItem = availableLineItems.find(ali => ali.partNumber == lineItemsInCategory[lineItemIndex].partNumber); (ali) => ali.partNumber == lineItemsInCategory[lineItemIndex].partNumber
);
if (availableLineItem) { if (availableLineItem) {
lineItemsInCategory[lineItemIndex].salesTax = availableLineItem.salesTax; lineItemsInCategory[lineItemIndex].salesTax = availableLineItem.salesTax;
} }
@ -2663,7 +2663,6 @@ function addGuidToLineItemsIfNotAlreadyThere(lineItems) {
} }
function syncLineItemIds(lineItemsWithoutIds, lineItemsWithIds) { function syncLineItemIds(lineItemsWithoutIds, lineItemsWithIds) {
if (!lineItemsWithIds || !lineItemsWithoutIds) { if (!lineItemsWithIds || !lineItemsWithoutIds) {
return; return;
} }