From bc0a6dfb1239c0f327fa2d8abad38f1448c9c055 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Sun, 11 Jun 2023 06:29:31 -0400 Subject: [PATCH 1/2] CSR-1144 rename function to reset schedule and use part type to find early bird selection. --- src/store/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/store/index.js b/src/store/index.js index ee6e40450..3b7bb4314 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -344,7 +344,7 @@ export const mutations = { //early bird fee used on schedule page also needs reset when schedule is reset const supportingItems = state.order.lineItems.supportingItems; const removeEarlyBirdIndex = supportingItems.findIndex( - (item) => item.partNumber == PREMIUM_FEE_PART_TYPE + (item) => item.partType == PREMIUM_FEE_PART_TYPE ); if (removeEarlyBirdIndex >= 0) { @@ -1431,7 +1431,7 @@ export const actions = { response.data ); - await validateAppointment(context, response.data.order); + await resetScheduleIfUnavailable(context, response.data.order); return response; }, (error) => { @@ -2071,7 +2071,7 @@ function convertGlassPieceToBackEndCompatibleFormat(glassPieces) { // check to see if we have an appointment date on the order object. // if so, make sure it's not in the past. if in the past, clear schedule info in store. // if date not in past, then call schedule service to verify appointment is still available. -async function validateAppointment(context, order) { +async function resetScheduleIfUnavailable(context, order) { if (!order.schedule?.date) { return; } @@ -2124,7 +2124,7 @@ async function validateAppointment(context, order) { // if early bird fee is in supporting items then need to check the timeslot to see if offer premium is also still available if ( order.lineItem?.supportingItems?.findIndex( - (item) => item.partNumber == PREMIUM_FEE_PART_TYPE + (item) => item.partType == PREMIUM_FEE_PART_TYPE ) ) { newTimeSlotsResponse.data.days?.forEach((day) => { From 201e90268b3c5206ee5ffa7d33aa9989f58a74c9 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Tue, 13 Jun 2023 06:18:41 -0400 Subject: [PATCH 2/2] CSR-1144 Use parttype to determine early bird --- src/layouts/schedule/schedule.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/layouts/schedule/schedule.vue b/src/layouts/schedule/schedule.vue index 8abd2ca5b..69b1de0c1 100644 --- a/src/layouts/schedule/schedule.vue +++ b/src/layouts/schedule/schedule.vue @@ -357,7 +357,7 @@ export default { this.selectedTimeSlotData?.isPremiumAppointment ) { const earlyBirdIndex = supportingItems.findIndex( - (item) => item.partNumber == PREMIUM_FEE_PART_TYPE + (item) => item.partType == PREMIUM_FEE_PART_TYPE ); if (earlyBirdIndex >= 0) { @@ -379,7 +379,7 @@ export default { } else { // if it's not a mobile and/or premium early bird, then make sure we remove any that may have been added const removeEarlyBirdIndex = supportingItems.findIndex( - (item) => item.partNumber == PREMIUM_FEE_PART_TYPE + (item) => item.partType == PREMIUM_FEE_PART_TYPE ); if (removeEarlyBirdIndex >= 0) {