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
This commit is contained in:
Bianca Widstam
2025-04-03 11:15:49 +00:00
parent 2272bb4403
commit 128c1e3462
3 changed files with 6 additions and 2 deletions

View File

@@ -154,7 +154,9 @@ export function AddedAncillaries({
</> </>
)} )}
</div> </div>
{booking.confirmationNumber && ancillary.code ? ( {booking.confirmationNumber &&
ancillary.code &&
booking.canModifyAncillaries ? (
<div className={styles.actions}> <div className={styles.actions}>
<RemoveButton <RemoveButton
confirmationNumber={booking.confirmationNumber} confirmationNumber={booking.confirmationNumber}

View File

@@ -168,7 +168,7 @@ export function Ancillaries({
return ( return (
<AddAncillaryProvider booking={booking} ancillaries={allAncillaries}> <AddAncillaryProvider booking={booking} ancillaries={allAncillaries}>
<div className={styles.container}> <div className={styles.container}>
{uniqueAncillaries.length > 0 && ( {uniqueAncillaries.length > 0 && booking.canModifyAncillaries && (
<> <>
<div className={styles.title}> <div className={styles.title}>
<Title as="h5"> <Title as="h5">
@@ -206,6 +206,7 @@ export function Ancillaries({
)} )}
<AddedAncillaries booking={booking} ancillaries={uniqueAncillaries} /> <AddedAncillaries booking={booking} ancillaries={uniqueAncillaries} />
<AncillaryFlowModalWrapper> <AncillaryFlowModalWrapper>
<AddAncillaryFlowModal <AddAncillaryFlowModal
user={user} user={user}

View File

@@ -262,4 +262,5 @@ export const bookingConfirmationSchema = z
) && data.attributes.reservationStatus !== BookingStatusEnum.Cancelled, ) && data.attributes.reservationStatus !== BookingStatusEnum.Cancelled,
isCancelable: !!data.links.cancel, isCancelable: !!data.links.cancel,
isModifiable: !!data.links.modify, isModifiable: !!data.links.modify,
canModifyAncillaries: !!data.links.addAncillary,
})) }))