From 128c1e3462dd7391d69c0c58553ce96bba730467 Mon Sep 17 00:00:00 2001 From: Bianca Widstam Date: Thu, 3 Apr 2025 11:15:49 +0000 Subject: [PATCH] Merged in fix/display-added-ancillaries-only-if-nonmodifiable (pull request #1718) fix: fix logic for showing ancillaries and add/remove ancillaries * fix: fix logic for showing ancillaries and add/remove ancillaries * fix: move canModifyAncillary check Approved-by: Niclas Edenvin --- .../MyStay/Ancillaries/AddedAncillaries/index.tsx | 4 +++- .../components/HotelReservation/MyStay/Ancillaries/index.tsx | 3 ++- apps/scandic-web/server/routers/booking/output.ts | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddedAncillaries/index.tsx b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddedAncillaries/index.tsx index 627084c4f..bba3acf29 100644 --- a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddedAncillaries/index.tsx +++ b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddedAncillaries/index.tsx @@ -154,7 +154,9 @@ export function AddedAncillaries({ )} - {booking.confirmationNumber && ancillary.code ? ( + {booking.confirmationNumber && + ancillary.code && + booking.canModifyAncillaries ? (
- {uniqueAncillaries.length > 0 && ( + {uniqueAncillaries.length > 0 && booking.canModifyAncillaries && ( <>
@@ -206,6 +206,7 @@ export function Ancillaries({ )} <AddedAncillaries booking={booking} ancillaries={uniqueAncillaries} /> + <AncillaryFlowModalWrapper> <AddAncillaryFlowModal user={user} diff --git a/apps/scandic-web/server/routers/booking/output.ts b/apps/scandic-web/server/routers/booking/output.ts index 130538d72..d648e34cc 100644 --- a/apps/scandic-web/server/routers/booking/output.ts +++ b/apps/scandic-web/server/routers/booking/output.ts @@ -262,4 +262,5 @@ export const bookingConfirmationSchema = z ) && data.attributes.reservationStatus !== BookingStatusEnum.Cancelled, isCancelable: !!data.links.cancel, isModifiable: !!data.links.modify, + canModifyAncillaries: !!data.links.addAncillary, }))