From d077184e5e1c045ad5689530dc2e14bedd72cf4d Mon Sep 17 00:00:00 2001 From: Bianca Widstam Date: Wed, 23 Apr 2025 23:44:52 +0000 Subject: [PATCH] Merged in fix/SW-2481-booking-number (pull request #1845) fix(SW-2481): add booking number for multiroom * fix(SW-2481): add booking number for multiroom Approved-by: Michael Zetterberg --- .../BookingConfirmation/Header/index.tsx | 11 ------ .../BookingConfirmation/Rooms/Room/index.tsx | 31 +++++++++++---- .../Rooms/Room/room.module.css | 4 ++ .../BookingConfirmation/Rooms/index.tsx | 39 +++++++++++-------- .../Rooms/rooms.module.css | 6 ++- 5 files changed, 54 insertions(+), 37 deletions(-) diff --git a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Header/index.tsx b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Header/index.tsx index 43f9ceeed..504cfbfdf 100644 --- a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Header/index.tsx +++ b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Header/index.tsx @@ -5,7 +5,6 @@ import { myStay } from "@/constants/routes/myStay" import Link from "@/components/TempDesignSystem/Link" import Body from "@/components/TempDesignSystem/Text/Body" -import Subtitle from "@/components/TempDesignSystem/Text/Subtitle" import Title from "@/components/TempDesignSystem/Text/Title" import useLang from "@/hooks/useLang" @@ -77,16 +76,6 @@ export default function Header({ {hotel.name} - - {intl.formatMessage( - { - defaultMessage: "Booking number {value}", - }, - { - value: booking.confirmationNumber, - } - )} - {text}
+ +

+ {intl.formatMessage( + { + defaultMessage: "Booking number {value}", + }, + { value: booking.confirmationNumber } + )} +

+ {booking.rateDefinition.isMemberRate ? (
<> @@ -60,19 +70,24 @@ export default function Room({ {booking.guaranteeInfo && (
+ +

+ {intl.formatMessage({ + defaultMessage: "Booking guaranteed.", + })} +

+ + {/* eslint-disable formatjs/no-literal-string-in-jsx */}{" "} + {/* eslint-enable formatjs/no-literal-string-in-jsx */}

- - {intl.formatMessage({ - defaultMessage: "Booking guaranteed.", - })} - - {/* eslint-disable formatjs/no-literal-string-in-jsx */}{" "} - {/* eslint-enable formatjs/no-literal-string-in-jsx */} {intl.formatMessage({ defaultMessage: "Your room will remain available for check-in even after 18:00.", diff --git a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/Room/room.module.css b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/Room/room.module.css index 8d0db9055..074ea2a44 100644 --- a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/Room/room.module.css +++ b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/Room/room.module.css @@ -20,6 +20,10 @@ width: max-content; } +.guaranteeText { + color: var(--Text-Feedback-Succes-Accent); +} + .booking { background-color: var(--Base-Background-Primary-Normal); border-radius: var(--Corner-radius-Large); diff --git a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/index.tsx b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/index.tsx index 498e4347c..32dec7c98 100644 --- a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/index.tsx +++ b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/index.tsx @@ -1,4 +1,5 @@ -import Subtitle from "@/components/TempDesignSystem/Text/Subtitle" +import { Typography } from "@scandic-hotels/design-system/Typography" + import { getIntl } from "@/i18n" import { LinkedReservation } from "./LinkedReservation" @@ -21,14 +22,16 @@ export default async function Rooms({

{linkedReservations.length ? ( - - {intl.formatMessage( - { - defaultMessage: "Room {roomIndex}", - }, - { roomIndex: 1 } - )} - + +

+ {intl.formatMessage( + { + defaultMessage: "Room {roomIndex}", + }, + { roomIndex: 1 } + )} +

+ ) : null} (
- - {intl.formatMessage( - { - defaultMessage: "Room {roomIndex}", - }, - { roomIndex: idx + 2 } - )} - + +

+ {intl.formatMessage( + { + defaultMessage: "Room {roomIndex}", + }, + { roomIndex: idx + 2 } + )} +

+