Merged in feat/BOOK-479-scandic-go-hotels-rm-brf- (pull request #3143)

feat(BOOK-479): Updated breakfast UI for ScandicGo hotels

Approved-by: Erik Tiekstra
This commit is contained in:
Hrishikesh Vaipurkar
2025-11-18 13:03:46 +00:00
parent 93c481fea8
commit 4c0daf8062
23 changed files with 144 additions and 213 deletions

View File

@@ -1,6 +1,7 @@
"use client"
import PriceDetailsModal from "@scandic-hotels/booking-flow/components/PriceDetailsModal"
import { dt } from "@scandic-hotels/common/dt"
import { HotelTypeEnum } from "@scandic-hotels/trpc/enums/hotelType"
import { useMyStayStore } from "@/stores/my-stay"
@@ -9,17 +10,20 @@ import { calculateTotalPrice, mapToPrice } from "./mapToPrice"
import styles from "./priceDetails.module.css"
export default function PriceDetails() {
const { bookedRoom, rooms } = useMyStayStore((state) => ({
bookedRoom: state.bookedRoom,
rooms: state.rooms
.filter((room) => !room.isCancelled)
.map((room) => ({
...room,
breakfastIncluded: room.rateDefinition.breakfastIncluded,
price: mapToPrice(room),
roomType: room.roomName,
})),
}))
const { bookedRoom, rooms, hotelOffersBreakfast } = useMyStayStore(
(state) => ({
bookedRoom: state.bookedRoom,
rooms: state.rooms
.filter((room) => !room.isCancelled)
.map((room) => ({
...room,
breakfastIncluded: room.rateDefinition.breakfastIncluded,
price: mapToPrice(room),
roomType: room.roomName,
})),
hotelOffersBreakfast: state.hotel.hotelType !== HotelTypeEnum.ScandicGo,
})
)
const bookingCode =
rooms.find((room) => room.bookingCode)?.bookingCode ?? undefined
@@ -38,6 +42,7 @@ export default function PriceDetails() {
vat={bookedRoom.vatPercentage}
defaultCurrency={bookedRoom.currencyCode}
isCampaignRate={bookedRoom.isCampaignRate}
hotelOffersBreakfast={hotelOffersBreakfast}
/>
</div>
)

View File

@@ -9,15 +9,23 @@ import { mapToPrice } from "./mapToPrice"
import type { Price } from "../../../types/price"
export default function PriceDetails() {
const { bookingCode, currency, fromDate, rooms, vat, toDate } =
useBookingConfirmationStore((state) => ({
bookingCode: state.bookingCode ?? undefined,
currency: state.currencyCode,
fromDate: state.fromDate,
rooms: state.rooms,
toDate: state.toDate,
vat: state.vat,
}))
const {
bookingCode,
currency,
hotelOffersBreakfast,
fromDate,
rooms,
vat,
toDate,
} = useBookingConfirmationStore((state) => ({
bookingCode: state.bookingCode ?? undefined,
currency: state.currencyCode,
hotelOffersBreakfast: state.hotelOffersBreakfast,
fromDate: state.fromDate,
rooms: state.rooms,
toDate: state.toDate,
vat: state.vat,
}))
if (!rooms[0]) {
return null
@@ -135,6 +143,7 @@ export default function PriceDetails() {
vat={vat}
defaultCurrency={currency}
isCampaignRate={isCampaignRate}
hotelOffersBreakfast={hotelOffersBreakfast}
/>
)
}

View File

@@ -15,7 +15,7 @@ import { ChildBedTypeEnum } from "@scandic-hotels/trpc/enums/childBedTypeEnum"
import { useBookingConfirmationStore } from "../../../../stores/booking-confirmation"
import { getRoomFeatureDescription } from "../../../../utils/getRoomFeatureDescription"
import Breakfast from "./Breakfast"
import { SummaryBreakfast } from "../../../SummaryBreakfast"
import RoomSkeletonLoader from "./RoomSkeletonLoader"
import styles from "./room.module.css"
@@ -36,11 +36,12 @@ export function ReceiptRoom({
showBookingCodeChip = false,
}: BookingConfirmationReceiptRoomProps) {
const intl = useIntl()
const { currencyCode, isVatCurrency, bookingCode } =
const { currencyCode, isVatCurrency, bookingCode, hotelOffersBreakfast } =
useBookingConfirmationStore((state) => ({
currencyCode: state.currencyCode,
isVatCurrency: state.isVatCurrency,
bookingCode: state.bookingCode,
hotelOffersBreakfast: state.hotelOffersBreakfast,
}))
if (!room) {
@@ -80,6 +81,11 @@ export function ReceiptRoom({
const showDiscounted =
room.rateDefinition.isMemberRate || room.rateDefinition.isCampaignRate
const breakfastPrice = room.breakfast
? room.breakfast?.totalPrice
: room.breakfast
const breakfastCurrency = room.breakfast ? room.breakfast?.currency : null
return (
<>
<div className={styles.room}>
@@ -275,10 +281,12 @@ export function ReceiptRoom({
</div>
</Typography>
) : null}
<Breakfast
breakfast={room.breakfast}
<SummaryBreakfast
breakfastPrice={breakfastPrice}
breakfastCurrency={breakfastCurrency}
breakfastIncluded={room.breakfastIncluded}
guests={guests}
hotelOffersBreakfast={hotelOffersBreakfast}
/>
{showBookingCodeChip && (

View File

@@ -4,6 +4,7 @@ import { AlertTypeEnum } from "@scandic-hotels/common/constants/alert"
import { dt } from "@scandic-hotels/common/dt"
import { Alert } from "@scandic-hotels/design-system/Alert"
import { Divider } from "@scandic-hotels/design-system/Divider"
import { HotelTypeEnum } from "@scandic-hotels/trpc/enums/hotelType"
import { BookingConfirmationProvider } from "../../providers/BookingConfirmationProvider"
import { getBookingConfirmation } from "../../trpc/memoizedRequests/getBookingConfirmation"
@@ -51,6 +52,7 @@ export async function BookingConfirmation({
bookingCode={booking.bookingCode}
currencyCode={booking.currencyCode}
fromDate={booking.checkInDate}
hotelOffersBreakfast={hotel.hotelType !== HotelTypeEnum.ScandicGo}
toDate={booking.checkOutDate}
roomCategories={roomCategories}
rooms={[

View File

@@ -1,6 +1,5 @@
"use client"
import { useEnterDetailsStore } from "../../../stores/enter-details"
import { SidePanel } from "../../SidePanel"
import SummaryUI from "./UI"
@@ -9,30 +8,9 @@ type Props = {
}
export default function DesktopSummary({ isUserLoggedIn }: Props) {
const toggleSummaryOpen = useEnterDetailsStore(
(state) => state.actions.toggleSummaryOpen
)
const { booking, rooms, totalPrice, vat, defaultCurrency } =
useEnterDetailsStore((state) => ({
booking: state.booking,
rooms: state.rooms,
totalPrice: state.totalPrice,
vat: state.vat,
defaultCurrency: state.defaultCurrency,
}))
return (
<SidePanel variant="summary">
<SummaryUI
booking={booking}
rooms={rooms}
isUserLoggedIn={isUserLoggedIn}
totalPrice={totalPrice}
vat={vat}
toggleSummaryOpen={toggleSummaryOpen}
defaultCurrency={defaultCurrency}
/>
<SummaryUI isUserLoggedIn={isUserLoggedIn} />
</SidePanel>
)
}

View File

@@ -11,22 +11,14 @@ type Props = {
isUserLoggedIn: boolean
}
export default function MobileSummary({ isUserLoggedIn }: Props) {
const { isSummaryOpen, toggleSummaryOpen } = useEnterDetailsStore(
const { rooms, isSummaryOpen, toggleSummaryOpen } = useEnterDetailsStore(
(state) => ({
rooms: state.rooms,
isSummaryOpen: state.isSummaryOpen,
toggleSummaryOpen: state.actions.toggleSummaryOpen,
})
)
const { booking, rooms, totalPrice, vat, defaultCurrency } =
useEnterDetailsStore((state) => ({
booking: state.booking,
rooms: state.rooms,
totalPrice: state.totalPrice,
vat: state.vat,
defaultCurrency: state.defaultCurrency,
}))
const showPromo =
!isUserLoggedIn &&
rooms.length === 1 &&
@@ -52,15 +44,7 @@ export default function MobileSummary({ isUserLoggedIn }: Props) {
<SummaryBottomSheet isUserLoggedIn={isUserLoggedIn}>
<div className={styles.wrapper}>
<SummaryUI
booking={booking}
rooms={rooms}
isUserLoggedIn={isUserLoggedIn}
totalPrice={totalPrice}
vat={vat}
toggleSummaryOpen={toggleSummaryOpen}
defaultCurrency={defaultCurrency}
/>
<SummaryUI isUserLoggedIn={isUserLoggedIn} />
</div>
</SummaryBottomSheet>
</div>

View File

@@ -1,13 +0,0 @@
.entry {
display: flex;
gap: var(--Space-x05);
justify-content: space-between;
}
.textDefault {
color: var(--Text-Default);
}
.uiTextMediumContrast {
color: var(--UI-Text-Medium-contrast);
}

View File

@@ -1,79 +0,0 @@
"use client"
import { useIntl } from "react-intl"
import { formatPrice } from "@scandic-hotels/common/utils/numberFormatting"
import { Typography } from "@scandic-hotels/design-system/Typography"
import styles from "./breakfast.module.css"
import type { BreakfastPackage } from "@scandic-hotels/trpc/routers/hotels/schemas/packages"
interface BreakfastProps {
adults: number
breakfast: BreakfastPackage | false | undefined
breakfastIncluded: boolean
guests: string
nights: number
}
export default function Breakfast({
adults,
breakfast,
breakfastIncluded,
guests,
nights,
}: BreakfastProps) {
const intl = useIntl()
const breakfastBuffet = intl.formatMessage({
id: "common.breakfastBuffet",
defaultMessage: "Breakfast buffet",
})
if (breakfastIncluded || breakfast) {
const price = breakfast
? formatPrice(
intl,
breakfast.localPrice.price * adults * nights,
breakfast.localPrice.currency
)
: intl.formatMessage({
id: "common.included",
defaultMessage: "Included",
})
return (
<div className={styles.entry}>
<div>
<Typography variant="Body/Paragraph/mdRegular">
<p className={styles.textDefault}>{breakfastBuffet}</p>
</Typography>
<Typography variant="Body/Supporting text (caption)/smRegular">
<p className={styles.uiTextMediumContrast}>{guests}</p>
</Typography>
</div>
<Typography variant="Body/Paragraph/mdRegular">
<p className={styles.textDefault}>{price}</p>
</Typography>
</div>
)
}
if (breakfast === false) {
const noBreakfast = intl.formatMessage({
id: "common.noBreakfast",
defaultMessage: "No breakfast",
})
return (
<div className={styles.entry}>
<Typography variant="Body/Paragraph/mdRegular">
<p className={styles.textDefault}>{breakfastBuffet}</p>
</Typography>
<Typography variant="Body/Paragraph/mdRegular">
<p className={styles.textDefault}>{noBreakfast}</p>
</Typography>
</div>
)
}
return null
}

View File

@@ -12,7 +12,7 @@ import { Typography } from "@scandic-hotels/design-system/Typography"
import { ChildBedMapEnum } from "@scandic-hotels/trpc/enums/childBedMapEnum"
import { getRoomFeatureDescription } from "../../../../../utils/getRoomFeatureDescription"
import Breakfast from "./Breakfast"
import { SummaryBreakfast } from "../../../../SummaryBreakfast"
import styles from "./room.module.css"
@@ -26,6 +26,7 @@ interface RoomProps {
nightsCount: number
defaultCurrency: CurrencyEnum
showBookingCodeChip?: boolean
hotelOffersBreakfast?: boolean
}
export default function Room({
@@ -36,6 +37,7 @@ export default function Room({
nightsCount,
defaultCurrency,
showBookingCodeChip = false,
hotelOffersBreakfast = true,
}: RoomProps) {
const intl = useIntl()
const adults = room.adults
@@ -132,6 +134,13 @@ export default function Room({
)
}
const breakfastPrice = room.breakfast
? room.breakfast?.localPrice.price * adults * nightsCount
: room.breakfast
const breakfastCurrency = room.breakfast
? room.breakfast?.localPrice.currency
: null
return (
<>
<div className={styles.room} data-testid={`summary-room-${roomNumber}`}>
@@ -340,12 +349,12 @@ export default function Room({
</Typography>
) : null}
<Breakfast
adults={room.adults}
breakfast={room.breakfast}
<SummaryBreakfast
breakfastIncluded={room.breakfastIncluded}
breakfastPrice={breakfastPrice}
breakfastCurrency={breakfastCurrency}
guests={guests}
nights={nightsCount}
hotelOffersBreakfast={hotelOffersBreakfast}
/>
</div>
{showBookingCodeChip && (

View File

@@ -16,6 +16,7 @@ import Subtitle from "@scandic-hotels/design-system/Subtitle"
import { Typography } from "@scandic-hotels/design-system/Typography"
import useLang from "../../../../hooks/useLang"
import { useEnterDetailsStore } from "../../../../stores/enter-details"
import PriceDetailsModal from "../../../PriceDetailsModal"
import { isBookingCodeRate } from "../../../SelectRate/RoomsContainer/RateSummary/utils"
import SignupPromoDesktop from "../../../SignupPromo/Desktop"
@@ -25,33 +26,33 @@ import { getMemberPrice } from "./utils"
import styles from "./ui.module.css"
import type { RoomState } from "../../../../stores/enter-details/types"
import type { Price } from "../../../../types/price"
import type { DetailsBooking } from "../../../../utils/url"
type EnterDetailsSummaryProps = {
booking: DetailsBooking
isUserLoggedIn: boolean
totalPrice: Price
vat: number
rooms: RoomState[]
toggleSummaryOpen: () => void
defaultCurrency: CurrencyEnum
}
export default function SummaryUI({
booking,
rooms,
totalPrice,
isUserLoggedIn,
vat,
toggleSummaryOpen,
defaultCurrency,
}: EnterDetailsSummaryProps) {
}: {
isUserLoggedIn: boolean
}) {
const intl = useIntl()
const lang = useLang()
const isDesktop = useMediaQuery("(min-width: 1367px)")
const {
booking,
defaultCurrency,
hotelOffersBreakfast,
rooms,
totalPrice,
vat,
toggleSummaryOpen,
} = useEnterDetailsStore((state) => ({
booking: state.booking,
defaultCurrency: state.defaultCurrency,
hotelOffersBreakfast: state.hotelOffersBreakfast,
rooms: state.rooms,
totalPrice: state.totalPrice,
vat: state.vat,
toggleSummaryOpen: state.actions.toggleSummaryOpen,
}))
const nights = dt(booking.toDate).diff(booking.fromDate, "days")
const nightsMsg = intl.formatMessage(
@@ -143,6 +144,7 @@ export default function SummaryUI({
(room.roomRate.rateDefinition.isCampaignRate ||
!!room.roomRate.bookingCode)
}
hotelOffersBreakfast={hotelOffersBreakfast}
/>
))}
@@ -231,6 +233,7 @@ export default function SummaryUI({
totalPrice={totalPrice}
vat={vat}
isCampaignRate={!!containsCampaignRate}
hotelOffersBreakfast={hotelOffersBreakfast}
/>
</div>
</div>

View File

@@ -18,6 +18,7 @@ interface BreakfastProps {
childrenInRoom: Child[] | undefined
currency: string
nights: number
hotelOffersBreakfast?: boolean
}
export default function Breakfast({
@@ -28,6 +29,7 @@ export default function Breakfast({
childrenInRoom = [],
currency,
nights,
hotelOffersBreakfast = true,
}: BreakfastProps) {
const intl = useIntl()
@@ -194,7 +196,10 @@ export default function Breakfast({
})
return (
<Tbody>
<BoldRow label={breakfastBuffet} value={noBreakfast} />
<BoldRow
label={hotelOffersBreakfast ? breakfastBuffet : undefined}
value={noBreakfast}
/>
</Tbody>
)
}

View File

@@ -5,7 +5,7 @@ import { Typography } from "@scandic-hotels/design-system/Typography"
import styles from "./row.module.css"
interface RowProps {
label: string
label?: string
value: string
regularValue?: string
isDiscounted?: boolean
@@ -19,11 +19,13 @@ export default function BoldRow({
}: RowProps) {
return (
<tr className={styles.row}>
<td>
<Typography variant="Body/Supporting text (caption)/smBold">
<span>{label}</span>
</Typography>
</td>
{label ? (
<td>
<Typography variant="Body/Supporting text (caption)/smBold">
<span>{label}</span>
</Typography>
</td>
) : null}
<td className={styles.price}>
{isDiscounted && regularValue ? (
<Typography variant="Body/Supporting text (caption)/smRegular">

View File

@@ -66,6 +66,7 @@ export interface PriceDetailsTableProps {
totalPrice: Price
vat: number
defaultCurrency: CurrencyEnum
hotelOffersBreakfast?: boolean
}
export default function PriceDetailsTable({
@@ -77,6 +78,7 @@ export default function PriceDetailsTable({
totalPrice,
vat,
defaultCurrency,
hotelOffersBreakfast,
}: PriceDetailsTableProps) {
const intl = useIntl()
const lang = useLang()
@@ -217,6 +219,7 @@ export default function PriceDetailsTable({
childrenInRoom={room.childrenInRoom}
currency={currency}
nights={nights}
hotelOffersBreakfast={hotelOffersBreakfast}
/>
{rooms.length !== 1 &&
(room.rateDefinition.isCampaignRate || !!bookingCode) && (

View File

@@ -4,20 +4,22 @@ import { useIntl } from "react-intl"
import { formatPrice } from "@scandic-hotels/common/utils/numberFormatting"
import { Typography } from "@scandic-hotels/design-system/Typography"
import styles from "./breakfast.module.css"
import type { PackageSchema } from "@scandic-hotels/trpc/types/bookingConfirmation"
import styles from "./summaryBreakfast.module.css"
interface BreakfastProps {
breakfast: PackageSchema | false | undefined
breakfastPrice: number | false | undefined
breakfastCurrency?: string | null
breakfastIncluded: boolean
guests: string
hotelOffersBreakfast: boolean
}
export default function Breakfast({
breakfast,
export function SummaryBreakfast({
breakfastPrice,
breakfastCurrency,
breakfastIncluded,
guests,
hotelOffersBreakfast = true,
}: BreakfastProps) {
const intl = useIntl()
@@ -26,13 +28,14 @@ export default function Breakfast({
defaultMessage: "Breakfast buffet",
})
if (breakfastIncluded || breakfast) {
const price = breakfast
? formatPrice(intl, breakfast.totalPrice, breakfast.currency)
: intl.formatMessage({
id: "common.included",
defaultMessage: "Included",
})
if (breakfastIncluded || (breakfastPrice && breakfastCurrency)) {
const price =
breakfastPrice && breakfastCurrency
? formatPrice(intl, breakfastPrice, breakfastCurrency)
: intl.formatMessage({
id: "common.included",
defaultMessage: "Included",
})
return (
<div className={styles.entry}>
<div>
@@ -50,20 +53,18 @@ export default function Breakfast({
)
}
if (breakfast === false) {
if (breakfastPrice === false) {
const noBreakfast = intl.formatMessage({
id: "common.noBreakfast",
defaultMessage: "No breakfast",
})
return (
<div className={styles.entry}>
<Typography variant="Body/Paragraph/mdRegular">
<p className={styles.textDefault}>{breakfastBuffet}</p>
</Typography>
<Typography variant="Body/Paragraph/mdRegular">
<p className={styles.textDefault}>{noBreakfast}</p>
</Typography>
</div>
<Typography variant="Body/Paragraph/mdRegular">
<div className={`${styles.entry} ${styles.textDefault}`}>
{hotelOffersBreakfast ? <p>{breakfastBuffet}</p> : null}
<p>{noBreakfast}</p>
</div>
</Typography>
)
}

View File

@@ -36,6 +36,7 @@ export const EnterDetailsContext = createContext<EnterDetailsStore | null>(null)
type DetailsProviderProps = React.PropsWithChildren & {
booking: DetailsBooking
breakfastPackages: BreakfastPackages
hotelOffersBreakfast: boolean
lang: Lang
rooms: Room[]
searchParamsStr: string
@@ -49,6 +50,7 @@ export default function EnterDetailsProvider({
booking,
breakfastPackages,
children,
hotelOffersBreakfast,
lang,
rooms,
searchParamsStr,
@@ -67,6 +69,7 @@ export default function EnterDetailsProvider({
if (!storeRef.current) {
const initialData: InitialState = {
booking,
hotelOffersBreakfast,
rooms: rooms
.filter((r) => r.bedTypes?.length) // TODO: how to handle room without bedtypes?
.map((room) => ({

View File

@@ -4,6 +4,7 @@ import { Suspense } from "react"
import { FamilyAndFriendsCodes } from "@scandic-hotels/common/constants/familyAndFriends"
import { SEARCH_TYPE_REDEMPTION } from "@scandic-hotels/trpc/constants/booking"
import { HotelTypeEnum } from "@scandic-hotels/trpc/enums/hotelType"
import { BookingFlowConfig } from "../bookingFlowConfig/bookingFlowConfig"
import HotelHeader from "../components/EnterDetails/Header"
@@ -137,6 +138,7 @@ export async function EnterDetailsPage({
rooms={rooms}
searchParamsStr={selectRoomParams.toString()}
user={user}
hotelOffersBreakfast={hotel.hotelType !== HotelTypeEnum.ScandicGo}
hotelName={hotel.name}
vat={hotel.vat}
roomCategories={hotelData.roomCategories}

View File

@@ -17,6 +17,7 @@ export function BookingConfirmationProvider({
children,
currencyCode,
fromDate,
hotelOffersBreakfast,
toDate,
roomCategories,
rooms,
@@ -94,6 +95,7 @@ export function BookingConfirmationProvider({
rooms,
vat,
isVatCurrency,
hotelOffersBreakfast,
formattedTotalCost,
totalBookingPrice,
totalBookingCheques,

View File

@@ -18,6 +18,7 @@ export function createBookingConfirmationStore(initialState: InitialState) {
roomCategories: initialState.roomCategories,
vat: initialState.vat,
formattedTotalCost: initialState.formattedTotalCost,
hotelOffersBreakfast: initialState.hotelOffersBreakfast,
isVatCurrency: initialState.isVatCurrency,
totalBookingPrice: initialState.totalBookingPrice,
totalBookingCheques: initialState.totalBookingCheques,

View File

@@ -107,6 +107,7 @@ export function createDetailsStore(
canProceedToPayment: false,
isSubmitting: false,
isSummaryOpen: false,
hotelOffersBreakfast: initialState.hotelOffersBreakfast,
lastRoom: initialState.booking.rooms.length - 1,
rooms: initialRooms.map((room, idx) => {
const steps: RoomState["steps"] = {

View File

@@ -85,6 +85,7 @@ export interface RoomState {
export type InitialState = {
booking: DetailsBooking
hotelOffersBreakfast: boolean
rooms: InitialRoomData[]
vat: number
hotelName: string
@@ -106,6 +107,7 @@ export interface DetailsState {
booking: DetailsBooking
breakfastPackages: BreakfastPackages
canProceedToPayment: boolean
hotelOffersBreakfast: boolean
isSubmitting: boolean
isSummaryOpen: boolean
lastRoom: number

View File

@@ -8,6 +8,7 @@ export interface BookingConfirmationProviderProps
bookingCode: string | null
currencyCode: CurrencyEnum
fromDate: string
hotelOffersBreakfast: boolean
roomCategories: RoomCategories
rooms: (Room | null)[]
toDate: string

View File

@@ -50,6 +50,7 @@ export interface InitialState {
roomCategories: RoomCategories
vat: number
isVatCurrency: boolean
hotelOffersBreakfast: boolean
formattedTotalCost: string
totalBookingPrice: number
totalBookingCheques: number