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

Merge pull request #2629 from Safelite/feature/CASH-845-stage-3

Browse source 
Feature/cash 845 stage 3
This commit is contained in:
AdamCaouetteSafelite 2025-07-09 15:50:08 -04:00 committed by GitHub
commit b7ac78aaca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/layouts/schedule/schedule.vue
View file

@ -80,10 +80,11 @@
labelBold="true" /> labelBold="true" />
</div> </div>
</div> </div>
<div class="row justify-content-center your-shop-location"> <div
class="row justify-content-center your-shop-location"
v-if="appointmentType && appointmentType !== appointmentTypeStrings.MOBILE">
<div class="col-md-6 col-xl-4"> <div class="col-md-6 col-xl-4">
<button-question <button-question
v-if="appointmentType == appointmentTypeStrings.IN_SHOP"
class="shop-question-button" class="shop-question-button"
ref="buttonQuestion" ref="buttonQuestion"
:answers="selectedShopAnswer" :answers="selectedShopAnswer"
@ -753,7 +754,11 @@ export default {
} }
}, },
isShopQuestionDisplayed() { isShopQuestionDisplayed() {
return this.appointmentType === "Inshop" || this.appointmentType === "Dropoff"; return (
this.appointmentType === AppointmentTypeStrings.IN_SHOP ||
this.appointmentType === AppointmentTypeStrings.DROP_OFF ||
AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF
);
}, },
isAppointmentTypeDisplayed() { isAppointmentTypeDisplayed() {
// temporary adjustment // temporary adjustment

15
src/layouts/service-location/shop-question/shop-question-popup.vue
View file

@ -134,7 +134,7 @@ export default {
}; };
}, },
props: { props: {
selectedAppointmentType: String, appointmentType: String,
shopProviderData: Object, shopProviderData: Object,
modelValue: { modelValue: {
type: Object, type: Object,
@ -201,7 +201,7 @@ export default {
availabilityRatingCallback: getAvailabilityRating, availabilityRatingCallback: getAvailabilityRating,
startDate: formattedStartDate, startDate: formattedStartDate,
endDate: formattedEndDate, endDate: formattedEndDate,
shopAppointmentType: this.selectedAppointmentType, shopAppointmentType: this.appointmentType,
}; };
}, },
showMoreShopsLinkText() { showMoreShopsLinkText() {
@ -271,8 +271,9 @@ export default {
gaAction = this.GaActions.SHOPS_FIRST_DISPLAYED; gaAction = this.GaActions.SHOPS_FIRST_DISPLAYED;
} }
if ( if (
this.selectedAppointmentType === AppointmentTypeStrings.IN_SHOP || this.appointmentType === AppointmentTypeStrings.IN_SHOP ||
this.selectedAppointmentType === AppointmentTypeStrings.DROP_OFF this.appointmentType === AppointmentTypeStrings.DROP_OFF ||
this.appointmentType === AppointmentTypeStrings.IN_SHOP_OR_DROP_OFF
) { ) {
var shops = mappedData.map((shop) => { var shops = mappedData.map((shop) => {
if (shop.value.length > 5 && shop.value.startsWith("00")) { if (shop.value.length > 5 && shop.value.startsWith("00")) {
@ -405,7 +406,7 @@ export default {
} }
this.localShopProviderData = result.data; this.localShopProviderData = result.data;
this.updateShopsForZip(this.internalModel.zipCode); this.updateShopsForZip(this.internalModel.zipCode);
if (this.selectedAppointmentType === "Mobile") { if (this.appointmentType === AppointmentTypeStrings.MOBILE) {
this.selectedProvider = new Provider( this.selectedProvider = new Provider(
this.shopProviderData.mobileProviderNumber this.shopProviderData.mobileProviderNumber
); );
@ -417,7 +418,7 @@ export default {
} }
}, },
async updateShopsForZip(zipCode) { async updateShopsForZip(zipCode) {
if (!this.selectedAppointmentType) { if (!this.appointmentType) {
this.answers = []; this.answers = [];
this.isLoadingShops = false; this.isLoadingShops = false;
return; return;
@ -476,7 +477,7 @@ export default {
availabilityRatingCallback: getAvailabilityRating, availabilityRatingCallback: getAvailabilityRating,
startDate: formattedStartDate, startDate: formattedStartDate,
endDate: formattedEndDate, endDate: formattedEndDate,
shopAppointmentType: this.selectedAppointmentType, shopAppointmentType: this.appointmentType,
}, },
value: shopProvider.providerNumber, value: shopProvider.providerNumber,
}; };