add discount to Order details view
This commit is contained in:
parent
a82de30309
commit
75efb26aa8
19 changed files with 134 additions and 0 deletions
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -174,6 +174,10 @@ export const fragmentOrderDetails = gql`
|
|||
currency
|
||||
}
|
||||
}
|
||||
discount {
|
||||
amount
|
||||
currency
|
||||
}
|
||||
}
|
||||
`;
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 {
|
||||
|
|
Loading…
Reference in a new issue