From 2d62e289131363f96668a7aaffee54b8c8114e53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frane=20Poli=C4=87?=
 <16856471+fPolic@users.noreply.github.com>
Date: Thu, 21 Aug 2025 22:34:26 +0200
Subject: [PATCH] fix(dashboard): show fulfilment option on SO edit (#13269)

* fix(dashboard): show fulfilment option on SO edit

* fix: validation
---
 .changeset/fuzzy-snakes-burn.md               |  5 +++
 .../edit-shipping-option-form.tsx             | 33 +++++++++++++++++++
 2 files changed, 38 insertions(+)
 create mode 100644 .changeset/fuzzy-snakes-burn.md

diff --git a/.changeset/fuzzy-snakes-burn.md b/.changeset/fuzzy-snakes-burn.md
new file mode 100644
index 0000000000..6434b3b4fc
--- /dev/null
+++ b/.changeset/fuzzy-snakes-burn.md
@@ -0,0 +1,5 @@
+---
+"@medusajs/dashboard": patch
+---
+
+fix(dashboard): show fulfilment option on SO edit
diff --git a/packages/admin/dashboard/src/routes/locations/location-service-zone-shipping-option-edit/components/edit-region-form/edit-shipping-option-form.tsx b/packages/admin/dashboard/src/routes/locations/location-service-zone-shipping-option-edit/components/edit-region-form/edit-shipping-option-form.tsx
index 777cf85436..b8bb52f06f 100644
--- a/packages/admin/dashboard/src/routes/locations/location-service-zone-shipping-option-edit/components/edit-region-form/edit-shipping-option-form.tsx
+++ b/packages/admin/dashboard/src/routes/locations/location-service-zone-shipping-option-edit/components/edit-region-form/edit-shipping-option-form.tsx
@@ -19,6 +19,7 @@ import {
   FulfillmentSetType,
   ShippingOptionPriceType,
 } from "../../../common/constants"
+import { formatProvider } from "../../../../../lib/format-provider"
 
 type EditShippingOptionFormProps = {
   locationId: string
@@ -32,6 +33,7 @@ const EditShippingOptionSchema = zod.object({
   enabled_in_store: zod.boolean().optional(),
   shipping_profile_id: zod.string(),
   shipping_option_type_id: zod.string(),
+  provider_id: zod.string().optional(), // just for UI purposes
 })
 
 export const EditShippingOptionForm = ({
@@ -72,6 +74,7 @@ export const EditShippingOptionForm = ({
       enabled_in_store: isOptionEnabledInStore(shippingOption),
       shipping_profile_id: shippingOption.shipping_profile_id,
       shipping_option_type_id: shippingOption.type.id,
+      provider_id: shippingOption.provider_id,
     },
     resolver: zodResolver(EditShippingOptionSchema),
   })
@@ -242,6 +245,36 @@ export const EditShippingOptionForm = ({
                     )
                   }}
                 />
+
+                <Form.Field
+                  control={form.control}
+                  name="provider_id"
+                  disabled={true}
+                  render={({ field }) => {
+                    return (
+                      <Form.Item>
+                        <Form.Label>
+                          {t("stockLocations.shippingOptions.fields.provider")}
+                        </Form.Label>
+                        <Form.Control>
+                          <Combobox
+                            value={shippingOption.provider_id}
+                            disabled={true}
+                            options={[
+                              {
+                                label: `${formatProvider(
+                                  shippingOption.provider_id
+                                )} (${shippingOption?.data?.id || "N/A"})`, // FO is stored in so.data and only guaranteed proeprty is `id`
+                                value: shippingOption.provider_id,
+                              },
+                            ]}
+                          />
+                        </Form.Control>
+                        <Form.ErrorMessage />
+                      </Form.Item>
+                    )
+                  }}
+                />
               </div>
 
               <Divider />