Merge branch 'master' into feature/tracking

types/components/form/bookingwidget.ts

@@ -4,7 +4,7 @@ import type { Location, Locations } from "@/types/trpc/routers/hotel/locations"
 export interface BookingWidgetFormProps {
   locations: Locations
   type?: BookingWidgetType
-  setIsOpen: (isOpen: boolean) => void
+  onClose: () => void
 }
 
 export interface BookingWidgetFormContentProps {

types/components/hotelPage/sidepeek/facility.ts

@@ -0,0 +1,5 @@
+import type { Hotel } from "@/types/hotel"
+
+export type FacilityProps = {
+  data: Hotel["healthFacilities"][number]
+}

types/components/hotelPage/sidepeek/wellnessAndExercise.ts

@@ -0,0 +1,6 @@
+import type { Hotel } from "@/types/hotel"
+
+export type WellnessAndExerciseSidePeekProps = {
+  healthFacilities: Hotel["healthFacilities"]
+  buttonUrl?: string
+}

types/components/hotelReservation/enterDetails/bookingData.ts

@@ -25,9 +25,10 @@ type Price = {
 export type RoomsData = {
   roomType: string
   localPrice: Price
-  euroPrice: Price
+  euroPrice: Price | undefined
   adults: number
   children?: Child[]
+  rateDetails?: string[]
   cancellationText: string
   packages: Packages | null
 }

types/components/hotelReservation/enterDetails/breakfast.ts

@@ -17,5 +17,5 @@ export interface BreakfastPackage
   extends z.output<typeof breakfastPackageSchema> {}
 
 export interface BreakfastProps {
-  packages: BreakfastPackages | null
+  packages: BreakfastPackages
 }

types/components/hotelReservation/enterDetails/details.ts

@@ -6,6 +6,14 @@ import type { SafeUser } from "@/types/user"
 
 export type DetailsSchema = z.output<typeof guestDetailsSchema>
 
+type MemberPrice = { price: number; currency: string }
+
 export interface DetailsProps {
   user: SafeUser
+  memberPrice?: MemberPrice
+}
+
+export type JoinScandicFriendsCardProps = {
+  name: string
+  memberPrice?: MemberPrice
 }

types/components/hotelReservation/enterDetails/step.ts

@@ -1,9 +1,4 @@
-export enum StepEnum {
-  selectBed = "select-bed",
-  breakfast = "breakfast",
-  details = "details",
-  payment = "payment",
-}
+import { StepEnum } from "@/types/enums/step"
 
 export const StepStoreKeys: Record<StepEnum, "bedType" | "breakfast" | null> = {
   "select-bed": "bedType",

types/components/hotelReservation/enterDetails/store.ts

@@ -1,3 +0,0 @@
-import { StepEnum } from "./step"
-
-export type EnterDetailsProviderProps = { step: StepEnum; isMember: boolean }

types/components/hotelReservation/enterDetails/summary.ts

@@ -0,0 +1,6 @@
+import type { RoomsData } from "./bookingData"
+
+export interface SummaryProps {
+  showMemberPrice: boolean
+  room: RoomsData
+}

types/components/hotelReservation/selectHotel/availabilityInput.ts

@@ -4,7 +4,5 @@ export type AvailabilityInput = {
   roomStayEndDate: string
   adults: number
   children?: string
-  promotionCode?: string
-  reservationProfileType?: string
-  attachedProfileId?: string
+  bookingCode?: string
 }

types/components/hotelReservation/selectHotel/filterAndSortModal.ts

@@ -0,0 +1,5 @@
+import { CategorizedFilters } from "./hotelFilters"
+
+export type FilterAndSortModalProps = {
+  filters: CategorizedFilters
+}

types/components/hotelReservation/selectHotel/filterCheckbox.ts

@@ -0,0 +1,6 @@
+export type FilterCheckboxProps = {
+  name: string
+  id: string
+  isSelected: boolean
+  onChange: (filterId: string) => void
+}

types/components/hotelReservation/selectHotel/hotePriceListProps.ts

@@ -1,5 +1,6 @@
-import type { HotelsAvailabilityPrices } from "@/server/routers/hotels/output"
+import type { ProductType } from "@/server/routers/hotels/output"
 
 export type HotelPriceListProps = {
-  price: HotelsAvailabilityPrices
+  price: ProductType
+  hotelId: string
 }

types/components/hotelReservation/selectHotel/hotelCardListingProps.ts

@@ -1,4 +1,4 @@
-import { HotelsAvailabilityPrices } from "@/server/routers/hotels/output"
+import { ProductType } from "@/server/routers/hotels/output"
 
 import { Hotel } from "@/types/hotel"
 
@@ -16,5 +16,5 @@ export type HotelCardListingProps = {
 
 export type HotelData = {
   hotelData: Hotel
-  price: HotelsAvailabilityPrices
+  price: ProductType
 }

types/components/hotelReservation/selectHotel/hotelFilters.ts

@@ -6,6 +6,7 @@ export type CategorizedFilters = {
 }
 export type HotelFiltersProps = {
   filters: CategorizedFilters
+  className?: string
 }
 
 export type Filter = {
@@ -15,3 +16,7 @@ export type Filter = {
   sortOrder: number
   filter?: string
 }
+
+export type HotelFilterModalProps = {
+  filters: CategorizedFilters
+}

types/components/hotelReservation/selectHotel/hotelSorter.ts

@@ -9,3 +9,7 @@ export type SortItem = {
   label: string
   value: string
 }
+
+export type HotelSorterProps = {
+  discreet?: boolean
+}

types/components/hotelReservation/selectHotel/map.ts

@@ -6,7 +6,7 @@ import {
 } from "@/server/routers/hotels/schemas/image"
 
 import { HotelData } from "./hotelCardListingProps"
-import { Filter } from "./hotelFilters"
+import { CategorizedFilters, Filter } from "./hotelFilters"
 
 import type { Coordinates } from "@/types/components/maps/coordinates"
 
@@ -21,6 +21,7 @@ export interface SelectHotelMapProps {
   hotelPins: HotelPin[]
   mapId: string
   hotels: HotelData[]
+  filterList: CategorizedFilters
 }
 
 type ImageSizes = z.infer<typeof imageSizesSchema>
@@ -29,8 +30,8 @@ type ImageMetaData = z.infer<typeof imageMetaDataSchema>
 export type HotelPin = {
   name: string
   coordinates: Coordinates
-  publicPrice: string | null
-  memberPrice: string | null
+  publicPrice: number | null
+  memberPrice: number | null
   currency: string | null
   images: {
     imageSizes: ImageSizes

types/components/hotelReservation/selectHotel/priceCardProps.ts

@@ -1,5 +1,6 @@
+import { ProductTypePrices } from "@/server/routers/hotels/output"
+
 export type PriceCardProps = {
-  currency: string
-  memberAmount?: string | undefined
-  regularAmount?: string | undefined
+  productTypePrices: ProductTypePrices
+  isMemberPrice?: boolean
 }

types/components/hotelReservation/selectRate/pricePopover.ts

@@ -1,5 +0,0 @@
-import type { PopoverProps } from "react-aria-components"
-
-export interface PricePopoverProps extends Omit<PopoverProps, "children"> {
-  children: React.ReactNode
-}

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[]
   setRateSummary: (rateSummary: Rate) => void
   rateSummary: Rate | null
@@ -18,5 +18,5 @@ export interface SelectRateProps {
   roomsAvailability: RoomsAvailability
   roomCategories: RoomData[]
   user: SafeUser
-  packages: RoomPackageData
+  availablePackages: RoomPackageData
 }

types/components/hotelReservation/selectRate/section.ts

@@ -28,7 +28,7 @@ export interface BreakfastSelectionProps extends SectionProps {
 export interface DetailsProps extends SectionProps {}
 
 export interface PaymentProps {
-  roomPrice: number
+  roomPrice: { publicPrice: number; memberPrice: number | undefined }
   otherPaymentOptions: string[]
   savedCreditCards: CreditCard[] | null
   mustBeGuaranteed: boolean

types/components/hotelReservation/selectRate/sectionAccordion.ts

@@ -1,4 +1,4 @@
-import { StepEnum } from "../enterDetails/step"
+import { StepEnum } from "@/types/enums/step"
 
 export interface SectionAccordionProps {
   header: string

types/components/maps/poiMarker.ts

@@ -2,14 +2,11 @@ import { poiVariants } from "@/components/Maps/Markers/Poi/variants"
 
 import type { VariantProps } from "class-variance-authority"
 
-import {
-  PointOfInterestCategoryNameEnum,
-  PointOfInterestGroupEnum,
-} from "@/types/hotel"
+import type { PointOfInterestGroupEnum } from "@/types/hotel"
 
 export interface PoiMarkerProps extends VariantProps<typeof poiVariants> {
   group: PointOfInterestGroupEnum
-  categoryName?: PointOfInterestCategoryNameEnum
+  categoryName?: string
   size?: number
   className?: string
 }

types/components/tracking.ts

@@ -130,3 +130,4 @@ export type TrackingPosition =
   | "hamburger menu"
   | "join scandic friends sidebar"
   | "sign up verification"
+  | "enter details"

types/contexts/details.ts

@@ -0,0 +1,3 @@
+import { createDetailsStore } from "@/stores/details"
+
+export type DetailsStore = ReturnType<typeof createDetailsStore>

types/contexts/steps.ts

@@ -0,0 +1,3 @@
+import { createStepsStore } from "@/stores/steps"
+
+export type StepsStore = ReturnType<typeof createStepsStore>

types/enums/breakfast.ts

@@ -1,5 +1,4 @@
 export enum BreakfastPackageEnum {
   FREE_MEMBER_BREAKFAST = "BRF0",
   REGULAR_BREAKFAST = "BRF1",
-  NO_BREAKFAST = "NO_BREAKFAST",
 }

types/enums/step.ts

@@ -0,0 +1,6 @@
+export enum StepEnum {
+  selectBed = "select-bed",
+  breakfast = "breakfast",
+  details = "details",
+  payment = "payment",
+}

types/hotel.ts

@@ -26,26 +26,6 @@ export type GalleryImage = z.infer<typeof imageSchema>
 
 export type PointOfInterest = z.output<typeof pointOfInterestSchema>
 
-export enum PointOfInterestCategoryNameEnum {
-  AIRPORT = "Airport",
-  AMUSEMENT_PARK = "Amusement park",
-  BUS_TERMINAL = "Bus terminal",
-  FAIR = "Fair",
-  HOSPITAL = "Hospital",
-  HOTEL = "Hotel",
-  MARKETING_CITY = "Marketing city",
-  MUSEUM = "Museum",
-  NEARBY_COMPANIES = "Nearby companies",
-  PARKING_GARAGE = "Parking / Garage",
-  RESTAURANT = "Restaurant",
-  SHOPPING = "Shopping",
-  SPORTS = "Sports",
-  THEATRE = "Theatre",
-  TOURIST = "Tourist",
-  TRANSPORTATIONS = "Transportations",
-  ZOO = "Zoo",
-}
-
 export enum PointOfInterestGroupEnum {
   PUBLIC_TRANSPORT = "Public transport",
   ATTRACTIONS = "Attractions",

types/providers/details.ts

@@ -0,0 +1,3 @@
+export interface DetailsProviderProps extends React.PropsWithChildren {
+  isMember: boolean
+}

types/providers/steps.ts

@@ -0,0 +1,11 @@
+import type { BedTypeSelection } from "@/types/components/hotelReservation/enterDetails/bedType"
+import { StepEnum } from "@/types/enums/step"
+import type { BreakfastPackage } from "../components/hotelReservation/enterDetails/breakfast"
+
+export interface StepsProviderProps extends React.PropsWithChildren {
+  bedTypes: BedTypeSelection[]
+  breakfastPackages: BreakfastPackage[] | null
+  isMember: boolean
+  searchParams: string
+  step: StepEnum
+}

types/stores/details.ts

@@ -0,0 +1,40 @@
+import type { BedTypeSchema } from "@/types/components/hotelReservation/enterDetails/bedType"
+import type { BookingData } from "@/types/components/hotelReservation/enterDetails/bookingData"
+import type { BreakfastPackage } from "@/types/components/hotelReservation/enterDetails/breakfast"
+import type { DetailsSchema } from "@/types/components/hotelReservation/enterDetails/details"
+import { StepEnum } from "@/types/enums/step"
+
+export interface DetailsState {
+  actions: {
+    setIsSubmittingDisabled: (isSubmittingDisabled: boolean) => void
+    setTotalPrice: (totalPrice: TotalPrice) => void
+    toggleSummaryOpen: () => void
+    updateBedType: (data: BedTypeSchema) => void
+    updateBreakfast: (data: BreakfastPackage | false) => void
+    updateDetails: (data: DetailsSchema) => void
+    updateValidity: (property: StepEnum, isValid: boolean) => void
+  }
+  data: DetailsSchema & {
+    bedType: BedTypeSchema | undefined
+    breakfast: BreakfastPackage | false | undefined
+    booking: BookingData
+  }
+  isSubmittingDisabled: boolean
+  isSummaryOpen: boolean
+  isValid: Record<StepEnum, boolean>
+  totalPrice: TotalPrice
+}
+
+export interface InitialState extends Partial<DetailsState> {
+  booking: BookingData
+}
+
+interface Price {
+  currency: string
+  price: number
+}
+
+export interface TotalPrice {
+  euro: Price | undefined
+  local: Price
+}

types/stores/steps.ts

@@ -0,0 +1,10 @@
+import { StepEnum } from "@/types/enums/step"
+
+export interface StepState {
+  completeStep: () => void
+  navigate: (step: StepEnum) => void
+  setStep: (step: StepEnum) => void
+
+  currentStep: StepEnum
+  steps: StepEnum[]
+}

types/window.d.ts

@@ -13,4 +13,5 @@ interface Window {
     }
   }
   Cookiebot: { changed: boolean; consented: boolean }
+  ApplePaySession: (() => void) | undefined
 }