From b69cd08e89ca83e6d50c3b8ed8007cfe0ddea98a Mon Sep 17 00:00:00 2001 From: Bryan Mauger Date: Tue, 13 May 2025 15:31:38 -0400 Subject: [PATCH 1/4] CASH-429 adjust calendar spacing. --- src/digital-components/date-picker/date-picker.vue | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index b23ccece2..30c285b6a 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -854,7 +854,7 @@ export default { } .calendar-grid-container { margin: 0 auto 1rem auto; - max-width: 400px; + max-width: 360px; position: relative; transition: height ease 2s, @@ -864,9 +864,6 @@ export default { justify-content: center; align-items: center; padding: 0; - @include media-breakpoint-up(md) { - padding: 0 0.75rem; - } opacity: 1; .grid-item { From 72952209ee8b5a2c3fff8f6a0ebe90b393e2626c Mon Sep 17 00:00:00 2001 From: Adam Caouette Date: Tue, 13 May 2025 16:11:49 -0400 Subject: [PATCH 2/4] CASH-690: fix view more dates error --- .../date-picker/date-picker.vue | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/digital-components/date-picker/date-picker.vue b/src/digital-components/date-picker/date-picker.vue index 1a7df91e0..ecb83fc36 100644 --- a/src/digital-components/date-picker/date-picker.vue +++ b/src/digital-components/date-picker/date-picker.vue @@ -688,17 +688,18 @@ export default { if (!this.months) return; this.isLoading = true; let monthToShow; - let monthStartDateNum = 0; + let monthStartDate; if (this.hideSomeDaysForInitialView) { monthToShow = this.months.find( ({ isMonthThatHidesSomeDaysForInitialView }) => isMonthThatHidesSomeDaysForInitialView ); + // find the first day-hidden to become the next api call start date - monthStartDateNum = - monthToShow.dates.find(({ dayClasses }) => dayClasses.includes("day-hidden")) - .dateNum - 1; + monthStartDate = monthToShow.dates.find(({ dayClasses }) => + dayClasses.includes("day-hidden") + ); } else { if (this.calendarViewDirection === "future") { monthToShow = this.months.find((month) => @@ -713,9 +714,13 @@ export default { } } if (monthToShow) { + const monthStartDateString = monthStartDate + ? monthStartDate.inputValue + : monthToShow.dates[0].inputValue; + // make new API call with this month's start and end dates const moreSelectableDatesData = await this.updateSelectableDates( - monthToShow.dates[monthStartDateNum].inputValue, + monthStartDateString, monthToShow.dates[monthToShow.dates.length - 1].inputValue ); this.isLoading = false; From 565b4bd41cab684a1dd64ead6e641f655cf16650 Mon Sep 17 00:00:00 2001 From: hiteshkumar87 Date: Wed, 14 May 2025 13:24:51 +0530 Subject: [PATCH 3/4] CASH-688 handle two async call simultaneous in case of single service type that cause availability indicators. --- .../shop-question/shop-question.vue | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/layouts/service-location/shop-question/shop-question.vue b/src/layouts/service-location/shop-question/shop-question.vue index 72862440b..5a9278d78 100644 --- a/src/layouts/service-location/shop-question/shop-question.vue +++ b/src/layouts/service-location/shop-question/shop-question.vue @@ -225,6 +225,15 @@ export default { return index; }, + async handleUpdate(selectedShopIndex = null) { + this.resetAnswers(); + if (selectedShopIndex >= 3) { + await this.getNextShopsFromList(selectedShopIndex + 1); + } else { + await this.getNextShopsFromList(); + await nextTick(); + } + }, }, watch: { selectedAppointmentType: { @@ -233,27 +242,16 @@ export default { // nothing to do with this component. We could mitigate this by showing / hiding this component with v-if but that messes // up the component initialization on page load. async handler() { - await nextTick(); - this.resetAnswers(); - this.getNextShopsFromList(); + this.handleUpdate(); }, }, shopProviders: { async handler(newValue) { - this.resetAnswers(); - - await nextTick(); const selectedShopIndex = this.getSelectedProviderIndex( newValue, this.selectedProviderNumber ); - - if (selectedShopIndex >= 3) { - await this.getNextShopsFromList(selectedShopIndex + 1); - } else { - await this.getNextShopsFromList(); - await nextTick(); - } + this.handleUpdate(selectedShopIndex); }, }, }, From 6a26eeea01047a5707e7f4844cf45d35fe69e0a6 Mon Sep 17 00:00:00 2001 From: Minojhini Valaiyapathi Date: Wed, 14 May 2025 13:42:30 -0400 Subject: [PATCH 4/4] CASH-696 - updated cashPriceSubTotal to be grabbed from store after it's saved. --- src/mixins/analytics-mixin.js | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/mixins/analytics-mixin.js b/src/mixins/analytics-mixin.js index b1df7156c..27ebb3048 100644 --- a/src/mixins/analytics-mixin.js +++ b/src/mixins/analytics-mixin.js @@ -313,15 +313,7 @@ export default { } // Cash Quote or Cash Price Sub Total - if (isPricingAvailable) { - const subtotal = baseMixin.methods - .getTotalPriceOfAllLineItemsAndChildParts(combinedLineItems, false) - .toFixed(2); - - payload.cashPriceSubTotal = parseFloat(subtotal); - } else { - payload.cashPriceSubTotal = ""; - } + payload.cashPriceSubTotal = store.getters.order?.cashPriceSubTotal ?? ""; //unverified (in scenarios we don’t display the price) if (