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

Merged in fix/sw-3568-sas-terms-and-conditions-link (pull request #3002)

Browse Source 
feat(SW-3568): Use dependency injected link for SF terms on enter details

* Use dependency injected link for sf terms


Approved-by: Linus Flood
This commit is contained in:
Anton Gunnarsson
2025-10-23 11:14:51 +00:00
parent 89f1fb0023
commit a00cf8d327
7 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/partner-sas/constants/bookingFlowConfig.ts
View File

@@ -1,5 +1,6 @@
import { bookingTermsAndConditionsRoutes } from "@scandic-hotels/common/constants/routes/bookingTermsAndConditionsRoutes"
import { customerService } from "@scandic-hotels/common/constants/routes/customerService"
import { membershipTermsAndConditions } from "@scandic-hotels/common/constants/routes/membershipTermsAndConditions"
import { myStay } from "@scandic-hotels/common/constants/routes/myStay"
import { privacyPolicyRoutes } from "@scandic-hotels/common/constants/routes/privacyPolicyRoutes"
@@ -16,6 +17,9 @@ export const bookingFlowConfig: BookingFlowConfig = {
bookingTermsAndConditions: routeToScandicWeb(
bookingTermsAndConditionsRoutes
),
membershipTermsAndConditions: routeToScandicWeb(
membershipTermsAndConditions
),
customerService: routeToScandicWeb(customerService),
privacyPolicy: routeToScandicWeb(privacyPolicyRoutes),
},

2
apps/scandic-web/constants/bookingFlowConfig.ts
View File

@@ -1,5 +1,6 @@
import { bookingTermsAndConditionsRoutes } from "@scandic-hotels/common/constants/routes/bookingTermsAndConditionsRoutes"
import { customerService } from "@scandic-hotels/common/constants/routes/customerService"
import { membershipTermsAndConditions } from "@scandic-hotels/common/constants/routes/membershipTermsAndConditions"
import { myStay } from "@scandic-hotels/common/constants/routes/myStay"
import { privacyPolicyRoutes } from "@scandic-hotels/common/constants/routes/privacyPolicyRoutes"
@@ -13,6 +14,7 @@ export const bookingFlowConfig: BookingFlowConfig = {
myStay,
customerService,
bookingTermsAndConditions: bookingTermsAndConditionsRoutes,
membershipTermsAndConditions,
privacyPolicy: privacyPolicyRoutes,
},
}

1
packages/booking-flow/lib/bookingFlowConfig/bookingFlowConfig.tsx
View File

