djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix some more types cause there was a typo

Browse source
This commit is contained in:
Magdalena Markusik 2021-01-21 14:25:00 +01:00
parent 02c2fdf927
commit d9250a7aea
5 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/orders/components/OrderRefundReturnAmount/utils.ts
View file

@ -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,

12
src/orders/components/OrderReturnPage/OrderReturnPage.tsx
View file

@ -46,11 +46,11 @@ const OrderRefundPage: React.FC<OrderReturnPageProps> = props => {
return (
<OrderRefundForm order={order} onSubmit={onSubmit}>
{({ 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 (
<Container>
@ -66,13 +66,13 @@ const OrderRefundPage: React.FC<OrderReturnPageProps> = props => {
/>
<Grid>
<div>
{!!data.unfulfiledItemsQuantities.length && (
{!!data.unfulfilledItemsQuantities.length && (
<>
<ItemsCard
errors={errors}
order={order}
lines={getUnfulfilledLines(order)}
itemsQuantities={data.unfulfiledItemsQuantities}
itemsQuantities={data.unfulfilledItemsQuantities}
itemsSelections={data.itemsToBeReplaced}
onChangeQuantity={handlers.changeUnfulfiledItemsQuantity}
onSetMaxQuantity={
@ -92,7 +92,7 @@ const OrderRefundPage: React.FC<OrderReturnPageProps> = props => {
order={order}
fulfilmentId={id}
lines={getParsedFulfiledLines(lines)}
itemsQuantities={data.fulfiledItemsQuantities}
itemsQuantities={data.fulfilledItemsQuantities}
itemsSelections={data.itemsToBeReplaced}
onChangeQuantity={handlers.changeFulfiledItemsQuantity}
onSetMaxQuantity={handlers.handleSetMaximalFulfiledItemsQuantities(

8
src/orders/utils/data.test.ts
View file

@ -1085,7 +1085,7 @@ describe("Get the total value of all selected products", () => {
}
];
const unfulfiledItemsQuantities: FormsetData<LineItemData, number> = [
const unfulfilledItemsQuantities: FormsetData<LineItemData, number> = [
{
data: { isFulfillment: false, isRefunded: false },
id: "1",
@ -1106,7 +1106,7 @@ describe("Get the total value of all selected products", () => {
}
];
const fulfiledItemsQuantities: FormsetData<LineItemData, number> = [
const fulfilledItemsQuantities: FormsetData<LineItemData, number> = [
{
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
}
);

6
src/orders/utils/data.ts
View file

@ -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)
});

8
src/orders/views/OrderReturn/utils.tsx
View file

@ -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<OrderReturnLineInput>(
unfulfiledItemsQuantities,
unfulfilledItemsQuantities,
"orderLineId"
);