Merged in fix/SW-2642-select-hotel-corporate-ch (pull request #2003)

fix: SW-2642 Fixed corporate chq and voucher rates city search

* fix: SW-2642 Fixed corporate chq and voucher rates city search

* fix: SW-2642 Fixed no availability alert for all hotels

* fix: SW-2642 Combined flags to suitable variable

* fix: SW-2642 Fixed map view to show prices


Approved-by: Arvid Norlin
This commit is contained in:
Hrishikesh Vaipurkar
2025-05-08 10:46:05 +00:00
parent a99e434d84
commit 74a5b5748a
18 changed files with 232 additions and 80 deletions

View File

@@ -12,12 +12,16 @@ interface HotelPinProps {
isActive: boolean
hotelPrice: number | null
currency: string
hotelAdditionalPrice?: number
hotelAdditionalCurrency?: string
}
export default function HotelPin({
isActive,
hotelPrice,
currency,
hotelAdditionalPrice,
hotelAdditionalCurrency,
}: HotelPinProps) {
const intl = useIntl()
const isNotAvailable = !hotelPrice
@@ -39,8 +43,18 @@ export default function HotelPin({
)}
</span>
<Typography variant="Body/Paragraph/mdRegular">
{/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
<p>{isNotAvailable ? "—" : formatPrice(intl, hotelPrice, currency)}</p>
<p>
{isNotAvailable
? // eslint-disable-next-line formatjs/no-literal-string-in-jsx
"—"
: formatPrice(
intl,
hotelPrice,
currency,
hotelAdditionalPrice,
hotelAdditionalCurrency
)}
</p>
</Typography>
</div>
)

View File

@@ -36,7 +36,19 @@ function HotelListingMapContent({ hotelPins }: HotelListingMapContentProps) {
const isActiveOrHovered =
activeHotel === pin.name || hoveredHotel === pin.name
const hotelPrice =
pin.memberPrice ?? pin.publicPrice ?? pin.redemptionPrice
pin.memberPrice ??
pin.publicPrice ??
pin.redemptionPrice ??
pin.voucherPrice ??
pin.chequePrice?.numberOfCheques ??
null
const hotelAdditionalPrice = pin.chequePrice
? pin.chequePrice.additionalPricePerStay
: undefined
const hotelAdditionalCurrency = pin.chequePrice
? pin.chequePrice.currency?.toString()
: undefined
return (
<AdvancedMarker
key={pin.name}
@@ -63,6 +75,8 @@ function HotelListingMapContent({ hotelPins }: HotelListingMapContentProps) {
isActive={isActiveOrHovered}
hotelPrice={hotelPrice}
currency={pin.currency}
hotelAdditionalPrice={hotelAdditionalPrice}
hotelAdditionalCurrency={hotelAdditionalCurrency}
/>
</AdvancedMarker>
)