From f43f03badbfd1d3598f3c6bc6c81e6fa2e9c2a09 Mon Sep 17 00:00:00 2001
From: Rares Stefan <rares.capilnar@gmail.com>
Date: Fri, 10 Mar 2023 14:41:03 +0100
Subject: [PATCH] fix(admin): Fix fulfilment creation (#3434)

* Remove error object nesting that stopped fulfilment creation

* Create stale-adults-tease.md

* Fix quantities object creation check

* Add some debug logs
---
 .changeset/stale-adults-tease.md                   |  5 +++++
 .../orders/details/create-fulfillment/index.tsx    | 14 +++-----------
 .../details/create-fulfillment/item-table.tsx      | 12 ++++++++++--
 3 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 .changeset/stale-adults-tease.md

diff --git a/.changeset/stale-adults-tease.md b/.changeset/stale-adults-tease.md
new file mode 100644
index 0000000000..d326667563
--- /dev/null
+++ b/.changeset/stale-adults-tease.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/admin-ui": patch
+---
+
+fix(admin): Fix fulfilment creation
diff --git a/packages/admin-ui/ui/src/domain/orders/details/create-fulfillment/index.tsx b/packages/admin-ui/ui/src/domain/orders/details/create-fulfillment/index.tsx
index 4d4bf5755f..336c7cb6e2 100644
--- a/packages/admin-ui/ui/src/domain/orders/details/create-fulfillment/index.tsx
+++ b/packages/admin-ui/ui/src/domain/orders/details/create-fulfillment/index.tsx
@@ -48,7 +48,7 @@ const CreateFulfillmentModal: React.FC<CreateFulfillmentModalProps> = ({
     isFeatureEnabled("inventoryService") &&
     isFeatureEnabled("stockLocationService")
   const [quantities, setQuantities] = useState<Record<string, number>>(
-    "object" in orderToFulfill
+    "items" in orderToFulfill
       ? (orderToFulfill as Order).items.reduce((acc, next) => {
           return {
             ...acc,
@@ -57,6 +57,7 @@ const CreateFulfillmentModal: React.FC<CreateFulfillmentModalProps> = ({
         }, {})
       : {}
   )
+  console.log({ orderToFulfill })
   const [noNotis, setNoNotis] = useState(false)
   const [errors, setErrors] = useState({})
   const [locationSelectValue, setLocationSelectValue] = useState<{
@@ -67,17 +68,8 @@ const CreateFulfillmentModal: React.FC<CreateFulfillmentModalProps> = ({
     { key: "", value: "" },
   ])
 
-  const salesChannelId =
-    "object" in orderToFulfill
-      ? (orderToFulfill as Order).sales_channel_id
-      : (orderToFulfill as ClaimOrder | Swap)?.order?.sales_channel_id
-
-  const filterableFields: { sales_channel_id?: string } = {}
-  if (salesChannelId) {
-    filterableFields.sales_channel_id = salesChannelId
-  }
   const { stock_locations, refetch } = useAdminStockLocations(
-    filterableFields,
+    {},
     {
       enabled: isLocationFulfillmentEnabled,
     }
diff --git a/packages/admin-ui/ui/src/domain/orders/details/create-fulfillment/item-table.tsx b/packages/admin-ui/ui/src/domain/orders/details/create-fulfillment/item-table.tsx
index e01a956945..c4954d9c13 100644
--- a/packages/admin-ui/ui/src/domain/orders/details/create-fulfillment/item-table.tsx
+++ b/packages/admin-ui/ui/src/domain/orders/details/create-fulfillment/item-table.tsx
@@ -106,15 +106,23 @@ const FulfillmentLine = ({
     (locationId &&
       (!availableQuantity || quantities[item.id] < availableQuantity))
 
+  console.log({
+    validQuantity,
+    locationId,
+    availableQuantity,
+    quantities,
+    itemId: item.id,
+  })
+
   React.useEffect(() => {
     setErrors((errors) => {
       if (validQuantity) {
         delete errors[item.id]
-        return { errors }
+        return errors
       }
 
       errors[item.id] = "Quantity is not valid"
-      return { errors }
+      return errors
     })
   }, [validQuantity, setErrors, item.id])