Merged in fix/sw-3299-alerts (pull request #2692)

fix(SW-3299): hotel alerts now visible if booking dates starts/ends before the alert period

* fix(SW-3299): hotel alerts now visible if booking dates starts/ends before the alert period


Approved-by: Bianca Widstam
Approved-by: Hrishikesh Vaipurkar
This commit is contained in:
Linus Flood
2025-08-22 13:10:38 +00:00
parent 2fcd277206
commit 208a64e54e
2 changed files with 88 additions and 6 deletions

View File

@@ -95,24 +95,33 @@ export function getHotelAlertsForBookingDates(
) {
return specialAlerts.filter((alert) => {
if (alert.endDate && alert.startDate) {
const alertEndDate = dt(alert.endDate)
const alertStartDate = dt(alert.startDate)
const alertEndDate = dt(alert.endDate)
const bookingStart = dt(fromDate)
const bookingEnd = dt(toDate)
const fromDateIsBetweenAlertDates = dt(fromDate).isBetween(
const fromDateIsBetweenAlertDates = bookingStart.isBetween(
alertStartDate,
alertEndDate,
"date",
"[]"
)
const toDateIsBetweenAlertDates = dt(toDate).isBetween(
const toDateIsBetweenAlertDates = bookingEnd.isBetween(
alertStartDate,
alertEndDate,
"date",
"[]"
)
const bookingSpanIsBetweenAlertDates =
fromDateIsBetweenAlertDates || toDateIsBetweenAlertDates
return bookingSpanIsBetweenAlertDates
const bookingFullyContainsAlert =
bookingStart.isSameOrBefore(alertStartDate, "date") &&
bookingEnd.isSameOrAfter(alertEndDate, "date")
return (
fromDateIsBetweenAlertDates ||
toDateIsBetweenAlertDates ||
bookingFullyContainsAlert
)
}
return true
})