@@ -15,6 +15,7 @@ export type BookingFlowConfig = {
routes: {
myStay: LangRoute
bookingTermsAndConditions: LangRoute
membershipTermsAndConditions: LangRoute
customerService: LangRoute
privacyPolicy: LangRoute
}

5
packages/booking-flow/lib/components/EnterDetails/Details/Multiroom/JoinScandicFriendsCard/index.tsx
View File

@@ -3,13 +3,13 @@
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 { useBookingFlowConfig } from "../../../../../bookingFlowConfig/bookingFlowConfigContext"
import { useRoomContext } from "../../../../../contexts/EnterDetails/RoomContext"
import useLang from "../../../../../hooks/useLang"
@@ -23,6 +23,7 @@ export default function JoinScandicFriendsCard({
}: JoinScandicFriendsCardProps) {
const lang = useLang()
const intl = useIntl()
const { routes } = useBookingFlowConfig()
const {
room,
roomNr,
@@ -96,7 +97,7 @@ export default function JoinScandicFriendsCard({
textDecoration="underline"
size="tiny"
target="_blank"
href={membershipTermsAndConditions[lang]}
href={routes.membershipTermsAndConditions[lang]}
>
{str}
</Link>

6
packages/booking-flow/lib/components/EnterDetails/Details/Multiroom/PartnerSASJoinScandicFriendsCard/index.tsx
View File

@@ -3,13 +3,13 @@ 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 { useBookingFlowConfig } from "../../../../../bookingFlowConfig/bookingFlowConfigContext"
import { useRoomContext } from "../../../../../contexts/EnterDetails/RoomContext"
import useLang from "../../../../../hooks/useLang"
import { MembershipNumberInput } from "../../RoomOne/Signup/MembershipNumberInput"
@@ -26,7 +26,7 @@ export function PartnerSASJoinScandicFriendsCard({
}: Props) {
const lang = useLang()
const intl = useIntl()
const { routes } = useBookingFlowConfig()
const {
room,
roomNr,
@@ -111,7 +111,7 @@ export function PartnerSASJoinScandicFriendsCard({
textDecoration="underline"
size="tiny"
target="_blank"
href={membershipTermsAndConditions[lang]}
href={routes.membershipTermsAndConditions[lang]}
>
{str}
</Link>

5
packages/booking-flow/lib/components/EnterDetails/Details/RoomOne/JoinScandicFriendsCard/index.tsx
View File

@@ -2,7 +2,6 @@
import { useIntl } from "react-intl"
import { CurrencyEnum } from "@scandic-hotels/common/constants/currency"
import { membershipTermsAndConditions } from "@scandic-hotels/common/constants/routes/membershipTermsAndConditions"
import { useLazyPathname } from "@scandic-hotels/common/hooks/useLazyPathname"
import { formatPrice } from "@scandic-hotels/common/utils/numberFormatting"
import Footnote from "@scandic-hotels/design-system/Footnote"
@@ -13,6 +12,7 @@ import { OldDSButton as Button } from "@scandic-hotels/design-system/OldDSButton
import { Typography } from "@scandic-hotels/design-system/Typography"
import { trackLoginClick } from "@scandic-hotels/tracking/navigation"
import { useBookingFlowConfig } from "../../../../../bookingFlowConfig/bookingFlowConfigContext"
import { useRoomContext } from "../../../../../contexts/EnterDetails/RoomContext"
import useLang from "../../../../../hooks/useLang"
@@ -24,6 +24,7 @@ type Props = {
export function JoinScandicFriendsCard({ name = "join" }: Props) {
const lang = useLang()
const intl = useIntl()
const { routes } = useBookingFlowConfig()
const loginPathname = useLazyPathname({ includeSearchParams: true })
const {
room,
@@ -105,7 +106,7 @@ export function JoinScandicFriendsCard({ name = "join" }: Props) {
textDecoration="underline"
size="tiny"
target="_blank"
href={membershipTermsAndConditions[lang]}
href={routes.membershipTermsAndConditions[lang]}
>
{str}
</Link>

5
packages/booking-flow/lib/components/EnterDetails/Details/RoomOne/PartnerSASJoinScandicFriendsCard/index.tsx
View File

@@ -3,7 +3,6 @@ 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"
@@ -11,6 +10,7 @@ import Link from "@scandic-hotels/design-system/Link"
import { Typography } from "@scandic-hotels/design-system/Typography"
import { trpc } from "@scandic-hotels/trpc/client"
import { useBookingFlowConfig } from "../../../../../bookingFlowConfig/bookingFlowConfigContext"
import { useRoomContext } from "../../../../../contexts/EnterDetails/RoomContext"
import useLang from "../../../../../hooks/useLang"
import { MembershipNumberInput } from "../Signup/MembershipNumberInput"
@@ -27,6 +27,7 @@ export function PartnerSASJoinScandicFriendsCard({
}: Props) {
const lang = useLang()
const intl = useIntl()
const { routes } = useBookingFlowConfig()
const { data: euroBonusProfile } =
trpc.partner.sas.getEuroBonusProfile.useQuery()
@@ -107,7 +108,7 @@ export function PartnerSASJoinScandicFriendsCard({
textDecoration="underline"
size="tiny"
target="_blank"
href={membershipTermsAndConditions[lang]}
href={routes.membershipTermsAndConditions[lang]}
>
{str}
</Link>