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

Merge branch 'release/2025.05.22' into feature/CASH-535

Browse source
This commit is contained in:
mvalaiyapathi 2025-05-07 13:06:29 -04:00 committed by GitHub
commit e09e490fe5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 38 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/digital-components/modal/modal.vue
View file

@ -119,12 +119,14 @@ export default {
}, },
onModalOpened() { onModalOpened() {
this.onModalOpenedCallback?.(); this.onModalOpenedCallback?.();
this.$emit("isModalOpened", true);
}, },
onModalClosed() { onModalClosed() {
this.resetButtonStyle(); this.resetButtonStyle();
this.onModalClosedCallback?.(); this.onModalClosedCallback?.();
if (this.suppressPageScroll) if (this.suppressPageScroll)
document.querySelector("body").classList.remove("prevent-modal-scroll"); document.querySelector("body").classList.remove("prevent-modal-scroll");
this.$emit("isModalOpened", false);
}, },
openModal() { openModal() {
if (this.suppressPageScroll) if (this.suppressPageScroll)

28
src/digital-components/salesforce-webchat/salesforce-webchat.vue
View file

@ -68,40 +68,40 @@ export default {
.dockableContainer { .dockableContainer {
&.showDockableContainer { &.showDockableContainer {
font-family: AvertaRegular; font-family: AvertaRegular;
color: #4d5151; color: $gray-600;
.sidebarBody { .sidebarBody {
button { button {
background: #0070d1; background: $blue;
color: #fff; color: $white;
&:hover { &:hover {
background: #06577c !important; background: $blue-700 !important;
} }
} }
.form-element__help { .form-element__help {
color: #db0020; color: $red;
} }
.embeddedServiceSidebarFormField { .embeddedServiceSidebarFormField {
.uiInput { .uiInput {
.uiLabel-left { .uiLabel-left {
color: #4d5151; color: $gray-600;
} }
} }
} }
.embeddedServiceSidebarButton { .embeddedServiceSidebarButton {
&.uiButton--inverse { &.uiButton--inverse {
.label { .label {
color: #fff; color: $white;
text-decoration: underline; text-decoration: underline;
} }
&:not(:disabled):focus { &:not(:disabled):focus {
background-color: #0070d1; background-color: $blue;
} }
} }
} }
.embeddedServiceLiveAgentStateChatAvatar { .embeddedServiceLiveAgentStateChatAvatar {
&.isLightningOutContext { &.isLightningOutContext {
.agentIconColor0 { .agentIconColor0 {
background-color: #0070d1; background-color: $blue;
} }
} }
} }
@ -130,11 +130,11 @@ export default {
} }
} }
.chatHeaderBranding { .chatHeaderBranding {
background-color: #0070d1; background-color: $blue;
} }
span { span {
&.required { &.required {
color: #db0020; color: $red;
} }
} }
} }
@ -142,7 +142,7 @@ export default {
.embeddedServiceHelpButton { .embeddedServiceHelpButton {
.helpButton { .helpButton {
.uiButton { .uiButton {
background-color: #0070d1 !important; background-color: $blue !important;
} }
} }
.embeddedServiceIcon { .embeddedServiceIcon {
@ -158,8 +158,8 @@ export default {
.sidebarHeader { .sidebarHeader {
&.minimizedContainer { &.minimizedContainer {
.embeddedServiceSidebarMinimizedDefaultUI { .embeddedServiceSidebarMinimizedDefaultUI {
background-color: #0070d1; background-color: $blue;
border: 1px solid #0070d1; border: 1px solid $blue;
} }
} }
} }

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

@ -375,6 +375,10 @@ export default {
setTimeout(() => { setTimeout(() => {
this.$refs.datePicker.showAnotherMonth().then((moreSelectableDatesData) => { this.$refs.datePicker.showAnotherMonth().then((moreSelectableDatesData) => {
this.selectableDatesData = moreSelectableDatesData; this.selectableDatesData = moreSelectableDatesData;
if (selectableDatesData?.days?.length > 0) {
this.selectedDate = selectableDatesData.days[0].date;
}
this.setDisplayWaitList(); this.setDisplayWaitList();
}); });
}, 50); }, 50);

2
src/layouts/service-location/mobile-location-modal-questions/mobile-location-modal-questions.vue
View file

@ -97,6 +97,7 @@ export default {
"updated-contains-military-base", "updated-contains-military-base",
"updated-bill-to-account-number", "updated-bill-to-account-number",
"setMobileLocationAndProceed", "setMobileLocationAndProceed",
"updated-modal-opened",
], ],
data() { data() {
return { return {
@ -228,6 +229,7 @@ export default {
}, },
setModalStatus(isOpened) { setModalStatus(isOpened) {
this.isModalOpened = isOpened; this.isModalOpened = isOpened;
this.$emit("updated-modal-opened", isOpened);
}, },
closeModal() { closeModal() {
this.modal.closeModal(); this.modal.closeModal();

14
src/layouts/service-location/service-location.spec.js
View file

@ -343,7 +343,7 @@ describe("service-location.vue", () => {
zipCode: "43054", zipCode: "43054",
}, },
isVehicleProtected: true, isVehicleProtected: true,
isMobileSelected: true, isMobileSelectedAndModalClosed: true,
}; };
wrapper.vm.mobileLocationQuestions = mobileLocationQuestions; wrapper.vm.mobileLocationQuestions = mobileLocationQuestions;
@ -356,7 +356,7 @@ describe("service-location.vue", () => {
zipCode: "61606", zipCode: "61606",
}, },
isVehicleProtected: null, isVehicleProtected: null,
isMobileSelected: false, isMobileSelectedAndModalClosed: false,
}; };
// Act // Act
@ -459,7 +459,7 @@ describe("service-location.vue", () => {
zipCode: "", zipCode: "",
}, },
isVehicleProtected: null, isVehicleProtected: null,
isMobileSelected: false, isMobileSelectedAndModalClosed: false,
}; };
wrapper.vm.mobileLocationQuestions = mobileLocationQuestions; wrapper.vm.mobileLocationQuestions = mobileLocationQuestions;
const newMobileLocationQuestions = { const newMobileLocationQuestions = {
@ -471,7 +471,7 @@ describe("service-location.vue", () => {
zipCode: "43054", zipCode: "43054",
}, },
isVehicleProtected: true, isVehicleProtected: true,
isMobileSelected: true, isMobileSelectedAndModalClosed: true,
}; };
wrapper.vm.closeModalAction = jest.fn(); wrapper.vm.closeModalAction = jest.fn();
@ -521,7 +521,7 @@ describe("service-location.vue", () => {
zipCode: "", zipCode: "",
}, },
isVehicleProtected: null, isVehicleProtected: null,
isMobileSelected: false, isMobileSelectedAndModalClosed: false,
mobileFeePart: null, mobileFeePart: null,
}; };
wrapper.vm.mobileLocationQuestions = mobileLocationQuestions; wrapper.vm.mobileLocationQuestions = mobileLocationQuestions;
@ -535,7 +535,7 @@ describe("service-location.vue", () => {
zipCode: "43081", zipCode: "43081",
}, },
isVehicleProtected: true, isVehicleProtected: true,
isMobileSelected: true, isMobileSelectedAndModalClosed: true,
mobileFeePart: null, mobileFeePart: null,
}; };
@ -599,7 +599,7 @@ describe("service-location.vue", () => {
zipCode: "43081", zipCode: "43081",
}, },
isVehicleProtected: "YesAnswer", isVehicleProtected: "YesAnswer",
isMobileSelected: true, isMobileSelectedAndModalClosed: true,
}; };
wrapper.vm.closeModalAction = jest.fn(); wrapper.vm.closeModalAction = jest.fn();

11
src/layouts/service-location/service-location.vue
View file

@ -98,6 +98,7 @@
@updated-serviceability="setServiceabilityDetails" @updated-serviceability="setServiceabilityDetails"
@updated-contains-military-base="setContainsMilitaryBase" @updated-contains-military-base="setContainsMilitaryBase"
@updated-mobile-ctu="setCtuForMobile" @updated-mobile-ctu="setCtuForMobile"
@updated-modal-opened="setMobileLocationModalOpened"
validationRules="mobile-location-required" validationRules="mobile-location-required"
ref="mobileLocationQuestions" ref="mobileLocationQuestions"
linkWidgetName="MobileLocationLinkWidget" linkWidgetName="MobileLocationLinkWidget"
@ -172,7 +173,7 @@ const MOBILE_FEE_PART_TYPE = "MOBILE FEE";
// DEFINE VALIDATION RULES // DEFINE VALIDATION RULES
defineRule("mobile-location-required", (value) => { defineRule("mobile-location-required", (value) => {
if ( if (
value.isMobileSelected && value.isMobileSelectedAndModalClosed &&
(!value.addressQuestions.streetAddress || (!value.addressQuestions.streetAddress ||
!value.addressQuestions.city || !value.addressQuestions.city ||
!value.addressQuestions.state || !value.addressQuestions.state ||
@ -211,6 +212,7 @@ export default {
billToAccountNumber: null, billToAccountNumber: null,
shopProviderData: null, shopProviderData: null,
navigatingForward: false, navigatingForward: false,
mobileLocationModalOpened: false,
}; };
}, },
async beforeRouteEnter(to, from, next) { async beforeRouteEnter(to, from, next) {
@ -301,7 +303,9 @@ export default {
zipCode: this.zipCode, zipCode: this.zipCode,
}, },
isVehicleProtected: this.isVehicleProtected, isVehicleProtected: this.isVehicleProtected,
isMobileSelected: this.selectedAppointmentType === "Mobile", isMobileSelectedAndModalClosed:
this.selectedAppointmentType === "Mobile" &&
!this.mobileLocationModalOpened,
}; };
}, },
}, },
@ -502,6 +506,9 @@ export default {
setRecycleFeePart(recycleFeePart) { setRecycleFeePart(recycleFeePart) {
this.recycleFeePart = recycleFeePart; this.recycleFeePart = recycleFeePart;
}, },
setMobileLocationModalOpened(isModalOpened) {
this.mobileLocationModalOpened = isModalOpened;
},
//creating async function as the computed property can not directly handle asynchronous operations or promises. //creating async function as the computed property can not directly handle asynchronous operations or promises.
async setMobileLocationQuestions(newValue) { async setMobileLocationQuestions(newValue) {
var newZipCode = newValue.addressQuestions.zipCode; var newZipCode = newValue.addressQuestions.zipCode;