CASH-2751 - Added service-zip
This commit is contained in:
Minojhini Valaiyapathi
parent
c7088cbad1
commit
e7b0629294
2 changed files with 297 additions and 28 deletions
|
|
@ -179,4 +179,110 @@ describe("scheduling.vue", () => {
|
|||
wrapper.unmount();
|
||||
});
|
||||
});
|
||||
|
||||
describe("service zip", () => {
|
||||
test("prefills zipSearchCode from store on mount", () => {
|
||||
const { wrapper } = setupMocks();
|
||||
expect(wrapper.vm.zipSearchCode).toBe("43235");
|
||||
wrapper.unmount();
|
||||
});
|
||||
|
||||
test("renders serviceZipQuestion with search icon", () => {
|
||||
const { wrapper } = setupMocks();
|
||||
const zipQuestion = wrapper.find("service-zip-question-stub");
|
||||
expect(zipQuestion.exists()).toBe(true);
|
||||
expect(zipQuestion.attributes("includesearchicon")).toBeDefined();
|
||||
wrapper.unmount();
|
||||
});
|
||||
|
||||
test("validates zip on search when field is blank", async () => {
|
||||
const validate = jest.fn().mockResolvedValue({ valid: false });
|
||||
const loadSchedulingData = jest.spyOn(scheduling.methods, "loadSchedulingData");
|
||||
const { wrapper } = setupMocks();
|
||||
Object.defineProperty(wrapper.vm.$refs, "zipCodeSearch", {
|
||||
configurable: true,
|
||||
value: {
|
||||
$refs: {
|
||||
zipInputTextQuestion: { validate },
|
||||
},
|
||||
},
|
||||
});
|
||||
wrapper.vm.zipSearchCode = "";
|
||||
|
||||
await wrapper.vm.onZipSearch({ preventDefault: jest.fn() });
|
||||
|
||||
expect(validate).toHaveBeenCalled();
|
||||
expect(loadSchedulingData).not.toHaveBeenCalled();
|
||||
loadSchedulingData.mockRestore();
|
||||
wrapper.unmount();
|
||||
});
|
||||
|
||||
test("reloads providers and timeslots when a valid zip is searched", async () => {
|
||||
store.dispatch.mockClear();
|
||||
store.dispatch.mockImplementation((action) => {
|
||||
if (action === "getProviders") {
|
||||
return Promise.resolve({
|
||||
data: {
|
||||
shopProviders: [{ providerNumber: "05018" }],
|
||||
mobileProviderNumber: "12345",
|
||||
},
|
||||
});
|
||||
}
|
||||
if (action === "saveServiceZipCodeInfo") {
|
||||
return Promise.resolve();
|
||||
}
|
||||
return Promise.resolve(null);
|
||||
});
|
||||
settleAllPromises.mockResolvedValueOnce({
|
||||
inshopTimeSlots: {
|
||||
providerTimeSlots: [
|
||||
{ providerNumber: "05018", days: [{ date: "2026-07-22", timeSlots: [] }] },
|
||||
],
|
||||
},
|
||||
mobileTimeSlots: { days: [{ date: "2026-07-22", timeSlots: [] }] },
|
||||
});
|
||||
|
||||
const { wrapper } = setupMocks();
|
||||
await wrapper.setData({ isLoadingDates: false });
|
||||
Object.defineProperty(wrapper.vm.$refs, "zipCodeSearch", {
|
||||
configurable: true,
|
||||
value: {
|
||||
$refs: {
|
||||
zipInputTextQuestion: {
|
||||
validate: jest.fn().mockResolvedValue({ valid: true }),
|
||||
},
|
||||
},
|
||||
},
|
||||
});
|
||||
wrapper.vm.zipSearchCode = "44101";
|
||||
wrapper.vm.datePickerEndDate = "2026-08-15";
|
||||
wrapper.vm.selectedScheduling = { appointmentType: "Mobile" };
|
||||
const initialDatePickerKey = wrapper.vm.datePickerKey;
|
||||
|
||||
await wrapper.vm.onZipSearch({ preventDefault: jest.fn() });
|
||||
|
||||
const getProvidersDispatch = store.dispatch.mock.calls.find(
|
||||
([actionName]) => actionName === "getProviders"
|
||||
);
|
||||
expect(getProvidersDispatch).toEqual([
|
||||
"getProviders",
|
||||
{
|
||||
payload: { serviceZipCode: "44101" },
|
||||
pageNameToLog: undefined,
|
||||
},
|
||||
]);
|
||||
const saveZipDispatch = store.dispatch.mock.calls.find(
|
||||
([actionName]) => actionName === "saveServiceZipCodeInfo"
|
||||
);
|
||||
expect(saveZipDispatch).toEqual(["saveServiceZipCodeInfo", { zipCode: "44101" }]);
|
||||
expect(settleAllPromises).toHaveBeenCalled();
|
||||
expect(wrapper.vm.datePickerKey).toBe(initialDatePickerKey + 1);
|
||||
expect(wrapper.vm.selectedDate).toBeNull();
|
||||
expect(wrapper.vm.selectedScheduling).toBeNull();
|
||||
expect(wrapper.vm.isWaitlistRequested).toBe(false);
|
||||
expect(wrapper.vm.inshopProvidersAndTimeSlots).toHaveLength(1);
|
||||
expect(wrapper.vm.mobileProviderAndTimeSlot.providerNumber).toBe("12345");
|
||||
wrapper.unmount();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -11,7 +11,18 @@
|
|||
</span>
|
||||
</h5>
|
||||
<funnelSubHeader cmsWidgetName="FunnelSubHeaderWidget" alignLeft />
|
||||
<form class="scheduling-zip-search mt-4" @submit.prevent="onZipSearch">
|
||||
<serviceZipQuestion
|
||||
ref="zipCodeSearch"
|
||||
v-model="zipSearchCode"
|
||||
cmsWidgetName="ServiceZipQuestionWidget"
|
||||
includeSearchIcon
|
||||
isRequired
|
||||
@search-icon-click="onZipSearch"
|
||||
@keydown.enter="onZipSearch" />
|
||||
</form>
|
||||
<datePicker
|
||||
:key="datePickerKey"
|
||||
class="mt-5"
|
||||
v-model="selectedDate"
|
||||
:startDate="datePickerStartDate"
|
||||
|
|
@ -92,8 +103,10 @@ import mobileSchedulingCard from "@/layouts/scheduling/mobile-scheduling-card/mo
|
|||
import inshopSchedulingCard from "@/layouts/scheduling/inshop-scheduling-card/inshop-scheduling-card";
|
||||
import interceptOverlay from "@/ux-components/intercept-overlay/intercept-overlay";
|
||||
import waitlistQuestion from "@/layouts/scheduling/waitlist-question/waitlist-question";
|
||||
import serviceZipQuestion from "@/layouts/service-location/service-zip-modal-question/service-zip-question/service-zip-question";
|
||||
import textLink from "@/ux-components/text-link/text-link";
|
||||
import store from "@/store";
|
||||
import { storeActions } from "@/constants/store-actions";
|
||||
import { AppointmentTypeStrings, PREMIUM_FEE_PART_TYPE } from "@/constants/schedule-constants";
|
||||
import { fetchCmsContentForPage } from "@/helpers/cms-content-helper";
|
||||
import { settleAllPromises } from "@/helpers/layout-helper";
|
||||
|
|
@ -274,38 +287,12 @@ export default {
|
|||
},
|
||||
];
|
||||
const resultMap = await settleAllPromises(promiseResultMap);
|
||||
const allShopProviders = resultMap.providers?.shopProviders ?? [];
|
||||
const providers = allShopProviders.slice(0, INITIAL_INSHOP_PROVIDER_COUNT);
|
||||
const mobileProviderNumber = resultMap.providers?.mobileProviderNumber ?? null;
|
||||
next(async (vm) => {
|
||||
vm.setCmsContent(resultMap.cmsContent);
|
||||
vm.allShopProviders = allShopProviders;
|
||||
vm.inshopProvidersAndTimeSlots = providers.map((provider) => ({
|
||||
provider,
|
||||
timeSlots: null,
|
||||
}));
|
||||
vm.mobileProviderAndTimeSlot = mobileProviderNumber
|
||||
? { providerNumber: mobileProviderNumber, timeSlots: null }
|
||||
: null;
|
||||
const startDate = toDateString(0);
|
||||
const endDate = toDateString(SCHEDULE_FETCH_DAYS - 1);
|
||||
const providerNumbers = providers.map((provider) => provider.providerNumber);
|
||||
const timeSlotsResultMap = await fetchTimeSlotsBatch({
|
||||
startDate,
|
||||
endDate,
|
||||
providerNumbers,
|
||||
zipCode: serviceZipCode,
|
||||
includeMobile: Boolean(mobileProviderNumber),
|
||||
await vm.loadSchedulingData(serviceZipCode, {
|
||||
providersResult: resultMap.providers,
|
||||
pageNameToLog: to.name,
|
||||
});
|
||||
assignInshopTimeSlotsFromV2Response(
|
||||
vm.inshopProvidersAndTimeSlots,
|
||||
timeSlotsResultMap.inshopTimeSlots
|
||||
);
|
||||
if (vm.mobileProviderAndTimeSlot) {
|
||||
vm.mobileProviderAndTimeSlot.timeSlots = timeSlotsResultMap.mobileTimeSlots ?? null;
|
||||
}
|
||||
vm.datesLoaded = true;
|
||||
vm.mobilePremiumAppointmentFee = resultMap.mobilePremiumFee ?? null;
|
||||
vm.isLoadingDates = false;
|
||||
});
|
||||
|
|
@ -383,9 +370,59 @@ export default {
|
|||
selectedScheduling: null,
|
||||
isWaitlistRequested: false,
|
||||
isLoadingMoreShops: false,
|
||||
zipSearchCode: store.getters.order.serviceLocation.zipCode ?? "",
|
||||
datePickerKey: 0,
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
async loadSchedulingData(
|
||||
serviceZipCode,
|
||||
{ providersResult = null, pageNameToLog = this.pageName } = {}
|
||||
) {
|
||||
let providersData = providersResult;
|
||||
if (!providersData) {
|
||||
providersData = await store.dispatch("getProviders", {
|
||||
payload: { serviceZipCode },
|
||||
pageNameToLog,
|
||||
});
|
||||
}
|
||||
if (providersData?.shopProviders === undefined) {
|
||||
providersData = providersData?.data ?? {};
|
||||
}
|
||||
|
||||
const allShopProviders = providersData.shopProviders ?? [];
|
||||
const providers = allShopProviders.slice(0, INITIAL_INSHOP_PROVIDER_COUNT);
|
||||
const mobileProviderNumber = providersData?.mobileProviderNumber ?? null;
|
||||
|
||||
this.allShopProviders = allShopProviders;
|
||||
this.inshopProvidersAndTimeSlots = providers.map((provider) => ({
|
||||
provider,
|
||||
timeSlots: null,
|
||||
}));
|
||||
this.mobileProviderAndTimeSlot = mobileProviderNumber
|
||||
? { providerNumber: mobileProviderNumber, timeSlots: null }
|
||||
: null;
|
||||
|
||||
const startDate = toDateString(0);
|
||||
const endDate = toDateString(SCHEDULE_FETCH_DAYS - 1);
|
||||
const providerNumbers = providers.map((provider) => provider.providerNumber);
|
||||
const timeSlotsResultMap = await fetchTimeSlotsBatch({
|
||||
startDate,
|
||||
endDate,
|
||||
providerNumbers,
|
||||
zipCode: serviceZipCode,
|
||||
includeMobile: Boolean(mobileProviderNumber),
|
||||
pageNameToLog,
|
||||
});
|
||||
assignInshopTimeSlotsFromV2Response(
|
||||
this.inshopProvidersAndTimeSlots,
|
||||
timeSlotsResultMap.inshopTimeSlots
|
||||
);
|
||||
if (this.mobileProviderAndTimeSlot) {
|
||||
this.mobileProviderAndTimeSlot.timeSlots = timeSlotsResultMap.mobileTimeSlots ?? null;
|
||||
}
|
||||
this.datesLoaded = true;
|
||||
},
|
||||
getInshopTimeSlotsForSelectedDate(providerNumber) {
|
||||
if (!this.selectedDate) {
|
||||
return [];
|
||||
|
|
@ -403,6 +440,37 @@ export default {
|
|||
onMobileZipCodeClicked() {
|
||||
// TODO: open service zip modal when zip edit is implemented for scheduling page
|
||||
},
|
||||
async onZipSearch(event) {
|
||||
event?.preventDefault?.();
|
||||
|
||||
const zipInput = this.$refs.zipCodeSearch?.$refs?.zipInputTextQuestion;
|
||||
if (!zipInput) {
|
||||
return;
|
||||
}
|
||||
|
||||
const validationResult = await zipInput.validate();
|
||||
if (!validationResult.valid || this.isLoadingDates) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.isLoadingDates = true;
|
||||
try {
|
||||
await store.dispatch(storeActions.SAVE_SERVICE_ZIP_CODE_INFO, {
|
||||
zipCode: this.zipSearchCode,
|
||||
});
|
||||
this.selectedDate = null;
|
||||
this.selectedScheduling = null;
|
||||
this.isWaitlistRequested = false;
|
||||
this.isLoadingMoreShops = false;
|
||||
this.datesLoaded = false;
|
||||
this.datePickerKey += 1;
|
||||
this.datePickerStartDate = toDateString(0);
|
||||
this.datePickerEndDate = toDateString(SCHEDULE_FETCH_DAYS - 1);
|
||||
await this.loadSchedulingData(this.zipSearchCode);
|
||||
} finally {
|
||||
this.isLoadingDates = false;
|
||||
}
|
||||
},
|
||||
async onViewMoreShopsClick() {
|
||||
if (this.isLoadingDates || this.isLoadingMoreShops) return;
|
||||
|
||||
|
|
@ -528,6 +596,7 @@ export default {
|
|||
inshopSchedulingCard,
|
||||
interceptOverlay,
|
||||
waitlistQuestion,
|
||||
serviceZipQuestion,
|
||||
textLink,
|
||||
},
|
||||
};
|
||||
|
|
@ -571,4 +640,98 @@ h5 {
|
|||
:deep(.text-link) {
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.scheduling-zip-search {
|
||||
position: relative;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: stretch;
|
||||
width: 100%;
|
||||
height: 48px;
|
||||
border-radius: 48px;
|
||||
padding-left: 16px;
|
||||
border: 1px solid $gray-500;
|
||||
background: $white;
|
||||
box-shadow: 0 1px 5px 0 rgba(0, 0, 0, 0.2);
|
||||
|
||||
&:has(:deep(.textbox-question.has-error)) {
|
||||
border-color: $red;
|
||||
}
|
||||
|
||||
@include media-breakpoint-up(md) {
|
||||
height: auto;
|
||||
padding-left: 0;
|
||||
}
|
||||
|
||||
:deep(.textbox-question) {
|
||||
width: 100%;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
:deep(.input-wrapper.has-search-icon) {
|
||||
display: flex;
|
||||
align-items: stretch;
|
||||
flex: 1 1 0;
|
||||
height: 100%;
|
||||
margin-bottom: 0;
|
||||
|
||||
input,
|
||||
.form-control {
|
||||
width: 100%;
|
||||
height: 48px;
|
||||
min-height: 48px;
|
||||
max-height: 48px;
|
||||
border: none;
|
||||
padding: 0 1.5rem;
|
||||
outline: none;
|
||||
font-size: 1rem;
|
||||
background: transparent;
|
||||
box-sizing: border-box;
|
||||
border-radius: 2.5rem 0 0 2.5rem;
|
||||
box-shadow: none;
|
||||
|
||||
&:hover,
|
||||
&:focus {
|
||||
box-shadow: none;
|
||||
border: none;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
:deep(.search-icon-button) {
|
||||
position: static;
|
||||
transform: none;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex-shrink: 0;
|
||||
background-color: $blue-150 !important;
|
||||
background-image: url("data:image/svg+xml,%3Csvg width='16' height='16' viewBox='0 0 16 16' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M15.7817 14.7328L11.8252 10.7762C12.8833 9.45005 13.3936 7.76911 13.2513 6.07849C13.1091 4.38788 12.325 2.81587 11.0601 1.6852C9.79515 0.554524 8.14538 -0.0490261 6.44946 -0.00154744C4.75353 0.0459312 3.14012 0.740836 1.94045 1.94051C0.740775 3.14018 0.0458701 4.75359 -0.00160848 6.44952C-0.0490871 8.14545 0.554463 9.79521 1.68514 11.0601C2.81581 12.325 4.38782 13.1091 6.07843 13.2514C7.76905 13.3937 9.44999 12.8834 10.7762 11.8252L14.7349 15.7839C14.8044 15.8527 14.8869 15.907 14.9774 15.9439C15.068 15.9808 15.165 15.9995 15.2628 15.9989C15.3606 15.9983 15.4573 15.9784 15.5475 15.9405C15.6376 15.9025 15.7194 15.8471 15.7881 15.7776C15.8568 15.708 15.9112 15.6256 15.9481 15.535C15.985 15.4444 16.0036 15.3474 16.0031 15.2496C16.0025 15.1518 15.9826 15.0551 15.9446 14.965C15.9067 14.8748 15.8513 14.7931 15.7817 14.7243V14.7328ZM6.63737 11.7913C5.61803 11.7913 4.62157 11.4891 3.77402 10.9228C2.92646 10.3564 2.26587 9.5515 1.87578 8.60975C1.4857 7.668 1.38363 6.63172 1.5825 5.63196C1.78136 4.6322 2.27222 3.71386 2.99301 2.99307C3.7138 2.27229 4.63214 1.78142 5.6319 1.58256C6.63166 1.38369 7.66793 1.48576 8.60969 1.87585C9.55144 2.26593 10.3564 2.92652 10.9227 3.77408C11.489 4.62163 11.7913 5.61809 11.7913 6.63743C11.7896 8.00382 11.2461 9.31376 10.2799 10.2799C9.3137 11.2461 8.00376 11.7897 6.63737 11.7913Z' fill='%230070d1'/%3E%3C/svg%3E%0A");
|
||||
background-repeat: no-repeat;
|
||||
background-position: center;
|
||||
width: 2.5rem;
|
||||
height: 48px;
|
||||
min-height: 48px;
|
||||
max-height: 48px;
|
||||
border: none;
|
||||
border-radius: 0 2.5rem 2.5rem 0;
|
||||
cursor: pointer;
|
||||
|
||||
&:hover,
|
||||
&:focus {
|
||||
border: 1px solid $gray-500;
|
||||
box-shadow: 0 0 0 4px $blue-300;
|
||||
background-color: $blue-150 !important;
|
||||
outline: none;
|
||||
}
|
||||
}
|
||||
|
||||
:deep(.form-test-error) {
|
||||
position: absolute;
|
||||
top: 100%;
|
||||
left: 0;
|
||||
right: 0;
|
||||
margin-top: 0.25rem;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
Loading…
Reference in a new issue