Add ready to capture field

This commit is contained in:
dominik-zeglen 2019-09-06 15:41:02 +02:00
parent 3917e13613
commit 258847545d
3 changed files with 23 additions and 7 deletions

View file

@ -31,14 +31,17 @@ const HomeSection = () => {
onOrdersToCaptureClick={() => onOrdersToCaptureClick={() =>
navigate( navigate(
orderListUrl({ orderListUrl({
status: OrderStatusFilter.READY_TO_CAPTURE status: [OrderStatusFilter.READY_TO_CAPTURE]
}) })
) )
} }
onOrdersToFulfillClick={() => onOrdersToFulfillClick={() =>
navigate( navigate(
orderListUrl({ orderListUrl({
status: OrderStatusFilter.READY_TO_FULFILL status: [
OrderStatusFilter.UNFULFILLED,
OrderStatusFilter.PARTIALLY_FULFILLED
]
}) })
) )
} }

View file

@ -19,7 +19,7 @@ export enum OrderFilterKeys {
dateLastWeek = "dateLastWeek", dateLastWeek = "dateLastWeek",
dateLastMonth = "dateLastMonth", dateLastMonth = "dateLastMonth",
dateLastYear = "dateLastYear", dateLastYear = "dateLastYear",
fulfillment = "fulfillment" status = "status"
} }
const OrderListFilter: React.FC<OrderListFilterProps> = props => { const OrderListFilter: React.FC<OrderListFilterProps> = props => {
@ -146,15 +146,21 @@ const OrderListFilter: React.FC<OrderListFilterProps> = props => {
description: "order fulfillment status" description: "order fulfillment status"
}), }),
value: OrderStatusFilter.UNFULFILLED.toString() value: OrderStatusFilter.UNFULFILLED.toString()
},
{
label: intl.formatMessage({
defaultMessage: "Ready to Capture",
description: "order status"
}),
value: OrderStatusFilter.READY_TO_CAPTURE.toString()
} }
], ],
type: FieldType.select type: FieldType.select
}, },
label: intl.formatMessage({ label: intl.formatMessage({
defaultMessage: "Fulfillment Status", defaultMessage: "Order Status"
description: "order"
}), }),
value: OrderFilterKeys.fulfillment value: OrderFilterKeys.status
} }
]; ];

View file

@ -46,6 +46,10 @@ const filterMessages = defineMessages({
defaultMessage: "Partially Fulfilled", defaultMessage: "Partially Fulfilled",
description: "order status" description: "order status"
}, },
readyToCapture: {
defaultMessage: "Ready to Capture",
description: "order status"
},
unfulfilled: { unfulfilled: {
defaultMessage: "Unfulfilled", defaultMessage: "Unfulfilled",
description: "order status" description: "order status"
@ -62,6 +66,9 @@ function getStatusLabel(status: string, intl: IntlShape): string {
case OrderStatusFilter.UNFULFILLED.toString(): case OrderStatusFilter.UNFULFILLED.toString():
return intl.formatMessage(filterMessages.unfulfilled); return intl.formatMessage(filterMessages.unfulfilled);
case OrderStatusFilter.READY_TO_CAPTURE.toString():
return intl.formatMessage(filterMessages.readyToCapture);
} }
return ""; return "";
@ -110,7 +117,7 @@ export function createFilter(
dateFrom: valueOrFirst(value), dateFrom: valueOrFirst(value),
dateTo: undefined dateTo: undefined
}; };
} else if (filterName === OrderFilterKeys.fulfillment) { } else if (filterName === OrderFilterKeys.status) {
return { return {
status: dedupeFilter( status: dedupeFilter(
filter.status filter.status