From 6608ac81227c75621ab4cd43e194b508489afdc5 Mon Sep 17 00:00:00 2001 From: Magdalena Markusik Date: Fri, 22 Jan 2021 16:30:01 +0100 Subject: [PATCH 1/7] Add returned products to refund page --- .../OrderRefundFulfilledProducts.tsx | 14 ++++++++++---- .../components/OrderRefundPage/OrderRefundPage.tsx | 10 ++++++++-- src/orders/components/OrderRefundPage/form.tsx | 4 +++- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/orders/components/OrderRefundFulfilledProducts/OrderRefundFulfilledProducts.tsx b/src/orders/components/OrderRefundFulfilledProducts/OrderRefundFulfilledProducts.tsx index bc464f64b..33cb46f2a 100644 --- a/src/orders/components/OrderRefundFulfilledProducts/OrderRefundFulfilledProducts.tsx +++ b/src/orders/components/OrderRefundFulfilledProducts/OrderRefundFulfilledProducts.tsx @@ -17,6 +17,7 @@ import TableCellAvatar from "@saleor/components/TableCellAvatar"; import { FormsetChange } from "@saleor/hooks/useFormset"; import { renderCollection } from "@saleor/misc"; import { OrderRefundData_order_fulfillments } from "@saleor/orders/types/OrderRefundData"; +import { FulfillmentStatus } from "@saleor/types/globalTypes"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; @@ -91,10 +92,15 @@ const OrderRefundFulfilledProducts: React.FC - {intl.formatMessage({ - defaultMessage: "Fulfillment", - description: "section header" - })} + {fulfillment.status === FulfillmentStatus.RETURNED + ? intl.formatMessage({ + defaultMessage: "Fulfillment returned", + description: "section header returned" + }) + : intl.formatMessage({ + defaultMessage: "Fulfillment", + description: "section header" + })} {fulfillment && ( {`#${orderNumber}-${fulfillment?.fulfillmentOrder}`} diff --git a/src/orders/components/OrderRefundPage/OrderRefundPage.tsx b/src/orders/components/OrderRefundPage/OrderRefundPage.tsx index 676cd399b..7576e2ee8 100644 --- a/src/orders/components/OrderRefundPage/OrderRefundPage.tsx +++ b/src/orders/components/OrderRefundPage/OrderRefundPage.tsx @@ -24,6 +24,11 @@ import OrderRefundForm, { OrderRefundType } from "./form"; +export const refundFulfilledStatuses = [ + FulfillmentStatus.FULFILLED, + FulfillmentStatus.RETURNED +]; + export interface OrderRefundPageProps { order: OrderRefundData_order; defaultType?: OrderRefundType; @@ -48,9 +53,10 @@ const OrderRefundPage: React.FC = props => { const unfulfilledLines = order?.lines.filter( line => line.quantity !== line.quantityFulfilled ); + const fulfilledFulfillemnts = - order?.fulfillments.filter( - fulfillment => fulfillment.status === FulfillmentStatus.FULFILLED + order?.fulfillments.filter(({ status }) => + refundFulfilledStatuses.includes(status) ) || []; return ( diff --git a/src/orders/components/OrderRefundPage/form.tsx b/src/orders/components/OrderRefundPage/form.tsx index 6f95ff7c4..a3de89063 100644 --- a/src/orders/components/OrderRefundPage/form.tsx +++ b/src/orders/components/OrderRefundPage/form.tsx @@ -8,6 +8,8 @@ import { FulfillmentStatus } from "@saleor/types/globalTypes"; import handleFormSubmit from "@saleor/utils/handlers/handleFormSubmit"; import React from "react"; +import { refundFulfilledStatuses } from "./OrderRefundPage"; + export enum OrderRefundType { MISCELLANEOUS = "miscellaneous", PRODUCTS = "products" @@ -87,7 +89,7 @@ function useOrderRefundForm( ); const refundedFulfilledProductQuantities = useFormset( order?.fulfillments - .filter(fulfillment => fulfillment.status === FulfillmentStatus.FULFILLED) + .filter(({ status }) => refundFulfilledStatuses.includes(status)) .reduce( (linesQty, fulfillemnt) => linesQty.concat( From 708e38157691cd44893c6895c8617897c21b12de Mon Sep 17 00:00:00 2001 From: Magdalena Markusik Date: Fri, 22 Jan 2021 16:31:56 +0100 Subject: [PATCH 2/7] Update messages --- locale/defaultMessages.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/locale/defaultMessages.json b/locale/defaultMessages.json index 796678ae6..aba381313 100644 --- a/locale/defaultMessages.json +++ b/locale/defaultMessages.json @@ -3776,6 +3776,10 @@ "context": "order line total price", "string": "Total" }, + "src_dot_orders_dot_components_dot_OrderRefundFulfilledProducts_dot_1097582574": { + "context": "section header returned", + "string": "Fulfillment returned" + }, "src_dot_orders_dot_components_dot_OrderRefundFulfilledProducts_dot_1134347598": { "context": "tabel column header", "string": "Price" From 94d08dde7d19b92269590eed2d379dfb00ee88fb Mon Sep 17 00:00:00 2001 From: Magdalena Markusik Date: Fri, 22 Jan 2021 16:36:35 +0100 Subject: [PATCH 3/7] Remove unnecessary import --- src/orders/components/OrderRefundPage/form.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/orders/components/OrderRefundPage/form.tsx b/src/orders/components/OrderRefundPage/form.tsx index a3de89063..f51e237b1 100644 --- a/src/orders/components/OrderRefundPage/form.tsx +++ b/src/orders/components/OrderRefundPage/form.tsx @@ -4,7 +4,6 @@ import useFormset, { FormsetData } from "@saleor/hooks/useFormset"; import { OrderRefundData_order } from "@saleor/orders/types/OrderRefundData"; -import { FulfillmentStatus } from "@saleor/types/globalTypes"; import handleFormSubmit from "@saleor/utils/handlers/handleFormSubmit"; import React from "react"; From f7c7f4e5184015ff5963739d408883d339fa040d Mon Sep 17 00:00:00 2001 From: Magdalena Markusik Date: Mon, 25 Jan 2021 11:27:45 +0100 Subject: [PATCH 4/7] Fix marked as paid item not displaying correctly in order history --- .../OrderHistory/ExtendedTimelineEvent.tsx | 24 +++++++++++++++++++ src/orders/components/OrderHistory/utils.tsx | 3 ++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/orders/components/OrderHistory/ExtendedTimelineEvent.tsx b/src/orders/components/OrderHistory/ExtendedTimelineEvent.tsx index 36bbc5519..c47be5f9b 100644 --- a/src/orders/components/OrderHistory/ExtendedTimelineEvent.tsx +++ b/src/orders/components/OrderHistory/ExtendedTimelineEvent.tsx @@ -78,6 +78,11 @@ export const titles = defineMessages({ defaultMessage: "Products were returned by", description: "returned event title", id: "event title returned" + }, + orderMarkedAsPaid: { + defaultMessage: "Order was marked as paid by", + description: "order marked as paid event title", + id: "event title marked as paid" } }); @@ -96,6 +101,11 @@ export const messages = defineMessages({ defaultMessage: "Shipment was refunded", description: "shipment refund title", id: "shipment refund title" + }, + transactionReference: { + defaultMessage: "Transaction reference", + description: "transaction reference subtitle", + id: "transaction reference subtitle" } }); @@ -115,6 +125,7 @@ const ExtendedTimelineEvent: React.FC = ({ user, lines, amount, + transactionReference, shippingCostsIncluded, relatedOrder } = event; @@ -204,6 +215,19 @@ const ExtendedTimelineEvent: React.FC = ({ )} )} + + {!!transactionReference && ( + <> + + {intl.formatMessage(messages.transactionReference)} + + {transactionReference} + + )} ); }; diff --git a/src/orders/components/OrderHistory/utils.tsx b/src/orders/components/OrderHistory/utils.tsx index 3d1c3030f..c0d166bc5 100644 --- a/src/orders/components/OrderHistory/utils.tsx +++ b/src/orders/components/OrderHistory/utils.tsx @@ -24,7 +24,8 @@ const timelineEventTypes = { OrderEventsEnum.FULFILLMENT_REFUNDED, OrderEventsEnum.FULFILLMENT_REPLACED, OrderEventsEnum.FULFILLMENT_RETURNED, - OrderEventsEnum.DRAFT_CREATED_FROM_REPLACE + OrderEventsEnum.DRAFT_CREATED_FROM_REPLACE, + OrderEventsEnum.ORDER_MARKED_AS_PAID ], linked: [OrderEventsEnum.ORDER_REPLACEMENT_CREATED], note: [OrderEventsEnum.NOTE_ADDED], From 679b532860ec672367cd9cb8221491a77d8484f7 Mon Sep 17 00:00:00 2001 From: Magdalena Markusik Date: Mon, 25 Jan 2021 11:28:44 +0100 Subject: [PATCH 5/7] Update messages --- locale/defaultMessages.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/locale/defaultMessages.json b/locale/defaultMessages.json index aba381313..bafa10e42 100644 --- a/locale/defaultMessages.json +++ b/locale/defaultMessages.json @@ -70,6 +70,10 @@ "context": "draft created from replace event title", "string": "Draft was reissued from order " }, + "event title marked as paid": { + "context": "order marked as paid event title", + "string": "Order was marked as paid by" + }, "event title refunded": { "context": "refunded event title", "string": "Products were refunded by " @@ -6885,6 +6889,10 @@ "context": "table column header", "string": "Quantity" }, + "transaction reference subtitle": { + "context": "transaction reference subtitle", + "string": "Transaction reference" + }, "voucherDetailsUnassignCategory": { "context": "unassign category from voucher, button", "string": "Unassign" From 2e9dcd52dd12572c659237734edf3af1549f89f7 Mon Sep 17 00:00:00 2001 From: Magdalena Markusik Date: Mon, 25 Jan 2021 11:50:51 +0100 Subject: [PATCH 6/7] Update snapshots --- .../__snapshots__/Stories.test.ts.snap | 140 ++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap index a64488aef..d9bbf9dae 100644 --- a/src/storybook/__snapshots__/Stories.test.ts.snap +++ b/src/storybook/__snapshots__/Stories.test.ts.snap @@ -14487,6 +14487,16 @@ exports[`Storyshots Orders / OrderHistory default 1`] = ` > Shipment was refunded +
+ Transaction reference +
+
+ 123 +
@@ -102501,6 +102511,16 @@ exports[`Storyshots Views / Orders / Order details cancelled 1`] = ` > Shipment was refunded +
+ Transaction reference +
+
+ 123 +
@@ -104279,6 +104299,16 @@ exports[`Storyshots Views / Orders / Order details default 1`] = ` > Shipment was refunded +
+ Transaction reference +
+
+ 123 +
@@ -106087,6 +106117,16 @@ exports[`Storyshots Views / Orders / Order details fulfilled 1`] = ` > Shipment was refunded +
+ Transaction reference +
+
+ 123 +
@@ -108463,6 +108503,16 @@ exports[`Storyshots Views / Orders / Order details no customer note 1`] = ` > Shipment was refunded +
+ Transaction reference +
+
+ 123 +
@@ -110271,6 +110321,16 @@ exports[`Storyshots Views / Orders / Order details no payment 1`] = ` > Shipment was refunded +
+ Transaction reference +
+
+ 123 +
@@ -112079,6 +112139,16 @@ exports[`Storyshots Views / Orders / Order details no shipping address 1`] = ` > Shipment was refunded +
+ Transaction reference +
+
+ 123 +
@@ -113887,6 +113957,16 @@ exports[`Storyshots Views / Orders / Order details partially fulfilled 1`] = ` > Shipment was refunded +
+ Transaction reference +
+
+ 123 +
@@ -115695,6 +115775,16 @@ exports[`Storyshots Views / Orders / Order details payment confirmed 1`] = ` > Shipment was refunded +
+ Transaction reference +
+
+ 123 +
@@ -117503,6 +117593,16 @@ exports[`Storyshots Views / Orders / Order details payment error 1`] = ` > Shipment was refunded +
+ Transaction reference +
+
+ 123 +
@@ -119311,6 +119411,16 @@ exports[`Storyshots Views / Orders / Order details pending payment 1`] = ` > Shipment was refunded +
+ Transaction reference +
+
+ 123 +
@@ -121119,6 +121229,16 @@ exports[`Storyshots Views / Orders / Order details refunded payment 1`] = ` > Shipment was refunded +
+ Transaction reference +
+
+ 123 +
@@ -122927,6 +123047,16 @@ exports[`Storyshots Views / Orders / Order details rejected payment 1`] = ` > Shipment was refunded +
+ Transaction reference +
+
+ 123 +
@@ -124735,6 +124865,16 @@ exports[`Storyshots Views / Orders / Order details unfulfilled 1`] = ` > Shipment was refunded +
+ Transaction reference +
+
+ 123 +
From 0649879873a420a97459ee958272426161ebed34 Mon Sep 17 00:00:00 2001 From: Magdalena Markusik Date: Tue, 26 Jan 2021 11:27:33 +0100 Subject: [PATCH 7/7] Trigger deployment