From 191965bbfe55dc1ae3be043dac67b0d4284444c9 Mon Sep 17 00:00:00 2001
From: Ionut <38911138+ionutgaina@users.noreply.github.com>
Date: Thu, 17 Apr 2025 13:42:45 +0300
Subject: [PATCH] fix: Ensure shipment includes tracking numbers from
 fulfillment (#11775)

What: Added existing tracking numbers during shipment creation from the admin dashboard

Bug details: See #11160
---
 .../order-create-shipment-form.tsx               | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/packages/admin/dashboard/src/routes/orders/order-create-shipment/components/order-create-shipment-form/order-create-shipment-form.tsx b/packages/admin/dashboard/src/routes/orders/order-create-shipment/components/order-create-shipment-form/order-create-shipment-form.tsx
index 43e8849eb7..602ded66fe 100644
--- a/packages/admin/dashboard/src/routes/orders/order-create-shipment/components/order-create-shipment-form/order-create-shipment-form.tsx
+++ b/packages/admin/dashboard/src/routes/orders/order-create-shipment/components/order-create-shipment-form/order-create-shipment-form.tsx
@@ -43,19 +43,21 @@ export function OrderCreateShipmentForm({
   })
 
   const handleSubmit = form.handleSubmit(async (data) => {
+    const addedLabels = data.labels
+    .filter((l) => !!l.tracking_number)
+    .map((l) => ({
+      tracking_number: l.tracking_number,
+      tracking_url: "#",
+      label_url: "#",
+    }))
+
     await createShipment(
       {
         items: fulfillment?.items?.map((i) => ({
           id: i.line_item_id,
           quantity: i.quantity,
         })),
-        labels: data.labels
-          .filter((l) => !!l.tracking_number)
-          .map((l) => ({
-            tracking_number: l.tracking_number,
-            tracking_url: "#",
-            label_url: "#",
-          })),
+        labels: [...addedLabels, ...(fulfillment?.labels || [])],
         no_notification: !data.send_notification,
       },
       {