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

feat(SW-2116): Use refId instead of confirmationNumber

Browse Source
This commit is contained in:
Michael Zetterberg
2025-05-04 11:11:15 +02:00
parent f681fa7675
commit b910b6a313
59 changed files with 491 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/index.tsx
View File

@@ -57,7 +57,6 @@ export default function AddAncillaryFlowModal({
packages,
user,
savedCreditCards,
refId,
}: AddAncillaryFlowModalProps) {
const {
currentStep,
@@ -123,7 +122,7 @@ export default function AddAncillaryFlowModal({
const addAncillary = trpc.booking.packages.useMutation()
const { guaranteeBooking, isLoading, handleGuaranteeError } =
useGuaranteeBooking(booking.confirmationNumber, true, booking.hotelId)
useGuaranteeBooking(booking.refId, true, booking.hotelId)
function validateTermsAndConditions(data: AncillaryFormData): boolean {
if (!data.termsAndConditions) {
@@ -145,7 +144,7 @@ export default function AddAncillaryFlowModal({
) {
addAncillary.mutate(
{
confirmationNumber: booking.confirmationNumber,
refId: booking.refId,
ancillaryComment: data.optionalText,
ancillaryDeliveryTime: selectedAncillary?.requiresDeliveryTime
? data.deliveryTime
@@ -176,7 +175,7 @@ export default function AddAncillaryFlowModal({
clearAncillarySessionData()
closeModal()
utils.booking.get.invalidate({
confirmationNumber: booking.confirmationNumber,
refId: booking.refId,
})
router.refresh()
} else {
@@ -202,7 +201,7 @@ export default function AddAncillaryFlowModal({
selectedAncillary,
data.deliveryTime
)
if (booking.confirmationNumber) {
if (booking.refId) {
const card = savedCreditCard
? {
alias: savedCreditCard.alias,
@@ -211,12 +210,12 @@ export default function AddAncillaryFlowModal({
}
: undefined
guaranteeBooking.mutate({
confirmationNumber: booking.confirmationNumber,
refId: booking.refId,
language: lang,
...(card && { card }),
success: `${guaranteeRedirectUrl}?status=success&RefId=${encodeURIComponent(refId)}&ancillary=1`,
error: `${guaranteeRedirectUrl}?status=error&RefId=${encodeURIComponent(refId)}&ancillary=1`,
cancel: `${guaranteeRedirectUrl}?status=cancel&RefId=${encodeURIComponent(refId)}&ancillary=1`,
success: `${guaranteeRedirectUrl}?status=success&ancillary=1&RefId=${encodeURIComponent(booking.refId)}`,
error: `${guaranteeRedirectUrl}?status=error&ancillary=1&RefId=${encodeURIComponent(booking.refId)}`,
cancel: `${guaranteeRedirectUrl}?status=cancel&ancillary=1&RefId=${encodeURIComponent(booking.refId)}`,
})
} else {
handleGuaranteeError("No confirmation number")

6
apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddedAncillaries/RemoveButton.tsx
View File

@@ -10,12 +10,12 @@ import { toast } from "@/components/TempDesignSystem/Toasts"
import useLang from "@/hooks/useLang"
export default function RemoveButton({
confirmationNumber,
refId,
codes,
title,
onSuccess,
}: {
confirmationNumber: string
refId: string
codes: string[]
title?: string
onSuccess: () => void
@@ -51,7 +51,7 @@ export default function RemoveButton({
removePackage.mutate(
{
language: lang,
confirmationNumber,
refId,
codes,
},
{

4
apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddedAncillaries/index.tsx
View File

@@ -126,7 +126,7 @@ export function AddedAncillaries({
{booking.confirmationNumber && ancillary.code ? (
<div className={styles.actions}>
<RemoveButton
confirmationNumber={booking.confirmationNumber}
refId={booking.refId}
codes={
ancillary.code ===
BreakfastPackageEnum.ANCILLARY_REGULAR_BREAKFAST
@@ -192,7 +192,7 @@ export function AddedAncillaries({
booking.canModifyAncillaries ? (
<div className={styles.actions}>
<RemoveButton
confirmationNumber={booking.confirmationNumber}
refId={booking.refId}
codes={
ancillary.code ===
BreakfastPackageEnum.ANCILLARY_REGULAR_BREAKFAST

6
apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/GuaranteeCallback/index.tsx
View File

@@ -21,9 +21,11 @@ import type { Lang } from "@/constants/languages"
export default function GuaranteeAncillaryHandler({
confirmationNumber,
returnUrl,
refId,
lang,
}: {
confirmationNumber: string
refId: string
returnUrl: string
lang: Lang
}) {
@@ -47,7 +49,7 @@ export default function GuaranteeAncillaryHandler({
addAncillary.mutate(
{
confirmationNumber,
refId,
ancillaryComment: formData.optionalText,
ancillaryDeliveryTime: selectedAncillary.requiresDeliveryTime
? formData.deliveryTime
@@ -86,7 +88,7 @@ export default function GuaranteeAncillaryHandler({
},
}
)
}, [confirmationNumber, returnUrl, addAncillary, lang, router])
}, [confirmationNumber, refId, returnUrl, addAncillary, lang, router])
return <LoadingSpinner />
}

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

@@ -83,7 +83,6 @@ export function Ancillaries({
packages,
user,
savedCreditCards,
refId,
}: AncillariesProps) {
const intl = useIntl()
const ancillaries = use(ancillariesPromise)
@@ -221,7 +220,6 @@ export function Ancillaries({
user={user}
booking={booking}
packages={packages}
refId={refId}
savedCreditCards={savedCreditCards}
/>
</AncillaryFlowModalWrapper>