From 75efb26aa859fb4b65e23369056bec9466eaf12a Mon Sep 17 00:00:00 2001
From: AlicjaSzu <alicja.szukuc@gmail.com>
Date: Fri, 15 May 2020 17:19:51 +0200
Subject: [PATCH 1/4] add discount to Order details view

---
 locale/defaultMessages.json                        |  4 ++++
 .../components/OrderPayment/OrderPayment.tsx       | 14 ++++++++++++++
 src/orders/queries.ts                              |  4 ++++
 src/orders/types/FulfillOrder.ts                   |  7 +++++++
 src/orders/types/OrderCancel.ts                    |  7 +++++++
 src/orders/types/OrderCapture.ts                   |  7 +++++++
 src/orders/types/OrderDetails.ts                   |  7 +++++++
 src/orders/types/OrderDetailsFragment.ts           |  7 +++++++
 src/orders/types/OrderDraftCancel.ts               |  7 +++++++
 src/orders/types/OrderDraftFinalize.ts             |  7 +++++++
 src/orders/types/OrderDraftUpdate.ts               |  7 +++++++
 src/orders/types/OrderFulfillmentCancel.ts         |  7 +++++++
 src/orders/types/OrderFulfillmentUpdateTracking.ts |  7 +++++++
 src/orders/types/OrderLineDelete.ts                |  7 +++++++
 src/orders/types/OrderLineUpdate.ts                |  7 +++++++
 src/orders/types/OrderLinesAdd.ts                  |  7 +++++++
 src/orders/types/OrderMarkAsPaid.ts                |  7 +++++++
 src/orders/types/OrderRefund.ts                    |  7 +++++++
 src/orders/types/OrderVoid.ts                      |  7 +++++++
 19 files changed, 134 insertions(+)

diff --git a/locale/defaultMessages.json b/locale/defaultMessages.json
index efb382289..b94bb5e2f 100644
--- a/locale/defaultMessages.json
+++ b/locale/defaultMessages.json
@@ -2749,6 +2749,10 @@
     "context": "order payment",
     "string": "Outstanding Balance"
   },
+  "src_dot_orders_dot_components_dot_OrderPayment_dot_3720114122": {
+    "context": "order discount",
+    "string": "Discount"
+  },
   "src_dot_orders_dot_components_dot_OrderPayment_dot_3768782744": {
     "context": "order payment",
     "string": "Preauthorized amount"
diff --git a/src/orders/components/OrderPayment/OrderPayment.tsx b/src/orders/components/OrderPayment/OrderPayment.tsx
index 2a8368e30..968ac7385 100644
--- a/src/orders/components/OrderPayment/OrderPayment.tsx
+++ b/src/orders/components/OrderPayment/OrderPayment.tsx
@@ -159,6 +159,20 @@ const OrderPayment: React.FC<OrderPaymentProps> = props => {
                 )}
               </td>
             </tr>
+            {maybe(() => order && order.discount.amount !== 0) ? (
+              <tr>
+                <td>
+                  <FormattedMessage
+                    defaultMessage="Discount"
+                    description="order discount"
+                  />
+                </td>
+                <td />
+                <td className={classes.textRight}>
+                  -<Money money={order.discount} />
+                </td>
+              </tr>
+            ) : null}
             <tr className={classes.totalRow}>
               <td>
                 <FormattedMessage
diff --git a/src/orders/queries.ts b/src/orders/queries.ts
index 99cd550e1..a266dd352 100644
--- a/src/orders/queries.ts
+++ b/src/orders/queries.ts
@@ -174,6 +174,10 @@ export const fragmentOrderDetails = gql`
         currency
       }
     }
+    discount {
+      amount
+      currency
+    }
   }
 `;
 
diff --git a/src/orders/types/FulfillOrder.ts b/src/orders/types/FulfillOrder.ts
index 786ffb08c..f3f8ca758 100644
--- a/src/orders/types/FulfillOrder.ts
+++ b/src/orders/types/FulfillOrder.ts
@@ -248,6 +248,12 @@ export interface FulfillOrder_orderFulfill_order_availableShippingMethods {
   price: FulfillOrder_orderFulfill_order_availableShippingMethods_price | null;
 }
 
