feat(SW-415): Added content from API

app/[lang]/(live)/(public)/hotelreservation/select-rate/page.module.css

@@ -8,11 +8,10 @@
 
 .content {
   max-width: 1434px;
-  margin-top: var(--Spacing-x5);
   margin-left: auto;
   margin-right: auto;
   display: flex;
-  justify-content: space-between;
+  flex-direction: column;
   gap: var(--Spacing-x7);
   padding: var(--Spacing-x2);
 }

app/[lang]/(live)/(public)/hotelreservation/select-rate/page.tsx

@@ -15,8 +15,11 @@ export default async function SelectRatePage({
 }: PageArgs<LangParams & { section: string }, SelectRateSearchParams>) {
   setLang(params.lang)
 
-  // TODO: Use real endpoint.
+  const hotelData = await serverClient().hotel.hotelData.get({
-  const hotel = tempHotelData.data.attributes
+    hotelId: searchParams.hotel,
+    language: params.lang,
+    include: ["RoomCategories"],
+  })
 
   const roomConfigurations = await serverClient().hotel.availability.rooms({
     hotelId: parseInt(searchParams.hotel, 10),
@@ -24,19 +27,27 @@ export default async function SelectRatePage({
     roomStayEndDate: "2024-11-03",
     adults: 1,
   })
-  console.log("roomConfigurations", roomConfigurations)
+
   if (!roomConfigurations) {
-    return "No rooms found"
+    return "No rooms found" // TODO: Add a proper error message
   }
 
+  if (!hotelData) {
+    return "No hotel data found" // TODO: Add a proper error message
+  }
+
+  const roomCategories = hotelData?.included
+
   return (
     <div>
-      {/* TODO: Add Hotel Listing Card */}
-      <div>Hotel Listing Card TBI</div>
-
       <div className={styles.content}>
+        {/* TODO: Add Hotel Listing Card */}
+        <div>Hotel Listing Card TBI</div>
         <div className={styles.main}>
-          <RoomSelection roomConfigurations={roomConfigurations} />
+          <RoomSelection
+            roomConfigurations={roomConfigurations}
+            roomCategories={roomCategories ?? []}
+          />
         </div>
       </div>
     </div>

components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/Popover/index.tsx

@@ -0,0 +1,44 @@
+import {
+  Button,
+  Dialog,
+  OverlayArrow,
+  Popover,
+  type PopoverProps,
+} from "react-aria-components"
+
+import { CloseIcon } from "@/components/Icons"
+
+import styles from "./popover.module.css"
+
+interface PricePopoverProps extends Omit<PopoverProps, "children"> {
+  children: React.ReactNode
+}
+
+export default function PricePopover({
+  children,
+  ...props
+}: PricePopoverProps) {
+  return (
+    <Popover {...props}>
+      <OverlayArrow className={styles.arrow}>
+        <svg
+          width="12"
+          height="12"
+          viewBox="0 0 12 12"
+          style={{ display: "block", transform: "rotate(180deg)" }}
+        >
+          <path d="M0 0L6 6L12 0" fill="white" />
+        </svg>
+      </OverlayArrow>
+      <Dialog>
+        <Button
+          onPress={() => props.onOpenChange?.(false)}
+          className={styles.closeButton}
+        >
+          <CloseIcon className={styles.closeIcon} />
+        </Button>
+        {children}
+      </Dialog>
+    </Popover>
+  )
+}

components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/Popover/popover.module.css

@@ -0,0 +1,12 @@
+.arrow {
+  top: -6px;
+}
+
+.closeButton {
+  position: absolute;
+  top: 5px;
+  right: 5px;
+  background: none;
+  border: none;
+  cursor: pointer;
+}

components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/PriceTable/index.tsx

@@ -1,7 +1,11 @@
 import { useIntl } from "react-intl"
 
+import Body from "@/components/TempDesignSystem/Text/Body"
+import Caption from "@/components/TempDesignSystem/Text/Caption"
 import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
 
+import styles from "./priceTable.module.css"
+
 import { PriceTableProps } from "@/types/components/hotelReservation/selectRate/flexibilityOption"
 
 export default function PriceTable({
@@ -18,39 +22,81 @@ export default function PriceTable({
   const showRequestedPrice = publicRequestedPrice && memberRequestedPrice
 
   return (
-    <dl>
+    <dl className={styles.priceTable}>
-      <div>
+      <div className={styles.priceRow}>
-        <dt>{intl.formatMessage({ id: "Standard price" })}</dt>
+        <dt>
+          <Caption
+            textTransform="bold"
+            color={publicLocalPrice ? "uiTextHighContrast" : "disabled"}
+          >
+            {intl.formatMessage({ id: "Standard price" })}
+          </Caption>
+        </dt>
         <dd>
           {publicLocalPrice ? (
-            <>
+            <div className={styles.price}>
-              {publicLocalPrice.pricePerNight} {publicLocalPrice.currency}/
+              <Subtitle type="two" color="uiTextHighContrast">
-              {intl.formatMessage({ id: "night" })}
+                {publicLocalPrice.pricePerNight}
-            </>
+              </Subtitle>
+              <Body color="uiTextHighContrast" textTransform="bold">
+                {publicLocalPrice.currency}
+              </Body>
+            </div>
           ) : (
-            <Subtitle type="two">{intl.formatMessage({ id: "n/a" })}</Subtitle>
+            <Subtitle type="two" color="disabled">
+              {intl.formatMessage({ id: "n/a" })}
+            </Subtitle>
           )}
         </dd>
       </div>
 
-      {memberLocalPrice && (
+      <div className={styles.priceRow}>
-        <div>
+        <dt>
-          <dt>{intl.formatMessage({ id: "Member price" })}</dt>
+          <Caption
-          <dd>
+            textTransform="bold"
-            {memberLocalPrice.pricePerNight} {memberLocalPrice.currency}/
+            color={memberLocalPrice ? "red" : "disabled"}
-            {intl.formatMessage({ id: "night" })}
+          >
-          </dd>
+            {intl.formatMessage({ id: "Member price" })}
-        </div>
+          </Caption>
-      )}
+        </dt>
-      {showRequestedPrice && (
+        <dd>
-        <div>
+          {memberLocalPrice ? (
-          <dt>{intl.formatMessage({ id: "Approx." })}</dt>
+            <div className={styles.price}>
-          <dd>
+              <Subtitle type="two" color="red">
-            {publicRequestedPrice.pricePerNight}/
+                {memberLocalPrice.pricePerNight}
-            {memberRequestedPrice.pricePerNight} {publicRequestedPrice.currency}
+              </Subtitle>
-          </dd>
+              <Body color="red" textTransform="bold">
-        </div>
+                {memberLocalPrice.currency}
-      )}
+              </Body>
+            </div>
+          ) : (
+            <Body textTransform="bold" color="disabled">
+              - {intl.formatMessage({ id: "Currency Code" })}
+            </Body>
+          )}
+        </dd>
+      </div>
+
+      <div className={styles.priceRow}>
+        <dt>
+          <Caption
+            color={showRequestedPrice ? "uiTextMediumContrast" : "disabled"}
+          >
+            {intl.formatMessage({ id: "Approx." })}
+          </Caption>
+        </dt>
+        <dd>
+          {showRequestedPrice ? (
+            <Caption color="uiTextMediumContrast">
+              {publicRequestedPrice.pricePerNight}/
+              {memberRequestedPrice.pricePerNight}{" "}
+              {publicRequestedPrice.currency}
+            </Caption>
+          ) : (
+            <Caption color="disabled">- / - EUR</Caption>
+          )}
+        </dd>
+      </div>
     </dl>
   )
 }

components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/PriceTable/priceTable.module.css

@@ -0,0 +1,14 @@
+.priceRow {
+  display: flex;
+  justify-content: space-between;
+  padding: var(--Spacing-x-quarter) 0;
+}
+
+.priceTable {
+  margin: 0;
+}
+
+.price {
+  display: flex;
+  gap: var(--Spacing-x-half);
+}

components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/flexibilityOption.module.css

@@ -2,7 +2,11 @@
 .disabledCard {
   border-radius: var(--Corner-radius-Large);
   padding: var(--Spacing-x-one-and-half) var(--Spacing-x2);
-  background-color: var(--Base-Surface-Primary-light-Hover);
+  background-color: var(--Base-Surface-Secondary-light-Normal);
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  gap: var(--Spacing-x-half);
 }
 
 .disabledCard {
@@ -15,10 +19,21 @@
 
 .card:hover {
   cursor: pointer;
+  background-color: var(--Base-Surface-Primary-light-Hover-alt);
+}
+.checkIcon {
+  display: none;
 }
 input[type="radio"]:checked + .card {
+  border: 1px solid var(--Primary-Dark-On-Surface-Divider);
   background-color: var(--Base-Surface-Primary-light-Hover-alt);
 }
+input[type="radio"]:checked + .card .checkIcon {
+  display: block;
+  position: absolute;
+  top: -10px;
+  right: -10px;
+}
 
 .header {
   display: flex;
@@ -26,7 +41,40 @@ input[type="radio"]:checked + .card {
 }
 
 .header .infoIcon,
-.header .infoIcon * {
+.header .infoIcon path {
-  stroke: var(--Base-Text-Disabled);
+  stroke: var(--UI-Text-Medium-contrast);
-  fill: var(--Base-Surface-Primary-light-Hover);
+  fill: transparent;
+}
+
+.button {
+  background: none;
+  border: none;
+  cursor: pointer;
+  grid-area: chevron;
+  height: 100%;
+  justify-self: flex-end;
+  padding: 0;
+}
+
+.popover {
+  background-color: var(--Main-Grey-White);
+
+  border-radius: var(--Corner-radius-Medium);
+  left: 0px;
+  max-height: 400px;
+  padding: var(--Spacing-x2);
+  top: calc(55px + var(--Spacing-x1));
+  width: 100%;
+  box-shadow: 0px 0px 14px 6px rgba(0, 0, 0, 0.1);
+}
+
+.popover section:focus-visible {
+  outline: none;
+}
+.popover .popoverText {
+  margin-bottom: var(--Spacing-x-half);
+}
+.popover .popoverHeading {
+  margin-bottom: var(--Spacing-x1);
+  font-weight: 600; /* TODO: Remove when this is updated in Design system */
 }

components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption/index.tsx

@@ -1,9 +1,11 @@
 "use client"
-import { useIntl } from "react-intl"
+import { useState } from "react"
+import { Button, DialogTrigger } from "react-aria-components"
 
-import { InfoCircleIcon } from "@/components/Icons"
+import { CheckCircleIcon, InfoCircleIcon } from "@/components/Icons"
 import Caption from "@/components/TempDesignSystem/Text/Caption"
 
+import PricePopover from "./Popover"
 import PriceTable from "./PriceTable"
 
 import styles from "./flexibilityOption.module.css"
@@ -14,18 +16,26 @@ export default function FlexibilityOption({
   product,
   name,
   paymentTerm,
+  priceInformation,
 }: FlexibilityOptionProps) {
-  const intl = useIntl()
+  const [rootDiv, setRootDiv] = useState<Element | undefined>(undefined)
+  const [isPopoverOpen, setIsPopoverOpen] = useState(false)
+
+  function setRef(node: Element | null) {
+    if (node) {
+      setRootDiv(node)
+    }
+  }
 
   if (!product) {
     return (
       <div className={styles.disabledCard}>
         <div className={styles.header}>
           <InfoCircleIcon className={styles.infoIcon} />
-          <Caption>{name}</Caption>
+          <Caption color="disabled">{name}</Caption>
-          <Caption color="uiTextPlaceholder">({paymentTerm})</Caption>
+          <Caption color="disabled">({paymentTerm})</Caption>
-          <PriceTable />
         </div>
+        <PriceTable />
       </div>
     )
   }
@@ -35,18 +45,65 @@ export default function FlexibilityOption({
 
   return (
     <label>
-      <input
+      <input type="radio" name="rateCode" value={publicPrice?.rateCode} />
-        type="radio"
-        name="rateCode"
-        value={product.productType.public?.rateCode}
-      />
       <div className={styles.card}>
-        <div className={styles.header}>
+        <div
-          <InfoCircleIcon className={styles.infoIcon} />
+          className={styles.header}
-          <Caption>{name}</Caption>
+          ref={(node: Element | null) => setRef(node)}
+        >
+          <DialogTrigger>
+            <Button
+              aria-label="Help"
+              className={styles.button}
+              onPress={() => setIsPopoverOpen(true)}
+            >
+              <InfoCircleIcon className={styles.infoIcon} />
+            </Button>
+            <PricePopover
+              placement="bottom"
+              className={styles.popover}
+              isNonModal
+              shouldFlip={false}
+              shouldUpdatePosition={false}
+              /**
+               * react-aria uses portals to render Popover in body
+               * unless otherwise specified. We need it to be contained
+               * by this component to both access css variables assigned
+               * on the container as well as to not overflow it at any time.
+               */
+              UNSTABLE_portalContainer={rootDiv}
+              isOpen={isPopoverOpen}
+              onOpenChange={setIsPopoverOpen}
+            >
+              <Caption
+                color="uiTextHighContrast"
+                textTransform="bold"
+                className={styles.popoverHeading}
+              >
+                {name}
+              </Caption>
+              {priceInformation?.map((info: string) => (
+                <Caption
+                  key={info}
+                  color="uiTextHighContrast"
+                  className={styles.popoverText}
+                >
+                  {info}
+                </Caption>
+              ))}
+            </PricePopover>
+          </DialogTrigger>
+          <Caption color="uiTextHighContrast">{name}</Caption>
           <Caption color="uiTextPlaceholder">({paymentTerm})</Caption>
-          <PriceTable publicPrice={publicPrice} memberPrice={memberPrice} />
         </div>
+        <PriceTable publicPrice={publicPrice} memberPrice={memberPrice} />
+        <CheckCircleIcon
+          color="blue"
+          className={styles.checkIcon}
+          width={24}
+          height={24}
+          stroke="white"
+        />
       </div>
     </label>
   )

components/HotelReservation/SelectRate/RoomSelection/RoomCard/index.tsx

@@ -1,10 +1,14 @@
 "use client"
 import { useIntl } from "react-intl"
 
+import { RateDefinition } from "@/server/routers/hotels/output"
+
 import FlexibilityOption from "@/components/HotelReservation/SelectRate/RoomSelection/FlexibilityOption"
 import { ChevronRightSmallIcon } from "@/components/Icons"
 import Button from "@/components/TempDesignSystem/Button"
+import Body from "@/components/TempDesignSystem/Text/Body"
 import Caption from "@/components/TempDesignSystem/Text/Caption"
+import Footnote from "@/components/TempDesignSystem/Text/Footnote"
 import Subtitle from "@/components/TempDesignSystem/Text/Subtitle"
 
 import styles from "./roomCard.module.css"
@@ -14,6 +18,7 @@ import { RoomCardProps } from "@/types/components/hotelReservation/selectRate/ro
 export default function RoomCard({
   rateDefinitions,
   roomConfiguration,
+  roomCategories,
 }: RoomCardProps) {
   const intl = useIntl()
 
@@ -30,27 +35,34 @@ export default function RoomCard({
     (rate) => rate.cancellationRule === "CancellableBefore6PM"
   )
 
-  const saveProduct = saveRate
+  const findProductForRate = (rate: RateDefinition | undefined) => {
-    ? roomConfiguration.products.find(
+    return rate
-        (product) =>
+      ? roomConfiguration.products.find(
-          product.productType.public?.rateCode === saveRate.rateCode ||
+          (product) =>
-          product.productType.member?.rateCode === saveRate.rateCode
+            product.productType.public?.rateCode === rate.rateCode ||
-      )
+            product.productType.member?.rateCode === rate.rateCode
-    : undefined
+        )
-  const changeProduct = changeRate
+      : undefined
-    ? roomConfiguration.products.find(
+  }
-        (product) =>
+
-          product.productType.public?.rateCode === changeRate.rateCode ||
+  const getPriceForRate = (
-          product.productType.member?.rateCode === changeRate.rateCode
+    rate: typeof saveRate | typeof changeRate | typeof flexRate
-      )
+  ) => {
-    : undefined
+    return rateDefinitions.find((def) => def.rateCode === rate?.rateCode)
-  const flexProduct = flexRate
+      ?.generalTerms
-    ? roomConfiguration.products.find(
+  }
-        (product) =>
+
-          product.productType.public?.rateCode === flexRate.rateCode ||
+  const roomSize = roomCategories.find(
-          product.productType.member?.rateCode === flexRate.rateCode
+    (category) => category.attributes.name === roomConfiguration.roomType
-      )
+  )?.attributes.roomSize
-    : undefined
+
+  const occupancy = roomCategories.find(
+    (category) => category.attributes.name === roomConfiguration.roomType
+  )?.attributes.occupancy.total
+
+  const roomDescription = roomCategories.find(
+    (room) => room.attributes.name === roomConfiguration.roomType
+  )?.attributes.content.texts.descriptions.short
 
   return (
     <div className={styles.card}>
@@ -60,17 +72,14 @@ export default function RoomCard({
             {/*TODO: Handle pluralisation*/}
             {intl.formatMessage(
               {
-                id: "Max {nrOfGuests} guests",
+                id: "booking.guests",
-                defaultMessage: "Max {nrOfGuests} guests",
               },
-              // TODO: Correct number
+              { nrOfGuests: occupancy }
-              { nrOfGuests: 2 }
             )}
           </Caption>
-          {
+          <Caption color="uiTextMediumContrast">
-            // Room size TBI
+            {roomSize?.min}-{roomSize?.max} m²
-          }
+          </Caption>
-          <Caption color="uiTextMediumContrast">11-13 m²</Caption>
           <Button
             intent="text"
             type="button"
@@ -83,44 +92,58 @@ export default function RoomCard({
           </Button>
         </div>
         <div className={styles.container}>
-          <Subtitle className={styles.name} type="two">
+          <div className={styles.roomDetails}>
-            {roomConfiguration.roomType}
+            <Subtitle className={styles.name} type="two">
-          </Subtitle>
+              {roomConfiguration.roomType}
-          <Caption>Room INFORMATION </Caption>
+            </Subtitle>
-
+            <Body>{roomDescription}</Body>
-          <Caption color="uiTextPlaceholder">
+          </div>
+          <Caption color="uiTextHighContrast">
             {intl.formatMessage({
-              id: "Breakfast included",
+              id: "Breakfast selection in next step.",
             })}
           </Caption>
-
+          <div>
-          <FlexibilityOption
+            <FlexibilityOption
-            name={intl.formatMessage({ id: "Non-refundable" })}
+              name={intl.formatMessage({ id: "Non-refundable" })}
-            value="non-refundable"
+              value="non-refundable"
-            paymentTerm={intl.formatMessage({ id: "Pay now" })}
+              paymentTerm={intl.formatMessage({ id: "Pay now" })}
-            product={saveProduct}
+              product={findProductForRate(saveRate)}
-          />
+              priceInformation={getPriceForRate(saveRate)}
-          <FlexibilityOption
+            />
-            name={intl.formatMessage({ id: "Free rebooking" })}
+            <FlexibilityOption
-            value="free-rebooking"
+              name={intl.formatMessage({ id: "Free rebooking" })}
-            paymentTerm={intl.formatMessage({ id: "Pay now" })}
+              value="free-rebooking"
-            product={changeProduct}
+              paymentTerm={intl.formatMessage({ id: "Pay now" })}
-          />
+              product={findProductForRate(changeRate)}
-          <FlexibilityOption
+              priceInformation={getPriceForRate(changeRate)}
-            name={intl.formatMessage({ id: "Free cancellation" })}
+            />
-            value="free-cancellation"
+            <FlexibilityOption
-            paymentTerm={intl.formatMessage({ id: "Pay later" })}
+              name={intl.formatMessage({ id: "Free cancellation" })}
-            product={flexProduct}
+              value="free-cancellation"
-          />
+              paymentTerm={intl.formatMessage({ id: "Pay later" })}
+              product={findProductForRate(flexRate)}
+              priceInformation={getPriceForRate(flexRate)}
+            />
+          </div>
         </div>
       </div>
-      {/* TODO: maybe use the `Image` component instead of the `img` tag. Waiting until we know how to get the image */}
+
-      {/* eslint-disable-next-line @next/next/no-img-element */}
+      <div className={styles.imageContainer}>
-      <img
+        <span className={styles.roomsLeft}>
-        alt={intl.formatMessage({ id: "A photo of the room" })}
+          <Footnote
-        // TODO: Correct image URL
+            color="burgundy"
-        src="https://www.scandichotels.se/imageVault/publishedmedia/xnmqnmz6mz0uhuat0917/scandic-helsinki-hub-room-standard-KR-7.jpg"
+            textTransform="uppercase"
-      />
+          >{`${roomConfiguration.roomsLeft} ${intl.formatMessage({ id: "Left" })}`}</Footnote>
+        </span>
+        {/* TODO: maybe use the `Image` component instead of the `img` tag. Waiting until we know how to get the image */}
+        {/* eslint-disable-next-line @next/next/no-img-element */}
+        <img
+          alt={intl.formatMessage({ id: "A photo of the room" })}
+          // TODO: Correct image URL
+          src="https://www.scandichotels.se/imageVault/publishedmedia/xnmqnmz6mz0uhuat0917/scandic-helsinki-hub-room-standard-KR-7.jpg"
+        />
+      </div>
     </div>
   )
 }

components/HotelReservation/SelectRate/RoomSelection/RoomCard/roomCard.module.css

@@ -5,12 +5,12 @@
   background-color: #fff;
   border-radius: var(--Corner-radius-Large);
   border: 1px solid var(--Base-Border-Subtle);
+  position: relative;
 }
 
 .cardBody {
   display: flex;
   flex-direction: column;
-  gap: var(--Spacing-x1);
 }
 
 .specification {
@@ -35,6 +35,12 @@
 
 .container {
   padding: var(--Spacing-x1) var(--Spacing-x2) var(--Spacing-x2);
+  display: flex;
+  flex-direction: column;
+  gap: var(--Spacing-x2);
+}
+
+.roomDetails {
   display: flex;
   flex-direction: column;
   gap: var(--Spacing-x1);
@@ -50,3 +56,12 @@
   object-fit: cover;
   border-radius: var(--Corner-radius-Medium) var(--Corner-radius-Medium) 0 0;
 }
+
+.roomsLeft {
+  position: absolute;
+  top: 12px;
+  left: 12px;
+  background-color: var(--Main-Grey-White);
+  padding: var(--Spacing-x-half) var(--Spacing-x1);
+  border-radius: var(--Corner-radius-Small);
+}

components/HotelReservation/SelectRate/RoomSelection/index.tsx

@@ -12,11 +12,14 @@ import { RoomSelectionProps } from "@/types/components/hotelReservation/selectRa
 
 export default function RoomSelection({
   roomConfigurations,
+  roomCategories,
 }: RoomSelectionProps) {
   const router = useRouter()
   const searchParams = useSearchParams()
   const intl = useIntl()
 
+  console.log(roomConfigurations)
+
   function handleSubmit(e: React.FormEvent<HTMLFormElement>) {
     e.preventDefault()
     const queryParams = new URLSearchParams(searchParams)
@@ -38,6 +41,7 @@ export default function RoomSelection({
               <RoomCard
                 rateDefinitions={roomConfigurations.rateDefinitions}
                 roomConfiguration={roomConfiguration}
+                roomCategories={roomCategories}
               />
             </li>
           ))}

components/HotelReservation/SelectRate/RoomSelection/roomSelection.module.css

@@ -1,5 +1,4 @@
 .wrapper {
-  border-bottom: 1px solid rgba(17, 17, 17, 0.2);
   padding-bottom: var(--Spacing-x3);
 }
 
@@ -7,7 +6,7 @@
   margin-top: var(--Spacing-x4);
   list-style: none;
   display: grid;
-  grid-template-columns: 1fr 1fr 1fr 1fr;
+  grid-template-columns: 1fr;
   gap: var(--Spacing-x3);
 }
 
@@ -29,3 +28,18 @@
   background-color: white;
   padding: var(--Spacing-x3) var(--Spacing-x7) var(--Spacing-x5);
 }
+
+@media (min-width: 767px) {
+  .roomList {
+    grid-template-columns: minmax(240px, 1fr) minmax(240px, 1fr) minmax(
+        240px,
+        1fr
+      );
+  }
+}
+
+@media (min-width: 1367px) {
+  .roomList {
+    grid-template-columns: 1fr 1fr 1fr 1fr;
+  }
+}

components/TempDesignSystem/Text/Body/body.module.css

@@ -99,3 +99,7 @@
 .uiTextPlaceholder {
   color: var(--UI-Text-Placeholder);
 }
+
+.disabled {
+  color: var(--Base-Text-Disabled);
+}

components/TempDesignSystem/Text/Body/variants.ts

@@ -7,6 +7,7 @@ const config = {
     color: {
       black: styles.black,
       burgundy: styles.burgundy,
+      disabled: styles.disabled,
       grey: styles.grey,
       pale: styles.pale,
       red: styles.red,

components/TempDesignSystem/Text/Subtitle/subtitle.module.css

@@ -66,3 +66,11 @@
 .uiTextMediumContrast {
   color: var(--UI-Text-Medium-contrast);
 }
+
+.red {
+  color: var(--Scandic-Brand-Scandic-Red);
+}
+
+.disabled {
+  color: var(--Base-Text-Disabled);
+}

components/TempDesignSystem/Text/Subtitle/variants.ts

@@ -7,9 +7,11 @@ const config = {
     color: {
       black: styles.black,
       burgundy: styles.burgundy,
+      disabled: styles.disabled,
       pale: styles.pale,
       uiTextHighContrast: styles.uiTextHighContrast,
       uiTextMediumContrast: styles.uiTextMediumContrast,
+      red: styles.red,
     },
     textAlign: {
       center: styles.center,

i18n/dictionaries/da.json

@@ -34,6 +34,7 @@
   "Book reward night": "Book bonusnat",
   "Booking number": "Bookingnummer",
   "booking.adults": "{totalAdults, plural, one {# voksen} other {# voksne}}",
+  "booking.guests": "Maks {nrOfGuests, plural, one {# gæst} other {# gæster}}",
   "booking.nights": "{totalNights, plural, one {# nat} other {# nætter}}",
   "booking.rooms": "{totalRooms, plural, one {# værelse} other {# værelser}}",
   "Breakfast": "Morgenmad",
@@ -41,6 +42,7 @@
   "Breakfast excluded": "Morgenmad ikke inkluderet",
   "Breakfast included": "Morgenmad inkluderet",
   "Breakfast restaurant": "Breakfast restaurant",
+  "Breakfast selection in next step.": "Valg af morgenmad i næste trin.",
   "Bus terminal": "Busstation",
   "Business": "Forretning",
   "by": "inden",
@@ -72,6 +74,7 @@
   "Country": "Land",
   "Country code": "Landekode",
   "Credit card deleted successfully": "Kreditkort blev slettet",
+  "Currency Code": "DKK",
   "Current password": "Nuværende kodeord",
   "Customer service": "Kundeservice",
   "Date of Birth": "Fødselsdato",
@@ -136,6 +139,7 @@
   "Language": "Sprog",
   "Lastname": "Efternavn",
   "Latest searches": "Seneste søgninger",
+  "Left": "tilbage",
   "Level": "Niveau",
   "Level 1": "Niveau 1",
   "Level 2": "Niveau 2",
@@ -237,6 +241,8 @@
   "Room & Terms": "Værelse & Vilkår",
   "Room facilities": "Værelsesfaciliteter",
   "Rooms": "Værelser",
+  "guest": "gæst",
+  "guests": "gæster",
   "Rooms & Guests": "Værelser & gæster",
   "Sauna and gym": "Sauna and gym",
   "Save": "Gemme",

i18n/dictionaries/de.json

@@ -34,6 +34,7 @@
   "Book reward night": "Bonusnacht buchen",
   "Booking number": "Buchungsnummer",
   "booking.adults": "{totalAdults, plural, one {# erwachsene} other {# erwachsene}}",
+  "booking.guests": "Max {nrOfGuests, plural, one {# gast} other {# gäste}}",
   "booking.nights": "{totalNights, plural, one {# nacht} other {# Nächte}}",
   "booking.rooms": "{totalRooms, plural, one {# zimmer} other {# räume}}",
   "Breakfast": "Frühstück",
@@ -41,6 +42,7 @@
   "Breakfast excluded": "Frühstück nicht inbegriffen",
   "Breakfast included": "Frühstück inbegriffen",
   "Breakfast restaurant": "Breakfast restaurant",
+  "Breakfast selection in next step.": "Frühstücksauswahl in nächsten Schritt.",
   "Bus terminal": "Busbahnhof",
   "Business": "Geschäft",
   "by": "bis",
@@ -72,6 +74,7 @@
   "Country": "Land",
   "Country code": "Landesvorwahl",
   "Credit card deleted successfully": "Kreditkarte erfolgreich gelöscht",
+  "Currency Code": "EUR",
   "Current password": "Aktuelles Passwort",
   "Customer service": "Kundendienst",
   "Date of Birth": "Geburtsdatum",
@@ -113,6 +116,8 @@
   "Get member benefits & offers": "Holen Sie sich Vorteile und Angebote für Mitglieder",
   "Go back to edit": "Zurück zum Bearbeiten",
   "Go back to overview": "Zurück zur Übersicht",
+  "guest": "gast",
+  "guests": "gäste",
   "Guest information": "Informationen für Gäste",
   "Guests & Rooms": "Gäste & Zimmer",
   "Hi": "Hallo",
@@ -137,6 +142,7 @@
   "Language": "Sprache",
   "Lastname": "Nachname",
   "Latest searches": "Letzte Suchanfragen",
+  "Left": "übrig",
   "Level": "Level",
   "Level 1": "Level 1",
   "Level 2": "Level 2",

i18n/dictionaries/en.json

@@ -34,6 +34,7 @@
   "Book reward night": "Book reward night",
   "Booking number": "Booking number",
   "booking.adults": "{totalAdults, plural, one {# adult} other {# adults}}",
+  "booking.guests": "Max {nrOfGuests, plural, one {# guest} other {# guests}}",
   "booking.nights": "{totalNights, plural, one {# night} other {# nights}}",
   "booking.rooms": "{totalRooms, plural, one {# room} other {# rooms}}",
   "Breakfast": "Breakfast",
@@ -41,6 +42,7 @@
   "Breakfast excluded": "Breakfast excluded",
   "Breakfast included": "Breakfast included",
   "Breakfast restaurant": "Breakfast restaurant",
+  "Breakfast selection in next step.": "Breakfast selection in next step.",
   "Bus terminal": "Bus terminal",
   "Business": "Business",
   "by": "by",
@@ -72,6 +74,7 @@
   "Country": "Country",
   "Country code": "Country code",
   "Credit card deleted successfully": "Credit card deleted successfully",
+  "Currency Code": "EUR",
   "Current password": "Current password",
   "Customer service": "Customer service",
   "Date of Birth": "Date of Birth",
@@ -113,6 +116,8 @@
   "Get member benefits & offers": "Get member benefits & offers",
   "Go back to edit": "Go back to edit",
   "Go back to overview": "Go back to overview",
+  "guest": "guest",
+  "guests": "guests",
   "Guest information": "Guest information",
   "Guests & Rooms": "Guests & Rooms",
   "Hi": "Hi",
@@ -135,6 +140,7 @@
   "King bed": "King bed",
   "Language": "Language",
   "Lastname": "Lastname",
+  "Left": "left",
   "Latest searches": "Latest searches",
   "Level": "Level",
   "Level 1": "Level 1",

i18n/dictionaries/fi.json

@@ -34,6 +34,7 @@
   "Book reward night": "Kirjapalkinto-ilta",
   "Booking number": "Varausnumero",
   "booking.adults": "{totalAdults, plural, one {# aikuinen} other {# aikuiset}}",
+  "booking.guests": "Max {nrOfGuests, plural, one {# vieras} other {# vieraita}}",
   "booking.nights": "{totalNights, plural, one {# yö} other {# yötä}}",
   "booking.rooms": "{totalRooms, plural, one {# huone} other {# sviitti}}",
   "Breakfast": "Aamiainen",
@@ -41,6 +42,7 @@
   "Breakfast excluded": "Aamiainen ei sisälly",
   "Breakfast included": "Aamiainen sisältyy",
   "Breakfast restaurant": "Breakfast restaurant",
+  "Breakfast selection in next step.": "Aamiaisvalinta seuraavassa vaiheessa.",
   "Bus terminal": "Bussiasema",
   "Business": "Business",
   "by": "mennessä",
@@ -72,6 +74,7 @@
   "Country": "Maa",
   "Country code": "Maatunnus",
   "Credit card deleted successfully": "Luottokortti poistettu onnistuneesti",
+  "Currency Code": "EUR",
   "Current password": "Nykyinen salasana",
   "Customer service": "Asiakaspalvelu",
   "Date of Birth": "Syntymäaika",
@@ -113,6 +116,8 @@
   "Get member benefits & offers": "Hanki jäsenetuja ja -tarjouksia",
   "Go back to edit": "Palaa muokkaamaan",
   "Go back to overview": "Palaa yleiskatsaukseen",
+  "guest": "Vieras",
+  "guests": "Vieraita",
   "Guest information": "Vieraan tiedot",
   "Guests & Rooms": "Vieraat & Huoneet",
   "Hi": "Hi",
@@ -136,6 +141,7 @@
   "Language": "Kieli",
   "Lastname": "Sukunimi",
   "Latest searches": "Viimeisimmät haut",
+  "Left": "jäljellä",
   "Level": "Level",
   "Level 1": "Taso 1",
   "Level 2": "Taso 2",

i18n/dictionaries/no.json

@@ -33,12 +33,15 @@
   "Book reward night": "Bestill belønningskveld",
   "Booking number": "Bestillingsnummer",
   "booking.adults": "{totalAdults, plural, one {# voksen} other {# voksne}}",
+  "booking.guests": "Maks {nrOfGuests, plural, one {# gjest} other {# gjester}}",
   "booking.nights": "{totalNights, plural, one {# natt} other {# netter}}",
   "booking.rooms": "{totalRooms, plural, one {# rom} other {# rom}}",
   "Breakfast": "Frokost",
   "Breakfast buffet": "Breakfast buffet",
   "Breakfast excluded": "Frokost ekskludert",
   "Breakfast included": "Frokost inkludert",
+  "Breakfast restaurant": "Breakfast restaurant",
+  "Breakfast selection in next step.": "Frokostvalg i neste steg.",
   "Bus terminal": "Bussterminal",
   "Business": "Forretnings",
   "by": "innen",
@@ -70,6 +73,7 @@
   "Country": "Land",
   "Country code": "Landskode",
   "Credit card deleted successfully": "Kredittkort slettet",
+  "Currency Code": "NOK",
   "Current password": "Nåværende passord",
   "Customer service": "Kundeservice",
   "Date of Birth": "Fødselsdato",
@@ -111,6 +115,8 @@
   "Get member benefits & offers": "Få medlemsfordeler og tilbud",
   "Go back to edit": "Gå tilbake til redigering",
   "Go back to overview": "Gå tilbake til oversikten",
+  "guest": "gjest",
+  "guests": "gjester",
   "Guest information": "Informasjon til gjester",
   "Guests & Rooms": "Gjester & rom",
   "Hi": "Hei",
@@ -134,6 +140,7 @@
   "Language": "Språk",
   "Lastname": "Etternavn",
   "Latest searches": "Siste søk",
+  "Left": "igjen",
   "Level": "Nivå",
   "Level 1": "Nivå 1",
   "Level 2": "Nivå 2",

i18n/dictionaries/sv.json

@@ -33,6 +33,7 @@
   "Book reward night": "Boka frinatt",
   "Booking number": "Bokningsnummer",
   "booking.adults": "{totalAdults, plural, one {# vuxen} other {# vuxna}}",
+  "booking.guests": "Max {nrOfGuests, plural, one {# gäst} other {# gäster}}",
   "booking.nights": "{totalNights, plural, one {# natt} other {# nätter}}",
   "booking.rooms": "{totalRooms, plural, one {# rum} other {# rum}}",
   "Breakfast": "Frukost",
@@ -40,6 +41,7 @@
   "Breakfast excluded": "Frukost ingår ej",
   "Breakfast included": "Frukost ingår",
   "Breakfast restaurant": "Breakfast restaurant",
+  "Breakfast selection in next step.": "Frukostval i nästa steg.",
   "Bus terminal": "Bussterminal",
   "Business": "Business",
   "by": "innan",
@@ -71,6 +73,7 @@
   "Country": "Land",
   "Country code": "Landskod",
   "Credit card deleted successfully": "Kreditkort har tagits bort",
+  "Currency Code": "SEK",
   "Current password": "Nuvarande lösenord",
   "Customer service": "Kundservice",
   "Date of Birth": "Födelsedatum",
@@ -112,6 +115,8 @@
   "Get member benefits & offers": "Ta del av medlemsförmåner och erbjudanden",
   "Go back to edit": "Gå tillbaka till redigeringen",
   "Go back to overview": "Gå tillbaka till översikten",
+  "guest": "gäst",
+  "guests": "gäster",
   "Guest information": "Information till gästerna",
   "Guests & Rooms": "Gäster & rum",
   "Hi": "Hej",
@@ -135,6 +140,7 @@
   "Language": "Språk",
   "Lastname": "Efternamn",
   "Latest searches": "Senaste sökningarna",
+  "Left": "kvar",
   "Level": "Nivå",
   "Level 1": "Nivå 1",
   "Level 2": "Nivå 2",

server/routers/hotels/query.ts

@@ -635,6 +635,7 @@ export const hotelQueryRouter = router({
             query: { hotelId, params: params },
           })
         )
+
         return validateHotelData.data
       }),
   }),

types/components/hotelReservation/selectRate/flexibilityOption.ts

@@ -5,6 +5,7 @@ export type FlexibilityOptionProps = {
   name: string
   value: string
   paymentTerm: string
+  priceInformation?: Array<string>
 }
 
 export interface PriceTableProps {

types/components/hotelReservation/selectRate/roomCard.ts

@@ -3,7 +3,10 @@ import {
   RoomConfiguration,
 } from "@/server/routers/hotels/output"
 
+import { RoomData } from "@/types/hotel"
+
 export type RoomCardProps = {
   roomConfiguration: RoomConfiguration
   rateDefinitions: RateDefinition[]
+  roomCategories: RoomData[]
 }

types/components/hotelReservation/selectRate/roomSelection.ts

@@ -1,5 +1,8 @@
 import { RoomsAvailability } from "@/server/routers/hotels/output"
 
+import { RoomData } from "@/types/hotel"
+
 export interface RoomSelectionProps {
   roomConfigurations: RoomsAvailability
+  roomCategories: RoomData[]
 }