Merged in feat/SW-1737-design-mystay-multiroom (pull request #1565)

Feat/SW-1737 design mystay multiroom

* feat(SW-1737) Fixed member view of guest details

* feat(SW-1737) fix merge issues

* feat(SW-1737) Fixed price details

* feat(SW-1737) removed unused imports

* feat(SW-1737) removed true as statement

* feat(SW-1737) updated store handling

* feat(SW-1737) fixed bug showing double numbers

* feat(SW-1737) small design fixed

* feat(SW-1737) fixed rebase errors

* feat(SW-1737) fixed create booking error with dates

* feat(SW-1737) fixed view multiroom as singleroom

* feat(SW-1737) fixes for multiroom

* feat(SW-1737) fixed bookingsummary

* feat(SW-1737) dont hide modify dates

* feat(SW-1737) updated breakfast to handle number

* feat(SW-1737) Added red color if member rate

* feat(SW-1737) fix PR comments

* feat(SW-1737) updated member tiers svg

* feat(SW-1737) updated how to handle paymentMethodDescription

* feat(SW-1737) fixes after testing mystay

* feat(SW-1737) updated Room type to just use whats used

* feat(SW-1737) fixed access

* feat(SW-1737) refactor my stay after PR comments

* feat(SW-1737) fix roomNumber translation

* feat(SW-1737) removed log


Approved-by: Arvid Norlin

apps/scandic-web/types/components/hotelReservation/bookingConfirmation/promo.ts

@@ -3,4 +3,18 @@ export interface PromoProps {
   href: string
   text: string
   title: string
+  image?: {
+    imageSizes: {
+      large: string
+      medium: string
+      small: string
+      tiny: string
+    }
+    metaData: {
+      altText: string
+      altText_En: string
+      copyRight: string
+      title: string
+    }
+  }
 }

apps/scandic-web/types/components/hotelReservation/myStay/cancelStay.ts

@@ -1,22 +1,19 @@
 import { z } from "zod"
 
 import type { Hotel } from "@/types/hotel"
-import type { BookingConfirmation } from "@/types/trpc/routers/booking/confirmation"
+import type { Room } from "@/stores/my-stay/myStayRoomDetailsStore"
 
 export const cancelStaySchema = z.object({
   rooms: z.array(
     z.object({
-      id: z.string().optional(),
       checked: z.boolean().optional(),
-      confirmationNumber: z.string().nullable().optional(),
+      confirmationNumber: z.string(),
     })
   ),
 })
 
 export interface CancelStayProps {
-  booking: BookingConfirmation["booking"]
   hotel: Hotel
-  setBookingStatus: () => void
   handleCloseModal: () => void
 }
 
@@ -33,7 +30,7 @@ export interface RoomDetails {
     generalTerms: string[]
     isMemberRate: boolean
     mustBeGuaranteed: boolean
-    rateCode: string | null
+    rateCode: string
     title: string | null
   }
   isMainBooking?: boolean
@@ -49,16 +46,14 @@ export interface StayDetails {
 
 export interface CancelStayConfirmationProps {
   hotel: Hotel
-  booking: BookingConfirmation["booking"]
   stayDetails: StayDetails
 }
 
 export interface FinalConfirmationProps {
-  booking: BookingConfirmation["booking"]
   stayDetails: StayDetails
 }
 
 export interface PriceContainerProps {
-  booking: BookingConfirmation["booking"]
+  roomDetails: Room
   stayDetails: StayDetails
 }

apps/scandic-web/types/components/hotelReservation/myStay/modifyDate.ts

@@ -2,9 +2,6 @@ import { z } from "zod"
 
 import { Lang } from "@/constants/languages"
 
-import type { BookingConfirmation } from "@/types/trpc/routers/booking/confirmation"
-import type { User } from "@/types/user"
-
 export const modifyDateSchema = z.object({
   checkInDate: z.string(),
   checkOutDate: z.string(),
@@ -37,6 +34,5 @@ export const DEFAULT_QUERY_INPUT: QueryInput = {
 }
 
 export interface ModifyStayProps {
-  booking: BookingConfirmation["booking"]
-  user: User | null
+  isLoggedIn: boolean
 }

apps/scandic-web/types/components/hotelReservation/sidePeek.ts

@@ -1,4 +1,5 @@
 export enum SidePeekEnum {
   hotelDetails = "hotel-detail-side-peek",
   roomDetails = "room-detail-side-peek",
+  bookedRoomDetails = "booked-room-detail-side-peek",
 }

apps/scandic-web/types/components/hotelReservation/toggleSidePeekProps.ts

@@ -1,6 +1,10 @@
+import type { User } from "@/types/user"
+
 export type ToggleSidePeekProps = {
   hotelId: string
   roomTypeCode?: string
   intent?: "text" | "textInverted"
   title?: string
+  user?: User
+  confirmationNumber?: string
 }

apps/scandic-web/types/components/myPages/membership.ts

@@ -1,9 +1,9 @@
-import { MembershipLevel } from "@/constants/membershipLevels"
-
-import { LevelProps } from "@/components/Levels/levels"
+import type { LevelProps } from "@/components/Levels/levels"
+import type { MembershipLevel } from "@/constants/membershipLevels"
 
 export type MembershipLevelIconProps = {
   level: MembershipLevel
+  rows?: 1 | 2
 } & LevelProps
 
 export type CopyButtonProps = {

apps/scandic-web/types/components/sidePeeks/bookedRoomSidePeek.ts

@@ -0,0 +1,17 @@
+import type { Room } from "@/types/hotel"
+import type { User } from "@/types/user"
+import type { SidePeekEnum } from "../hotelReservation/sidePeek"
+
+export type BookedRoomSidePeekProps = {
+  room: Room
+  activeSidePeek: SidePeekEnum | null
+  close: () => void
+  user: User | null
+  confirmationNumber: string
+}
+
+export type RoomDetailsProps = {
+  roomDescription: string
+  roomFacilities: Room["roomFacilities"]
+  roomTypes: Room["roomTypes"]
+}