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:
@@ -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}
|
||||||
|
|||||||
@@ -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}
|
||||||
|
|||||||
@@ -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,
|
||||||
}))
|
}))
|
||||||
|
|||||||
Reference in New Issue
Block a user