From 258847545d6213567d9071f4abfab02c99522e15 Mon Sep 17 00:00:00 2001
From: dominik-zeglen <flesz3@o2.pl>
Date: Fri, 6 Sep 2019 15:41:02 +0200
Subject: [PATCH] Add ready to capture field

---
 src/home/views/index.tsx                           |  7 +++++--
 .../components/OrderListFilter/OrderListFilter.tsx | 14 ++++++++++----
 src/orders/views/OrderList/filters.ts              |  9 ++++++++-
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/home/views/index.tsx b/src/home/views/index.tsx
index 116175d7c..63bba5deb 100644
--- a/src/home/views/index.tsx
+++ b/src/home/views/index.tsx
@@ -31,14 +31,17 @@ const HomeSection = () => {
           onOrdersToCaptureClick={() =>
             navigate(
               orderListUrl({
-                status: OrderStatusFilter.READY_TO_CAPTURE
+                status: [OrderStatusFilter.READY_TO_CAPTURE]
               })
             )
           }
           onOrdersToFulfillClick={() =>
             navigate(
               orderListUrl({
-                status: OrderStatusFilter.READY_TO_FULFILL
+                status: [
+                  OrderStatusFilter.UNFULFILLED,
+                  OrderStatusFilter.PARTIALLY_FULFILLED
+                ]
               })
             )
           }
diff --git a/src/orders/components/OrderListFilter/OrderListFilter.tsx b/src/orders/components/OrderListFilter/OrderListFilter.tsx
index 06d9fa0d5..ca7547276 100644
--- a/src/orders/components/OrderListFilter/OrderListFilter.tsx
+++ b/src/orders/components/OrderListFilter/OrderListFilter.tsx
@@ -19,7 +19,7 @@ export enum OrderFilterKeys {
   dateLastWeek = "dateLastWeek",
   dateLastMonth = "dateLastMonth",
   dateLastYear = "dateLastYear",
-  fulfillment = "fulfillment"
+  status = "status"
 }
 
 const OrderListFilter: React.FC<OrderListFilterProps> = props => {
@@ -146,15 +146,21 @@ const OrderListFilter: React.FC<OrderListFilterProps> = props => {
               description: "order fulfillment status"
             }),
             value: OrderStatusFilter.UNFULFILLED.toString()
+          },
+          {
+            label: intl.formatMessage({
+              defaultMessage: "Ready to Capture",
+              description: "order status"
+            }),
+            value: OrderStatusFilter.READY_TO_CAPTURE.toString()
           }
         ],
         type: FieldType.select
       },
       label: intl.formatMessage({
-        defaultMessage: "Fulfillment Status",
-        description: "order"
+        defaultMessage: "Order Status"
       }),
-      value: OrderFilterKeys.fulfillment
+      value: OrderFilterKeys.status
     }
   ];
 
diff --git a/src/orders/views/OrderList/filters.ts b/src/orders/views/OrderList/filters.ts
index 46ad23977..db290ab37 100644
--- a/src/orders/views/OrderList/filters.ts
+++ b/src/orders/views/OrderList/filters.ts
@@ -46,6 +46,10 @@ const filterMessages = defineMessages({
     defaultMessage: "Partially Fulfilled",
     description: "order status"
   },
+  readyToCapture: {
+    defaultMessage: "Ready to Capture",
+    description: "order status"
+  },
   unfulfilled: {
     defaultMessage: "Unfulfilled",
     description: "order status"
@@ -62,6 +66,9 @@ function getStatusLabel(status: string, intl: IntlShape): string {
 
     case OrderStatusFilter.UNFULFILLED.toString():
       return intl.formatMessage(filterMessages.unfulfilled);
+
+    case OrderStatusFilter.READY_TO_CAPTURE.toString():
+      return intl.formatMessage(filterMessages.readyToCapture);
   }
 
   return "";
@@ -110,7 +117,7 @@ export function createFilter(
       dateFrom: valueOrFirst(value),
       dateTo: undefined
     };
-  } else if (filterName === OrderFilterKeys.fulfillment) {
+  } else if (filterName === OrderFilterKeys.status) {
     return {
       status: dedupeFilter(
         filter.status