feat: add no breakfast message to price details modal and to conf page receipt

apps/scandic-web/components/HotelReservation/BookingConfirmation/PriceDetails/mapToPrice.ts

@@ -4,6 +4,7 @@ import {
 } from "@/server/routers/hotels/schemas/packages"
 
 import { ChildBedMapEnum } from "@/types/components/bookingWidget/enums"
+import type { BreakfastPackage } from "@/types/components/hotelReservation/breakfast"
 import { BreakfastPackageEnum } from "@/types/enums/breakfast"
 import { PackageTypeEnum } from "@/types/enums/packages"
 import type { Package } from "@/types/requests/packages"
@@ -47,6 +48,11 @@ export function mapToPrice(rooms: (Room | null)[], nights: number) {
         }
       }
 
+      let breakfast:
+        | false
+        | undefined
+        | Omit<BreakfastPackage, "requestedPrice">
+      if (room.breakfast) {
         const breakfastPackage = breakfastPackageSchema.safeParse({
           code: room.breakfast?.code,
           description: room.breakfast?.description,
@@ -65,6 +71,14 @@ export function mapToPrice(rooms: (Room | null)[], nights: number) {
             totalPrice: room.breakfast?.totalPrice,
           },
         })
+        if (breakfastPackage.success) {
+          breakfast = breakfastPackage.data
+        }
+      }
+
+      if (!room.breakfastIncluded && !breakfast) {
+        breakfast = false
+      }
 
       const packages = room.roomFeatures
         ?.map((featPkg) => {
@@ -97,7 +111,7 @@ export function mapToPrice(rooms: (Room | null)[], nights: number) {
           description: room.bedDescription,
           roomTypeCode: room.roomTypeCode || "",
         },
-        breakfast: breakfastPackage.success ? breakfastPackage.data : undefined,
+        breakfast,
         breakfastIncluded: room.rateDefinition.breakfastIncluded,
         childrenInRoom: room.childrenAges?.map((age) => ({
           age,

apps/scandic-web/components/HotelReservation/BookingConfirmation/Receipt/Room/Breakfast/breakfast.module.css

@@ -0,0 +1,12 @@
+.entry {
+  display: flex;
+  justify-content: space-between;
+}
+
+.textDefault {
+  color: var(--Text-Default);
+}
+
+.textSecondary {
+  color: var(--Text-Secondary);
+}

apps/scandic-web/components/HotelReservation/BookingConfirmation/Receipt/Room/Breakfast/index.tsx

@@ -0,0 +1,65 @@
+"use client"
+import { useIntl } from "react-intl"
+
+import { Typography } from "@scandic-hotels/design-system/Typography"
+
+import { formatPrice } from "@/utils/numberFormatting"
+
+import styles from "./breakfast.module.css"
+
+import type { PackageSchema } from "@/types/trpc/routers/booking/confirmation"
+
+interface BreakfastProps {
+  breakfast: PackageSchema | false | undefined
+  breakfastIncluded: boolean
+  guests: string
+}
+
+export default function Breakfast({
+  breakfast,
+  breakfastIncluded,
+  guests,
+}: BreakfastProps) {
+  const intl = useIntl()
+
+  const breakfastBuffet = intl.formatMessage({
+    defaultMessage: "Breakfast buffet",
+  })
+
+  if (breakfastIncluded || breakfast) {
+    const price = breakfast
+      ? formatPrice(intl, breakfast.totalPrice, breakfast.currency)
+      : intl.formatMessage({ 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.textSecondary}>{guests}</p>
+          </Typography>
+        </div>
+        <Typography variant="Body/Paragraph/mdRegular">
+          <p className={styles.textDefault}>{price}</p>
+        </Typography>
+      </div>
+    )
+  }
+
+  if (breakfast === false) {
+    const noBreakfast = intl.formatMessage({ 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
+}

apps/scandic-web/components/HotelReservation/BookingConfirmation/Receipt/Room/index.tsx

@@ -13,6 +13,7 @@ import Button from "@/components/TempDesignSystem/Button"
 import Link from "@/components/TempDesignSystem/Link"
 import { formatPrice } from "@/utils/numberFormatting"
 
+import Breakfast from "./Breakfast"
 import RoomSkeletonLoader from "./RoomSkeletonLoader"
 
 import styles from "./room.module.css"
@@ -34,8 +35,7 @@ export default function ReceiptRoom({
   if (!room) {
     return <RoomSkeletonLoader />
   }
-  const breakfastIncluded =
+
-    room.breakfastIncluded || room.rateDefinition.breakfastIncluded
   const childBedCrib = room.childBedPreferences.find(
     (c) => c.bedType === ChildBedTypeEnum.Crib
   )
@@ -63,6 +63,8 @@ export default function ReceiptRoom({
     guestsParts.push(childrenMsg)
   }
 
+  const guests = guestsParts.join(", ")
+
   return (
     <article className={styles.room}>
       <header className={styles.roomHeader}>
@@ -83,9 +85,7 @@ export default function ReceiptRoom({
           </Typography>
         )}
         <Typography variant="Body/Paragraph/mdRegular">
-          <p className={styles.uiTextMediumContrast}>
+          <p className={styles.uiTextMediumContrast}>{guests}</p>
-            {guestsParts.join(", ")}
-          </p>
         </Typography>
         <Typography variant="Body/Paragraph/mdRegular">
           <p className={styles.uiTextMediumContrast}>
@@ -226,37 +226,11 @@ export default function ReceiptRoom({
           </Typography>
         </div>
       ) : null}
-      {room.breakfast || breakfastIncluded ? (
+      <Breakfast
-        <div className={styles.entry}>
+        breakfast={room.breakfast}
-          <Typography variant="Body/Paragraph/mdRegular">
+        breakfastIncluded={room.breakfastIncluded}
-            <p>
+        guests={guests}
-              {intl.formatMessage({
+      />
-                defaultMessage: "Breakfast buffet",
-              })}
-            </p>
-          </Typography>
-          {breakfastIncluded ? (
-            <Typography variant="Body/Paragraph/mdRegular">
-              <p className={styles.red}>
-                {intl.formatMessage({
-                  defaultMessage: "Included",
-                })}
-              </p>
-            </Typography>
-          ) : null}
-          {room.breakfast && !breakfastIncluded ? (
-            <Typography variant="Body/Paragraph/mdRegular">
-              <p className={styles.uiTextHighContrast}>
-                {formatPrice(
-                  intl,
-                  room.breakfast.totalPrice,
-                  room.breakfast.currency
-                )}
-              </p>
-            </Typography>
-          ) : null}
-        </div>
-      ) : null}
     </article>
   )
 }

apps/scandic-web/components/HotelReservation/BookingConfirmation/utils.ts

@@ -5,19 +5,30 @@ import type { IntlShape } from "react-intl"
 import type { BookingConfirmationRoom } from "@/types/components/hotelReservation/bookingConfirmation/bookingConfirmation"
 import { BreakfastPackageEnum } from "@/types/enums/breakfast"
 import { CurrencyEnum } from "@/types/enums/currency"
-import type { BookingConfirmationSchema } from "@/types/trpc/routers/booking/confirmation"
+import type {
+  BookingConfirmationSchema,
+  PackageSchema,
+} from "@/types/trpc/routers/booking/confirmation"
 
 export function mapRoomState(
   booking: BookingConfirmationSchema,
   room: BookingConfirmationRoom,
   intl: IntlShape
 ) {
-  const breakfast = booking.packages.find(
+  const breakfastPackage = booking.packages.find(
     (pkg) => pkg.code === BreakfastPackageEnum.REGULAR_BREAKFAST
   )
-  const breakfastIncluded = booking.packages.some(
+  const breakfastIncluded =
+    booking.packages.some(
       (pkg) => pkg.code === BreakfastPackageEnum.FREE_MEMBER_BREAKFAST
-  )
+    ) || booking.rateDefinition.breakfastIncluded
+
+  let breakfast: false | undefined | PackageSchema
+  if (breakfastPackage) {
+    breakfast = breakfastPackage
+  } else if (!breakfastIncluded) {
+    breakfast = false
+  }
 
   let formattedRoomCost = formatPrice(
     intl,

apps/scandic-web/components/HotelReservation/EnterDetails/Summary/UI/Breakfast/breakfast.module.css

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

apps/scandic-web/components/HotelReservation/EnterDetails/Summary/UI/Breakfast/index.tsx

@@ -0,0 +1,73 @@
+"use client"
+import { useIntl } from "react-intl"
+
+import { Typography } from "@scandic-hotels/design-system/Typography"
+
+import { formatPrice } from "@/utils/numberFormatting"
+
+import styles from "./breakfast.module.css"
+
+import type { BreakfastPackage } from "@/types/components/hotelReservation/breakfast"
+
+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({
+    defaultMessage: "Breakfast buffet",
+  })
+
+  if (breakfastIncluded || breakfast) {
+    const price = breakfast
+      ? formatPrice(
+          intl,
+          breakfast.localPrice.price * adults * nights,
+          breakfast.localPrice.currency
+        )
+      : intl.formatMessage({ 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({ 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
+}

apps/scandic-web/components/HotelReservation/EnterDetails/Summary/UI/index.tsx

@@ -19,6 +19,7 @@ import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
 import useLang from "@/hooks/useLang"
 import { formatPrice } from "@/utils/numberFormatting"
 
+import Breakfast from "./Breakfast"
 import { mapToPrice } from "./mapToPrice"
 
 import styles from "./ui.module.css"
@@ -185,6 +186,8 @@ export default function SummaryUI({
           guestsParts.push(childrenMsg)
         }
 
+        const guests = guestsParts.join(", ")
+
         const hideBedCurrency = notDisplayableCurrencies.includes(
           room.roomPrice.perStay.local.currency
         )
@@ -233,9 +236,7 @@ export default function SummaryUI({
                         )}
                   </Body>
                 </div>
-                <Caption color="uiTextMediumContrast">
+                <Caption color="uiTextMediumContrast">{guests}</Caption>
-                  {guestsParts.join(", ")}
-                </Caption>
                 <Caption color="uiTextMediumContrast">
                   {room.cancellationText}
                 </Caption>
@@ -371,82 +372,13 @@ export default function SummaryUI({
                   </Body>
                 </div>
               ) : null}
-              {room.breakfastIncluded ? (
+              <Breakfast
-                <div className={styles.entry}>
+                adults={room.adults}
-                  <Body color="uiTextHighContrast">
+                breakfast={room.breakfast}
-                    {intl.formatMessage({
+                breakfastIncluded={room.breakfastIncluded}
-                      defaultMessage: "Breakfast buffet",
+                guests={guests}
-                    })}
+                nights={nights}
-                  </Body>
+              />
-                  <Body color="red">
-                    {intl.formatMessage({
-                      defaultMessage: "Included",
-                    })}
-                  </Body>
-                </div>
-              ) : room.breakfast === false ? (
-                <div className={styles.entry}>
-                  <Body color="uiTextHighContrast">
-                    {intl.formatMessage({
-                      defaultMessage: "No breakfast",
-                    })}
-                  </Body>
-                  <Body color="uiTextHighContrast">
-                    {formatPrice(
-                      intl,
-                      0,
-                      room.roomPrice.perStay.local.currency
-                    )}
-                  </Body>
-                </div>
-              ) : null}
-              {room.breakfast ? (
-                <div>
-                  <Body color="uiTextHighContrast">
-                    {intl.formatMessage({
-                      defaultMessage: "Breakfast buffet",
-                    })}
-                  </Body>
-                  <div className={styles.entry}>
-                    <Caption color="uiTextMediumContrast">
-                      {intl.formatMessage(
-                        {
-                          defaultMessage:
-                            "{totalAdults, plural, one {# adult} other {# adults}}",
-                        },
-                        { totalAdults: adults }
-                      )}
-                    </Caption>
-                    <Body color="uiTextHighContrast">
-                      {formatPrice(
-                        intl,
-                        room.breakfast.localPrice.price * adults * nights,
-                        room.breakfast.localPrice.currency
-                      )}
-                    </Body>
-                  </div>
-                  {childrenInRoom?.length ? (
-                    <div className={styles.entry}>
-                      <Caption color="uiTextMediumContrast">
-                        {intl.formatMessage(
-                          {
-                            defaultMessage:
-                              "{totalChildren, plural, one {# child} other {# children}}",
-                          },
-                          { totalChildren: childrenInRoom.length }
-                        )}
-                      </Caption>
-                      <Body color="uiTextHighContrast">
-                        {formatPrice(
-                          intl,
-                          0,
-                          room.breakfast.localPrice.currency
-                        )}
-                      </Body>
-                    </div>
-                  ) : null}
-                </div>
-              ) : null}
             </div>
             <Divider color="primaryLightSubtle" />
           </Fragment>

apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Actions/NotCancelled/ManageStay/Actions/ChangeDates/Steps/index.tsx

@@ -64,7 +64,8 @@ export default function Steps({ closeModal }: ChangeDatesStepsProps) {
     setDates({ fromDate, toDate })
 
     const pkgsSum = sumPackages(packages)
-    const extraPrice = pkgsSum.price + (breakfast?.localPrice.totalPrice || 0)
+    const extraPrice =
+      pkgsSum.price + ((breakfast && breakfast.localPrice.totalPrice) || 0)
     if (isLoggedIn && "member" in data.product && data.product.member) {
       const { currency, pricePerStay } = data.product.member.localPrice
       setNewPrice(formatPrice(intl, pricePerStay + extraPrice, currency))

apps/scandic-web/components/HotelReservation/MyStay/utils/mapRoomDetails.ts

@@ -40,9 +40,9 @@ export function mapRoomDetails({
   )
 
   // We don't get `requestedPrice` in packages
-  const breakfast: Omit<BreakfastPackage, "requestedPrice"> | null =
+  let breakfast: Omit<BreakfastPackage, "requestedPrice"> | undefined | false
-    breakfastPackageAdults
+  if (breakfastPackageAdults) {
-      ? {
+    breakfast = {
       code: breakfastPackageAdults.code,
       description: breakfastPackageAdults.description,
       localPrice: {
@@ -52,7 +52,9 @@ export function mapRoomDetails({
       },
       packageType: PackageTypeEnum.BreakfastAdult,
     }
-      : null
+  } else if (!booking.rateDefinition.breakfastIncluded) {
+    breakfast = false
+  }
 
   const validBreakfastPackagesChildren: string[] = [
     BreakfastPackageEnum.ANCILLARY_CHILD_PAYING_BREAKFAST,
@@ -62,7 +64,7 @@ export function mapRoomDetails({
   )
   // We don't get `requestedPrice` in packages
   const breakfastChildren: Omit<BreakfastPackage, "requestedPrice"> | null =
-    breakfastPackageChildren
+    (breakfastPackageChildren && !booking.rateDefinition.breakfastIncluded)
       ? {
         code: breakfastPackageChildren.code,
         description: breakfastPackageChildren.description,

apps/scandic-web/components/HotelReservation/PriceDetailsModal/PriceDetailsTable/Breakfast.tsx

@@ -31,23 +31,21 @@ export default function Breakfast({
 }: BreakfastProps) {
   const intl = useIntl()
 
-  if (breakfastIncluded) {
+  const breakfastBuffet = intl.formatMessage({
-    const included = intl.formatMessage({ defaultMessage: "Included" })
+    defaultMessage: "Breakfast buffet",
-    return (
+  })
-      <Tbody border>
+
-        <RegularRow
+  const adultsMsg = intl.formatMessage(
-          label={intl.formatMessage(
     {
       defaultMessage:
         "Breakfast ({totalAdults, plural, one {# adult} other {# adults}}) x {totalBreakfasts}",
     },
     { totalAdults: adults, totalBreakfasts: nights }
-          )}
+  )
-          value={included}
+
-        />
+  let kidsMsg = ""
-        {childrenInRoom?.length ? (
+  if (childrenInRoom?.length) {
-          <RegularRow
+    kidsMsg = intl.formatMessage(
-            label={intl.formatMessage(
       {
         defaultMessage:
           "Breakfast ({totalChildren, plural, one {# child} other {# children}}) x {totalBreakfasts}",
@@ -56,22 +54,26 @@ export default function Breakfast({
         totalChildren: childrenInRoom.length,
         totalBreakfasts: nights,
       }
-            )}
+    )
-            value={included}
+  }
-          />
+
+  if (breakfastIncluded) {
+    const included = intl.formatMessage({ defaultMessage: "Included" })
+    return (
+      <Tbody>
+        <RegularRow label={adultsMsg} value={included} />
+        {childrenInRoom?.length ? (
+          <RegularRow label={kidsMsg} value={included} />
         ) : null}
         <BoldRow
-          label={intl.formatMessage({ defaultMessage: "Breakfast charge" })}
+          label={breakfastBuffet}
           value={formatPrice(intl, 0, currency)}
         />
       </Tbody>
     )
   }
 
-  if (!breakfast) {
+  if (breakfast) {
-    return null
-  }
-
     const adultPricePerNight = breakfast.localPrice.price * adults
     const breakfastAdultsPricePerNight = formatPrice(
       intl,
@@ -170,10 +172,21 @@ export default function Breakfast({
             value={formatPrice(intl, 0, breakfast.localPrice.currency)}
           />
         ) : null}
-      <BoldRow
+        <BoldRow label={breakfastBuffet} value={breakfastTotalPrice} />
-        label={intl.formatMessage({ defaultMessage: "Breakfast charge" })}
-        value={breakfastTotalPrice}
-      />
       </Tbody>
     )
   }
+
+  if (breakfast === false) {
+    const noBreakfast = intl.formatMessage({
+      defaultMessage: "No breakfast",
+    })
+    return (
+      <Tbody>
+        <BoldRow label={breakfastBuffet} value={noBreakfast} />
+      </Tbody>
+    )
+  }
+
+  return null
+}

apps/scandic-web/components/SidePeeks/BookedRoomSidePeek/index.tsx

@@ -55,7 +55,7 @@ export type Room = Pick<
   | "vouchers"
 > & {
   bedType: BedTypeSchema
-  breakfast: Omit<BreakfastPackage, "requestedPrice"> | null
+  breakfast: Omit<BreakfastPackage, "requestedPrice"> | false | undefined
   childrenInRoom: Child[]
   isCancelled: boolean
   packages: Packages | null

apps/scandic-web/types/stores/booking-confirmation.ts

@@ -15,7 +15,7 @@ export interface Room {
   adults: number
   bedDescription: string
   bookingCode: string | null
-  breakfast?: PackageSchema
+  breakfast: PackageSchema | false | undefined
   breakfastIncluded: boolean
   cheques: number
   childBedPreferences: ChildBedPreference[]

apps/scandic-web/types/stores/my-stay.ts

@@ -42,7 +42,7 @@ export type Room = Pick<
   | "vouchers"
 > & {
   bedType: BedTypeSchema
-  breakfast: Omit<BreakfastPackage, "requestedPrice"> | null
+  breakfast: Omit<BreakfastPackage, "requestedPrice"> | undefined | false
   breakfastChildren: Omit<BreakfastPackage, "requestedPrice"> | null
   childrenAsString: string
   childrenInRoom: Child[]