merge

types/components/hotelReservation/enterDetails/bookingData.ts

@@ -7,6 +7,7 @@ interface Room {
   adults: number
   roomTypeCode: string
   rateCode: string
+  counterRateCode: string
   children?: Child[]
   packages?: RoomPackageCodeEnum[]
 }
@@ -18,14 +19,24 @@ export interface BookingData {
 }
 
 type Price = {
-  price: number
+  amount: number
   currency: string
 }
 
 export type RoomsData = {
   roomType: string
-  localPrice: Price
-  euroPrice: Price | undefined
+  prices: {
+    public: {
+      local: Price
+      euro: Price | undefined
+    }
+    member:
+      | {
+          local: Price
+          euro: Price | undefined
+        }
+      | undefined
+  }
   adults: number
   children?: Child[]
   rateDetails?: string[]

types/components/hotelReservation/selectRate/roomFilter.ts

@@ -1,19 +1,22 @@
 import { z } from "zod"
 
-import {
-  getRoomPackagesSchema,
-  packagesSchema,
-} from "@/server/routers/hotels/output"
+import { packagesSchema } from "@/server/routers/hotels/output"
 
 export enum RoomPackageCodeEnum {
   PET_ROOM = "PETR",
   ALLERGY_ROOM = "ALLG",
   ACCESSIBILITY_ROOM = "ACCE",
 }
+
+export interface DefaultFilterOptions {
+  code: RoomPackageCodeEnum
+  description: string
+  itemCode: string | undefined
+}
 export interface RoomFilterProps {
   numberOfRooms: number
   onFilter: (filter: Record<string, boolean | undefined>) => void
-  filterOptions: RoomPackageData
+  filterOptions: DefaultFilterOptions[]
 }
 
 export type RoomPackage = z.output<typeof packagesSchema>

types/components/hotelReservation/selectRate/roomSelection.ts

@@ -8,7 +8,7 @@ export interface RoomSelectionProps {
   roomsAvailability: RoomsAvailability
   roomCategories: RoomData[]
   user: SafeUser
-  packages: RoomPackageData | undefined
+  availablePackages: RoomPackageData | undefined
   selectedPackages: RoomPackageCodes[]
   setRateCode: (rateCode: {
     publicRateCode: string
@@ -21,5 +21,5 @@ export interface SelectRateProps {
   roomsAvailability: RoomsAvailability
   roomCategories: RoomData[]
   user: SafeUser
-  packages: RoomPackageData
+  availablePackages: RoomPackageData
 }

types/components/hotelReservation/selectRate/section.ts

@@ -1,4 +1,4 @@
-import { CreditCard } from "@/types/user"
+import { CreditCard, SafeUser } from "@/types/user"
 
 export interface SectionProps {
   nextPath: string
@@ -28,6 +28,7 @@ export interface BreakfastSelectionProps extends SectionProps {
 export interface DetailsProps extends SectionProps {}
 
 export interface PaymentProps {
+  user: SafeUser
   roomPrice: { publicPrice: number; memberPrice: number | undefined }
   otherPaymentOptions: string[]
   savedCreditCards: CreditCard[] | null

types/components/hotelReservation/selectRate/selectRate.ts

@@ -11,7 +11,7 @@ interface Room {
   adults: number
   roomtype: string
   ratecode: string
-  counterratecode?: string
+  counterratecode: string
   child?: Child[]
   packages?: string
 }