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

Merge branch 'release/2025.10.23' into revert-prs-from-CASH-1315

Browse source
This commit is contained in:
AdamCaouetteSafelite 2025-10-20 12:51:15 -04:00 committed by GitHub
commit 7e437adbe3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/fmg-components/save-progress-popup-question/save-progress-popup-question.vue
View file

@ -250,7 +250,8 @@ export default {
} }
} }
.modal-disclaimer { .modal-disclaimer {
font-size: 0.75rem; font-size: 0.8125rem;
color: #525656;
text-align: left; text-align: left;
order: 3; order: 3;
margin: 0; margin: 0;

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

@ -669,10 +669,12 @@ export default {
: this.ServiceLocationFullAddress.zipCode; : this.ServiceLocationFullAddress.zipCode;
}, },
AppointmentWordingText() { AppointmentWordingText() {
return this.getCmsContent("ApptDetailsSnapshotWidget", "BodyText")?.replaceAll( const text = this.getCmsContent("ApptDetailsSnapshotWidget", "BodyText")?.replaceAll(
"{custom:ADDRESS}", "{custom:ADDRESS}",
this.ServiceLocationFullAddressText this.ServiceLocationFullAddressText
); );
return text?.replace(/\barriving between\b/gi, "<span>arriving between</span>");
}, },
isRecalibrationOnOrder() { isRecalibrationOnOrder() {
const order = baseMixin.methods.hasSubmittedOrder() const order = baseMixin.methods.hasSubmittedOrder()
@ -799,14 +801,17 @@ export default {
}, },
isRecalPriceRemove() { isRecalPriceRemove() {
return ( return (
!this.isInsurance &&
this.getSettingValue(experimentSettings.RECAL_PRICE_REMOVE)?.toLowerCase() === this.getSettingValue(experimentSettings.RECAL_PRICE_REMOVE)?.toLowerCase() ===
"true" "true" &&
this.isRecalibrationOnOrder
); );
}, },
isAfterpayBreakoutDisplay() { isAfterpayBreakoutDisplay() {
return ( return (
this.showInsuranceCoverageAs !== coverageStatus.PENDING && this.showInsuranceCoverageAs !== coverageStatus.PENDING &&
!this.isRecalPriceRemove && !this.isRecalPriceRemove &&
this.isPiaEnabled &&
this.hasSettingEqualTo(experimentSettings.DISPLAY_AFTERPAY_BREAKOUT_DISPLAY, "true") this.hasSettingEqualTo(experimentSettings.DISPLAY_AFTERPAY_BREAKOUT_DISPLAY, "true")
); );
}, },

4
src/layouts/schedule/time-slot-question/time-slot-question.vue
View file

@ -509,8 +509,12 @@ export default {
// this.availableTimeSlots only returns mobile/inshop slots so we know // this.availableTimeSlots only returns mobile/inshop slots so we know
// the only available slot is not dropOFf // the only available slot is not dropOFf
this.selectedAnswerForTimeSlots = this.availableTimeSlots[0].value; this.selectedAnswerForTimeSlots = this.availableTimeSlots[0].value;
// emit up to parent that the time slot has been selected (when mobile or inshop)
this.timeSlotSelectionChanged(this.availableTimeSlots[0].value);
} else { } else {
this.selectedAnswerForDropOffOrInshop = this.answersForDropOffQuestion[0].value; this.selectedAnswerForDropOffOrInshop = this.answersForDropOffQuestion[0].value;
// emit up to parent that the time slot has been selected (when only dropoff)
this.dropOffSelectionChanged(this.answersForDropOffQuestion[0].value);
} }
} }
}, },