From d9250a7aeaa2c041b6c3990e161e764c2b7ef812 Mon Sep 17 00:00:00 2001 From: Magdalena Markusik Date: Thu, 21 Jan 2021 14:25:00 +0100 Subject: [PATCH] Fix some more types cause there was a typo --- .../components/OrderRefundReturnAmount/utils.ts | 8 ++++---- .../components/OrderReturnPage/OrderReturnPage.tsx | 12 ++++++------ src/orders/utils/data.test.ts | 8 ++++---- src/orders/utils/data.ts | 6 +++--- src/orders/views/OrderReturn/utils.tsx | 8 ++++---- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/orders/components/OrderRefundReturnAmount/utils.ts b/src/orders/components/OrderRefundReturnAmount/utils.ts index 96f343487..7a89ec46c 100644 --- a/src/orders/components/OrderRefundReturnAmount/utils.ts +++ b/src/orders/components/OrderRefundReturnAmount/utils.ts @@ -149,8 +149,8 @@ export const getReturnProductsAmountValues = ( const authorizedAmount = getAuthorizedAmount(order); const { - fulfiledItemsQuantities, - unfulfiledItemsQuantities, + fulfilledItemsQuantities, + unfulfilledItemsQuantities, refundShipmentCosts } = formData; @@ -177,8 +177,8 @@ export const getReturnProductsAmountValues = ( return { ...getProductsAmountValues( order, - fulfiledItemsQuantities, - unfulfiledItemsQuantities, + fulfilledItemsQuantities, + unfulfilledItemsQuantities, refundShipmentCosts ), refundTotalAmount, diff --git a/src/orders/components/OrderReturnPage/OrderReturnPage.tsx b/src/orders/components/OrderReturnPage/OrderReturnPage.tsx index 169f5f0ca..2311961ab 100644 --- a/src/orders/components/OrderReturnPage/OrderReturnPage.tsx +++ b/src/orders/components/OrderReturnPage/OrderReturnPage.tsx @@ -46,11 +46,11 @@ const OrderRefundPage: React.FC = props => { return ( {({ data, handlers, change, submit }) => { - const { fulfiledItemsQuantities, unfulfiledItemsQuantities } = data; + const { fulfilledItemsQuantities, unfulfilledItemsQuantities } = data; const hasAnyItemsSelected = - fulfiledItemsQuantities.some(({ value }) => !!value) || - unfulfiledItemsQuantities.some(({ value }) => !!value); + fulfilledItemsQuantities.some(({ value }) => !!value) || + unfulfilledItemsQuantities.some(({ value }) => !!value); return ( @@ -66,13 +66,13 @@ const OrderRefundPage: React.FC = props => { />
- {!!data.unfulfiledItemsQuantities.length && ( + {!!data.unfulfilledItemsQuantities.length && ( <> = props => { order={order} fulfilmentId={id} lines={getParsedFulfiledLines(lines)} - itemsQuantities={data.fulfiledItemsQuantities} + itemsQuantities={data.fulfilledItemsQuantities} itemsSelections={data.itemsToBeReplaced} onChangeQuantity={handlers.changeFulfiledItemsQuantity} onSetMaxQuantity={handlers.handleSetMaximalFulfiledItemsQuantities( diff --git a/src/orders/utils/data.test.ts b/src/orders/utils/data.test.ts index 7a6604625..37efa117f 100644 --- a/src/orders/utils/data.test.ts +++ b/src/orders/utils/data.test.ts @@ -1085,7 +1085,7 @@ describe("Get the total value of all selected products", () => { } ]; - const unfulfiledItemsQuantities: FormsetData = [ + const unfulfilledItemsQuantities: FormsetData = [ { data: { isFulfillment: false, isRefunded: false }, id: "1", @@ -1106,7 +1106,7 @@ describe("Get the total value of all selected products", () => { } ]; - const fulfiledItemsQuantities: FormsetData = [ + const fulfilledItemsQuantities: FormsetData = [ { data: { isFulfillment: true, isRefunded: false }, id: "4", @@ -1196,8 +1196,8 @@ describe("Get the total value of all selected products", () => { }, { itemsToBeReplaced, - unfulfiledItemsQuantities, - fulfiledItemsQuantities + unfulfilledItemsQuantities, + fulfilledItemsQuantities } ); diff --git a/src/orders/utils/data.ts b/src/orders/utils/data.ts index 413912d54..8980507a6 100644 --- a/src/orders/utils/data.ts +++ b/src/orders/utils/data.ts @@ -107,20 +107,20 @@ export const getReplacedProductsAmount = ( export const getReturnSelectedProductsAmount = ( order: OrderDetails_order, - { itemsToBeReplaced, unfulfiledItemsQuantities, fulfiledItemsQuantities } + { itemsToBeReplaced, unfulfilledItemsQuantities, fulfilledItemsQuantities } ) => { if (!order) { return 0; } const unfulfilledItemsValue = getPartialProductsValue({ - itemsQuantities: unfulfiledItemsQuantities, + itemsQuantities: unfulfilledItemsQuantities, itemsToBeReplaced, orderLines: order.lines }); const fulfiledItemsValue = getPartialProductsValue({ - itemsQuantities: fulfiledItemsQuantities, + itemsQuantities: fulfilledItemsQuantities, itemsToBeReplaced, orderLines: getAllOrderFulfilledLines(order) }); diff --git a/src/orders/views/OrderReturn/utils.tsx b/src/orders/views/OrderReturn/utils.tsx index 16c8c4923..cc3c4ba7e 100644 --- a/src/orders/views/OrderReturn/utils.tsx +++ b/src/orders/views/OrderReturn/utils.tsx @@ -23,17 +23,17 @@ class ReturnFormDataParser { public getParsedData = (): OrderReturnProductsInput => { const { - fulfiledItemsQuantities, - unfulfiledItemsQuantities, + fulfilledItemsQuantities, + unfulfilledItemsQuantities, refundShipmentCosts } = this.formData; const fulfillmentLines = this.getParsedLineData< OrderReturnFulfillmentLineInput - >(fulfiledItemsQuantities, "fulfillmentLineId"); + >(fulfilledItemsQuantities, "fulfillmentLineId"); const orderLines = this.getParsedLineData( - unfulfiledItemsQuantities, + unfulfilledItemsQuantities, "orderLineId" );