Fix some types and tests

src/orders/components/OrderReturnPage/form.tsx

@@ -47,8 +47,8 @@ export interface OrderReturnHandlers {
 
 export interface OrderReturnFormData extends OrderReturnData {
   itemsToBeReplaced: FormsetReplacementData;
-  fulfiledItemsQuantities: FormsetQuantityData;
+  fulfilledItemsQuantities: FormsetQuantityData;
-  unfulfiledItemsQuantities: FormsetQuantityData;
+  unfulfilledItemsQuantities: FormsetQuantityData;
 }
 
 export type OrderRefundSubmitData = OrderReturnFormData;
@@ -184,9 +184,9 @@ function useOrderReturnForm(
   };
 
   const data: OrderReturnFormData = {
-    fulfiledItemsQuantities: fulfiledItemsQuatities.data,
+    fulfilledItemsQuantities: fulfiledItemsQuatities.data,
     itemsToBeReplaced: itemsToBeReplaced.data,
-    unfulfiledItemsQuantities: unfulfiledItemsQuantites.data,
+    unfulfilledItemsQuantities: unfulfiledItemsQuantites.data,
     ...form.data
   };
 

src/orders/utils/data.test.ts

@@ -738,7 +738,7 @@ describe("Get the total value of all replaced products", () => {
       }
     ];
 
-    const unfulfiledItemsQuantities: FormsetData<LineItemData, number> = [
+    const unfulfilledItemsQuantities: FormsetData<LineItemData, number> = [
       {
         data: { isFulfillment: false, isRefunded: false },
         id: "1",
@@ -759,7 +759,7 @@ describe("Get the total value of all replaced products", () => {
       }
     ];
 
-    const fulfiledItemsQuantities: FormsetData<LineItemData, number> = [
+    const fulfilledItemsQuantities: FormsetData<LineItemData, number> = [
       {
         data: { isFulfillment: true, isRefunded: false },
         id: "4",
@@ -861,8 +861,8 @@ describe("Get the total value of all replaced products", () => {
       },
       {
         itemsToBeReplaced,
-        unfulfiledItemsQuantities,
+        unfulfilledItemsQuantities,
-        fulfiledItemsQuantities
+        fulfilledItemsQuantities
       }
     );
 
@@ -1085,42 +1085,42 @@ describe("Get the total value of all selected products", () => {
       }
     ];
 
-    const unfulfiledItemsQuantities: FormsetData<null, number> = [
+    const unfulfiledItemsQuantities: FormsetData<LineItemData, number> = [
       {
-        data: null,
+        data: { isFulfillment: false, isRefunded: false },
         id: "1",
         label: null,
         value: 0
       },
       {
-        data: null,
+        data: { isFulfillment: false, isRefunded: false },
         id: "2",
         label: null,
         value: 2
       },
       {
-        data: null,
+        data: { isFulfillment: false, isRefunded: false },
         id: "3",
         label: null,
         value: 1
       }
     ];
 
-    const fulfiledItemsQuantities: FormsetData<null, number> = [
+    const fulfiledItemsQuantities: FormsetData<LineItemData, number> = [
       {
-        data: null,
+        data: { isFulfillment: true, isRefunded: false },
         id: "4",
         label: null,
         value: 4
       },
       {
-        data: null,
+        data: { isFulfillment: true, isRefunded: false },
         id: "5",
         label: null,
         value: 0
       },
       {
-        data: null,
+        data: { isFulfillment: true, isRefunded: false },
         id: "6",
         label: null,
         value: 3

src/orders/utils/data.ts

@@ -53,8 +53,8 @@ const getItemPriceAndQuantity = ({
 const selectItemPriceAndQuantity = (
   order: OrderDetails_order,
   {
-    fulfiledItemsQuantities,
+    fulfilledItemsQuantities,
-    unfulfiledItemsQuantities
+    unfulfilledItemsQuantities
   }: Partial<OrderReturnFormData>,
   id: string,
   isFulfillment: boolean
@@ -62,12 +62,12 @@ const selectItemPriceAndQuantity = (
   isFulfillment
     ? getItemPriceAndQuantity({
         id,
-        itemsQuantities: fulfiledItemsQuantities,
+        itemsQuantities: fulfilledItemsQuantities,
         orderLines: getAllOrderFulfilledLines(order)
       })
     : getItemPriceAndQuantity({
         id,
-        itemsQuantities: unfulfiledItemsQuantities,
+        itemsQuantities: unfulfilledItemsQuantities,
         orderLines: order.lines
       });
 
@@ -75,8 +75,8 @@ export const getReplacedProductsAmount = (
   order: OrderDetails_order,
   {
     itemsToBeReplaced,
-    unfulfiledItemsQuantities,
+    unfulfilledItemsQuantities,
-    fulfiledItemsQuantities
+    fulfilledItemsQuantities
   }: Partial<OrderReturnFormData>
 ) => {
   if (!order || !itemsToBeReplaced.length) {
@@ -94,7 +94,7 @@ export const getReplacedProductsAmount = (
 
       const { unitPrice, selectedQuantity } = selectItemPriceAndQuantity(
         order,
-        { fulfiledItemsQuantities, unfulfiledItemsQuantities },
+        { fulfilledItemsQuantities, unfulfilledItemsQuantities },
         id,
         isFulfillment
       );