diff --git a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx index ea1539b41..785d49e17 100644 --- a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx +++ b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx @@ -145,10 +145,11 @@ const OrderDetailsPage: React.FC = props => { makeChangeHandler: makeMetadataChangeHandler } = useMetadataChangeTrigger(); - const canCancel = maybe(() => order.status) !== OrderStatus.CANCELED; - const canEditAddresses = maybe(() => order.status) !== OrderStatus.CANCELED; - const canFulfill = maybe(() => order.status) !== OrderStatus.CANCELED; - const unfulfilled = maybe(() => order.lines, []).filter( + const isOrderUnconfirmed = order?.status === OrderStatus.UNCONFIRMED; + const canCancel = order?.status !== OrderStatus.CANCELED; + const canEditAddresses = order?.status !== OrderStatus.CANCELED; + const canFulfill = order?.status !== OrderStatus.CANCELED; + const unfulfilled = (order?.lines || []).filter( line => line.quantityFulfilled < line.quantity ); @@ -169,13 +170,12 @@ const OrderDetailsPage: React.FC = props => { privateMetadata: order?.privateMetadata.map(mapMetadataItemToInput) }; - const saveLabel = - order?.status === OrderStatus.UNCONFIRMED - ? intl.formatMessage(messages.confirmOrder) - : undefined; + const saveLabel = isOrderUnconfirmed + ? intl.formatMessage(messages.confirmOrder) + : undefined; const allowSave = (hasChanged: boolean) => { - if (order?.status !== OrderStatus.UNCONFIRMED) { + if (!isOrderUnconfirmed) { return disabled || !hasChanged; } else if (!order?.lines?.length) { return true; @@ -228,7 +228,7 @@ const OrderDetailsPage: React.FC = props => {
- {order?.status !== OrderStatus.UNCONFIRMED ? ( + {!isOrderUnconfirmed ? ( = props => { /> ))} - {order?.status !== OrderStatus.UNCONFIRMED && ( + {!isOrderUnconfirmed && ( <> = props => { selectedChannelName={order?.channel?.name} /> - {order?.status !== OrderStatus.UNCONFIRMED && ( + {!isOrderUnconfirmed && ( <>