Merged in feat/sw-3514-join-card-membership-id (pull request #2967)

feat(SW-3514): Add variant of join friends card with membership id input

* Move membershipId input in enter details to join card

Add booking flow feature flag to move membershipId into join card and hide login button.
Currently only applies to first room.

* Add sas join card to multiroom


Approved-by: Hrishikesh Vaipurkar
This commit is contained in:
Anton Gunnarsson
2025-10-16 08:24:20 +00:00
parent b5817c5dcd
commit 611d81222c
11 changed files with 360 additions and 106 deletions

View File

@@ -0,0 +1,127 @@
"use client"
import { useWatch } from "react-hook-form"
import { useIntl } from "react-intl"
import { CurrencyEnum } from "@scandic-hotels/common/constants/currency"
import { membershipTermsAndConditions } from "@scandic-hotels/common/constants/routes/membershipTermsAndConditions"
import { formatPrice } from "@scandic-hotels/common/utils/numberFormatting"
import Footnote from "@scandic-hotels/design-system/Footnote"
import Checkbox from "@scandic-hotels/design-system/Form/Checkbox"
import Link from "@scandic-hotels/design-system/Link"
import { Typography } from "@scandic-hotels/design-system/Typography"
import { trpc } from "@scandic-hotels/trpc/client"
import { useRoomContext } from "../../../../../contexts/EnterDetails/RoomContext"
import useLang from "../../../../../hooks/useLang"
import { MembershipNumberInput } from "../../RoomOne/Signup/MembershipNumberInput"
import styles from "./partnerSASJoinScandicFriendsCard.module.css"
type Props = {
name?: string
updateDetailsStore?: () => void
}
export function PartnerSASJoinScandicFriendsCard({
name = "join",
updateDetailsStore,
}: Props) {
const lang = useLang()
const intl = useIntl()
const { data: euroBonusProfile } =
trpc.partner.sas.getEuroBonusProfile.useQuery()
const {
room,
roomNr,
actions: { updateJoin },
} = useRoomContext()
const joinValue = useWatch({ name: "join" })
function onChange(event: { target: { value: boolean } }) {
updateJoin(event.target.value)
}
if (euroBonusProfile && euroBonusProfile.linkStatus !== "UNLINKED") {
return null
}
if (!("member" in room.roomRate) || !room.roomRate.member) {
return null
}
return (
<div className={styles.cardContainer}>
<Typography variant="Title/Subtitle/md">
<h2 className={styles.priceContainer}>
<span>
{intl.formatMessage({
defaultMessage: "Get the member room price",
})}
{/* eslint-disable-next-line formatjs/no-literal-string-in-jsx */}
{`: `}
</span>
<span className={styles.price}>
{intl.formatMessage(
{
defaultMessage: "{amount} for room {roomNr}",
},
{
amount: formatPrice(
intl,
room.roomRate.member.localPrice.pricePerStay ?? 0,
room.roomRate.member.localPrice.currency ??
CurrencyEnum.Unknown
),
roomNr,
}
)}
</span>
</h2>
</Typography>
<div className={styles.checkBox}>
<Checkbox name={name} registerOptions={{ onChange }}>
<Typography variant="Body/Paragraph/mdRegular">
<div>
{intl.formatMessage({
defaultMessage: "Join Scandic Friends before check-in",
})}
</div>
</Typography>
</Checkbox>
<MembershipNumberInput
className={styles.membershipInput}
registerOptions={{ onBlur: updateDetailsStore }}
disabled={Boolean(joinValue)}
label={intl.formatMessage({
defaultMessage: "Already a member? Membership ID",
})}
/>
</div>
<div className={styles.terms}>
<Footnote color="uiTextPlaceholder">
{intl.formatMessage(
{
defaultMessage:
"By joining you accept the <termsAndConditionsLink>Terms and Conditions</termsAndConditionsLink>. The Scandic Friends Membership is valid until further notice, but can at any time be terminated by contacting Scandic Customer Service.",
},
{
termsAndConditionsLink: (str) => (
<Link
textDecoration="underline"
size="tiny"
target="_blank"
href={membershipTermsAndConditions[lang]}
>
{str}
</Link>
),
}
)}
</Footnote>
</div>
</div>
)
}

View File

@@ -0,0 +1,51 @@
.cardContainer {
align-self: flex-start;
background-color: var(--Surface-Primary-Hover-Accent);
border-radius: var(--Corner-radius-lg);
display: grid;
gap: var(--Space-x2);
padding: var(--Space-x2);
grid-template-areas:
"price"
"checkbox"
"terms";
width: min(100%, 696px);
}
.priceContainer {
grid-area: price;
margin-bottom: var(--Space-x1);
}
.price {
color: var(--Text-Accent-Primary);
}
.checkBox {
align-self: center;
grid-area: checkbox;
display: flex;
flex-direction: column;
gap: var(--Space-x2);
}
.terms {
grid-area: terms;
}
@media screen and (min-width: 768px) {
.cardContainer {
grid-template-columns: 1fr 1fr;
grid-template-rows: auto auto;
gap: var(--Space-x3);
grid-template-areas:
"price checkbox"
"terms terms";
}
.priceContainer {
margin-bottom: 0;
display: flex;
flex-direction: column;
}
}

View File

@@ -22,6 +22,7 @@ import { getErrorMessage } from "../../../BookingFlowInput/errors"
import MemberPriceModal from "../MemberPriceModal"
import { SpecialRequests } from "../SpecialRequests"
import JoinScandicFriendsCard from "./JoinScandicFriendsCard"
import { PartnerSASJoinScandicFriendsCard } from "./PartnerSASJoinScandicFriendsCard"
import { getMultiroomDetailsSchema } from "./schema"
import styles from "./details.module.css"
@@ -161,6 +162,10 @@ export default function Details() {
const guestIsGoingToJoin = methods.watch("join")
const guestIsMember = methods.watch("membershipNo")
const showMembershipIdInput =
config.enterDetailsMembershipIdInputLocation === "form" &&
!guestIsGoingToJoin
return (
<FormProvider {...methods}>
<form
@@ -168,7 +173,9 @@ export default function Details() {
id={`${formID}-room-${roomNr}`}
onSubmit={methods.handleSubmit(updateDetails)}
>
{guestIsMember ? null : <JoinScandicFriendsCard />}
{guestIsMember ? null : (
<JoinScandicCard updateDetailsStore={updateDetailsStore} />
)}
<div className={styles.container}>
<Footnote
color="uiTextHighContrast"
@@ -245,7 +252,7 @@ export default function Details() {
name="phoneNumber"
registerOptions={{ required: true, onBlur: updateDetailsStore }}
/>
{guestIsGoingToJoin ? null : (
{showMembershipIdInput ? (
<BookingFlowInput
className={styles.fullWidth}
label={intl.formatMessage({
@@ -255,7 +262,7 @@ export default function Details() {
type="tel"
registerOptions={{ onBlur: updateDetailsStore }}
/>
)}
) : null}
<SpecialRequests registerOptions={{ onBlur: updateDetailsStore }} />
</div>
<MemberPriceModal />
@@ -263,3 +270,26 @@ export default function Details() {
</FormProvider>
)
}
function JoinScandicCard({
updateDetailsStore,
}: {
updateDetailsStore: () => void
}) {
const config = useBookingFlowConfig()
switch (config.enterDetailsMembershipIdInputLocation) {
case "form":
return <JoinScandicFriendsCard />
case "join-card":
return (
<PartnerSASJoinScandicFriendsCard
updateDetailsStore={updateDetailsStore}
/>
)
default:
const _exhaustiveCheck: never =
config.enterDetailsMembershipIdInputLocation
return null
}
}