diff --git a/locale/defaultMessages.json b/locale/defaultMessages.json index febc07f49..ccba72831 100644 --- a/locale/defaultMessages.json +++ b/locale/defaultMessages.json @@ -2619,6 +2619,10 @@ "context": "order history message", "string": "Order confirmation was sent to customer" }, + "src_dot_orders_dot_components_dot_OrderHistory_dot_2421636085": { + "context": "order history message", + "string": "Invoice was requested by {requestedBy}" + }, "src_dot_orders_dot_components_dot_OrderHistory_dot_2566971846": { "context": "order history message", "string": "Payment was voided" @@ -2678,6 +2682,14 @@ "context": "order history message", "string": "Shipping details was sent to customer" }, + "src_dot_orders_dot_components_dot_OrderHistory_dot_748112244": { + "context": "order history message", + "string": "Invoice no. {invoiceNumber} was generated by {generatedBy}" + }, + "src_dot_orders_dot_components_dot_OrderHistory_dot_88351908": { + "context": "order history message", + "string": "Invoice was sent to customer by {sentBy}" + }, "src_dot_orders_dot_components_dot_OrderHistory_dot_950782935": { "context": "order history message", "string": "Order was cancelled" diff --git a/schema.graphql b/schema.graphql index 876d48e8b..8b56b3f50 100644 --- a/schema.graphql +++ b/schema.graphql @@ -2814,6 +2814,7 @@ type OrderEvent implements Node { quantity: Int composedId: String orderNumber: String + invoiceNumber: String oversoldItems: [String] lines: [OrderEventOrderLineObject] fulfilledItems: [FulfillmentLine] @@ -2863,6 +2864,9 @@ enum OrderEventsEnum { PAYMENT_REFUNDED PAYMENT_VOIDED PAYMENT_FAILED + INVOICE_REQUESTED + INVOICE_GENERATED + INVOICE_SENT FULFILLMENT_CANCELED FULFILLMENT_RESTOCKED_ITEMS FULFILLMENT_FULFILLED_ITEMS diff --git a/src/fragments/orders.ts b/src/fragments/orders.ts index 0ea8826fb..08a2e5ae6 100644 --- a/src/fragments/orders.ts +++ b/src/fragments/orders.ts @@ -9,6 +9,7 @@ export const fragmentOrderEvent = gql` date email emailType + invoiceNumber message quantity type diff --git a/src/fragments/types/OrderDetailsFragment.ts b/src/fragments/types/OrderDetailsFragment.ts index 48fbcb7ae..dc9f99b58 100644 --- a/src/fragments/types/OrderDetailsFragment.ts +++ b/src/fragments/types/OrderDetailsFragment.ts @@ -43,6 +43,7 @@ export interface OrderDetailsFragment_events { date: any | null; email: string | null; emailType: OrderEventsEmailsEnum | null; + invoiceNumber: string | null; message: string | null; quantity: number | null; type: OrderEventsEnum | null; diff --git a/src/fragments/types/OrderEventFragment.ts b/src/fragments/types/OrderEventFragment.ts index 324d3d958..4331d9cd1 100644 --- a/src/fragments/types/OrderEventFragment.ts +++ b/src/fragments/types/OrderEventFragment.ts @@ -21,6 +21,7 @@ export interface OrderEventFragment { date: any | null; email: string | null; emailType: OrderEventsEmailsEnum | null; + invoiceNumber: string | null; message: string | null; quantity: number | null; type: OrderEventsEnum | null; diff --git a/src/orders/components/OrderHistory/OrderHistory.tsx b/src/orders/components/OrderHistory/OrderHistory.tsx index 230093d91..3ebe974a1 100644 --- a/src/orders/components/OrderHistory/OrderHistory.tsx +++ b/src/orders/components/OrderHistory/OrderHistory.tsx @@ -82,6 +82,38 @@ const getEventMessage = (event: OrderDetails_order_events, intl: IntlShape) => { defaultMessage: "Fulfillment was cancelled", description: "order history message" }); + case OrderEventsEnum.INVOICE_REQUESTED: + return intl.formatMessage( + { + defaultMessage: "Invoice was requested by {requestedBy}", + description: "order history message" + }, + { + requestedBy: event.user ? event.user.email : null + } + ); + case OrderEventsEnum.INVOICE_GENERATED: + return intl.formatMessage( + { + defaultMessage: + "Invoice no. {invoiceNumber} was generated by {generatedBy}", + description: "order history message" + }, + { + invoiceNumber: event.invoiceNumber, + generatedBy: event.user ? event.user.email : null + } + ); + case OrderEventsEnum.INVOICE_SENT: + return intl.formatMessage( + { + defaultMessage: "Invoice was sent to customer by {sentBy}", + description: "order history message" + }, + { + sentBy: event.user ? event.user.email : null + } + ); case OrderEventsEnum.FULFILLMENT_FULFILLED_ITEMS: return intl.formatMessage( { diff --git a/src/orders/fixtures.ts b/src/orders/fixtures.ts index f992a15fc..a33d861ef 100644 --- a/src/orders/fixtures.ts +++ b/src/orders/fixtures.ts @@ -820,6 +820,7 @@ export const order = (placeholder: string): OrderDetails_order => ({ date: "2018-09-17T13:22:24.376193+00:00", email: null, emailType: null, + invoiceNumber: "23/07/2020", id: "T3JkZXJFdmVudDoyMQ==", message: null, quantity: 1, diff --git a/src/orders/types/FulfillOrder.ts b/src/orders/types/FulfillOrder.ts index 60798da5c..5fc03413e 100644 --- a/src/orders/types/FulfillOrder.ts +++ b/src/orders/types/FulfillOrder.ts @@ -51,6 +51,7 @@ export interface FulfillOrder_orderFulfill_order_events { date: any | null; email: string | null; emailType: OrderEventsEmailsEnum | null; + invoiceNumber: string | null; message: string | null; quantity: number | null; type: OrderEventsEnum | null; diff --git a/src/orders/types/OrderAddNote.ts b/src/orders/types/OrderAddNote.ts index 3d268218c..75cd83e43 100644 --- a/src/orders/types/OrderAddNote.ts +++ b/src/orders/types/OrderAddNote.ts @@ -27,6 +27,7 @@ export interface OrderAddNote_orderAddNote_order_events { date: any | null; email: string | null; emailType: OrderEventsEmailsEnum | null; + invoiceNumber: string | null; message: string | null; quantity: number | null; type: OrderEventsEnum | null; diff --git a/src/orders/types/OrderCancel.ts b/src/orders/types/OrderCancel.ts index ad93b33e3..1905fa0d8 100644 --- a/src/orders/types/OrderCancel.ts +++ b/src/orders/types/OrderCancel.ts @@ -49,6 +49,7 @@ export interface OrderCancel_orderCancel_order_events { date: any | null; email: string | null; emailType: OrderEventsEmailsEnum | null; + invoiceNumber: string | null; message: string | null; quantity: number | null; type: OrderEventsEnum | null; diff --git a/src/orders/types/OrderCapture.ts b/src/orders/types/OrderCapture.ts index fe727a08e..113779604 100644 --- a/src/orders/types/OrderCapture.ts +++ b/src/orders/types/OrderCapture.ts @@ -49,6 +49,7 @@ export interface OrderCapture_orderCapture_order_events { date: any | null; email: string | null; emailType: OrderEventsEmailsEnum | null; + invoiceNumber: string | null; message: string | null; quantity: number | null; type: OrderEventsEnum | null; diff --git a/src/orders/types/OrderDetails.ts b/src/orders/types/OrderDetails.ts index 48e16314c..b783d37be 100644 --- a/src/orders/types/OrderDetails.ts +++ b/src/orders/types/OrderDetails.ts @@ -43,6 +43,7 @@ export interface OrderDetails_order_events { date: any | null; email: string | null; emailType: OrderEventsEmailsEnum | null; + invoiceNumber: string | null; message: string | null; quantity: number | null; type: OrderEventsEnum | null; diff --git a/src/orders/types/OrderDraftCancel.ts b/src/orders/types/OrderDraftCancel.ts index 3320b9017..dbff891e6 100644 --- a/src/orders/types/OrderDraftCancel.ts +++ b/src/orders/types/OrderDraftCancel.ts @@ -49,6 +49,7 @@ export interface OrderDraftCancel_draftOrderDelete_order_events { date: any | null; email: string | null; emailType: OrderEventsEmailsEnum | null; + invoiceNumber: string | null; message: string | null; quantity: number | null; type: OrderEventsEnum | null; diff --git a/src/orders/types/OrderDraftFinalize.ts b/src/orders/types/OrderDraftFinalize.ts index db0658998..be0bd2fdc 100644 --- a/src/orders/types/OrderDraftFinalize.ts +++ b/src/orders/types/OrderDraftFinalize.ts @@ -49,6 +49,7 @@ export interface OrderDraftFinalize_draftOrderComplete_order_events { date: any | null; email: string | null; emailType: OrderEventsEmailsEnum | null; + invoiceNumber: string | null; message: string | null; quantity: number | null; type: OrderEventsEnum | null; diff --git a/src/orders/types/OrderDraftUpdate.ts b/src/orders/types/OrderDraftUpdate.ts index ec5873bae..9d07a60bf 100644 --- a/src/orders/types/OrderDraftUpdate.ts +++ b/src/orders/types/OrderDraftUpdate.ts @@ -49,6 +49,7 @@ export interface OrderDraftUpdate_draftOrderUpdate_order_events { date: any | null; email: string | null; emailType: OrderEventsEmailsEnum | null; + invoiceNumber: string | null; message: string | null; quantity: number | null; type: OrderEventsEnum | null; diff --git a/src/orders/types/OrderFulfillmentCancel.ts b/src/orders/types/OrderFulfillmentCancel.ts index 276d099b5..bbd3bb49f 100644 --- a/src/orders/types/OrderFulfillmentCancel.ts +++ b/src/orders/types/OrderFulfillmentCancel.ts @@ -49,6 +49,7 @@ export interface OrderFulfillmentCancel_orderFulfillmentCancel_order_events { date: any | null; email: string | null; emailType: OrderEventsEmailsEnum | null; + invoiceNumber: string | null; message: string | null; quantity: number | null; type: OrderEventsEnum | null; diff --git a/src/orders/types/OrderFulfillmentUpdateTracking.ts b/src/orders/types/OrderFulfillmentUpdateTracking.ts index 0652c972d..6fe289741 100644 --- a/src/orders/types/OrderFulfillmentUpdateTracking.ts +++ b/src/orders/types/OrderFulfillmentUpdateTracking.ts @@ -49,6 +49,7 @@ export interface OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_o date: any | null; email: string | null; emailType: OrderEventsEmailsEnum | null; + invoiceNumber: string | null; message: string | null; quantity: number | null; type: OrderEventsEnum | null; diff --git a/src/orders/types/OrderLineDelete.ts b/src/orders/types/OrderLineDelete.ts index e8dcdada6..f34532688 100644 --- a/src/orders/types/OrderLineDelete.ts +++ b/src/orders/types/OrderLineDelete.ts @@ -49,6 +49,7 @@ export interface OrderLineDelete_draftOrderLineDelete_order_events { date: any | null; email: string | null; emailType: OrderEventsEmailsEnum | null; + invoiceNumber: string | null; message: string | null; quantity: number | null; type: OrderEventsEnum | null; diff --git a/src/orders/types/OrderLineUpdate.ts b/src/orders/types/OrderLineUpdate.ts index 25db5e22a..f227505b2 100644 --- a/src/orders/types/OrderLineUpdate.ts +++ b/src/orders/types/OrderLineUpdate.ts @@ -49,6 +49,7 @@ export interface OrderLineUpdate_draftOrderLineUpdate_order_events { date: any | null; email: string | null; emailType: OrderEventsEmailsEnum | null; + invoiceNumber: string | null; message: string | null; quantity: number | null; type: OrderEventsEnum | null; diff --git a/src/orders/types/OrderLinesAdd.ts b/src/orders/types/OrderLinesAdd.ts index 75d8d50bc..4837a83bc 100644 --- a/src/orders/types/OrderLinesAdd.ts +++ b/src/orders/types/OrderLinesAdd.ts @@ -49,6 +49,7 @@ export interface OrderLinesAdd_draftOrderLinesCreate_order_events { date: any | null; email: string | null; emailType: OrderEventsEmailsEnum | null; + invoiceNumber: string | null; message: string | null; quantity: number | null; type: OrderEventsEnum | null; diff --git a/src/orders/types/OrderMarkAsPaid.ts b/src/orders/types/OrderMarkAsPaid.ts index f9b985df0..f13208f76 100644 --- a/src/orders/types/OrderMarkAsPaid.ts +++ b/src/orders/types/OrderMarkAsPaid.ts @@ -49,6 +49,7 @@ export interface OrderMarkAsPaid_orderMarkAsPaid_order_events { date: any | null; email: string | null; emailType: OrderEventsEmailsEnum | null; + invoiceNumber: string | null; message: string | null; quantity: number | null; type: OrderEventsEnum | null; diff --git a/src/orders/types/OrderRefund.ts b/src/orders/types/OrderRefund.ts index 36acf30ac..e0367a4d6 100644 --- a/src/orders/types/OrderRefund.ts +++ b/src/orders/types/OrderRefund.ts @@ -49,6 +49,7 @@ export interface OrderRefund_orderRefund_order_events { date: any | null; email: string | null; emailType: OrderEventsEmailsEnum | null; + invoiceNumber: string | null; message: string | null; quantity: number | null; type: OrderEventsEnum | null; diff --git a/src/orders/types/OrderVoid.ts b/src/orders/types/OrderVoid.ts index 41c348242..e9bd01553 100644 --- a/src/orders/types/OrderVoid.ts +++ b/src/orders/types/OrderVoid.ts @@ -49,6 +49,7 @@ export interface OrderVoid_orderVoid_order_events { date: any | null; email: string | null; emailType: OrderEventsEmailsEnum | null; + invoiceNumber: string | null; message: string | null; quantity: number | null; type: OrderEventsEnum | null; diff --git a/src/types/globalTypes.ts b/src/types/globalTypes.ts index 50c6b6515..31c239b72 100644 --- a/src/types/globalTypes.ts +++ b/src/types/globalTypes.ts @@ -519,6 +519,9 @@ export enum OrderEventsEnum { FULFILLMENT_CANCELED = "FULFILLMENT_CANCELED", FULFILLMENT_FULFILLED_ITEMS = "FULFILLMENT_FULFILLED_ITEMS", FULFILLMENT_RESTOCKED_ITEMS = "FULFILLMENT_RESTOCKED_ITEMS", + INVOICE_GENERATED = "INVOICE_GENERATED", + INVOICE_REQUESTED = "INVOICE_REQUESTED", + INVOICE_SENT = "INVOICE_SENT", NOTE_ADDED = "NOTE_ADDED", ORDER_FULLY_PAID = "ORDER_FULLY_PAID", ORDER_MARKED_AS_PAID = "ORDER_MARKED_AS_PAID",