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

Merge pull request #2961 from Safelite/rlsmerge/2025.12.04-to-develop

Browse source 
Rlsmerge/2025.12.04-to-develop
This commit is contained in:
Chris 2025-12-02 11:03:03 -05:00 committed by GitHub
commit d43e43493b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 42 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/fmg-components/funnel-footer/funnel-footer.vue
View file

@ -75,17 +75,12 @@ export default {
:deep(a) { :deep(a) {
text-decoration: none; text-decoration: none;
&.new-window-link { &.new-window-link,
font-family: Urbanist, Arial, Helvetica, sans-serif;
margin: 0 0.75rem;
color: $gray-600;
font-weight: 400;
}
&.navigation-link { &.navigation-link {
font-family: Urbanist, Arial, Helvetica, sans-serif; font-family: UrbanistRegular, Arial, Helvetica, sans-serif;
margin: 0 0.75rem; margin: 0 0.75rem;
color: $gray-600; color: $gray-600;
font-weight: 400; font-weight: initial;
} }
} }

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

@ -986,8 +986,9 @@ export default {
} }
} }
} }
:deep(span.label) { :deep(span.label),
font-weight: 600; :deep(span) {
font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
} }
:deep(div.service-questions span) { :deep(div.service-questions span) {
color: $black; color: $black;

2
src/layouts/quote/quote.vue
View file

@ -581,7 +581,7 @@ export default {
return store.getters.isRecalibrationOnOrder; return store.getters.isRecalibrationOnOrder;
}, },
isQuotePageDiscountOnOrder() { isQuotePageDiscountOnOrder() {
return this.quotePageDiscountPartsInfo?.length > 0; return this.quoteDiscountPartsInfo?.length > 0;
}, },
shouldHideRecalibration() { shouldHideRecalibration() {
return ( return (

6
src/layouts/quote/service-package-question/service-package-radio/service-package-radio.vue
View file

@ -294,12 +294,11 @@ export default {
.pricing-info .insurance-pricing span { .pricing-info .insurance-pricing span {
font-size: 0.875rem; font-size: 0.875rem;
font-family: Urbanist, Arial, Helvetica, sans-serif; font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
font-weight: 500;
} }
p { p {
font-family: Urbanist, Arial, Helvetica, sans-serif; font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
@ -312,7 +311,6 @@ export default {
color: $green; color: $green;
font-size: 0.875rem; font-size: 0.875rem;
font-family: UrbanistSemibold, Arial, Helvetica, sans-serif; font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
font-weight: 600;
@include media-breakpoint-up(md) { @include media-breakpoint-up(md) {
position: absolute; position: absolute;
bottom: 0.75rem; bottom: 0.75rem;

1
src/layouts/schedule/mobile-first-modal/mobile-first-modal.vue
View file

@ -76,6 +76,7 @@ export default {
let selectedTimeSlot = { let selectedTimeSlot = {
timeSlot: this.selectedAppontment.timeSlot, timeSlot: this.selectedAppontment.timeSlot,
routeCode: this.selectedAppontment.timeSlot.id, routeCode: this.selectedAppontment.timeSlot.id,
date: this.selectedAppontment.date,
}; };
this.$emit("confirm-appointment", selectedTimeSlot); this.$emit("confirm-appointment", selectedTimeSlot);
this.modal.closeModal(); this.modal.closeModal();

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

@ -469,6 +469,11 @@ export default {
navigatingForward: false, navigatingForward: false,
shopListButton: shopListButton, shopListButton: shopListButton,
lastSelectedInshopOrDropoffProvider: null, lastSelectedInshopOrDropoffProvider: null,
selectedMobileFirstAppointment: false,
isShowMobileFirstAppt: experimentMixin.methods.hasSettingEqualTo(
experimentSettings.SHOW_MOBILE_FIRST_APPT,
"true"
),
}; };
}, },
async beforeRouteEnter(to, from, next) { async beforeRouteEnter(to, from, next) {
@ -597,7 +602,9 @@ export default {
pricedMobileFeePart, pricedMobileFeePart,
shopProviderData.data shopProviderData.data
); );
vm.initializeDatePicker(); vm.initializeDatePicker().then(() => {
vm.showMobileFirstModal();
});
}); });
}, },
computed: { computed: {
@ -858,7 +865,9 @@ export default {
); );
}, },
isMobileFirstModalOpen() { isMobileFirstModalOpen() {
return this.isMobileSelected ? this.$refs.mobileFirstModal?.getIsModalOpen() : false; return this.selectableDatesMobile.days
? this.$refs.mobileFirstModal?.getIsModalOpen()
: false;
}, },
}, },
methods: { methods: {
@ -1187,12 +1196,12 @@ export default {
moreShopTimeSlots.mobileTimeSlotsData.days moreShopTimeSlots.mobileTimeSlotsData.days
); );
this.showMobileFirstModal();
return moreShopTimeSlots; return moreShopTimeSlots;
}, },
async initializeDatePicker() { async initializeDatePicker() {
this.isShowMobileFirstAppt && this.showLoadingModal();
this.selectedDate = null; this.selectedDate = null;
const includeMobileTimeSlots = this.isServiceableMobile; const includeMobileTimeSlots = this.isServiceableMobile;
@ -1230,6 +1239,8 @@ export default {
this.setDisplayWaitList(); this.setDisplayWaitList();
} }
} }
this.isShowMobileFirstAppt && this.hideLoadingModal();
}, },
getScheduleApiResponse, getScheduleApiResponse,
getServiceZipCtuCodeFromStore() { getServiceZipCtuCodeFromStore() {
@ -1346,6 +1357,9 @@ export default {
showLoadingModal() { showLoadingModal() {
this.$refs.loadingModal.showModal(); this.$refs.loadingModal.showModal();
}, },
hideLoadingModal() {
this.$refs.loadingModal.hideModal();
},
async forwardButtonAction() { async forwardButtonAction() {
this.navigatingForward = true; this.navigatingForward = true;
var ctu = this.zipCodeCtu; var ctu = this.zipCodeCtu;
@ -1678,7 +1692,9 @@ export default {
this.zipCode = newZipCode.zipCode; this.zipCode = newZipCode.zipCode;
this.zipCodeCtu = newZipCode.zipCodeCtu; this.zipCodeCtu = newZipCode.zipCodeCtu;
this.selectedDate = null; this.selectedDate = null;
this.initializeDatePicker(); this.initializeDatePicker().then(() => {
this.showMobileFirstModal();
});
}); });
}, },
updateSelectedProviderAndZipCode(newZipCode, newProvider) { updateSelectedProviderAndZipCode(newZipCode, newProvider) {
@ -1716,7 +1732,6 @@ export default {
} }
this.appointmentType = AppointmentTypeStrings.MOBILE; this.appointmentType = AppointmentTypeStrings.MOBILE;
this.updateSelectedProvider(); this.updateSelectedProvider();
this.showMobileFirstModal();
} else if (newAppointmentType) { } else if (newAppointmentType) {
if (this.appointmentType != AppointmentTypeStrings.MOBILE) { if (this.appointmentType != AppointmentTypeStrings.MOBILE) {
// Clear last shop selected if appointment type was changed in any manner other than from Mobile // Clear last shop selected if appointment type was changed in any manner other than from Mobile
@ -1742,11 +1757,7 @@ export default {
this.selectedDate = this.getFirstAvailableDate(); this.selectedDate = this.getFirstAvailableDate();
}, },
async showMobileFirstModal() { async showMobileFirstModal() {
if (this.appointmentType == AppointmentTypeStrings.MOBILE) { if (!this.selectedRouteCodeData?.routeCode) {
const isShowMobileFirstAppt = experimentMixin.methods.hasSettingEqualTo(
experimentSettings.SHOW_MOBILE_FIRST_APPT,
"true"
);
const pmMobileDays = experimentMixin.methods.getSettingValue( const pmMobileDays = experimentMixin.methods.getSettingValue(
experimentSettings.SHOW_PM_MOBILE_DAYS experimentSettings.SHOW_PM_MOBILE_DAYS
); );
@ -1801,7 +1812,7 @@ export default {
); );
} }
if (isShowMobileFirstAppt) { if (this.isShowMobileFirstAppt) {
if (firstMobilePMDate && numberOfDaysToFirstMobilePMDate <= pmMobileDays) { if (firstMobilePMDate && numberOfDaysToFirstMobilePMDate <= pmMobileDays) {
preSelectedMobileAppointment = firstMobilePMAppt; preSelectedMobileAppointment = firstMobilePMAppt;
} else if ( } else if (
@ -1824,9 +1835,6 @@ export default {
} }
}, },
async getFirstAvailableMobileApptByTOD(timeOfDay) { async getFirstAvailableMobileApptByTOD(timeOfDay) {
if (!this.selectableDatesMobile.days) {
await this.initializeDatePicker();
}
if (!this.selectableDatesMobile?.days?.length) { if (!this.selectableDatesMobile?.days?.length) {
return null; return null;
} else { } else {
@ -1853,6 +1861,10 @@ export default {
} }
}, },
updateTimeSlotandNavigateForward(timeSlotObj) { updateTimeSlotandNavigateForward(timeSlotObj) {
this.selectedMobileFirstAppointment = true;
this.appointmentType = AppointmentTypeStrings.MOBILE;
this.selectedDate = timeSlotObj.date;
this.updateSelectedProvider();
this.updateTimeSlot(timeSlotObj); this.updateTimeSlot(timeSlotObj);
this.forwardButtonAction(); this.forwardButtonAction();
}, },
@ -1872,7 +1884,7 @@ export default {
const hasValueChanged = newValue !== oldValue; const hasValueChanged = newValue !== oldValue;
const isDateDifferent = (newValue || oldValue) !== selectedDate; const isDateDifferent = (newValue || oldValue) !== selectedDate;
if (hasValueChanged && isDateDifferent) { if (hasValueChanged && isDateDifferent && !this.selectedMobileFirstAppointment) {
this.selectedTimeSlotInfo = { this.selectedTimeSlotInfo = {
timeSlot: { timeSlot: {
date: null, date: null,

2
src/layouts/schedule/shop-location/shop-location.vue
View file

@ -109,10 +109,10 @@ export default {
border-radius: $border-radius-pill; border-radius: $border-radius-pill;
a { a {
font-family: UrbanistSemibold;
display: inline-block; display: inline-block;
text-decoration: none; text-decoration: none;
color: $white; color: $white;
font-weight: $font-weight-600;
line-height: 1.5rem; line-height: 1.5rem;
padding: 0.75rem 3rem; padding: 0.75rem 3rem;
} }

4
src/styles/ux-variables.scss
View file

@ -123,8 +123,8 @@ $body-color: $gray-600;
//Fonts //Fonts
$font-family-sans-serif: UrbanistRegular, Arial, Helvetica, sans-serif; $font-family-sans-serif: UrbanistRegular, Arial, Helvetica, sans-serif;
$font-family-monospace: UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", $font-family-monospace:
monospace; UrbanistRegular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
// stylelint-enable value-keyword-case // stylelint-enable value-keyword-case
$font-family-base: $font-family-sans-serif; $font-family-base: $font-family-sans-serif;
$font-family-code: $font-family-monospace; $font-family-code: $font-family-monospace;

7
src/ux-components/button-main/button-main.vue
View file

@ -63,13 +63,13 @@ export default {
<style lang="scss"> <style lang="scss">
.btn { .btn {
font-family: UrbanistSemibold, Arial, Helvetica, sans-serif;
&.btn-primary { &.btn-primary {
position: relative; position: relative;
background: $red; background: $red;
border: none; border: none;
color: $white; color: $white;
justify-content: center; justify-content: center;
font-weight: 500;
@media (hover: hover) { @media (hover: hover) {
background: $red; background: $red;
} }
@ -92,7 +92,6 @@ export default {
background: $gray-200 !important; background: $gray-200 !important;
background: $red !important; background: $red !important;
color: $white !important; color: $white !important;
font-weight: 400;
height: 48px; height: 48px;
border: none; border: none;
cursor: pointer; cursor: pointer;
@ -116,7 +115,6 @@ export default {
background: transparent; background: transparent;
border: 1px solid $blue; border: 1px solid $blue;
color: $blue; color: $blue;
font-weight: 500;
transition: all 150ms linear; transition: all 150ms linear;
height: 3rem; height: 3rem;
&:hover { &:hover {
@ -137,7 +135,6 @@ export default {
&:disabled { &:disabled {
background: transparent; background: transparent;
color: $red !important; color: $red !important;
font-weight: 400;
height: 48px; height: 48px;
border: 1px solid $red; border: 1px solid $red;
cursor: pointer; cursor: pointer;
@ -157,7 +154,6 @@ export default {
background: $green-100; background: $green-100;
border: 1px solid $green-400; border: 1px solid $green-400;
color: $black; color: $black;
font-weight: 500;
transition: all 150ms linear; transition: all 150ms linear;
height: 3rem; height: 3rem;
&:hover { &:hover {
@ -177,7 +173,6 @@ export default {
&:disabled { &:disabled {
background: transparent; background: transparent;
color: $gray-550 !important; color: $gray-550 !important;
font-weight: 400;
height: 48px; height: 48px;
border: 1px solid $gray-550; border: 1px solid $gray-550;
cursor: pointer; cursor: pointer;