scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in feat/book-623-bw-lang (pull request #3248)

Browse Source 
feat(BOOK-623): pass correct lang to booking widget and fix some more error logs

* feat(BOOK-623): pass correct lang to booking widget and fix some more error logs


Approved-by: Joakim Jäderberg
This commit is contained in:
Linus Flood
2025-11-28 08:59:39 +00:00
parent c65091b36a
commit 9bcb9e8232
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/scandic-web/app/[lang]/(live)/@bookingwidget/(contentTypes)/hotel_page/[uid]/page.tsx
View File

@@ -4,14 +4,14 @@ import { parseBookingWidgetSearchParams } from "@scandic-hotels/booking-flow/uti
import { bookingFlowConfig } from "@/constants/bookingFlowConfig" import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
import { getHotel, getHotelPage } from "@/lib/trpc/memoizedRequests" import { getHotel, getHotelPage } from "@/lib/trpc/memoizedRequests"
import type { Lang } from "@scandic-hotels/common/constants/language" import { getLang } from "@/i18n/serverContext"
export default async function BookingWidgetHotelPage( export default async function BookingWidgetHotelPage(
props: PageProps<"/[lang]/hotel_page/[uid]"> props: PageProps<"/[lang]/hotel_page/[uid]">
) { ) {
const searchParams = await props.searchParams const searchParams = await props.searchParams
const params = await props.params
const lang = params.lang as Lang const lang = await getLang()
const hotelPageData = await getHotelPage() const hotelPageData = await getHotelPage()
const hotelData = await getHotel({ const hotelData = await getHotel({

5
apps/scandic-web/app/[lang]/(live)/@bookingwidget/hotelreservation/page.tsx
View File

@@ -3,17 +3,16 @@ import { parseBookingWidgetSearchParams } from "@scandic-hotels/booking-flow/uti
import { bookingFlowConfig } from "@/constants/bookingFlowConfig" import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
import type { Lang } from "@scandic-hotels/common/constants/language" import { getLang } from "@/i18n/serverContext"
export default async function BookingWidgetPage( export default async function BookingWidgetPage(
props: PageProps<"/[lang]/hotelreservation"> props: PageProps<"/[lang]/hotelreservation">
) { ) {
const searchParams = await props.searchParams const searchParams = await props.searchParams
const params = await props.params
const booking = parseBookingWidgetSearchParams(searchParams) const booking = parseBookingWidgetSearchParams(searchParams)
const lang = params.lang as Lang const lang = await getLang()
return ( return (
<BookingWidget booking={booking} lang={lang} config={bookingFlowConfig} /> <BookingWidget booking={booking} lang={lang} config={bookingFlowConfig} />

5
apps/scandic-web/app/[lang]/(live)/@bookingwidget/page.tsx
View File

@@ -3,15 +3,14 @@ import { parseBookingWidgetSearchParams } from "@scandic-hotels/booking-flow/uti
import { bookingFlowConfig } from "@/constants/bookingFlowConfig" import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
import type { Lang } from "@scandic-hotels/common/constants/language" import { getLang } from "@/i18n/serverContext"
export default async function BookingWidgetPage(props: PageProps<"/[lang]">) { export default async function BookingWidgetPage(props: PageProps<"/[lang]">) {
const searchParams = await props.searchParams const searchParams = await props.searchParams
const params = await props.params
const booking = parseBookingWidgetSearchParams(searchParams) const booking = parseBookingWidgetSearchParams(searchParams)
const lang = params.lang as Lang const lang = await getLang()
return ( return (
<BookingWidget booking={booking} lang={lang} config={bookingFlowConfig} /> <BookingWidget booking={booking} lang={lang} config={bookingFlowConfig} />

2
apps/scandic-web/components/HotelReservation/MyStay/index.tsx
View File

@@ -84,7 +84,7 @@ async function MyStay(props: {
if (isLoggedIn) { if (isLoggedIn) {
bookingConfirmation = await getBookingConfirmation(refId) bookingConfirmation = await getBookingConfirmation(refId)
} else if (bv) { } else if (bv) {
logger.info(`MyStay: bv`, bv) logger.debug(`MyStay: bv`, bv)
const { const {
firstName, firstName,
email, email,

4
apps/scandic-web/utils/getErrorMessage.ts
View File

@@ -185,6 +185,10 @@ export function getErrorMessage(intl: IntlShape, errorCode?: string) {
defaultMessage: defaultMessage:
"Membership number can't be the same for two different rooms", "Membership number can't be the same for two different rooms",
}) })
case undefined:
case null:
case "":
return errorCode
default: default:
logger.warn("Error code not supported:", errorCode) logger.warn("Error code not supported:", errorCode)
return errorCode return errorCode