djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CR changes

Browse source
This commit is contained in:
Tomasz Szymanski 2021-02-08 14:30:06 +01:00
parent 49124e2014
commit b3fe252f20
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx
View file

@ -145,10 +145,11 @@ const OrderDetailsPage: React.FC<OrderDetailsPageProps> = props => {
makeChangeHandler: makeMetadataChangeHandler makeChangeHandler: makeMetadataChangeHandler
} = useMetadataChangeTrigger(); } = useMetadataChangeTrigger();
const canCancel = maybe(() => order.status) !== OrderStatus.CANCELED; const isOrderUnconfirmed = order?.status === OrderStatus.UNCONFIRMED;
const canEditAddresses = maybe(() => order.status) !== OrderStatus.CANCELED; const canCancel = order?.status !== OrderStatus.CANCELED;
const canFulfill = maybe(() => order.status) !== OrderStatus.CANCELED; const canEditAddresses = order?.status !== OrderStatus.CANCELED;
const unfulfilled = maybe(() => order.lines, []).filter( const canFulfill = order?.status !== OrderStatus.CANCELED;
const unfulfilled = (order?.lines || []).filter(
line => line.quantityFulfilled < line.quantity line => line.quantityFulfilled < line.quantity
); );
@ -169,13 +170,12 @@ const OrderDetailsPage: React.FC<OrderDetailsPageProps> = props => {
privateMetadata: order?.privateMetadata.map(mapMetadataItemToInput) privateMetadata: order?.privateMetadata.map(mapMetadataItemToInput)
}; };
const saveLabel = const saveLabel = isOrderUnconfirmed
order?.status === OrderStatus.UNCONFIRMED ? intl.formatMessage(messages.confirmOrder)
? intl.formatMessage(messages.confirmOrder) : undefined;
: undefined;
const allowSave = (hasChanged: boolean) => { const allowSave = (hasChanged: boolean) => {
if (order?.status !== OrderStatus.UNCONFIRMED) { if (!isOrderUnconfirmed) {
return disabled || !hasChanged; return disabled || !hasChanged;
} else if (!order?.lines?.length) { } else if (!order?.lines?.length) {
return true; return true;
@ -228,7 +228,7 @@ const OrderDetailsPage: React.FC<OrderDetailsPageProps> = props => {
</div> </div>
<Grid> <Grid>
<div> <div>
{order?.status !== OrderStatus.UNCONFIRMED ? ( {!isOrderUnconfirmed ? (
<OrderUnfulfilledProductsCard <OrderUnfulfilledProductsCard
canFulfill={canFulfill} canFulfill={canFulfill}
lines={unfulfilled} lines={unfulfilled}
@ -262,7 +262,7 @@ const OrderDetailsPage: React.FC<OrderDetailsPageProps> = props => {
/> />
</React.Fragment> </React.Fragment>
))} ))}
{order?.status !== OrderStatus.UNCONFIRMED && ( {!isOrderUnconfirmed && (
<> <>
<OrderPayment <OrderPayment
order={order} order={order}
@ -296,7 +296,7 @@ const OrderDetailsPage: React.FC<OrderDetailsPageProps> = props => {
selectedChannelName={order?.channel?.name} selectedChannelName={order?.channel?.name}
/> />
<CardSpacer /> <CardSpacer />
{order?.status !== OrderStatus.UNCONFIRMED && ( {!isOrderUnconfirmed && (
<> <>
<OrderInvoiceList <OrderInvoiceList
invoices={order?.invoices} invoices={order?.invoices}