- {room.roomType}
+ {room.roomType}
{intl.formatMessage(
{ id: "{amount} {currency}" },
{
- amount: intl.formatNumber(
- parseInt(room.localPrice.price ?? "0")
- ),
+ amount: intl.formatNumber(room.localPrice.price),
currency: room.localPrice.currency,
}
)}
@@ -180,17 +175,37 @@ export default function Summary({
{intl.formatMessage({ id: "Rate details" })}
+ {room.packages
+ ? room.packages.map((roomPackage) => (
+
+
+
+ {roomPackage.description}
+
+
+
+ {intl.formatMessage(
+ { id: "{amount} {currency}" },
+ {
+ amount: roomPackage.localPrice.price,
+ currency: roomPackage.localPrice.currency,
+ }
+ )}
+
+
+ ))
+ : null}
{chosenBed ? (
- {chosenBed.description}
+ {chosenBed.description}
{intl.formatMessage({ id: "Based on availability" })}
-
+
{intl.formatMessage(
{ id: "{amount} {currency}" },
{ amount: "0", currency: room.localPrice.currency }
@@ -202,10 +217,10 @@ export default function Summary({
{chosenBreakfast ? (
chosenBreakfast === BreakfastPackageEnum.NO_BREAKFAST ? (
-
+
{intl.formatMessage({ id: "No breakfast" })}
-
+
{intl.formatMessage(
{ id: "{amount} {currency}" },
{ amount: "0", currency: room.localPrice.currency }
@@ -214,10 +229,10 @@ export default function Summary({
) : (
-
+
{intl.formatMessage({ id: "Breakfast buffet" })}
-
+
{intl.formatMessage(
{ id: "{amount} {currency}" },
{
diff --git a/components/HotelReservation/HotelSelectionHeader/index.tsx b/components/HotelReservation/HotelSelectionHeader/index.tsx
index 4cb88f67f..c0045dff5 100644
--- a/components/HotelReservation/HotelSelectionHeader/index.tsx
+++ b/components/HotelReservation/HotelSelectionHeader/index.tsx
@@ -41,7 +41,7 @@ export default function HotelSelectionHeader({
-
+
{hotel.hotelContent.texts.descriptions.short}
diff --git a/components/Maps/InteractiveMap/HotelListingMapContent/index.tsx b/components/Maps/InteractiveMap/HotelListingMapContent/index.tsx
index c3b83edb3..ce9e95020 100644
--- a/components/Maps/InteractiveMap/HotelListingMapContent/index.tsx
+++ b/components/Maps/InteractiveMap/HotelListingMapContent/index.tsx
@@ -73,7 +73,7 @@ export default function HotelListingMapContent({
{pin.memberPrice} {pin.currency}
diff --git a/components/TempDesignSystem/Text/Body/body.module.css b/components/TempDesignSystem/Text/Body/body.module.css
index a39439815..5cd96c0ae 100644
--- a/components/TempDesignSystem/Text/Body/body.module.css
+++ b/components/TempDesignSystem/Text/Body/body.module.css
@@ -80,7 +80,7 @@
color: var(--Base-Text-Medium-contrast);
}
-.textHighContrast {
+.baseTextHighContrast {
color: var(--Base-Text-High-contrast);
}
diff --git a/components/TempDesignSystem/Text/Body/variants.ts b/components/TempDesignSystem/Text/Body/variants.ts
index aa614fe14..00ee46a3d 100644
--- a/components/TempDesignSystem/Text/Body/variants.ts
+++ b/components/TempDesignSystem/Text/Body/variants.ts
@@ -13,7 +13,7 @@ const config = {
red: styles.red,
textMediumContrast: styles.textMediumContrast,
baseTextMediumContrast: styles.baseTextMediumContrast,
- textHighContrast: styles.textHighContrast,
+ baseTextHighContrast: styles.baseTextHighContrast,
white: styles.white,
peach50: styles.peach50,
uiTextHighContrast: styles.uiTextHighContrast,
diff --git a/server/routers/booking/input.ts b/server/routers/booking/input.ts
index b5bc65a30..4c7d802ef 100644
--- a/server/routers/booking/input.ts
+++ b/server/routers/booking/input.ts
@@ -14,13 +14,11 @@ const roomsSchema = z.array(
)
.default([]),
rateCode: z.string(),
- roomTypeCode: z.string(),
+ roomTypeCode: z.coerce.string(),
guest: z.object({
- title: z.string(),
firstName: z.string(),
lastName: z.string(),
email: z.string().email(),
- phoneCountryCodePrefix: z.string().nullable(),
phoneNumber: z.string(),
countryCode: z.string(),
membershipNumber: z.string().optional(),
diff --git a/server/routers/hotels/output.ts b/server/routers/hotels/output.ts
index aaacd60ae..da202c7d3 100644
--- a/server/routers/hotels/output.ts
+++ b/server/routers/hotels/output.ts
@@ -541,8 +541,8 @@ export type HotelsAvailabilityPrices =
HotelsAvailability["data"][number]["attributes"]["bestPricePerNight"]
export const priceSchema = z.object({
- pricePerNight: z.string(),
- pricePerStay: z.string(),
+ pricePerNight: z.coerce.number(),
+ pricePerStay: z.coerce.number(),
currency: z.string(),
})
diff --git a/server/routers/hotels/query.ts b/server/routers/hotels/query.ts
index 20db2922e..11f235ab6 100644
--- a/server/routers/hotels/query.ts
+++ b/server/routers/hotels/query.ts
@@ -724,8 +724,6 @@ export const hotelQueryRouter = router({
ctx.serviceToken
)
- console.log({ packageCodes })
-
const availableRooms =
validateAvailabilityData.data.roomConfigurations.filter((room) => {
if (packageCodes) {
@@ -740,7 +738,6 @@ export const hotelQueryRouter = router({
return room.status === "Available"
})
- console.log("hrteij", JSON.stringify(availableRooms, null, 4))
const selectedRoom = availableRooms.find(
(room) => room.roomTypeCode === roomTypeCode
)
@@ -748,11 +745,6 @@ export const hotelQueryRouter = router({
const availableRoomsInCategory = availableRooms.filter(
(room) => room.roomType === selectedRoom?.roomType
)
-
- console.log(
- "availableRoomsInCategory",
- JSON.stringify(availableRoomsInCategory, null, 4)
- )
if (!selectedRoom) {
console.error("No matching room found")
return null
diff --git a/types/components/hotelReservation/enterDetails/bookingData.ts b/types/components/hotelReservation/enterDetails/bookingData.ts
index 89ca94efb..74ed4bda4 100644
--- a/types/components/hotelReservation/enterDetails/bookingData.ts
+++ b/types/components/hotelReservation/enterDetails/bookingData.ts
@@ -1,6 +1,8 @@
import { RoomPackageCodeEnum } from "../selectRate/roomFilter"
import { Child } from "../selectRate/selectRate"
+import { Packages } from "@/types/requests/packages"
+
interface Room {
adults: number
roomTypeCode: string
@@ -16,7 +18,7 @@ export interface BookingData {
}
type Price = {
- price: string
+ price: number
currency: string
}
@@ -27,4 +29,5 @@ export type RoomsData = {
adults: number
children?: Child[]
cancellationText: string
+ packages: Packages | null
}
diff --git a/types/components/hotelReservation/selectRate/section.ts b/types/components/hotelReservation/selectRate/section.ts
index df9ec7a71..578819fb1 100644
--- a/types/components/hotelReservation/selectRate/section.ts
+++ b/types/components/hotelReservation/selectRate/section.ts
@@ -28,7 +28,7 @@ export interface BreakfastSelectionProps extends SectionProps {
export interface DetailsProps extends SectionProps {}
export interface PaymentProps {
- roomPrice: string
+ roomPrice: number
otherPaymentOptions: string[]
savedCreditCards: CreditCard[] | null
mustBeGuaranteed: boolean
diff --git a/types/requests/packages.ts b/types/requests/packages.ts
index 222a4970f..fb242917f 100644
--- a/types/requests/packages.ts
+++ b/types/requests/packages.ts
@@ -4,9 +4,12 @@ import {
getBreakfastPackageInputSchema,
getRoomPackagesInputSchema,
} from "@/server/routers/hotels/input"
+import { getRoomPackagesSchema } from "@/server/routers/hotels/output"
export interface BreackfastPackagesInput
extends z.input {}
export interface PackagesInput
extends z.input {}
+
+export interface Packages extends z.output {}