+export interface FulfillOrder_orderFulfill_order_discount {
+  __typename: "Money";
+  amount: number;
+  currency: string;
+}
+
 export interface FulfillOrder_orderFulfill_order {
   __typename: "Order";
   id: string;
@@ -273,6 +279,7 @@ export interface FulfillOrder_orderFulfill_order {
   user: FulfillOrder_orderFulfill_order_user | null;
   userEmail: string | null;
   availableShippingMethods: (FulfillOrder_orderFulfill_order_availableShippingMethods | null)[] | null;
+  discount: FulfillOrder_orderFulfill_order_discount | null;
 }
 
 export interface FulfillOrder_orderFulfill {
diff --git a/src/orders/types/OrderCancel.ts b/src/orders/types/OrderCancel.ts
index 7258dbdb0..14800b4b4 100644
--- a/src/orders/types/OrderCancel.ts
+++ b/src/orders/types/OrderCancel.ts
@@ -246,6 +246,12 @@ export interface OrderCancel_orderCancel_order_availableShippingMethods {
   price: OrderCancel_orderCancel_order_availableShippingMethods_price | null;
 }
 
+export interface OrderCancel_orderCancel_order_discount {
+  __typename: "Money";
+  amount: number;
+  currency: string;
+}
+
 export interface OrderCancel_orderCancel_order {
   __typename: "Order";
   id: string;
@@ -271,6 +277,7 @@ export interface OrderCancel_orderCancel_order {
   user: OrderCancel_orderCancel_order_user | null;
   userEmail: string | null;
   availableShippingMethods: (OrderCancel_orderCancel_order_availableShippingMethods | null)[] | null;
+  discount: OrderCancel_orderCancel_order_discount | null;
 }
 
 export interface OrderCancel_orderCancel {
diff --git a/src/orders/types/OrderCapture.ts b/src/orders/types/OrderCapture.ts
index 5c3abf2ee..38ddbdf43 100644
--- a/src/orders/types/OrderCapture.ts
+++ b/src/orders/types/OrderCapture.ts
@@ -246,6 +246,12 @@ export interface OrderCapture_orderCapture_order_availableShippingMethods {
   price: OrderCapture_orderCapture_order_availableShippingMethods_price | null;
 }
 
+export interface OrderCapture_orderCapture_order_discount {
+  __typename: "Money";
+  amount: number;
+  currency: string;
+}
+
 export interface OrderCapture_orderCapture_order {
   __typename: "Order";
   id: string;
@@ -271,6 +277,7 @@ export interface OrderCapture_orderCapture_order {
   user: OrderCapture_orderCapture_order_user | null;
   userEmail: string | null;
   availableShippingMethods: (OrderCapture_orderCapture_order_availableShippingMethods | null)[] | null;
+  discount: OrderCapture_orderCapture_order_discount | null;
 }
 
 export interface OrderCapture_orderCapture {
diff --git a/src/orders/types/OrderDetails.ts b/src/orders/types/OrderDetails.ts
index 4ec01cdca..c752aab4c 100644
--- a/src/orders/types/OrderDetails.ts
+++ b/src/orders/types/OrderDetails.ts
@@ -240,6 +240,12 @@ export interface OrderDetails_order_availableShippingMethods {
   price: OrderDetails_order_availableShippingMethods_price | null;
 }
 
+export interface OrderDetails_order_discount {
+  __typename: "Money";
+  amount: number;
+  currency: string;
+}
+
 export interface OrderDetails_order {
   __typename: "Order";
   id: string;
@@ -265,6 +271,7 @@ export interface OrderDetails_order {
   user: OrderDetails_order_user | null;
   userEmail: string | null;
   availableShippingMethods: (OrderDetails_order_availableShippingMethods | null)[] | null;
+  discount: OrderDetails_order_discount | null;
 }
 
 export interface OrderDetails_shop_countries {
diff --git a/src/orders/types/OrderDetailsFragment.ts b/src/orders/types/OrderDetailsFragment.ts
index e01d64bbb..f14f016d7 100644
--- a/src/orders/types/OrderDetailsFragment.ts
+++ b/src/orders/types/OrderDetailsFragment.ts
@@ -240,6 +240,12 @@ export interface OrderDetailsFragment_availableShippingMethods {
   price: OrderDetailsFragment_availableShippingMethods_price | null;
 }
 
+export interface OrderDetailsFragment_discount {
+  __typename: "Money";
+  amount: number;
+  currency: string;
+}
+
 export interface OrderDetailsFragment {
   __typename: "Order";
   id: string;
@@ -265,4 +271,5 @@ export interface OrderDetailsFragment {
   user: OrderDetailsFragment_user | null;
   userEmail: string | null;
   availableShippingMethods: (OrderDetailsFragment_availableShippingMethods | null)[] | null;
+  discount: OrderDetailsFragment_discount | null;
 }
diff --git a/src/orders/types/OrderDraftCancel.ts b/src/orders/types/OrderDraftCancel.ts
index 0d5f737d9..26b8c2672 100644
--- a/src/orders/types/OrderDraftCancel.ts
+++ b/src/orders/types/OrderDraftCancel.ts
@@ -246,6 +246,12 @@ export interface OrderDraftCancel_draftOrderDelete_order_availableShippingMethod
   price: OrderDraftCancel_draftOrderDelete_order_availableShippingMethods_price | null;
 }
 
+export interface OrderDraftCancel_draftOrderDelete_order_discount {
+  __typename: "Money";
+  amount: number;
+  currency: string;
+}
+
 export interface OrderDraftCancel_draftOrderDelete_order {
   __typename: "Order";
   id: string;
@@ -271,6 +277,7 @@ export interface OrderDraftCancel_draftOrderDelete_order {
   user: OrderDraftCancel_draftOrderDelete_order_user | null;
   userEmail: string | null;
   availableShippingMethods: (OrderDraftCancel_draftOrderDelete_order_availableShippingMethods | null)[] | null;
+  discount: OrderDraftCancel_draftOrderDelete_order_discount | null;
 }
 
 export interface OrderDraftCancel_draftOrderDelete {
diff --git a/src/orders/types/OrderDraftFinalize.ts b/src/orders/types/OrderDraftFinalize.ts
index 8b1ea1068..62f289a95 100644
--- a/src/orders/types/OrderDraftFinalize.ts
+++ b/src/orders/types/OrderDraftFinalize.ts
@@ -246,6 +246,12 @@ export interface OrderDraftFinalize_draftOrderComplete_order_availableShippingMe
   price: OrderDraftFinalize_draftOrderComplete_order_availableShippingMethods_price | null;
 }
 
+export interface OrderDraftFinalize_draftOrderComplete_order_discount {
+  __typename: "Money";
+  amount: number;
+  currency: string;
+}
+
 export interface OrderDraftFinalize_draftOrderComplete_order {
   __typename: "Order";
   id: string;
@@ -271,6 +277,7 @@ export interface OrderDraftFinalize_draftOrderComplete_order {
   user: OrderDraftFinalize_draftOrderComplete_order_user | null;
   userEmail: string | null;
   availableShippingMethods: (OrderDraftFinalize_draftOrderComplete_order_availableShippingMethods | null)[] | null;
+  discount: OrderDraftFinalize_draftOrderComplete_order_discount | null;
 }
 
 export interface OrderDraftFinalize_draftOrderComplete {
diff --git a/src/orders/types/OrderDraftUpdate.ts b/src/orders/types/OrderDraftUpdate.ts
index 77f764948..90d8e039e 100644
--- a/src/orders/types/OrderDraftUpdate.ts
+++ b/src/orders/types/OrderDraftUpdate.ts
@@ -246,6 +246,12 @@ export interface OrderDraftUpdate_draftOrderUpdate_order_availableShippingMethod
   price: OrderDraftUpdate_draftOrderUpdate_order_availableShippingMethods_price | null;
 }
 
+export interface OrderDraftUpdate_draftOrderUpdate_order_discount {
+  __typename: "Money";
+  amount: number;
+  currency: string;
+}
+
 export interface OrderDraftUpdate_draftOrderUpdate_order {
   __typename: "Order";
   id: string;
@@ -271,6 +277,7 @@ export interface OrderDraftUpdate_draftOrderUpdate_order {
   user: OrderDraftUpdate_draftOrderUpdate_order_user | null;
   userEmail: string | null;
   availableShippingMethods: (OrderDraftUpdate_draftOrderUpdate_order_availableShippingMethods | null)[] | null;
+  discount: OrderDraftUpdate_draftOrderUpdate_order_discount | null;
 }
 
 export interface OrderDraftUpdate_draftOrderUpdate {
diff --git a/src/orders/types/OrderFulfillmentCancel.ts b/src/orders/types/OrderFulfillmentCancel.ts
index 014908b9e..6d440ced5 100644
--- a/src/orders/types/OrderFulfillmentCancel.ts
+++ b/src/orders/types/OrderFulfillmentCancel.ts
@@ -246,6 +246,12 @@ export interface OrderFulfillmentCancel_orderFulfillmentCancel_order_availableSh
   price: OrderFulfillmentCancel_orderFulfillmentCancel_order_availableShippingMethods_price | null;
 }
 
+export interface OrderFulfillmentCancel_orderFulfillmentCancel_order_discount {
+  __typename: "Money";
+  amount: number;
+  currency: string;
+}
+
 export interface OrderFulfillmentCancel_orderFulfillmentCancel_order {
   __typename: "Order";
   id: string;
@@ -271,6 +277,7 @@ export interface OrderFulfillmentCancel_orderFulfillmentCancel_order {
   user: OrderFulfillmentCancel_orderFulfillmentCancel_order_user | null;
   userEmail: string | null;
   availableShippingMethods: (OrderFulfillmentCancel_orderFulfillmentCancel_order_availableShippingMethods | null)[] | null;
+  discount: OrderFulfillmentCancel_orderFulfillmentCancel_order_discount | null;
 }
 
 export interface OrderFulfillmentCancel_orderFulfillmentCancel {
diff --git a/src/orders/types/OrderFulfillmentUpdateTracking.ts b/src/orders/types/OrderFulfillmentUpdateTracking.ts
index 0a0e5cca1..c1b94eb78 100644
--- a/src/orders/types/OrderFulfillmentUpdateTracking.ts
+++ b/src/orders/types/OrderFulfillmentUpdateTracking.ts
@@ -246,6 +246,12 @@ export interface OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_o
   price: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_availableShippingMethods_price | null;
 }
 
+export interface OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_discount {
+  __typename: "Money";
+  amount: number;
+  currency: string;
+}
+
 export interface OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order {
   __typename: "Order";
   id: string;
@@ -271,6 +277,7 @@ export interface OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_o
   user: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_user | null;
   userEmail: string | null;
   availableShippingMethods: (OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_availableShippingMethods | null)[] | null;
+  discount: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_discount | null;
 }
 
 export interface OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking {
diff --git a/src/orders/types/OrderLineDelete.ts b/src/orders/types/OrderLineDelete.ts
index 8205439ea..632857bfc 100644
--- a/src/orders/types/OrderLineDelete.ts
+++ b/src/orders/types/OrderLineDelete.ts
@@ -246,6 +246,12 @@ export interface OrderLineDelete_draftOrderLineDelete_order_availableShippingMet
   price: OrderLineDelete_draftOrderLineDelete_order_availableShippingMethods_price | null;
 }
 
+export interface OrderLineDelete_draftOrderLineDelete_order_discount {
+  __typename: "Money";
+  amount: number;
+  currency: string;
+}
+
 export interface OrderLineDelete_draftOrderLineDelete_order {
   __typename: "Order";
   id: string;
@@ -271,6 +277,7 @@ export interface OrderLineDelete_draftOrderLineDelete_order {
   user: OrderLineDelete_draftOrderLineDelete_order_user | null;
   userEmail: string | null;
   availableShippingMethods: (OrderLineDelete_draftOrderLineDelete_order_availableShippingMethods | null)[] | null;
+  discount: OrderLineDelete_draftOrderLineDelete_order_discount | null;
 }
 
 export interface OrderLineDelete_draftOrderLineDelete {
diff --git a/src/orders/types/OrderLineUpdate.ts b/src/orders/types/OrderLineUpdate.ts
index 948b0beac..f2186941f 100644
--- a/src/orders/types/OrderLineUpdate.ts
+++ b/src/orders/types/OrderLineUpdate.ts
@@ -246,6 +246,12 @@ export interface OrderLineUpdate_draftOrderLineUpdate_order_availableShippingMet
   price: OrderLineUpdate_draftOrderLineUpdate_order_availableShippingMethods_price | null;
 }
 
+export interface OrderLineUpdate_draftOrderLineUpdate_order_discount {
+  __typename: "Money";
+  amount: number;
+  currency: string;
+}
+
 export interface OrderLineUpdate_draftOrderLineUpdate_order {
   __typename: "Order";
   id: string;
@@ -271,6 +277,7 @@ export interface OrderLineUpdate_draftOrderLineUpdate_order {
   user: OrderLineUpdate_draftOrderLineUpdate_order_user | null;
   userEmail: string | null;
   availableShippingMethods: (OrderLineUpdate_draftOrderLineUpdate_order_availableShippingMethods | null)[] | null;
+  discount: OrderLineUpdate_draftOrderLineUpdate_order_discount | null;
 }
 
 export interface OrderLineUpdate_draftOrderLineUpdate {
diff --git a/src/orders/types/OrderLinesAdd.ts b/src/orders/types/OrderLinesAdd.ts
index b2cd429e8..b8ab0f6ef 100644
--- a/src/orders/types/OrderLinesAdd.ts
+++ b/src/orders/types/OrderLinesAdd.ts
@@ -246,6 +246,12 @@ export interface OrderLinesAdd_draftOrderLinesCreate_order_availableShippingMeth
   price: OrderLinesAdd_draftOrderLinesCreate_order_availableShippingMethods_price | null;
 }
 
+export interface OrderLinesAdd_draftOrderLinesCreate_order_discount {
+  __typename: "Money";
+  amount: number;
+  currency: string;
+}
+
 export interface OrderLinesAdd_draftOrderLinesCreate_order {
   __typename: "Order";
   id: string;
@@ -271,6 +277,7 @@ export interface OrderLinesAdd_draftOrderLinesCreate_order {
   user: OrderLinesAdd_draftOrderLinesCreate_order_user | null;
   userEmail: string | null;
   availableShippingMethods: (OrderLinesAdd_draftOrderLinesCreate_order_availableShippingMethods | null)[] | null;
+  discount: OrderLinesAdd_draftOrderLinesCreate_order_discount | null;
 }
 
 export interface OrderLinesAdd_draftOrderLinesCreate {
diff --git a/src/orders/types/OrderMarkAsPaid.ts b/src/orders/types/OrderMarkAsPaid.ts
index 898cf9a99..a13983748 100644
--- a/src/orders/types/OrderMarkAsPaid.ts
+++ b/src/orders/types/OrderMarkAsPaid.ts
@@ -246,6 +246,12 @@ export interface OrderMarkAsPaid_orderMarkAsPaid_order_availableShippingMethods
   price: OrderMarkAsPaid_orderMarkAsPaid_order_availableShippingMethods_price | null;
 }
 
+export interface OrderMarkAsPaid_orderMarkAsPaid_order_discount {
+  __typename: "Money";
+  amount: number;
+  currency: string;
+}
+
 export interface OrderMarkAsPaid_orderMarkAsPaid_order {
   __typename: "Order";
   id: string;
@@ -271,6 +277,7 @@ export interface OrderMarkAsPaid_orderMarkAsPaid_order {
   user: OrderMarkAsPaid_orderMarkAsPaid_order_user | null;
   userEmail: string | null;
   availableShippingMethods: (OrderMarkAsPaid_orderMarkAsPaid_order_availableShippingMethods | null)[] | null;
+  discount: OrderMarkAsPaid_orderMarkAsPaid_order_discount | null;
 }
 
 export interface OrderMarkAsPaid_orderMarkAsPaid {
diff --git a/src/orders/types/OrderRefund.ts b/src/orders/types/OrderRefund.ts
index 6f764f9e6..87a525ed8 100644
--- a/src/orders/types/OrderRefund.ts
+++ b/src/orders/types/OrderRefund.ts
@@ -246,6 +246,12 @@ export interface OrderRefund_orderRefund_order_availableShippingMethods {
   price: OrderRefund_orderRefund_order_availableShippingMethods_price | null;
 }
 
+export interface OrderRefund_orderRefund_order_discount {
+  __typename: "Money";
+  amount: number;
+  currency: string;
+}
+
 export interface OrderRefund_orderRefund_order {
   __typename: "Order";
   id: string;
@@ -271,6 +277,7 @@ export interface OrderRefund_orderRefund_order {
   user: OrderRefund_orderRefund_order_user | null;
   userEmail: string | null;
   availableShippingMethods: (OrderRefund_orderRefund_order_availableShippingMethods | null)[] | null;
+  discount: OrderRefund_orderRefund_order_discount | null;
 }
 
 export interface OrderRefund_orderRefund {
diff --git a/src/orders/types/OrderVoid.ts b/src/orders/types/OrderVoid.ts
index 880598c78..77ce2269d 100644
--- a/src/orders/types/OrderVoid.ts
+++ b/src/orders/types/OrderVoid.ts
@@ -246,6 +246,12 @@ export interface OrderVoid_orderVoid_order_availableShippingMethods {
   price: OrderVoid_orderVoid_order_availableShippingMethods_price | null;
 }
 
+export interface OrderVoid_orderVoid_order_discount {
+  __typename: "Money";
+  amount: number;
+  currency: string;
+}
+
 export interface OrderVoid_orderVoid_order {
   __typename: "Order";
   id: string;
@@ -271,6 +277,7 @@ export interface OrderVoid_orderVoid_order {
   user: OrderVoid_orderVoid_order_user | null;
   userEmail: string | null;
   availableShippingMethods: (OrderVoid_orderVoid_order_availableShippingMethods | null)[] | null;
+  discount: OrderVoid_orderVoid_order_discount | null;
 }
 
 export interface OrderVoid_orderVoid {

From ea3b65bd8cb36a898755776a33ecc45f63345ca0 Mon Sep 17 00:00:00 2001
From: AlicjaSzu <alicja.szukuc@gmail.com>
Date: Fri, 15 May 2020 18:09:14 +0200
Subject: [PATCH 2/4] update orderes fixtures

---
 src/orders/fixtures.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/orders/fixtures.ts b/src/orders/fixtures.ts
index acd3fc9e2..a881d9769 100644
--- a/src/orders/fixtures.ts
+++ b/src/orders/fixtures.ts
@@ -810,6 +810,7 @@ export const order = (placeholder: string): OrderDetails_order => ({
   canFinalize: true,
   created: "2018-09-11T09:37:28.185874+00:00",
   customerNote: "Lorem ipsum dolor sit amet",
+  discount: null,
   events: [
     {
       __typename: "OrderEvent",
@@ -1043,6 +1044,7 @@ export const draftOrder = (placeholder: string): OrderDetails_order => ({
   customerNote: "Lorem ipsum dolor sit",
   events: [],
   fulfillments: [],
+  discount: null,
   id: "T3JkZXI6MjQ=",
   lines: [
     {

From aefb339861e3867b898cb656865f1d60b1d2d492 Mon Sep 17 00:00:00 2001
From: AlicjaSzu <alicja.szukuc@gmail.com>
Date: Tue, 19 May 2020 11:34:01 +0200
Subject: [PATCH 3/4] fix orders fixture error

---
 src/orders/components/OrderPayment/OrderPayment.tsx | 4 ++--
 src/orders/fixtures.ts                              | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/orders/components/OrderPayment/OrderPayment.tsx b/src/orders/components/OrderPayment/OrderPayment.tsx
index 968ac7385..dcdaa71f9 100644
--- a/src/orders/components/OrderPayment/OrderPayment.tsx
+++ b/src/orders/components/OrderPayment/OrderPayment.tsx
@@ -159,7 +159,7 @@ const OrderPayment: React.FC<OrderPaymentProps> = props => {
                 )}
               </td>
             </tr>
-            {maybe(() => order && order.discount.amount !== 0) ? (
+            {maybe(() => order && order.discount.amount !== 0) && (
               <tr>
                 <td>
                   <FormattedMessage
@@ -172,7 +172,7 @@ const OrderPayment: React.FC<OrderPaymentProps> = props => {
                   -<Money money={order.discount} />
                 </td>
               </tr>
-            ) : null}
+            )}
             <tr className={classes.totalRow}>
               <td>
                 <FormattedMessage
diff --git a/src/orders/fixtures.ts b/src/orders/fixtures.ts
index a881d9769..6ec41e96e 100644
--- a/src/orders/fixtures.ts
+++ b/src/orders/fixtures.ts
@@ -1042,9 +1042,9 @@ export const draftOrder = (placeholder: string): OrderDetails_order => ({
   canFinalize: true,
   created: "2018-09-20T23:23:39.811428+00:00",
   customerNote: "Lorem ipsum dolor sit",
+  discount: null,
   events: [],
   fulfillments: [],
-  discount: null,
   id: "T3JkZXI6MjQ=",
   lines: [
     {

From 1047762aa67564f642e4f8d01ecc5b97da2bedbc Mon Sep 17 00:00:00 2001
From: AlicjaSzu <alicja.szukuc@gmail.com>
Date: Tue, 19 May 2020 13:10:11 +0200
Subject: [PATCH 4/4] OrderPayment - update discount condition

---
 src/orders/components/OrderPayment/OrderPayment.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/orders/components/OrderPayment/OrderPayment.tsx b/src/orders/components/OrderPayment/OrderPayment.tsx
index dcdaa71f9..48a1c1992 100644
--- a/src/orders/components/OrderPayment/OrderPayment.tsx
+++ b/src/orders/components/OrderPayment/OrderPayment.tsx
@@ -159,7 +159,7 @@ const OrderPayment: React.FC<OrderPaymentProps> = props => {
                 )}
               </td>
             </tr>
-            {maybe(() => order && order.discount.amount !== 0) && (
+            {order?.discount?.amount > 0 && (
               <tr>
                 <td>
                   <FormattedMessage