Merge remote-tracking branch 'origin' into feat/tracking-payment

types/components/blocks/surprises.ts

@@ -1,6 +1,6 @@
 import type { Reward } from "@/server/routers/contentstack/reward/output"
 
-export interface Surprise extends Reward {
+export interface Surprise extends Omit<Reward, "operaRewardId"> {
   coupons: { couponCode?: string; expiresAt?: string }[]
 }
 

types/components/bookingWidget/guestsRoomsPicker.ts

@@ -8,7 +8,7 @@ export type Child = {
   bed: number
 }
 
-export type GuestsRoom = {
+export type TGuestsRoom = {
   adults: number
   child: Child[]
 }

types/components/bookingWidget/index.ts

@@ -4,7 +4,7 @@ import type { z } from "zod"
 import type { Locations } from "@/types/trpc/routers/hotel/locations"
 import type { bookingWidgetSchema } from "@/components/Forms/BookingWidget/schema"
 import type { bookingWidgetVariants } from "@/components/Forms/BookingWidget/variants"
-import type { GuestsRoom } from "./guestsRoomsPicker"
+import type { TGuestsRoom } from "./guestsRoomsPicker"
 
 export type BookingWidgetSchema = z.output<typeof bookingWidgetSchema>
 
@@ -13,7 +13,7 @@ export type BookingWidgetSearchParams = {
   hotel?: string
   fromDate?: string
   toDate?: string
-  room?: GuestsRoom[]
+  room?: TGuestsRoom[]
 }
 
 export type BookingWidgetType = VariantProps<

types/components/footer/socialLink.ts

@@ -0,0 +1,6 @@
+export interface SocialLinkProps {
+  link: {
+    href: string
+    title: string
+  }
+}

types/components/hotelPage/facilities.ts

@@ -1,10 +1,12 @@
-import type { Facility } from "@/types/hotel"
+import type { Amenities, Facility, HealthFacilities } from "@/types/hotel"
 import type { ActivityCard } from "@/types/trpc/routers/contentstack/hotelPage"
 import type { CardProps } from "@/components/TempDesignSystem/Card/card"
 
 export type FacilitiesProps = {
   facilities: Facility[]
-  activitiesCard: ActivityCard | null
+  activitiesCard?: ActivityCard
+  amenities: Amenities
+  healthFacilities: HealthFacilities
 }
 
 export type FacilityImage = {
@@ -22,7 +24,7 @@ export type FacilityCard = {
     scrollOnClick: boolean
   }
   heading: string
-  scriptedTopTitle: string
+  scriptedTopTitle?: string
   theme: CardProps["theme"]
   id: string
 }
@@ -47,3 +49,19 @@ export enum RestaurantHeadings {
   restaurant = "Restaurant",
   breakfastRestaurant = "Breakfast restaurant",
 }
+
+export enum WellnessHeadings {
+  GymPool = "Gym & Pool",
+  GymSauna = "Gym & Sauna",
+  GymPoolSaunaRelax = "Gym, Pool, Sauna & Relax",
+  GymJacuzziSaunaRelax = "Gym, Jacuzzi, Sauna & Relax",
+}
+
+export enum HealthFacilitiesEnum {
+  Jacuzzi = "Jacuzzi",
+  Gym = "Gym",
+  Sauna = "Sauna",
+  Relax = "Relax",
+  IndoorPool = "IndoorPool",
+  OutdoorPool = "OutdoorPool",
+}

types/components/hotelPage/sidepeek/wellnessAndExercise.ts

@@ -2,5 +2,9 @@ import type { Hotel } from "@/types/hotel"
 
 export type WellnessAndExerciseSidePeekProps = {
   healthFacilities: Hotel["healthFacilities"]
-  buttonUrl?: string
+  wellnessExerciseButton?: string
+  spaPage?: {
+    buttonCTA: string
+    url: string
+  }
 }

types/components/hotelReservation/enterDetails/bedType.ts

@@ -4,6 +4,7 @@ import type {
   bedTypeFormSchema,
   bedTypeSchema,
 } from "@/components/HotelReservation/EnterDetails/BedType/schema"
+import type { BedTypeEnum, ExtraBedTypeEnum } from "@/constants/booking"
 
 export type BedTypeSelection = {
   description: string
@@ -12,6 +13,13 @@ export type BedTypeSelection = {
     max: number
   }
   value: string
+  type: BedTypeEnum
+  extraBed:
+    | {
+        description: string
+        type: ExtraBedTypeEnum
+      }
+    | undefined
 }
 export type BedTypeProps = {
   bedTypes: BedTypeSelection[]

types/components/hotelReservation/selectRate/roomSelection.ts

@@ -7,18 +7,18 @@ import type { Rate, RateCode } from "./selectRate"
 export interface RoomSelectionProps {
   roomsAvailability: RoomsAvailability
   roomCategories: RoomData[]
-  user: SafeUser
   availablePackages: RoomPackageData | undefined
   selectedPackages: RoomPackageCodes[]
   setRateCode: React.Dispatch<React.SetStateAction<RateCode | undefined>>
   rateSummary: Rate | null
   hotelType: string | undefined
+  isUserLoggedIn: boolean
 }
 
 export interface SelectRateProps {
   roomsAvailability: RoomsAvailability
   roomCategories: RoomData[]
-  user: SafeUser
   availablePackages: RoomPackageData
   hotelType: string | undefined
+  isUserLoggedIn: boolean
 }

types/components/hotelReservation/summary.ts

@@ -15,4 +15,5 @@ export interface SummaryProps
   extends Pick<RoomAvailability, "cancellationText" | "rateDetails">,
     Pick<RoomAvailability["selectedRoom"], "roomType"> {
   isMember: boolean
+  breakfastIncluded: boolean
 }

types/components/myPages/myPage/accountPage.ts

@@ -1,3 +1,4 @@
+import type { Dispatch, ReactNode, SetStateAction } from "react"
 import type { z } from "zod"
 
 import type { DynamicContent } from "@/types/trpc/routers/contentstack/blocks"
@@ -37,3 +38,8 @@ export interface RedeemProps {
 export type RedeemModalState = "unmounted" | "hidden" | "visible"
 
 export type RedeemStep = "initial" | "confirmation" | "redeemed"
+
+export type RedeemFlowContext = {
+  redeemStep: RedeemStep
+  setRedeemStep: Dispatch<SetStateAction<RedeemStep>>
+}

types/enums/hotelPage.ts

@@ -3,6 +3,7 @@ export namespace HotelPageEnum {
     export const enum blocks {
       Faq = "HotelPageFaq",
       ActivitiesCard = "HotelPageContentUpcomingActivitiesCard",
+      SpaPage = "HotelPageContentSpaPage",
     }
   }
 }

types/hotel.ts

@@ -21,6 +21,8 @@ export type Hotel = HotelData["data"]["attributes"]
 export type HotelAddress = HotelData["data"]["attributes"]["address"]
 export type HotelLocation = HotelData["data"]["attributes"]["location"]
 export type Amenities = HotelData["data"]["attributes"]["detailedFacilities"]
+export type HealthFacilities =
+  HotelData["data"]["attributes"]["healthFacilities"]
 
 type HotelRatings = HotelData["data"]["attributes"]["ratings"]
 export type HotelTripAdvisor =

types/providers/enter-details.ts

@@ -9,7 +9,7 @@ import type { Packages } from "../requests/packages"
 export interface DetailsProviderProps extends React.PropsWithChildren {
   booking: BookingData
   bedTypes: BedTypeSelection[]
-  breakfastPackages: BreakfastPackage[] | null
+  showBreakfastStep: boolean
   packages: Packages | null
   roomRate: Pick<RoomAvailability, "memberRate" | "publicRate">
   searchParamsStr: string

types/trpc/routers/contentstack/hotelPage.ts

@@ -7,13 +7,16 @@ import type {
   hotelPageUrlSchema,
 } from "@/server/routers/contentstack/hotelPage/output"
 import type { activitiesCardSchema } from "@/server/routers/contentstack/schemas/blocks/activitiesCard"
+import type { spaPageSchema } from "@/server/routers/contentstack/schemas/blocks/spaPage"
 
 export interface GetHotelPageData extends z.input<typeof hotelPageSchema> {}
 export interface HotelPage extends z.output<typeof hotelPageSchema> {}
 
 export interface ActivitiesCard extends z.output<typeof activitiesCardSchema> {}
 export type ActivityCard = ActivitiesCard["upcoming_activities_card"]
-export interface ContentBlock extends z.output<typeof contentBlock> {}
+
+export interface SpaPage extends z.output<typeof spaPageSchema> {}
+export type ContentBlock = z.output<typeof contentBlock>
 
 export interface GetHotelPageRefsSchema
   extends z.input<typeof hotelPageRefsSchema> {}