Fix some more types cause there was a typo
This commit is contained in:
parent
02c2fdf927
commit
d9250a7aea
5 changed files with 21 additions and 21 deletions
|
@ -149,8 +149,8 @@ export const getReturnProductsAmountValues = (
|
||||||
const authorizedAmount = getAuthorizedAmount(order);
|
const authorizedAmount = getAuthorizedAmount(order);
|
||||||
|
|
||||||
const {
|
const {
|
||||||
fulfiledItemsQuantities,
|
fulfilledItemsQuantities,
|
||||||
unfulfiledItemsQuantities,
|
unfulfilledItemsQuantities,
|
||||||
refundShipmentCosts
|
refundShipmentCosts
|
||||||
} = formData;
|
} = formData;
|
||||||
|
|
||||||
|
@ -177,8 +177,8 @@ export const getReturnProductsAmountValues = (
|
||||||
return {
|
return {
|
||||||
...getProductsAmountValues(
|
...getProductsAmountValues(
|
||||||
order,
|
order,
|
||||||
fulfiledItemsQuantities,
|
fulfilledItemsQuantities,
|
||||||
unfulfiledItemsQuantities,
|
unfulfilledItemsQuantities,
|
||||||
refundShipmentCosts
|
refundShipmentCosts
|
||||||
),
|
),
|
||||||
refundTotalAmount,
|
refundTotalAmount,
|
||||||
|
|
|
@ -46,11 +46,11 @@ const OrderRefundPage: React.FC<OrderReturnPageProps> = props => {
|
||||||
return (
|
return (
|
||||||
<OrderRefundForm order={order} onSubmit={onSubmit}>
|
<OrderRefundForm order={order} onSubmit={onSubmit}>
|
||||||
{({ data, handlers, change, submit }) => {
|
{({ data, handlers, change, submit }) => {
|
||||||
const { fulfiledItemsQuantities, unfulfiledItemsQuantities } = data;
|
const { fulfilledItemsQuantities, unfulfilledItemsQuantities } = data;
|
||||||
|
|
||||||
const hasAnyItemsSelected =
|
const hasAnyItemsSelected =
|
||||||
fulfiledItemsQuantities.some(({ value }) => !!value) ||
|
fulfilledItemsQuantities.some(({ value }) => !!value) ||
|
||||||
unfulfiledItemsQuantities.some(({ value }) => !!value);
|
unfulfilledItemsQuantities.some(({ value }) => !!value);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Container>
|
<Container>
|
||||||
|
@ -66,13 +66,13 @@ const OrderRefundPage: React.FC<OrderReturnPageProps> = props => {
|
||||||
/>
|
/>
|
||||||
<Grid>
|
<Grid>
|
||||||
<div>
|
<div>
|
||||||
{!!data.unfulfiledItemsQuantities.length && (
|
{!!data.unfulfilledItemsQuantities.length && (
|
||||||
<>
|
<>
|
||||||
<ItemsCard
|
<ItemsCard
|
||||||
errors={errors}
|
errors={errors}
|
||||||
order={order}
|
order={order}
|
||||||
lines={getUnfulfilledLines(order)}
|
lines={getUnfulfilledLines(order)}
|
||||||
itemsQuantities={data.unfulfiledItemsQuantities}
|
itemsQuantities={data.unfulfilledItemsQuantities}
|
||||||
itemsSelections={data.itemsToBeReplaced}
|
itemsSelections={data.itemsToBeReplaced}
|
||||||
onChangeQuantity={handlers.changeUnfulfiledItemsQuantity}
|
onChangeQuantity={handlers.changeUnfulfiledItemsQuantity}
|
||||||
onSetMaxQuantity={
|
onSetMaxQuantity={
|
||||||
|
@ -92,7 +92,7 @@ const OrderRefundPage: React.FC<OrderReturnPageProps> = props => {
|
||||||
order={order}
|
order={order}
|
||||||
fulfilmentId={id}
|
fulfilmentId={id}
|
||||||
lines={getParsedFulfiledLines(lines)}
|
lines={getParsedFulfiledLines(lines)}
|
||||||
itemsQuantities={data.fulfiledItemsQuantities}
|
itemsQuantities={data.fulfilledItemsQuantities}
|
||||||
itemsSelections={data.itemsToBeReplaced}
|
itemsSelections={data.itemsToBeReplaced}
|
||||||
onChangeQuantity={handlers.changeFulfiledItemsQuantity}
|
onChangeQuantity={handlers.changeFulfiledItemsQuantity}
|
||||||
onSetMaxQuantity={handlers.handleSetMaximalFulfiledItemsQuantities(
|
onSetMaxQuantity={handlers.handleSetMaximalFulfiledItemsQuantities(
|
||||||
|
|
|
@ -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 },
|
data: { isFulfillment: false, isRefunded: false },
|
||||||
id: "1",
|
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 },
|
data: { isFulfillment: true, isRefunded: false },
|
||||||
id: "4",
|
id: "4",
|
||||||
|
@ -1196,8 +1196,8 @@ describe("Get the total value of all selected products", () => {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
itemsToBeReplaced,
|
itemsToBeReplaced,
|
||||||
unfulfiledItemsQuantities,
|
unfulfilledItemsQuantities,
|
||||||
fulfiledItemsQuantities
|
fulfilledItemsQuantities
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -107,20 +107,20 @@ export const getReplacedProductsAmount = (
|
||||||
|
|
||||||
export const getReturnSelectedProductsAmount = (
|
export const getReturnSelectedProductsAmount = (
|
||||||
order: OrderDetails_order,
|
order: OrderDetails_order,
|
||||||
{ itemsToBeReplaced, unfulfiledItemsQuantities, fulfiledItemsQuantities }
|
{ itemsToBeReplaced, unfulfilledItemsQuantities, fulfilledItemsQuantities }
|
||||||
) => {
|
) => {
|
||||||
if (!order) {
|
if (!order) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
const unfulfilledItemsValue = getPartialProductsValue({
|
const unfulfilledItemsValue = getPartialProductsValue({
|
||||||
itemsQuantities: unfulfiledItemsQuantities,
|
itemsQuantities: unfulfilledItemsQuantities,
|
||||||
itemsToBeReplaced,
|
itemsToBeReplaced,
|
||||||
orderLines: order.lines
|
orderLines: order.lines
|
||||||
});
|
});
|
||||||
|
|
||||||
const fulfiledItemsValue = getPartialProductsValue({
|
const fulfiledItemsValue = getPartialProductsValue({
|
||||||
itemsQuantities: fulfiledItemsQuantities,
|
itemsQuantities: fulfilledItemsQuantities,
|
||||||
itemsToBeReplaced,
|
itemsToBeReplaced,
|
||||||
orderLines: getAllOrderFulfilledLines(order)
|
orderLines: getAllOrderFulfilledLines(order)
|
||||||
});
|
});
|
||||||
|
|
|
@ -23,17 +23,17 @@ class ReturnFormDataParser {
|
||||||
|
|
||||||
public getParsedData = (): OrderReturnProductsInput => {
|
public getParsedData = (): OrderReturnProductsInput => {
|
||||||
const {
|
const {
|
||||||
fulfiledItemsQuantities,
|
fulfilledItemsQuantities,
|
||||||
unfulfiledItemsQuantities,
|
unfulfilledItemsQuantities,
|
||||||
refundShipmentCosts
|
refundShipmentCosts
|
||||||
} = this.formData;
|
} = this.formData;
|
||||||
|
|
||||||
const fulfillmentLines = this.getParsedLineData<
|
const fulfillmentLines = this.getParsedLineData<
|
||||||
OrderReturnFulfillmentLineInput
|
OrderReturnFulfillmentLineInput
|
||||||
>(fulfiledItemsQuantities, "fulfillmentLineId");
|
>(fulfilledItemsQuantities, "fulfillmentLineId");
|
||||||
|
|
||||||
const orderLines = this.getParsedLineData<OrderReturnLineInput>(
|
const orderLines = this.getParsedLineData<OrderReturnLineInput>(
|
||||||
unfulfiledItemsQuantities,
|
unfulfilledItemsQuantities,
|
||||||
"orderLineId"
|
"orderLineId"
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue