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

CASH-1712: missed save for merge conflict; committing conflict resolve

Browse source
This commit is contained in:
AdamCaouetteSafelite 2025-10-28 16:05:50 -04:00
parent 4d705ab3f1
commit cdeede1ed6
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -579,13 +579,8 @@ export default {
vm.showPricingByDay = false; // Pricing By Day is not used in this version vm.showPricingByDay = false; // Pricing By Day is not used in this version
vm.preSelectedDate = preSelectedDate; vm.preSelectedDate = preSelectedDate;
vm.appointmentType = appointmentType; vm.appointmentType = appointmentType;
<<<<<<< HEAD
vm.setDataOnLoad( vm.setDataOnLoad(
resultMap.zipCodeData, resultMap.zipCodeData,
=======
vm.setData(
zipCodeData,
>>>>>>> release/2025.11.06
resultMap.serviceabilityDetails, resultMap.serviceabilityDetails,
pricedMobileFeePart, pricedMobileFeePart,
shopProviderData.data shopProviderData.data
@ -1630,7 +1625,6 @@ export default {
this.updateSelectedProvider(); this.updateSelectedProvider();
}, },
updateSelectedProvider(newShopProvider) { updateSelectedProvider(newShopProvider) {
if (newShopProvider) { if (newShopProvider) {
this.selectedProvider = newShopProvider; this.selectedProvider = newShopProvider;
} else if (this.appointmentType === this.appointmentTypeStrings.MOBILE) { } else if (this.appointmentType === this.appointmentTypeStrings.MOBILE) {