Merge pull request #394 from emrysal/hotfix/fix-incorrect-calendar-day-shifting

This commit is contained in:
Bailey Pumfleet 2021-07-29 17:14:14 +01:00 committed by GitHub
commit d8533b3a5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -121,17 +121,14 @@ const getSlots = ({
// current date in invitee tz // current date in invitee tz
const currentDate = dayjs().utcOffset(inviteeDate.utcOffset()); const currentDate = dayjs().utcOffset(inviteeDate.utcOffset());
const startDate = currentDate.add(minimumBookingNotice, "minutes"); // + minimum notice period const startDate = currentDate.add(minimumBookingNotice, "minutes"); // + minimum notice period
// when the invitee date is not the same as the current date, reset the date to the start of day
if (inviteeDate.date() !== currentDate.date()) {
inviteeDate = inviteeDate.startOf("day");
}
const startTime = startDate.isAfter(inviteeDate) const startTime = startDate.isAfter(inviteeDate)
? // block out everything when inviteeDate is less than startDate ? // block out everything when inviteeDate is less than startDate
startDate.date() > inviteeDate.date() startDate.diff(inviteeDate, "day") > 0
? 1440 ? 1440
: startDate.hour() * 60 + startDate.minute() : startDate.hour() * 60 + startDate.minute()
: 0; : 0;
const inviteeBounds = inviteeBoundary(startTime, inviteeDate.utcOffset(), frequency); const inviteeBounds = inviteeBoundary(startTime, inviteeDate.utcOffset(), frequency);
return getOverlaps( return getOverlaps(