@medusajs/draft-order 2.11.3-preview-20251103120146 → 2.11.3-snapshot-20251103115905

package/.medusa/server/src/admin/index.mjs

@@ -9,7 +9,7 @@ import Medusa from "@medusajs/js-sdk";
 import { format, formatDistance, sub, subDays, subMonths } from "date-fns";
 import { enUS } from "date-fns/locale";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { FormProvider, Controller, useFormContext, useFormState, useForm, useWatch, useFieldArray } from "react-hook-form";
+import { FormProvider, useFormContext, useFormState, Controller, useForm, useWatch, useFieldArray } from "react-hook-form";
 import { Slot, Collapsible, Accordion } from "radix-ui";
 import { ComboboxProvider, Combobox as Combobox$1, ComboboxDisclosure, ComboboxPopover, ComboboxItem, ComboboxItemCheck, ComboboxItemValue, Separator } from "@ariakit/react";
 import { matchSorter } from "match-sorter";
@@ -4647,9 +4647,6 @@ ZodReadonly.create = (type, params) => {
     ...processCreateParams(params)
   });
 };
-({
-  object: ZodObject.lazycreate
-});
 var ZodFirstPartyTypeKind;
 (function(ZodFirstPartyTypeKind2) {
   ZodFirstPartyTypeKind2["ZodString"] = "ZodString";
@@ -4696,7 +4693,6 @@ const anyType = ZodAny.create;
 ZodNever.create;
 const arrayType = ZodArray.create;
 const objectType = ZodObject.create;
-ZodObject.strictCreate;
 const unionType = ZodUnion.create;
 ZodIntersection.create;
 ZodTuple.create;
@@ -9755,27 +9751,6 @@ const BillingAddressForm = ({ order }) => {
   ) });
 };
 const schema$5 = addressSchema;
-const CustomItems = () => {
-  return /* @__PURE__ */ jsxs(RouteDrawer, { children: [
-    /* @__PURE__ */ jsx(RouteDrawer.Header, { children: /* @__PURE__ */ jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsx(Heading, { children: "Edit Custom Items" }) }) }),
-    /* @__PURE__ */ jsx(CustomItemsForm, {})
-  ] });
-};
-const CustomItemsForm = () => {
-  const form = useForm({
-    resolver: zodResolver(schema$4)
-  });
-  return /* @__PURE__ */ jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxs(KeyboundForm, { className: "flex flex-1 flex-col", children: [
-    /* @__PURE__ */ jsx(RouteDrawer.Body, {}),
-    /* @__PURE__ */ jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxs("div", { className: "flex justify-end gap-2", children: [
-      /* @__PURE__ */ jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsx(Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
-      /* @__PURE__ */ jsx(Button, { size: "small", type: "submit", children: "Save" })
-    ] }) })
-  ] }) });
-};
-const schema$4 = objectType({
-  email: stringType().email()
-});
 const Email = () => {
   const { id } = useParams();
   const { order, isPending, isError, error } = useOrder(id, {
@@ -9798,7 +9773,7 @@ const EmailForm = ({ order }) => {
     defaultValues: {
       email: order.email ?? ""
     },
-    resolver: zodResolver(schema$3)
+    resolver: zodResolver(schema$4)
   });
   const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
   const { handleSuccess } = useRouteModal();
@@ -9841,6 +9816,27 @@ const EmailForm = ({ order }) => {
     }
   ) });
 };
+const schema$4 = objectType({
+  email: stringType().email()
+});
+const CustomItems = () => {
+  return /* @__PURE__ */ jsxs(RouteDrawer, { children: [
+    /* @__PURE__ */ jsx(RouteDrawer.Header, { children: /* @__PURE__ */ jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsx(Heading, { children: "Edit Custom Items" }) }) }),
+    /* @__PURE__ */ jsx(CustomItemsForm, {})
+  ] });
+};
+const CustomItemsForm = () => {
+  const form = useForm({
+    resolver: zodResolver(schema$3)
+  });
+  return /* @__PURE__ */ jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxs(KeyboundForm, { className: "flex flex-1 flex-col", children: [
+    /* @__PURE__ */ jsx(RouteDrawer.Body, {}),
+    /* @__PURE__ */ jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxs("div", { className: "flex justify-end gap-2", children: [
+      /* @__PURE__ */ jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsx(Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
+      /* @__PURE__ */ jsx(Button, { size: "small", type: "submit", children: "Save" })
+    ] }) })
+  ] }) });
+};
 const schema$3 = objectType({
   email: stringType().email()
 });
@@ -11445,1016 +11441,1122 @@ function getPromotionIds(items, shippingMethods) {
   }
   return Array.from(promotionIds);
 }
-const STACKED_FOCUS_MODAL_ID = "shipping-form";
-const Shipping = () => {
-  var _a;
+const SalesChannel = () => {
   const { id } = useParams();
-  const { order, isPending, isError, error } = useOrder(id, {
-    fields: "+items.*,+items.variant.*,+items.variant.product.*,+items.variant.product.shipping_profile.*,+currency_code"
-  });
-  const {
-    order: preview,
-    isPending: isPreviewPending,
-    isError: isPreviewError,
-    error: previewError
-  } = useOrderPreview(id);
-  useInitiateOrderEdit({ preview });
-  const { onCancel } = useCancelOrderEdit({ preview });
-  if (isError) {
-    throw error;
-  }
-  if (isPreviewError) {
-    throw previewError;
-  }
-  const orderHasItems = (((_a = order == null ? void 0 : order.items) == null ? void 0 : _a.length) || 0) > 0;
-  const isReady = preview && !isPreviewPending && order && !isPending;
-  return /* @__PURE__ */ jsx(RouteFocusModal, { onClose: onCancel, children: !orderHasItems ? /* @__PURE__ */ jsxs("div", { className: "flex h-full flex-col overflow-hidden ", children: [
-    /* @__PURE__ */ jsx(RouteFocusModal.Header, {}),
-    /* @__PURE__ */ jsx(RouteFocusModal.Body, { className: "flex flex-1 flex-col overflow-hidden", children: /* @__PURE__ */ jsx("div", { className: "flex flex-1 flex-col items-center overflow-y-auto", children: /* @__PURE__ */ jsxs("div", { className: "flex w-full max-w-[720px] flex-col gap-y-6 px-6 py-16", children: [
-      /* @__PURE__ */ jsx(RouteFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsx(Heading, { children: "Shipping" }) }),
-      /* @__PURE__ */ jsx(RouteFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsx(Text, { size: "small", className: "text-ui-fg-subtle", children: "This draft order currently has no items. Add items to the order before adding shipping." }) })
-    ] }) }) }),
-    /* @__PURE__ */ jsx(RouteFocusModal.Footer, { children: /* @__PURE__ */ jsx(RouteFocusModal.Close, { asChild: true, children: /* @__PURE__ */ jsx(Button, { size: "small", variant: "secondary", type: "button", children: "Cancel" }) }) })
-  ] }) : isReady ? /* @__PURE__ */ jsx(ShippingForm, { preview, order }) : /* @__PURE__ */ jsxs("div", { children: [
-    /* @__PURE__ */ jsx(RouteFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: "Edit Shipping" }) }),
-    /* @__PURE__ */ jsx(RouteFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: "Loading data for the draft order, please wait..." }) })
-  ] }) });
-};
-const ShippingForm = ({ preview, order }) => {
-  var _a;
-  const { setIsOpen } = useStackedModal();
-  const [isSubmitting, setIsSubmitting] = useState(false);
-  const [data, setData] = useState(null);
-  const appliedShippingOptionIds = (_a = preview.shipping_methods) == null ? void 0 : _a.map((method) => method.shipping_option_id).filter(Boolean);
-  const { shipping_options } = useShippingOptions(
+  const { draft_order, isPending, isError, error } = useDraftOrder(
+    id,
     {
-      id: appliedShippingOptionIds,
-      fields: "+service_zone.*,+service_zone.fulfillment_set.*,+service_zone.fulfillment_set.location.*"
+      fields: "+sales_channel_id"
     },
     {
-      enabled: appliedShippingOptionIds.length > 0
+      enabled: !!id
     }
   );
-  const uniqueShippingProfiles = useMemo(() => {
-    const profiles = /* @__PURE__ */ new Map();
-    getUniqueShippingProfiles(order.items).forEach((profile) => {
-      profiles.set(profile.id, profile);
-    });
-    shipping_options == null ? void 0 : shipping_options.forEach((option) => {
-      profiles.set(option.shipping_profile_id, option.shipping_profile);
-    });
-    return Array.from(profiles.values());
-  }, [order.items, shipping_options]);
+  if (isError) {
+    throw error;
+  }
+  const ISrEADY = !!draft_order && !isPending;
+  return /* @__PURE__ */ jsxs(RouteDrawer, { children: [
+    /* @__PURE__ */ jsxs(RouteDrawer.Header, { children: [
+      /* @__PURE__ */ jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsx(Heading, { children: "Edit Sales Channel" }) }),
+      /* @__PURE__ */ jsx(RouteDrawer.Description, { asChild: true, children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: "Update which sales channel the draft order is associated with" }) })
+    ] }),
+    ISrEADY && /* @__PURE__ */ jsx(SalesChannelForm, { order: draft_order })
+  ] });
+};
+const SalesChannelForm = ({ order }) => {
+  const form = useForm({
+    defaultValues: {
+      sales_channel_id: order.sales_channel_id || ""
+    },
+    resolver: zodResolver(schema$2)
+  });
+  const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
   const { handleSuccess } = useRouteModal();
-  const { mutateAsync: confirmOrderEdit } = useDraftOrderConfirmEdit(preview.id);
-  const { mutateAsync: requestOrderEdit } = useDraftOrderRequestEdit(preview.id);
-  const { mutateAsync: removeShippingMethod } = useDraftOrderRemoveShippingMethod(preview.id);
-  const { mutateAsync: removeActionShippingMethod } = useDraftOrderRemoveActionShippingMethod(preview.id);
-  const onSubmit = async () => {
-    setIsSubmitting(true);
-    let requestSucceeded = false;
-    await requestOrderEdit(void 0, {
-      onError: (e) => {
-        toast.error(`Failed to request order edit: ${e.message}`);
-      },
-      onSuccess: () => {
-        requestSucceeded = true;
-      }
-    });
-    if (!requestSucceeded) {
-      setIsSubmitting(false);
-      return;
-    }
-    await confirmOrderEdit(void 0, {
-      onError: (e) => {
-        toast.error(`Failed to confirm order edit: ${e.message}`);
-      },
-      onSuccess: () => {
-        handleSuccess();
+  const onSubmit = form.handleSubmit(async (data) => {
+    await mutateAsync(
+      {
+        sales_channel_id: data.sales_channel_id
       },
-      onSettled: () => {
-        setIsSubmitting(false);
-      }
-    });
-  };
-  const onKeydown = useCallback(
-    (e) => {
-      if (e.key === "Enter" && (e.ctrlKey || e.metaKey)) {
-        if (data || isSubmitting) {
-          return;
+      {
+        onSuccess: () => {
+          toast.success("Sales channel updated");
+          handleSuccess();
+        },
+        onError: (error) => {
+          toast.error(error.message);
         }
-        onSubmit();
       }
+    );
+  });
+  return /* @__PURE__ */ jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxs(
+    KeyboundForm,
+    {
+      className: "flex flex-1 flex-col overflow-hidden",
+      onSubmit,
+      children: [
+        /* @__PURE__ */ jsx(RouteDrawer.Body, { className: "flex flex-col gap-y-6 overflow-y-auto", children: /* @__PURE__ */ jsx(SalesChannelField, { control: form.control, order }) }),
+        /* @__PURE__ */ jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxs("div", { className: "flex justify-end gap-2", children: [
+          /* @__PURE__ */ jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsx(Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
+          /* @__PURE__ */ jsx(Button, { size: "small", type: "submit", isLoading: isPending, children: "Save" })
+        ] }) })
+      ]
+    }
+  ) });
+};
+const SalesChannelField = ({ control, order }) => {
+  const salesChannels = useComboboxData({
+    queryFn: async (params) => {
+      return await sdk.admin.salesChannel.list(params);
     },
-    [data, isSubmitting, onSubmit]
+    queryKey: ["sales-channels"],
+    getOptions: (data) => {
+      return data.sales_channels.map((salesChannel) => ({
+        label: salesChannel.name,
+        value: salesChannel.id
+      }));
+    },
+    defaultValue: order.sales_channel_id || void 0
+  });
+  return /* @__PURE__ */ jsx(
+    Form$2.Field,
+    {
+      control,
+      name: "sales_channel_id",
+      render: ({ field }) => {
+        return /* @__PURE__ */ jsxs(Form$2.Item, { children: [
+          /* @__PURE__ */ jsx(Form$2.Label, { children: "Sales Channel" }),
+          /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(
+            Combobox,
+            {
+              options: salesChannels.options,
+              fetchNextPage: salesChannels.fetchNextPage,
+              isFetchingNextPage: salesChannels.isFetchingNextPage,
+              searchValue: salesChannels.searchValue,
+              onSearchValueChange: salesChannels.onSearchValueChange,
+              placeholder: "Select sales channel",
+              ...field
+            }
+          ) }),
+          /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
+        ] });
+      }
+    }
   );
-  useEffect(() => {
-    document.addEventListener("keydown", onKeydown);
-    return () => {
-      document.removeEventListener("keydown", onKeydown);
-    };
-  }, [onKeydown]);
-  return /* @__PURE__ */ jsxs("div", { className: "flex h-full flex-col overflow-hidden", children: [
-    /* @__PURE__ */ jsx(RouteFocusModal.Header, {}),
-    /* @__PURE__ */ jsxs(RouteFocusModal.Body, { className: "flex flex-1 flex-col overflow-hidden", children: [
-      /* @__PURE__ */ jsx("div", { className: "flex flex-1 flex-col items-center overflow-y-auto", children: /* @__PURE__ */ jsxs("div", { className: "flex w-full max-w-[720px] flex-col gap-y-6 px-6 py-16", children: [
-        /* @__PURE__ */ jsxs("div", { children: [
-          /* @__PURE__ */ jsx(RouteFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsx(Heading, { children: "Shipping" }) }),
-          /* @__PURE__ */ jsx(RouteFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsx(Text, { size: "small", className: "text-ui-fg-subtle", children: "Choose which shipping method(s) to use for the items in the order." }) })
-        ] }),
-        /* @__PURE__ */ jsx(Divider, { variant: "dashed" }),
-        /* @__PURE__ */ jsx(Accordion.Root, { type: "multiple", children: /* @__PURE__ */ jsxs("div", { className: "bg-ui-bg-subtle shadow-elevation-card-rest rounded-xl", children: [
-          /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between px-4 py-2", children: [
-            /* @__PURE__ */ jsx(
-              Text,
-              {
-                size: "xsmall",
-                weight: "plus",
-                className: "text-ui-fg-muted",
-                children: "Shipping profile"
-              }
-            ),
-            /* @__PURE__ */ jsx(
-              Text,
-              {
-                size: "xsmall",
-                weight: "plus",
-                className: "text-ui-fg-muted",
-                children: "Action"
+};
+const schema$2 = objectType({
+  sales_channel_id: stringType().min(1)
+});
+const ShippingAddress = () => {
+  const { id } = useParams();
+  const { order, isPending, isError, error } = useOrder(id, {
+    fields: "+shipping_address"
+  });
+  if (isError) {
+    throw error;
+  }
+  const isReady = !isPending && !!order;
+  return /* @__PURE__ */ jsxs(RouteDrawer, { children: [
+    /* @__PURE__ */ jsxs(RouteDrawer.Header, { children: [
+      /* @__PURE__ */ jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsx(Heading, { children: "Edit Shipping Address" }) }),
+      /* @__PURE__ */ jsx(RouteDrawer.Description, { asChild: true, children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: "Edit the shipping address for the draft order" }) })
+    ] }),
+    isReady && /* @__PURE__ */ jsx(ShippingAddressForm, { order })
+  ] });
+};
+const ShippingAddressForm = ({ order }) => {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  const form = useForm({
+    defaultValues: {
+      first_name: ((_a = order.shipping_address) == null ? void 0 : _a.first_name) ?? "",
+      last_name: ((_b = order.shipping_address) == null ? void 0 : _b.last_name) ?? "",
+      company: ((_c = order.shipping_address) == null ? void 0 : _c.company) ?? "",
+      address_1: ((_d = order.shipping_address) == null ? void 0 : _d.address_1) ?? "",
+      address_2: ((_e = order.shipping_address) == null ? void 0 : _e.address_2) ?? "",
+      city: ((_f = order.shipping_address) == null ? void 0 : _f.city) ?? "",
+      province: ((_g = order.shipping_address) == null ? void 0 : _g.province) ?? "",
+      country_code: ((_h = order.shipping_address) == null ? void 0 : _h.country_code) ?? "",
+      postal_code: ((_i = order.shipping_address) == null ? void 0 : _i.postal_code) ?? "",
+      phone: ((_j = order.shipping_address) == null ? void 0 : _j.phone) ?? ""
+    },
+    resolver: zodResolver(schema$1)
+  });
+  const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
+  const { handleSuccess } = useRouteModal();
+  const onSubmit = form.handleSubmit(async (data) => {
+    await mutateAsync(
+      {
+        shipping_address: {
+          first_name: data.first_name,
+          last_name: data.last_name,
+          company: data.company,
+          address_1: data.address_1,
+          address_2: data.address_2,
+          city: data.city,
+          province: data.province,
+          country_code: data.country_code,
+          postal_code: data.postal_code,
+          phone: data.phone
+        }
+      },
+      {
+        onSuccess: () => {
+          handleSuccess();
+        },
+        onError: (error) => {
+          toast.error(error.message);
+        }
+      }
+    );
+  });
+  return /* @__PURE__ */ jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxs(
+    KeyboundForm,
+    {
+      className: "flex flex-1 flex-col overflow-hidden",
+      onSubmit,
+      children: [
+        /* @__PURE__ */ jsx(RouteDrawer.Body, { className: "flex flex-col gap-y-6 overflow-y-auto", children: /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-y-4", children: [
+          /* @__PURE__ */ jsx(
+            Form$2.Field,
+            {
+              control: form.control,
+              name: "country_code",
+              render: ({ field }) => /* @__PURE__ */ jsxs(Form$2.Item, { children: [
+                /* @__PURE__ */ jsx(Form$2.Label, { children: "Country" }),
+                /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(CountrySelect, { ...field }) }),
+                /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
+              ] })
+            }
+          ),
+          /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-2 gap-4", children: [
+            /* @__PURE__ */ jsx(
+              Form$2.Field,
+              {
+                control: form.control,
+                name: "first_name",
+                render: ({ field }) => /* @__PURE__ */ jsxs(Form$2.Item, { children: [
+                  /* @__PURE__ */ jsx(Form$2.Label, { children: "First name" }),
+                  /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(Input, { ...field }) }),
+                  /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
+                ] })
+              }
+            ),
+            /* @__PURE__ */ jsx(
+              Form$2.Field,
+              {
+                control: form.control,
+                name: "last_name",
+                render: ({ field }) => /* @__PURE__ */ jsxs(Form$2.Item, { children: [
+                  /* @__PURE__ */ jsx(Form$2.Label, { children: "Last name" }),
+                  /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(Input, { ...field }) }),
+                  /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
+                ] })
               }
             )
           ] }),
-          /* @__PURE__ */ jsx("div", { className: "px-[5px] pb-[5px]", children: uniqueShippingProfiles.map((profile) => {
-            var _a2, _b, _c, _d, _e, _f, _g;
-            const items = getItemsWithShippingProfile(
-              profile.id,
-              order.items
-            );
-            const hasItems = items.length > 0;
-            const shippingOption = shipping_options == null ? void 0 : shipping_options.find(
-              (option) => option.shipping_profile_id === profile.id
-            );
-            const shippingMethod = preview.shipping_methods.find(
-              (method) => method.shipping_option_id === (shippingOption == null ? void 0 : shippingOption.id)
-            );
-            const addShippingMethodAction = (_a2 = shippingMethod == null ? void 0 : shippingMethod.actions) == null ? void 0 : _a2.find(
-              (action) => action.action === "SHIPPING_ADD"
-            );
-            return /* @__PURE__ */ jsxs(
-              Accordion.Item,
+          /* @__PURE__ */ jsx(
+            Form$2.Field,
+            {
+              control: form.control,
+              name: "company",
+              render: ({ field }) => /* @__PURE__ */ jsxs(Form$2.Item, { children: [
+                /* @__PURE__ */ jsx(Form$2.Label, { optional: true, children: "Company" }),
+                /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(Input, { ...field }) }),
+                /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
+              ] })
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            Form$2.Field,
+            {
+              control: form.control,
+              name: "address_1",
+              render: ({ field }) => /* @__PURE__ */ jsxs(Form$2.Item, { children: [
+                /* @__PURE__ */ jsx(Form$2.Label, { children: "Address" }),
+                /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(Input, { ...field }) }),
+                /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
+              ] })
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            Form$2.Field,
+            {
+              control: form.control,
+              name: "address_2",
+              render: ({ field }) => /* @__PURE__ */ jsxs(Form$2.Item, { children: [
+                /* @__PURE__ */ jsx(Form$2.Label, { optional: true, children: "Apartment, suite, etc." }),
+                /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(Input, { ...field }) }),
+                /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
+              ] })
+            }
+          ),
+          /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-2 gap-4", children: [
+            /* @__PURE__ */ jsx(
+              Form$2.Field,
               {
-                value: profile.id,
-                className: "bg-ui-bg-base shadow-elevation-card-rest rounded-lg",
-                children: [
-                  /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between gap-3 px-3 py-2", children: [
-                    /* @__PURE__ */ jsxs("div", { className: "flex w-full items-center gap-x-3 overflow-hidden", children: [
-                      /* @__PURE__ */ jsx(Accordion.Trigger, { asChild: true, children: /* @__PURE__ */ jsx(
-                        IconButton,
-                        {
-                          size: "2xsmall",
-                          variant: "transparent",
-                          className: "group/trigger",
-                          disabled: !hasItems,
-                          children: /* @__PURE__ */ jsx(TriangleRightMini, { className: "transition-transform group-data-[state=open]/trigger:rotate-90" })
-                        }
-                      ) }),
-                      !shippingOption ? /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-x-3", children: [
-                        /* @__PURE__ */ jsx("div", { className: "shadow-borders-base flex size-7 items-center justify-center rounded-md", children: /* @__PURE__ */ jsx("div", { className: "bg-ui-bg-component-hover flex size-6 items-center justify-center rounded", children: /* @__PURE__ */ jsx(Shopping, { className: "text-ui-fg-subtle" }) }) }),
-                        /* @__PURE__ */ jsxs("div", { className: "flex flex-1 flex-col", children: [
-                          /* @__PURE__ */ jsx(
-                            Text,
-                            {
-                              size: "small",
-                              weight: "plus",
-                              leading: "compact",
-                              children: profile.name
-                            }
-                          ),
-                          /* @__PURE__ */ jsxs(
-                            Text,
-                            {
-                              size: "small",
-                              leading: "compact",
-                              className: "text-ui-fg-subtle",
-                              children: [
-                                items.length,
-                                " ",
-                                pluralize(items.length, "items", "item")
-                              ]
-                            }
-                          )
-                        ] })
-                      ] }) : /* @__PURE__ */ jsxs("div", { className: "flex w-full flex-1 items-center gap-[5px] overflow-hidden max-sm:flex-col max-sm:items-start", children: [
-                        /* @__PURE__ */ jsx(
-                          Tooltip,
-                          {
-                            content: /* @__PURE__ */ jsx("ul", { children: items.map((item) => {
-                              var _a3, _b2, _c2;
-                              return /* @__PURE__ */ jsx(
-                                "li",
-                                {
-                                  children: `${item.quantity}x ${(_b2 = (_a3 = item.variant) == null ? void 0 : _a3.product) == null ? void 0 : _b2.title} (${(_c2 = item.variant) == null ? void 0 : _c2.title})`
-                                },
-                                item.id
-                              );
-                            }) }),
-                            children: /* @__PURE__ */ jsxs(
-                              Badge,
-                              {
-                                className: "flex cursor-default items-center gap-x-[3px] overflow-hidden",
-                                size: "xsmall",
-                                children: [
-                                  /* @__PURE__ */ jsx(Shopping, { className: "shrink-0" }),
-                                  /* @__PURE__ */ jsxs("span", { className: "truncate", children: [
-                                    items.reduce(
-                                      (acc, item) => acc + item.quantity,
-                                      0
-                                    ),
-                                    "x",
-                                    " ",
-                                    pluralize(items.length, "items", "item")
-                                  ] })
-                                ]
-                              }
-                            )
-                          }
-                        ),
-                        /* @__PURE__ */ jsx(
-                          Tooltip,
-                          {
-                            content: (_d = (_c = (_b = shippingOption.service_zone) == null ? void 0 : _b.fulfillment_set) == null ? void 0 : _c.location) == null ? void 0 : _d.name,
-                            children: /* @__PURE__ */ jsxs(
-                              Badge,
-                              {
-                                className: "flex cursor-default items-center gap-x-[3px] overflow-hidden",
-                                size: "xsmall",
-                                children: [
-                                  /* @__PURE__ */ jsx(Buildings, { className: "shrink-0" }),
-                                  /* @__PURE__ */ jsx("span", { className: "truncate", children: (_g = (_f = (_e = shippingOption.service_zone) == null ? void 0 : _e.fulfillment_set) == null ? void 0 : _f.location) == null ? void 0 : _g.name })
-                                ]
-                              }
-                            )
-                          }
-                        ),
-                        /* @__PURE__ */ jsx(Tooltip, { content: shippingOption.name, children: /* @__PURE__ */ jsxs(
-                          Badge,
-                          {
-                            className: "flex cursor-default items-center gap-x-[3px] overflow-hidden",
-                            size: "xsmall",
-                            children: [
-                              /* @__PURE__ */ jsx(TruckFast, { className: "shrink-0" }),
-                              /* @__PURE__ */ jsx("span", { className: "truncate", children: shippingOption.name })
-                            ]
-                          }
-                        ) })
-                      ] })
-                    ] }),
-                    shippingOption ? /* @__PURE__ */ jsx(
-                      ActionMenu,
-                      {
-                        groups: [
-                          {
-                            actions: [
-                              hasItems ? {
-                                label: "Edit shipping option",
-                                icon: /* @__PURE__ */ jsx(Channels, {}),
-                                onClick: () => {
-                                  setIsOpen(
-                                    STACKED_FOCUS_MODAL_ID,
-                                    true
-                                  );
-                                  setData({
-                                    shippingProfileId: profile.id,
-                                    shippingOption,
-                                    shippingMethod
-                                  });
-                                }
-                              } : void 0,
-                              {
-                                label: "Remove shipping option",
-                                icon: /* @__PURE__ */ jsx(Trash, {}),
-                                onClick: () => {
-                                  if (shippingMethod) {
-                                    if (addShippingMethodAction) {
-                                      removeActionShippingMethod(
-                                        addShippingMethodAction.id
-                                      );
-                                    } else {
-                                      removeShippingMethod(
-                                        shippingMethod.id
-                                      );
-                                    }
-                                  }
-                                }
-                              }
-                            ].filter(Boolean)
-                          }
-                        ]
-                      }
-                    ) : /* @__PURE__ */ jsx(
-                      StackedModalTrigger,
-                      {
-                        shippingProfileId: profile.id,
-                        shippingOption,
-                        shippingMethod,
-                        setData,
-                        children: "Add shipping option"
-                      }
-                    )
-                  ] }),
-                  /* @__PURE__ */ jsxs(Accordion.Content, { children: [
-                    /* @__PURE__ */ jsx(Divider, { variant: "dashed" }),
-                    items.map((item, idx) => {
-                      var _a3, _b2, _c2, _d2, _e2;
-                      return /* @__PURE__ */ jsxs("div", { children: [
-                        /* @__PURE__ */ jsxs(
-                          "div",
-                          {
-                            className: "flex items-center gap-x-3 px-3",
-                            children: [
-                              /* @__PURE__ */ jsx("div", { className: "flex h-[56px] w-5 flex-col items-center justify-center", children: /* @__PURE__ */ jsx(
-                                Divider,
-                                {
-                                  variant: "dashed",
-                                  orientation: "vertical"
-                                }
-                              ) }),
-                              /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-x-3 py-2", children: [
-                                /* @__PURE__ */ jsx("div", { className: "flex size-7 items-center justify-center tabular-nums", children: /* @__PURE__ */ jsxs(
-                                  Text,
-                                  {
-                                    size: "small",
-                                    leading: "compact",
-                                    className: "text-ui-fg-subtle",
-                                    children: [
-                                      item.quantity,
-                                      "x"
-                                    ]
-                                  }
-                                ) }),
-                                /* @__PURE__ */ jsx(Thumbnail, { thumbnail: item.thumbnail }),
-                                /* @__PURE__ */ jsxs("div", { children: [
-                                  /* @__PURE__ */ jsxs(
-                                    Text,
-                                    {
-                                      size: "small",
-                                      leading: "compact",
-                                      weight: "plus",
-                                      children: [
-                                        (_b2 = (_a3 = item.variant) == null ? void 0 : _a3.product) == null ? void 0 : _b2.title,
-                                        " (",
-                                        (_c2 = item.variant) == null ? void 0 : _c2.title,
-                                        ")"
-                                      ]
-                                    }
-                                  ),
-                                  /* @__PURE__ */ jsx(
-                                    Text,
-                                    {
-                                      size: "small",
-                                      leading: "compact",
-                                      className: "text-ui-fg-subtle",
-                                      children: (_e2 = (_d2 = item.variant) == null ? void 0 : _d2.options) == null ? void 0 : _e2.map((option) => option.value).join(" · ")
-                                    }
-                                  )
-                                ] })
-                              ] })
-                            ]
-                          },
-                          item.id
-                        ),
-                        idx !== items.length - 1 && /* @__PURE__ */ jsx(Divider, { variant: "dashed" })
-                      ] }, item.id);
-                    })
-                  ] })
-                ]
-              },
-              profile.id
-            );
-          }) })
-        ] }) })
-      ] }) }),
-      /* @__PURE__ */ jsx(
-        StackedFocusModal,
-        {
-          id: STACKED_FOCUS_MODAL_ID,
-          onOpenChangeCallback: (open) => {
-            if (!open) {
-              setData(null);
+                control: form.control,
+                name: "postal_code",
+                render: ({ field }) => /* @__PURE__ */ jsxs(Form$2.Item, { children: [
+                  /* @__PURE__ */ jsx(Form$2.Label, { children: "Postal code" }),
+                  /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(Input, { ...field }) }),
+                  /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
+                ] })
+              }
+            ),
+            /* @__PURE__ */ jsx(
+              Form$2.Field,
+              {
+                control: form.control,
+                name: "city",
+                render: ({ field }) => /* @__PURE__ */ jsxs(Form$2.Item, { children: [
+                  /* @__PURE__ */ jsx(Form$2.Label, { children: "City" }),
+                  /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(Input, { ...field }) }),
+                  /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
+                ] })
+              }
+            )
+          ] }),
+          /* @__PURE__ */ jsx(
+            Form$2.Field,
+            {
+              control: form.control,
+              name: "province",
+              render: ({ field }) => /* @__PURE__ */ jsxs(Form$2.Item, { children: [
+                /* @__PURE__ */ jsx(Form$2.Label, { optional: true, children: "Province / State" }),
+                /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(Input, { ...field }) }),
+                /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
+              ] })
             }
-            return open;
-          },
-          children: data && /* @__PURE__ */ jsx(ShippingProfileForm, { data, order, preview })
-        }
-      )
-    ] }),
-    /* @__PURE__ */ jsx(RouteFocusModal.Footer, { children: /* @__PURE__ */ jsxs("div", { className: "flex justify-end gap-x-2", children: [
-      /* @__PURE__ */ jsx(RouteFocusModal.Close, { asChild: true, children: /* @__PURE__ */ jsx(Button, { size: "small", variant: "secondary", type: "button", children: "Cancel" }) }),
-      /* @__PURE__ */ jsx(
-        Button,
-        {
-          size: "small",
-          type: "button",
-          isLoading: isSubmitting,
-          onClick: onSubmit,
-          children: "Save"
-        }
-      )
-    ] }) })
-  ] });
-};
-const StackedModalTrigger = ({
-  shippingProfileId,
-  shippingOption,
-  shippingMethod,
-  setData,
-  children
-}) => {
-  const { setIsOpen, getIsOpen } = useStackedModal();
-  const isOpen = getIsOpen(STACKED_FOCUS_MODAL_ID);
-  const onToggle = () => {
-    if (isOpen) {
-      setIsOpen(STACKED_FOCUS_MODAL_ID, false);
-      setData(null);
-    } else {
-      setIsOpen(STACKED_FOCUS_MODAL_ID, true);
-      setData({
-        shippingProfileId,
-        shippingOption,
-        shippingMethod
-      });
-    }
-  };
-  return /* @__PURE__ */ jsx(
-    Button,
-    {
-      size: "small",
-      variant: "secondary",
-      onClick: onToggle,
-      className: "text-ui-fg-primary shrink-0",
-      children
+          ),
+          /* @__PURE__ */ jsx(
+            Form$2.Field,
+            {
+              control: form.control,
+              name: "phone",
+              render: ({ field }) => /* @__PURE__ */ jsxs(Form$2.Item, { children: [
+                /* @__PURE__ */ jsx(Form$2.Label, { optional: true, children: "Phone" }),
+                /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(Input, { ...field }) }),
+                /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
+              ] })
+            }
+          )
+        ] }) }),
+        /* @__PURE__ */ jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxs("div", { className: "flex justify-end gap-2", children: [
+          /* @__PURE__ */ jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsx(Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
+          /* @__PURE__ */ jsx(Button, { size: "small", type: "submit", isLoading: isPending, children: "Save" })
+        ] }) })
+      ]
     }
-  );
+  ) });
 };
-const ShippingProfileForm = ({
-  data,
-  order,
-  preview
-}) => {
-  var _a, _b, _c, _d, _e, _f;
-  const { setIsOpen } = useStackedModal();
-  const form = useForm({
-    resolver: zodResolver(shippingMethodSchema),
-    defaultValues: {
-      location_id: (_d = (_c = (_b = (_a = data.shippingOption) == null ? void 0 : _a.service_zone) == null ? void 0 : _b.fulfillment_set) == null ? void 0 : _c.location) == null ? void 0 : _d.id,
-      shipping_option_id: (_e = data.shippingOption) == null ? void 0 : _e.id,
-      custom_amount: (_f = data.shippingMethod) == null ? void 0 : _f.amount
-    }
+const schema$1 = addressSchema;
+const STACKED_FOCUS_MODAL_ID = "shipping-form";
+const Shipping = () => {
+  var _a;
+  const { id } = useParams();
+  const { order, isPending, isError, error } = useOrder(id, {
+    fields: "+items.*,+items.variant.*,+items.variant.product.*,+items.variant.product.shipping_profile.*,+currency_code"
   });
-  const { mutateAsync: addShippingMethod, isPending } = useDraftOrderAddShippingMethod(order.id);
   const {
-    mutateAsync: updateShippingMethod,
-    isPending: isUpdatingShippingMethod
-  } = useDraftOrderUpdateShippingMethod(order.id);
-  const onSubmit = form.handleSubmit(async (values) => {
-    if (isEqual(values, form.formState.defaultValues)) {
-      setIsOpen(STACKED_FOCUS_MODAL_ID, false);
-      return;
+    order: preview,
+    isPending: isPreviewPending,
+    isError: isPreviewError,
+    error: previewError
+  } = useOrderPreview(id);
+  useInitiateOrderEdit({ preview });
+  const { onCancel } = useCancelOrderEdit({ preview });
+  if (isError) {
+    throw error;
+  }
+  if (isPreviewError) {
+    throw previewError;
+  }
+  const orderHasItems = (((_a = order == null ? void 0 : order.items) == null ? void 0 : _a.length) || 0) > 0;
+  const isReady = preview && !isPreviewPending && order && !isPending;
+  return /* @__PURE__ */ jsx(RouteFocusModal, { onClose: onCancel, children: !orderHasItems ? /* @__PURE__ */ jsxs("div", { className: "flex h-full flex-col overflow-hidden ", children: [
+    /* @__PURE__ */ jsx(RouteFocusModal.Header, {}),
+    /* @__PURE__ */ jsx(RouteFocusModal.Body, { className: "flex flex-1 flex-col overflow-hidden", children: /* @__PURE__ */ jsx("div", { className: "flex flex-1 flex-col items-center overflow-y-auto", children: /* @__PURE__ */ jsxs("div", { className: "flex w-full max-w-[720px] flex-col gap-y-6 px-6 py-16", children: [
+      /* @__PURE__ */ jsx(RouteFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsx(Heading, { children: "Shipping" }) }),
+      /* @__PURE__ */ jsx(RouteFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsx(Text, { size: "small", className: "text-ui-fg-subtle", children: "This draft order currently has no items. Add items to the order before adding shipping." }) })
+    ] }) }) }),
+    /* @__PURE__ */ jsx(RouteFocusModal.Footer, { children: /* @__PURE__ */ jsx(RouteFocusModal.Close, { asChild: true, children: /* @__PURE__ */ jsx(Button, { size: "small", variant: "secondary", type: "button", children: "Cancel" }) }) })
+  ] }) : isReady ? /* @__PURE__ */ jsx(ShippingForm, { preview, order }) : /* @__PURE__ */ jsxs("div", { children: [
+    /* @__PURE__ */ jsx(RouteFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: "Edit Shipping" }) }),
+    /* @__PURE__ */ jsx(RouteFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: "Loading data for the draft order, please wait..." }) })
+  ] }) });
+};
+const ShippingForm = ({ preview, order }) => {
+  var _a;
+  const { setIsOpen } = useStackedModal();
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [data, setData] = useState(null);
+  const appliedShippingOptionIds = (_a = preview.shipping_methods) == null ? void 0 : _a.map((method) => method.shipping_option_id).filter(Boolean);
+  const { shipping_options } = useShippingOptions(
+    {
+      id: appliedShippingOptionIds,
+      fields: "+service_zone.*,+service_zone.fulfillment_set.*,+service_zone.fulfillment_set.location.*"
+    },
+    {
+      enabled: appliedShippingOptionIds.length > 0
     }
-    if (data.shippingMethod) {
-      await updateShippingMethod(
-        {
-          method_id: data.shippingMethod.id,
-          shipping_option_id: values.shipping_option_id,
-          custom_amount: values.custom_amount ? convertNumber(values.custom_amount) : void 0
-        },
-        {
-          onError: (e) => {
-            toast.error(e.message);
-          },
-          onSuccess: () => {
-            setIsOpen(STACKED_FOCUS_MODAL_ID, false);
-          }
-        }
-      );
+  );
+  const uniqueShippingProfiles = useMemo(() => {
+    const profiles = /* @__PURE__ */ new Map();
+    getUniqueShippingProfiles(order.items).forEach((profile) => {
+      profiles.set(profile.id, profile);
+    });
+    shipping_options == null ? void 0 : shipping_options.forEach((option) => {
+      profiles.set(option.shipping_profile_id, option.shipping_profile);
+    });
+    return Array.from(profiles.values());
+  }, [order.items, shipping_options]);
+  const { handleSuccess } = useRouteModal();
+  const { mutateAsync: confirmOrderEdit } = useDraftOrderConfirmEdit(preview.id);
+  const { mutateAsync: requestOrderEdit } = useDraftOrderRequestEdit(preview.id);
+  const { mutateAsync: removeShippingMethod } = useDraftOrderRemoveShippingMethod(preview.id);
+  const { mutateAsync: removeActionShippingMethod } = useDraftOrderRemoveActionShippingMethod(preview.id);
+  const onSubmit = async () => {
+    setIsSubmitting(true);
+    let requestSucceeded = false;
+    await requestOrderEdit(void 0, {
+      onError: (e) => {
+        toast.error(`Failed to request order edit: ${e.message}`);
+      },
+      onSuccess: () => {
+        requestSucceeded = true;
+      }
+    });
+    if (!requestSucceeded) {
+      setIsSubmitting(false);
       return;
     }
-    await addShippingMethod(
-      {
-        shipping_option_id: values.shipping_option_id,
-        custom_amount: values.custom_amount ? convertNumber(values.custom_amount) : void 0
+    await confirmOrderEdit(void 0, {
+      onError: (e) => {
+        toast.error(`Failed to confirm order edit: ${e.message}`);
       },
-      {
-        onError: (e) => {
-          toast.error(e.message);
-        },
-        onSuccess: () => {
-          setIsOpen(STACKED_FOCUS_MODAL_ID, false);
+      onSuccess: () => {
+        handleSuccess();
+      },
+      onSettled: () => {
+        setIsSubmitting(false);
+      }
+    });
+  };
+  const onKeydown = useCallback(
+    (e) => {
+      if (e.key === "Enter" && (e.ctrlKey || e.metaKey)) {
+        if (data || isSubmitting) {
+          return;
         }
+        onSubmit();
       }
-    );
-  });
-  return /* @__PURE__ */ jsx(StackedFocusModal.Content, { children: /* @__PURE__ */ jsx(Form$2, { ...form, children: /* @__PURE__ */ jsxs(
-    KeyboundForm,
-    {
-      className: "flex h-full flex-col overflow-hidden",
-      onSubmit,
-      children: [
-        /* @__PURE__ */ jsx(StackedFocusModal.Header, {}),
-        /* @__PURE__ */ jsx(StackedFocusModal.Body, { className: "flex flex-1 flex-col overflow-hidden", children: /* @__PURE__ */ jsx("div", { className: "flex flex-1 flex-col items-center overflow-y-auto", children: /* @__PURE__ */ jsxs("div", { className: "flex w-full max-w-[720px] flex-col gap-y-6 px-6 py-16", children: [
-          /* @__PURE__ */ jsxs("div", { children: [
-            /* @__PURE__ */ jsx(RouteFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsx(Heading, { children: "Shipping" }) }),
-            /* @__PURE__ */ jsx(RouteFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsx(Text, { size: "small", className: "text-ui-fg-subtle", children: "Add a shipping method for the selected shipping profile. You can see the items that will be shipped using this method in the preview below." }) })
-          ] }),
-          /* @__PURE__ */ jsx(Divider, { variant: "dashed" }),
-          /* @__PURE__ */ jsx(
-            LocationField,
-            {
-              control: form.control,
-              setValue: form.setValue
-            }
-          ),
-          /* @__PURE__ */ jsx(Divider, { variant: "dashed" }),
-          /* @__PURE__ */ jsx(
-            ShippingOptionField,
-            {
-              shippingProfileId: data.shippingProfileId,
-              preview,
-              control: form.control
-            }
-          ),
-          /* @__PURE__ */ jsx(Divider, { variant: "dashed" }),
-          /* @__PURE__ */ jsx(
-            CustomAmountField,
-            {
-              control: form.control,
-              currencyCode: order.currency_code
-            }
-          ),
-          /* @__PURE__ */ jsx(Divider, { variant: "dashed" }),
-          /* @__PURE__ */ jsx(
-            ItemsPreview,
-            {
-              order,
-              shippingProfileId: data.shippingProfileId
-            }
-          )
-        ] }) }) }),
-        /* @__PURE__ */ jsx(StackedFocusModal.Footer, { children: /* @__PURE__ */ jsxs("div", { className: "flex justify-end gap-x-2", children: [
-          /* @__PURE__ */ jsx(StackedFocusModal.Close, { asChild: true, children: /* @__PURE__ */ jsx(Button, { size: "small", variant: "secondary", type: "button", children: "Cancel" }) }),
-          /* @__PURE__ */ jsx(
-            Button,
-            {
-              size: "small",
-              type: "submit",
-              isLoading: isPending || isUpdatingShippingMethod,
-              children: data.shippingMethod ? "Update" : "Add"
-            }
-          )
-        ] }) })
-      ]
-    }
-  ) }) });
-};
-const shippingMethodSchema = objectType({
-  location_id: stringType(),
-  shipping_option_id: stringType(),
-  custom_amount: unionType([numberType(), stringType()]).optional()
-});
-const ItemsPreview = ({ order, shippingProfileId }) => {
-  const matches = order.items.filter(
-    (item) => {
-      var _a, _b, _c;
-      return ((_c = (_b = (_a = item.variant) == null ? void 0 : _a.product) == null ? void 0 : _b.shipping_profile) == null ? void 0 : _c.id) === shippingProfileId;
-    }
+    },
+    [data, isSubmitting, onSubmit]
   );
-  return /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-y-6", children: [
-    /* @__PURE__ */ jsx("div", { className: "grid grid-cols-2 items-center gap-3", children: /* @__PURE__ */ jsxs("div", { className: "flex flex-col", children: [
-      /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", leading: "compact", children: "Items to ship" }),
-      /* @__PURE__ */ jsx(Text, { size: "small", className: "text-ui-fg-subtle", children: "Items with the selected shipping profile." })
-    ] }) }),
-    /* @__PURE__ */ jsxs("div", { className: "bg-ui-bg-subtle shadow-elevation-card-rest rounded-xl", children: [
-      /* @__PURE__ */ jsxs("div", { className: "text-ui-fg-muted grid grid-cols-2 gap-3 px-4 py-2", children: [
-        /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", children: "Item" }) }),
-        /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", children: "Quantity" }) })
-      ] }),
-      /* @__PURE__ */ jsx("div", { className: "flex flex-col gap-y-1.5 px-[5px] pb-[5px]", children: matches.length > 0 ? matches == null ? void 0 : matches.map((item) => /* @__PURE__ */ jsxs(
-        "div",
-        {
-          className: "bg-ui-bg-base shadow-elevation-card-rest grid grid-cols-2 items-center gap-3 rounded-lg px-4 py-2",
-          children: [
-            /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-x-3", children: [
-              /* @__PURE__ */ jsx(
-                Thumbnail,
-                {
-                  thumbnail: item.thumbnail,
-                  alt: item.product_title ?? void 0
-                }
-              ),
-              /* @__PURE__ */ jsxs("div", { className: "flex flex-col", children: [
-                /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-x-1", children: [
-                  /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", leading: "compact", children: item.product_title }),
-                  /* @__PURE__ */ jsxs(
-                    Text,
-                    {
-                      size: "small",
-                      leading: "compact",
-                      className: "text-ui-fg-subtle",
-                      children: [
-                        "(",
-                        item.variant_title,
-                        ")"
-                      ]
-                    }
-                  )
-                ] }),
-                /* @__PURE__ */ jsx(
-                  Text,
-                  {
-                    size: "small",
-                    leading: "compact",
-                    className: "text-ui-fg-subtle",
-                    children: item.variant_sku
-                  }
-                )
-              ] })
-            ] }),
-            /* @__PURE__ */ jsxs(
+  useEffect(() => {
+    document.addEventListener("keydown", onKeydown);
+    return () => {
+      document.removeEventListener("keydown", onKeydown);
+    };
+  }, [onKeydown]);
+  return /* @__PURE__ */ jsxs("div", { className: "flex h-full flex-col overflow-hidden", children: [
+    /* @__PURE__ */ jsx(RouteFocusModal.Header, {}),
+    /* @__PURE__ */ jsxs(RouteFocusModal.Body, { className: "flex flex-1 flex-col overflow-hidden", children: [
+      /* @__PURE__ */ jsx("div", { className: "flex flex-1 flex-col items-center overflow-y-auto", children: /* @__PURE__ */ jsxs("div", { className: "flex w-full max-w-[720px] flex-col gap-y-6 px-6 py-16", children: [
+        /* @__PURE__ */ jsxs("div", { children: [
+          /* @__PURE__ */ jsx(RouteFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsx(Heading, { children: "Shipping" }) }),
+          /* @__PURE__ */ jsx(RouteFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsx(Text, { size: "small", className: "text-ui-fg-subtle", children: "Choose which shipping method(s) to use for the items in the order." }) })
+        ] }),
+        /* @__PURE__ */ jsx(Divider, { variant: "dashed" }),
+        /* @__PURE__ */ jsx(Accordion.Root, { type: "multiple", children: /* @__PURE__ */ jsxs("div", { className: "bg-ui-bg-subtle shadow-elevation-card-rest rounded-xl", children: [
+          /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between px-4 py-2", children: [
+            /* @__PURE__ */ jsx(
               Text,
               {
-                size: "small",
-                leading: "compact",
-                className: "text-ui-fg-subtle",
-                children: [
-                  item.quantity,
-                  "x"
-                ]
+                size: "xsmall",
+                weight: "plus",
+                className: "text-ui-fg-muted",
+                children: "Shipping profile"
+              }
+            ),
+            /* @__PURE__ */ jsx(
+              Text,
+              {
+                size: "xsmall",
+                weight: "plus",
+                className: "text-ui-fg-muted",
+                children: "Action"
               }
             )
-          ]
-        },
-        item.id
-      )) : /* @__PURE__ */ jsxs("div", { className: "bg-ui-bg-base shadow-elevation-card-rest flex flex-col items-center justify-center gap-1 gap-x-3 rounded-lg p-4", children: [
-        /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", leading: "compact", children: "No items found" }),
-        /* @__PURE__ */ jsxs(Text, { size: "small", className: "text-ui-fg-subtle", children: [
-          'No items found for "',
-          query,
-          '".'
-        ] })
-      ] }) })
-    ] })
-  ] });
-};
-const LocationField = ({ control, setValue }) => {
-  const locations = useComboboxData({
-    queryKey: ["locations"],
-    queryFn: async (params) => {
-      return await sdk.admin.stockLocation.list(params);
-    },
-    getOptions: (data) => {
-      return data.stock_locations.map((location) => ({
-        label: location.name,
-        value: location.id
-      }));
-    }
-  });
-  return /* @__PURE__ */ jsx(
-    Form$2.Field,
-    {
-      control,
-      name: "location_id",
-      render: ({ field: { onChange, ...field } }) => {
-        return /* @__PURE__ */ jsx(Form$2.Item, { children: /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
-          /* @__PURE__ */ jsxs("div", { children: [
-            /* @__PURE__ */ jsx(Form$2.Label, { children: "Location" }),
-            /* @__PURE__ */ jsx(Form$2.Hint, { children: "Choose where you want to ship the items from." })
           ] }),
-          /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(
-            Combobox,
-            {
-              options: locations.options,
-              fetchNextPage: locations.fetchNextPage,
-              isFetchingNextPage: locations.isFetchingNextPage,
-              searchValue: locations.searchValue,
-              onSearchValueChange: locations.onSearchValueChange,
-              placeholder: "Select location",
-              onChange: (value) => {
-                setValue("shipping_option_id", "", {
-                  shouldDirty: true,
-                  shouldTouch: true
-                });
-                onChange(value);
+          /* @__PURE__ */ jsx("div", { className: "px-[5px] pb-[5px]", children: uniqueShippingProfiles.map((profile) => {
+            var _a2, _b, _c, _d, _e, _f, _g;
+            const items = getItemsWithShippingProfile(
+              profile.id,
+              order.items
+            );
+            const hasItems = items.length > 0;
+            const shippingOption = shipping_options == null ? void 0 : shipping_options.find(
+              (option) => option.shipping_profile_id === profile.id
+            );
+            const shippingMethod = preview.shipping_methods.find(
+              (method) => method.shipping_option_id === (shippingOption == null ? void 0 : shippingOption.id)
+            );
+            const addShippingMethodAction = (_a2 = shippingMethod == null ? void 0 : shippingMethod.actions) == null ? void 0 : _a2.find(
+              (action) => action.action === "SHIPPING_ADD"
+            );
+            return /* @__PURE__ */ jsxs(
+              Accordion.Item,
+              {
+                value: profile.id,
+                className: "bg-ui-bg-base shadow-elevation-card-rest rounded-lg",
+                children: [
+                  /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-between gap-3 px-3 py-2", children: [
+                    /* @__PURE__ */ jsxs("div", { className: "flex w-full items-center gap-x-3 overflow-hidden", children: [
+                      /* @__PURE__ */ jsx(Accordion.Trigger, { asChild: true, children: /* @__PURE__ */ jsx(
+                        IconButton,
+                        {
+                          size: "2xsmall",
+                          variant: "transparent",
+                          className: "group/trigger",
+                          disabled: !hasItems,
+                          children: /* @__PURE__ */ jsx(TriangleRightMini, { className: "transition-transform group-data-[state=open]/trigger:rotate-90" })
+                        }
+                      ) }),
+                      !shippingOption ? /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-x-3", children: [
+                        /* @__PURE__ */ jsx("div", { className: "shadow-borders-base flex size-7 items-center justify-center rounded-md", children: /* @__PURE__ */ jsx("div", { className: "bg-ui-bg-component-hover flex size-6 items-center justify-center rounded", children: /* @__PURE__ */ jsx(Shopping, { className: "text-ui-fg-subtle" }) }) }),
+                        /* @__PURE__ */ jsxs("div", { className: "flex flex-1 flex-col", children: [
+                          /* @__PURE__ */ jsx(
+                            Text,
+                            {
+                              size: "small",
+                              weight: "plus",
+                              leading: "compact",
+                              children: profile.name
+                            }
+                          ),
+                          /* @__PURE__ */ jsxs(
+                            Text,
+                            {
+                              size: "small",
+                              leading: "compact",
+                              className: "text-ui-fg-subtle",
+                              children: [
+                                items.length,
+                                " ",
+                                pluralize(items.length, "items", "item")
+                              ]
+                            }
+                          )
+                        ] })
+                      ] }) : /* @__PURE__ */ jsxs("div", { className: "flex w-full flex-1 items-center gap-[5px] overflow-hidden max-sm:flex-col max-sm:items-start", children: [
+                        /* @__PURE__ */ jsx(
+                          Tooltip,
+                          {
+                            content: /* @__PURE__ */ jsx("ul", { children: items.map((item) => {
+                              var _a3, _b2, _c2;
+                              return /* @__PURE__ */ jsx(
+                                "li",
+                                {
+                                  children: `${item.quantity}x ${(_b2 = (_a3 = item.variant) == null ? void 0 : _a3.product) == null ? void 0 : _b2.title} (${(_c2 = item.variant) == null ? void 0 : _c2.title})`
+                                },
+                                item.id
+                              );
+                            }) }),
+                            children: /* @__PURE__ */ jsxs(
+                              Badge,
+                              {
+                                className: "flex cursor-default items-center gap-x-[3px] overflow-hidden",
+                                size: "xsmall",
+                                children: [
+                                  /* @__PURE__ */ jsx(Shopping, { className: "shrink-0" }),
+                                  /* @__PURE__ */ jsxs("span", { className: "truncate", children: [
+                                    items.reduce(
+                                      (acc, item) => acc + item.quantity,
+                                      0
+                                    ),
+                                    "x",
+                                    " ",
+                                    pluralize(items.length, "items", "item")
+                                  ] })
+                                ]
+                              }
+                            )
+                          }
+                        ),
+                        /* @__PURE__ */ jsx(
+                          Tooltip,
+                          {
+                            content: (_d = (_c = (_b = shippingOption.service_zone) == null ? void 0 : _b.fulfillment_set) == null ? void 0 : _c.location) == null ? void 0 : _d.name,
+                            children: /* @__PURE__ */ jsxs(
+                              Badge,
+                              {
+                                className: "flex cursor-default items-center gap-x-[3px] overflow-hidden",
+                                size: "xsmall",
+                                children: [
+                                  /* @__PURE__ */ jsx(Buildings, { className: "shrink-0" }),
+                                  /* @__PURE__ */ jsx("span", { className: "truncate", children: (_g = (_f = (_e = shippingOption.service_zone) == null ? void 0 : _e.fulfillment_set) == null ? void 0 : _f.location) == null ? void 0 : _g.name })
+                                ]
+                              }
+                            )
+                          }
+                        ),
+                        /* @__PURE__ */ jsx(Tooltip, { content: shippingOption.name, children: /* @__PURE__ */ jsxs(
+                          Badge,
+                          {
+                            className: "flex cursor-default items-center gap-x-[3px] overflow-hidden",
+                            size: "xsmall",
+                            children: [
+                              /* @__PURE__ */ jsx(TruckFast, { className: "shrink-0" }),
+                              /* @__PURE__ */ jsx("span", { className: "truncate", children: shippingOption.name })
+                            ]
+                          }
+                        ) })
+                      ] })
+                    ] }),
+                    shippingOption ? /* @__PURE__ */ jsx(
+                      ActionMenu,
+                      {
+                        groups: [
+                          {
+                            actions: [
+                              hasItems ? {
+                                label: "Edit shipping option",
+                                icon: /* @__PURE__ */ jsx(Channels, {}),
+                                onClick: () => {
+                                  setIsOpen(
+                                    STACKED_FOCUS_MODAL_ID,
+                                    true
+                                  );
+                                  setData({
+                                    shippingProfileId: profile.id,
+                                    shippingOption,
+                                    shippingMethod
+                                  });
+                                }
+                              } : void 0,
+                              {
+                                label: "Remove shipping option",
+                                icon: /* @__PURE__ */ jsx(Trash, {}),
+                                onClick: () => {
+                                  if (shippingMethod) {
+                                    if (addShippingMethodAction) {
+                                      removeActionShippingMethod(
+                                        addShippingMethodAction.id
+                                      );
+                                    } else {
+                                      removeShippingMethod(
+                                        shippingMethod.id
+                                      );
+                                    }
+                                  }
+                                }
+                              }
+                            ].filter(Boolean)
+                          }
+                        ]
+                      }
+                    ) : /* @__PURE__ */ jsx(
+                      StackedModalTrigger,
+                      {
+                        shippingProfileId: profile.id,
+                        shippingOption,
+                        shippingMethod,
+                        setData,
+                        children: "Add shipping option"
+                      }
+                    )
+                  ] }),
+                  /* @__PURE__ */ jsxs(Accordion.Content, { children: [
+                    /* @__PURE__ */ jsx(Divider, { variant: "dashed" }),
+                    items.map((item, idx) => {
+                      var _a3, _b2, _c2, _d2, _e2;
+                      return /* @__PURE__ */ jsxs("div", { children: [
+                        /* @__PURE__ */ jsxs(
+                          "div",
+                          {
+                            className: "flex items-center gap-x-3 px-3",
+                            children: [
+                              /* @__PURE__ */ jsx("div", { className: "flex h-[56px] w-5 flex-col items-center justify-center", children: /* @__PURE__ */ jsx(
+                                Divider,
+                                {
+                                  variant: "dashed",
+                                  orientation: "vertical"
+                                }
+                              ) }),
+                              /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-x-3 py-2", children: [
+                                /* @__PURE__ */ jsx("div", { className: "flex size-7 items-center justify-center tabular-nums", children: /* @__PURE__ */ jsxs(
+                                  Text,
+                                  {
+                                    size: "small",
+                                    leading: "compact",
+                                    className: "text-ui-fg-subtle",
+                                    children: [
+                                      item.quantity,
+                                      "x"
+                                    ]
+                                  }
+                                ) }),
+                                /* @__PURE__ */ jsx(Thumbnail, { thumbnail: item.thumbnail }),
+                                /* @__PURE__ */ jsxs("div", { children: [
+                                  /* @__PURE__ */ jsxs(
+                                    Text,
+                                    {
+                                      size: "small",
+                                      leading: "compact",
+                                      weight: "plus",
+                                      children: [
+                                        (_b2 = (_a3 = item.variant) == null ? void 0 : _a3.product) == null ? void 0 : _b2.title,
+                                        " (",
+                                        (_c2 = item.variant) == null ? void 0 : _c2.title,
+                                        ")"
+                                      ]
+                                    }
+                                  ),
+                                  /* @__PURE__ */ jsx(
+                                    Text,
+                                    {
+                                      size: "small",
+                                      leading: "compact",
+                                      className: "text-ui-fg-subtle",
+                                      children: (_e2 = (_d2 = item.variant) == null ? void 0 : _d2.options) == null ? void 0 : _e2.map((option) => option.value).join(" · ")
+                                    }
+                                  )
+                                ] })
+                              ] })
+                            ]
+                          },
+                          item.id
+                        ),
+                        idx !== items.length - 1 && /* @__PURE__ */ jsx(Divider, { variant: "dashed" })
+                      ] }, item.id);
+                    })
+                  ] })
+                ]
               },
-              ...field
+              profile.id
+            );
+          }) })
+        ] }) })
+      ] }) }),
+      /* @__PURE__ */ jsx(
+        StackedFocusModal,
+        {
+          id: STACKED_FOCUS_MODAL_ID,
+          onOpenChangeCallback: (open) => {
+            if (!open) {
+              setData(null);
             }
-          ) })
-        ] }) });
-      }
-    }
-  );
+            return open;
+          },
+          children: data && /* @__PURE__ */ jsx(ShippingProfileForm, { data, order, preview })
+        }
+      )
+    ] }),
+    /* @__PURE__ */ jsx(RouteFocusModal.Footer, { children: /* @__PURE__ */ jsxs("div", { className: "flex justify-end gap-x-2", children: [
+      /* @__PURE__ */ jsx(RouteFocusModal.Close, { asChild: true, children: /* @__PURE__ */ jsx(Button, { size: "small", variant: "secondary", type: "button", children: "Cancel" }) }),
+      /* @__PURE__ */ jsx(
+        Button,
+        {
+          size: "small",
+          type: "button",
+          isLoading: isSubmitting,
+          onClick: onSubmit,
+          children: "Save"
+        }
+      )
+    ] }) })
+  ] });
 };
-const ShippingOptionField = ({
+const StackedModalTrigger = ({
   shippingProfileId,
-  preview,
-  control
+  shippingOption,
+  shippingMethod,
+  setData,
+  children
 }) => {
-  var _a;
-  const locationId = useWatch({ control, name: "location_id" });
-  const shippingOptions = useComboboxData({
-    queryKey: ["shipping_options", locationId, shippingProfileId],
-    queryFn: async (params) => {
-      return await sdk.admin.shippingOption.list({
-        ...params,
-        stock_location_id: locationId,
-        shipping_profile_id: shippingProfileId
+  const { setIsOpen, getIsOpen } = useStackedModal();
+  const isOpen = getIsOpen(STACKED_FOCUS_MODAL_ID);
+  const onToggle = () => {
+    if (isOpen) {
+      setIsOpen(STACKED_FOCUS_MODAL_ID, false);
+      setData(null);
+    } else {
+      setIsOpen(STACKED_FOCUS_MODAL_ID, true);
+      setData({
+        shippingProfileId,
+        shippingOption,
+        shippingMethod
       });
-    },
-    getOptions: (data) => {
-      return data.shipping_options.map((option) => {
-        var _a2;
-        if ((_a2 = option.rules) == null ? void 0 : _a2.find(
-          (r) => r.attribute === "is_return" && r.value === "true"
-        )) {
-          return void 0;
-        }
-        return {
-          label: option.name,
-          value: option.id
-        };
-      }).filter(Boolean);
-    },
-    enabled: !!locationId && !!shippingProfileId,
-    defaultValue: ((_a = preview.shipping_methods[0]) == null ? void 0 : _a.shipping_option_id) || void 0
-  });
-  const tooltipContent = !locationId && !shippingProfileId ? "Choose a location and shipping profile first." : !locationId ? "Choose a location first." : "Choose a shipping profile first.";
-  return /* @__PURE__ */ jsx(
-    Form$2.Field,
-    {
-      control,
-      name: "shipping_option_id",
-      render: ({ field }) => {
-        return /* @__PURE__ */ jsx(Form$2.Item, { children: /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
-          /* @__PURE__ */ jsxs("div", { className: "flex flex-col", children: [
-            /* @__PURE__ */ jsx(Form$2.Label, { children: "Shipping option" }),
-            /* @__PURE__ */ jsx(Form$2.Hint, { children: "Choose the shipping option to use." })
-          ] }),
-          /* @__PURE__ */ jsx(
-            ConditionalTooltip,
-            {
-              content: tooltipContent,
-              showTooltip: !locationId || !shippingProfileId,
-              children: /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(
-                Combobox,
-                {
-                  options: shippingOptions.options,
-                  fetchNextPage: shippingOptions.fetchNextPage,
-                  isFetchingNextPage: shippingOptions.isFetchingNextPage,
-                  searchValue: shippingOptions.searchValue,
-                  onSearchValueChange: shippingOptions.onSearchValueChange,
-                  placeholder: "Select shipping option",
-                  ...field,
-                  disabled: !locationId || !shippingProfileId
-                }
-              ) }) })
-            }
-          )
-        ] }) });
-      }
     }
-  );
-};
-const CustomAmountField = ({
-  control,
-  currencyCode
-}) => {
+  };
   return /* @__PURE__ */ jsx(
-    Form$2.Field,
+    Button,
     {
-      control,
-      name: "custom_amount",
-      render: ({ field: { onChange, ...field } }) => {
-        return /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
-          /* @__PURE__ */ jsxs("div", { className: "flex flex-col", children: [
-            /* @__PURE__ */ jsx(Form$2.Label, { optional: true, children: "Custom amount" }),
-            /* @__PURE__ */ jsx(Form$2.Hint, { children: "Set a custom amount for the shipping option." })
-          ] }),
-          /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(
-            CurrencyInput,
-            {
-              ...field,
-              onValueChange: (value) => onChange(value),
-              symbol: getNativeSymbol(currencyCode),
-              code: currencyCode
-            }
-          ) })
-        ] });
-      }
+      size: "small",
+      variant: "secondary",
+      onClick: onToggle,
+      className: "text-ui-fg-primary shrink-0",
+      children
     }
   );
 };
-const ShippingAddress = () => {
-  const { id } = useParams();
-  const { order, isPending, isError, error } = useOrder(id, {
-    fields: "+shipping_address"
-  });
-  if (isError) {
-    throw error;
-  }
-  const isReady = !isPending && !!order;
-  return /* @__PURE__ */ jsxs(RouteDrawer, { children: [
-    /* @__PURE__ */ jsxs(RouteDrawer.Header, { children: [
-      /* @__PURE__ */ jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsx(Heading, { children: "Edit Shipping Address" }) }),
-      /* @__PURE__ */ jsx(RouteDrawer.Description, { asChild: true, children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: "Edit the shipping address for the draft order" }) })
-    ] }),
-    isReady && /* @__PURE__ */ jsx(ShippingAddressForm, { order })
-  ] });
-};
-const ShippingAddressForm = ({ order }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+const ShippingProfileForm = ({
+  data,
+  order,
+  preview
+}) => {
+  var _a, _b, _c, _d, _e, _f;
+  const { setIsOpen } = useStackedModal();
   const form = useForm({
+    resolver: zodResolver(shippingMethodSchema),
     defaultValues: {
-      first_name: ((_a = order.shipping_address) == null ? void 0 : _a.first_name) ?? "",
-      last_name: ((_b = order.shipping_address) == null ? void 0 : _b.last_name) ?? "",
-      company: ((_c = order.shipping_address) == null ? void 0 : _c.company) ?? "",
-      address_1: ((_d = order.shipping_address) == null ? void 0 : _d.address_1) ?? "",
-      address_2: ((_e = order.shipping_address) == null ? void 0 : _e.address_2) ?? "",
-      city: ((_f = order.shipping_address) == null ? void 0 : _f.city) ?? "",
-      province: ((_g = order.shipping_address) == null ? void 0 : _g.province) ?? "",
-      country_code: ((_h = order.shipping_address) == null ? void 0 : _h.country_code) ?? "",
-      postal_code: ((_i = order.shipping_address) == null ? void 0 : _i.postal_code) ?? "",
-      phone: ((_j = order.shipping_address) == null ? void 0 : _j.phone) ?? ""
-    },
-    resolver: zodResolver(schema$2)
+      location_id: (_d = (_c = (_b = (_a = data.shippingOption) == null ? void 0 : _a.service_zone) == null ? void 0 : _b.fulfillment_set) == null ? void 0 : _c.location) == null ? void 0 : _d.id,
+      shipping_option_id: (_e = data.shippingOption) == null ? void 0 : _e.id,
+      custom_amount: (_f = data.shippingMethod) == null ? void 0 : _f.amount
+    }
   });
-  const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
-  const { handleSuccess } = useRouteModal();
-  const onSubmit = form.handleSubmit(async (data) => {
-    await mutateAsync(
-      {
-        shipping_address: {
-          first_name: data.first_name,
-          last_name: data.last_name,
-          company: data.company,
-          address_1: data.address_1,
-          address_2: data.address_2,
-          city: data.city,
-          province: data.province,
-          country_code: data.country_code,
-          postal_code: data.postal_code,
-          phone: data.phone
+  const { mutateAsync: addShippingMethod, isPending } = useDraftOrderAddShippingMethod(order.id);
+  const {
+    mutateAsync: updateShippingMethod,
+    isPending: isUpdatingShippingMethod
+  } = useDraftOrderUpdateShippingMethod(order.id);
+  const onSubmit = form.handleSubmit(async (values) => {
+    if (isEqual(values, form.formState.defaultValues)) {
+      setIsOpen(STACKED_FOCUS_MODAL_ID, false);
+      return;
+    }
+    if (data.shippingMethod) {
+      await updateShippingMethod(
+        {
+          method_id: data.shippingMethod.id,
+          shipping_option_id: values.shipping_option_id,
+          custom_amount: values.custom_amount ? convertNumber(values.custom_amount) : void 0
+        },
+        {
+          onError: (e) => {
+            toast.error(e.message);
+          },
+          onSuccess: () => {
+            setIsOpen(STACKED_FOCUS_MODAL_ID, false);
+          }
         }
+      );
+      return;
+    }
+    await addShippingMethod(
+      {
+        shipping_option_id: values.shipping_option_id,
+        custom_amount: values.custom_amount ? convertNumber(values.custom_amount) : void 0
       },
       {
-        onSuccess: () => {
-          handleSuccess();
+        onError: (e) => {
+          toast.error(e.message);
         },
-        onError: (error) => {
-          toast.error(error.message);
+        onSuccess: () => {
+          setIsOpen(STACKED_FOCUS_MODAL_ID, false);
         }
       }
     );
   });
-  return /* @__PURE__ */ jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxs(
+  return /* @__PURE__ */ jsx(StackedFocusModal.Content, { children: /* @__PURE__ */ jsx(Form$2, { ...form, children: /* @__PURE__ */ jsxs(
     KeyboundForm,
     {
-      className: "flex flex-1 flex-col overflow-hidden",
+      className: "flex h-full flex-col overflow-hidden",
       onSubmit,
       children: [
-        /* @__PURE__ */ jsx(RouteDrawer.Body, { className: "flex flex-col gap-y-6 overflow-y-auto", children: /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-y-4", children: [
+        /* @__PURE__ */ jsx(StackedFocusModal.Header, {}),
+        /* @__PURE__ */ jsx(StackedFocusModal.Body, { className: "flex flex-1 flex-col overflow-hidden", children: /* @__PURE__ */ jsx("div", { className: "flex flex-1 flex-col items-center overflow-y-auto", children: /* @__PURE__ */ jsxs("div", { className: "flex w-full max-w-[720px] flex-col gap-y-6 px-6 py-16", children: [
+          /* @__PURE__ */ jsxs("div", { children: [
+            /* @__PURE__ */ jsx(RouteFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsx(Heading, { children: "Shipping" }) }),
+            /* @__PURE__ */ jsx(RouteFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsx(Text, { size: "small", className: "text-ui-fg-subtle", children: "Add a shipping method for the selected shipping profile. You can see the items that will be shipped using this method in the preview below." }) })
+          ] }),
+          /* @__PURE__ */ jsx(Divider, { variant: "dashed" }),
           /* @__PURE__ */ jsx(
-            Form$2.Field,
+            LocationField,
             {
               control: form.control,
-              name: "country_code",
-              render: ({ field }) => /* @__PURE__ */ jsxs(Form$2.Item, { children: [
-                /* @__PURE__ */ jsx(Form$2.Label, { children: "Country" }),
-                /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(CountrySelect, { ...field }) }),
-                /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
-              ] })
+              setValue: form.setValue
             }
           ),
-          /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-2 gap-4", children: [
-            /* @__PURE__ */ jsx(
-              Form$2.Field,
-              {
-                control: form.control,
-                name: "first_name",
-                render: ({ field }) => /* @__PURE__ */ jsxs(Form$2.Item, { children: [
-                  /* @__PURE__ */ jsx(Form$2.Label, { children: "First name" }),
-                  /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(Input, { ...field }) }),
-                  /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
-                ] })
-              }
-            ),
-            /* @__PURE__ */ jsx(
-              Form$2.Field,
-              {
-                control: form.control,
-                name: "last_name",
-                render: ({ field }) => /* @__PURE__ */ jsxs(Form$2.Item, { children: [
-                  /* @__PURE__ */ jsx(Form$2.Label, { children: "Last name" }),
-                  /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(Input, { ...field }) }),
-                  /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
-                ] })
-              }
-            )
-          ] }),
+          /* @__PURE__ */ jsx(Divider, { variant: "dashed" }),
           /* @__PURE__ */ jsx(
-            Form$2.Field,
+            ShippingOptionField,
             {
-              control: form.control,
-              name: "company",
-              render: ({ field }) => /* @__PURE__ */ jsxs(Form$2.Item, { children: [
-                /* @__PURE__ */ jsx(Form$2.Label, { optional: true, children: "Company" }),
-                /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(Input, { ...field }) }),
-                /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
-              ] })
+              shippingProfileId: data.shippingProfileId,
+              preview,
+              control: form.control
             }
           ),
+          /* @__PURE__ */ jsx(Divider, { variant: "dashed" }),
           /* @__PURE__ */ jsx(
-            Form$2.Field,
+            CustomAmountField,
             {
               control: form.control,
-              name: "address_1",
-              render: ({ field }) => /* @__PURE__ */ jsxs(Form$2.Item, { children: [
-                /* @__PURE__ */ jsx(Form$2.Label, { children: "Address" }),
-                /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(Input, { ...field }) }),
-                /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
-              ] })
+              currencyCode: order.currency_code
             }
           ),
+          /* @__PURE__ */ jsx(Divider, { variant: "dashed" }),
           /* @__PURE__ */ jsx(
-            Form$2.Field,
+            ItemsPreview,
             {
-              control: form.control,
-              name: "address_2",
-              render: ({ field }) => /* @__PURE__ */ jsxs(Form$2.Item, { children: [
-                /* @__PURE__ */ jsx(Form$2.Label, { optional: true, children: "Apartment, suite, etc." }),
-                /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(Input, { ...field }) }),
-                /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
-              ] })
+              order,
+              shippingProfileId: data.shippingProfileId
             }
-          ),
-          /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-2 gap-4", children: [
-            /* @__PURE__ */ jsx(
-              Form$2.Field,
-              {
-                control: form.control,
-                name: "postal_code",
-                render: ({ field }) => /* @__PURE__ */ jsxs(Form$2.Item, { children: [
-                  /* @__PURE__ */ jsx(Form$2.Label, { children: "Postal code" }),
-                  /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(Input, { ...field }) }),
-                  /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
-                ] })
-              }
-            ),
-            /* @__PURE__ */ jsx(
-              Form$2.Field,
+          )
+        ] }) }) }),
+        /* @__PURE__ */ jsx(StackedFocusModal.Footer, { children: /* @__PURE__ */ jsxs("div", { className: "flex justify-end gap-x-2", children: [
+          /* @__PURE__ */ jsx(StackedFocusModal.Close, { asChild: true, children: /* @__PURE__ */ jsx(Button, { size: "small", variant: "secondary", type: "button", children: "Cancel" }) }),
+          /* @__PURE__ */ jsx(
+            Button,
+            {
+              size: "small",
+              type: "submit",
+              isLoading: isPending || isUpdatingShippingMethod,
+              children: data.shippingMethod ? "Update" : "Add"
+            }
+          )
+        ] }) })
+      ]
+    }
+  ) }) });
+};
+const shippingMethodSchema = objectType({
+  location_id: stringType(),
+  shipping_option_id: stringType(),
+  custom_amount: unionType([numberType(), stringType()]).optional()
+});
+const ItemsPreview = ({ order, shippingProfileId }) => {
+  const matches = order.items.filter(
+    (item) => {
+      var _a, _b, _c;
+      return ((_c = (_b = (_a = item.variant) == null ? void 0 : _a.product) == null ? void 0 : _b.shipping_profile) == null ? void 0 : _c.id) === shippingProfileId;
+    }
+  );
+  return /* @__PURE__ */ jsxs("div", { className: "flex flex-col gap-y-6", children: [
+    /* @__PURE__ */ jsx("div", { className: "grid grid-cols-2 items-center gap-3", children: /* @__PURE__ */ jsxs("div", { className: "flex flex-col", children: [
+      /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", leading: "compact", children: "Items to ship" }),
+      /* @__PURE__ */ jsx(Text, { size: "small", className: "text-ui-fg-subtle", children: "Items with the selected shipping profile." })
+    ] }) }),
+    /* @__PURE__ */ jsxs("div", { className: "bg-ui-bg-subtle shadow-elevation-card-rest rounded-xl", children: [
+      /* @__PURE__ */ jsxs("div", { className: "text-ui-fg-muted grid grid-cols-2 gap-3 px-4 py-2", children: [
+        /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", children: "Item" }) }),
+        /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", children: "Quantity" }) })
+      ] }),
+      /* @__PURE__ */ jsx("div", { className: "flex flex-col gap-y-1.5 px-[5px] pb-[5px]", children: matches.length > 0 ? matches == null ? void 0 : matches.map((item) => /* @__PURE__ */ jsxs(
+        "div",
+        {
+          className: "bg-ui-bg-base shadow-elevation-card-rest grid grid-cols-2 items-center gap-3 rounded-lg px-4 py-2",
+          children: [
+            /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-x-3", children: [
+              /* @__PURE__ */ jsx(
+                Thumbnail,
+                {
+                  thumbnail: item.thumbnail,
+                  alt: item.product_title ?? void 0
+                }
+              ),
+              /* @__PURE__ */ jsxs("div", { className: "flex flex-col", children: [
+                /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-x-1", children: [
+                  /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", leading: "compact", children: item.product_title }),
+                  /* @__PURE__ */ jsxs(
+                    Text,
+                    {
+                      size: "small",
+                      leading: "compact",
+                      className: "text-ui-fg-subtle",
+                      children: [
+                        "(",
+                        item.variant_title,
+                        ")"
+                      ]
+                    }
+                  )
+                ] }),
+                /* @__PURE__ */ jsx(
+                  Text,
+                  {
+                    size: "small",
+                    leading: "compact",
+                    className: "text-ui-fg-subtle",
+                    children: item.variant_sku
+                  }
+                )
+              ] })
+            ] }),
+            /* @__PURE__ */ jsxs(
+              Text,
               {
-                control: form.control,
-                name: "city",
-                render: ({ field }) => /* @__PURE__ */ jsxs(Form$2.Item, { children: [
-                  /* @__PURE__ */ jsx(Form$2.Label, { children: "City" }),
-                  /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(Input, { ...field }) }),
-                  /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
-                ] })
+                size: "small",
+                leading: "compact",
+                className: "text-ui-fg-subtle",
+                children: [
+                  item.quantity,
+                  "x"
+                ]
               }
             )
+          ]
+        },
+        item.id
+      )) : /* @__PURE__ */ jsxs("div", { className: "bg-ui-bg-base shadow-elevation-card-rest flex flex-col items-center justify-center gap-1 gap-x-3 rounded-lg p-4", children: [
+        /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", leading: "compact", children: "No items found" }),
+        /* @__PURE__ */ jsxs(Text, { size: "small", className: "text-ui-fg-subtle", children: [
+          'No items found for "',
+          query,
+          '".'
+        ] })
+      ] }) })
+    ] })
+  ] });
+};
+const LocationField = ({ control, setValue }) => {
+  const locations = useComboboxData({
+    queryKey: ["locations"],
+    queryFn: async (params) => {
+      return await sdk.admin.stockLocation.list(params);
+    },
+    getOptions: (data) => {
+      return data.stock_locations.map((location) => ({
+        label: location.name,
+        value: location.id
+      }));
+    }
+  });
+  return /* @__PURE__ */ jsx(
+    Form$2.Field,
+    {
+      control,
+      name: "location_id",
+      render: ({ field: { onChange, ...field } }) => {
+        return /* @__PURE__ */ jsx(Form$2.Item, { children: /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
+          /* @__PURE__ */ jsxs("div", { children: [
+            /* @__PURE__ */ jsx(Form$2.Label, { children: "Location" }),
+            /* @__PURE__ */ jsx(Form$2.Hint, { children: "Choose where you want to ship the items from." })
+          ] }),
+          /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(
+            Combobox,
+            {
+              options: locations.options,
+              fetchNextPage: locations.fetchNextPage,
+              isFetchingNextPage: locations.isFetchingNextPage,
+              searchValue: locations.searchValue,
+              onSearchValueChange: locations.onSearchValueChange,
+              placeholder: "Select location",
+              onChange: (value) => {
+                setValue("shipping_option_id", "", {
+                  shouldDirty: true,
+                  shouldTouch: true
+                });
+                onChange(value);
+              },
+              ...field
+            }
+          ) })
+        ] }) });
+      }
+    }
+  );
+};
+const ShippingOptionField = ({
+  shippingProfileId,
+  preview,
+  control
+}) => {
+  var _a;
+  const locationId = useWatch({ control, name: "location_id" });
+  const shippingOptions = useComboboxData({
+    queryKey: ["shipping_options", locationId, shippingProfileId],
+    queryFn: async (params) => {
+      return await sdk.admin.shippingOption.list({
+        ...params,
+        stock_location_id: locationId,
+        shipping_profile_id: shippingProfileId
+      });
+    },
+    getOptions: (data) => {
+      return data.shipping_options.map((option) => {
+        var _a2;
+        if ((_a2 = option.rules) == null ? void 0 : _a2.find(
+          (r) => r.attribute === "is_return" && r.value === "true"
+        )) {
+          return void 0;
+        }
+        return {
+          label: option.name,
+          value: option.id
+        };
+      }).filter(Boolean);
+    },
+    enabled: !!locationId && !!shippingProfileId,
+    defaultValue: ((_a = preview.shipping_methods[0]) == null ? void 0 : _a.shipping_option_id) || void 0
+  });
+  const tooltipContent = !locationId && !shippingProfileId ? "Choose a location and shipping profile first." : !locationId ? "Choose a location first." : "Choose a shipping profile first.";
+  return /* @__PURE__ */ jsx(
+    Form$2.Field,
+    {
+      control,
+      name: "shipping_option_id",
+      render: ({ field }) => {
+        return /* @__PURE__ */ jsx(Form$2.Item, { children: /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
+          /* @__PURE__ */ jsxs("div", { className: "flex flex-col", children: [
+            /* @__PURE__ */ jsx(Form$2.Label, { children: "Shipping option" }),
+            /* @__PURE__ */ jsx(Form$2.Hint, { children: "Choose the shipping option to use." })
           ] }),
           /* @__PURE__ */ jsx(
-            Form$2.Field,
+            ConditionalTooltip,
             {
-              control: form.control,
-              name: "province",
-              render: ({ field }) => /* @__PURE__ */ jsxs(Form$2.Item, { children: [
-                /* @__PURE__ */ jsx(Form$2.Label, { optional: true, children: "Province / State" }),
-                /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(Input, { ...field }) }),
-                /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
-              ] })
+              content: tooltipContent,
+              showTooltip: !locationId || !shippingProfileId,
+              children: /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(
+                Combobox,
+                {
+                  options: shippingOptions.options,
+                  fetchNextPage: shippingOptions.fetchNextPage,
+                  isFetchingNextPage: shippingOptions.isFetchingNextPage,
+                  searchValue: shippingOptions.searchValue,
+                  onSearchValueChange: shippingOptions.onSearchValueChange,
+                  placeholder: "Select shipping option",
+                  ...field,
+                  disabled: !locationId || !shippingProfileId
+                }
+              ) }) })
             }
-          ),
-          /* @__PURE__ */ jsx(
-            Form$2.Field,
+          )
+        ] }) });
+      }
+    }
+  );
+};
+const CustomAmountField = ({
+  control,
+  currencyCode
+}) => {
+  return /* @__PURE__ */ jsx(
+    Form$2.Field,
+    {
+      control,
+      name: "custom_amount",
+      render: ({ field: { onChange, ...field } }) => {
+        return /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
+          /* @__PURE__ */ jsxs("div", { className: "flex flex-col", children: [
+            /* @__PURE__ */ jsx(Form$2.Label, { optional: true, children: "Custom amount" }),
+            /* @__PURE__ */ jsx(Form$2.Hint, { children: "Set a custom amount for the shipping option." })
+          ] }),
+          /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(
+            CurrencyInput,
             {
-              control: form.control,
-              name: "phone",
-              render: ({ field }) => /* @__PURE__ */ jsxs(Form$2.Item, { children: [
-                /* @__PURE__ */ jsx(Form$2.Label, { optional: true, children: "Phone" }),
-                /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(Input, { ...field }) }),
-                /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
-              ] })
+              ...field,
+              onValueChange: (value) => onChange(value),
+              symbol: getNativeSymbol(currencyCode),
+              code: currencyCode
             }
-          )
-        ] }) }),
-        /* @__PURE__ */ jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxs("div", { className: "flex justify-end gap-2", children: [
-          /* @__PURE__ */ jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsx(Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
-          /* @__PURE__ */ jsx(Button, { size: "small", type: "submit", isLoading: isPending, children: "Save" })
-        ] }) })
-      ]
+          ) })
+        ] });
+      }
     }
-  ) });
+  );
 };
-const schema$2 = addressSchema;
 const TransferOwnership = () => {
   const { id } = useParams();
   const { draft_order, isPending, isError, error } = useDraftOrder(id, {
@@ -12478,7 +12580,7 @@ const TransferOwnershipForm = ({ order }) => {
     defaultValues: {
       customer_id: order.customer_id || ""
     },
-    resolver: zodResolver(schema$1)
+    resolver: zodResolver(schema)
   });
   const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
   const { handleSuccess } = useRouteModal();
@@ -12928,114 +13030,8 @@ const Illustration = () => {
     }
   );
 };
-const schema$1 = objectType({
-  customer_id: stringType().min(1)
-});
-const SalesChannel = () => {
-  const { id } = useParams();
-  const { draft_order, isPending, isError, error } = useDraftOrder(
-    id,
-    {
-      fields: "+sales_channel_id"
-    },
-    {
-      enabled: !!id
-    }
-  );
-  if (isError) {
-    throw error;
-  }
-  const ISrEADY = !!draft_order && !isPending;
-  return /* @__PURE__ */ jsxs(RouteDrawer, { children: [
-    /* @__PURE__ */ jsxs(RouteDrawer.Header, { children: [
-      /* @__PURE__ */ jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsx(Heading, { children: "Edit Sales Channel" }) }),
-      /* @__PURE__ */ jsx(RouteDrawer.Description, { asChild: true, children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: "Update which sales channel the draft order is associated with" }) })
-    ] }),
-    ISrEADY && /* @__PURE__ */ jsx(SalesChannelForm, { order: draft_order })
-  ] });
-};
-const SalesChannelForm = ({ order }) => {
-  const form = useForm({
-    defaultValues: {
-      sales_channel_id: order.sales_channel_id || ""
-    },
-    resolver: zodResolver(schema)
-  });
-  const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
-  const { handleSuccess } = useRouteModal();
-  const onSubmit = form.handleSubmit(async (data) => {
-    await mutateAsync(
-      {
-        sales_channel_id: data.sales_channel_id
-      },
-      {
-        onSuccess: () => {
-          toast.success("Sales channel updated");
-          handleSuccess();
-        },
-        onError: (error) => {
-          toast.error(error.message);
-        }
-      }
-    );
-  });
-  return /* @__PURE__ */ jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxs(
-    KeyboundForm,
-    {
-      className: "flex flex-1 flex-col overflow-hidden",
-      onSubmit,
-      children: [
-        /* @__PURE__ */ jsx(RouteDrawer.Body, { className: "flex flex-col gap-y-6 overflow-y-auto", children: /* @__PURE__ */ jsx(SalesChannelField, { control: form.control, order }) }),
-        /* @__PURE__ */ jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxs("div", { className: "flex justify-end gap-2", children: [
-          /* @__PURE__ */ jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsx(Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
-          /* @__PURE__ */ jsx(Button, { size: "small", type: "submit", isLoading: isPending, children: "Save" })
-        ] }) })
-      ]
-    }
-  ) });
-};
-const SalesChannelField = ({ control, order }) => {
-  const salesChannels = useComboboxData({
-    queryFn: async (params) => {
-      return await sdk.admin.salesChannel.list(params);
-    },
-    queryKey: ["sales-channels"],
-    getOptions: (data) => {
-      return data.sales_channels.map((salesChannel) => ({
-        label: salesChannel.name,
-        value: salesChannel.id
-      }));
-    },
-    defaultValue: order.sales_channel_id || void 0
-  });
-  return /* @__PURE__ */ jsx(
-    Form$2.Field,
-    {
-      control,
-      name: "sales_channel_id",
-      render: ({ field }) => {
-        return /* @__PURE__ */ jsxs(Form$2.Item, { children: [
-          /* @__PURE__ */ jsx(Form$2.Label, { children: "Sales Channel" }),
-          /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(
-            Combobox,
-            {
-              options: salesChannels.options,
-              fetchNextPage: salesChannels.fetchNextPage,
-              isFetchingNextPage: salesChannels.isFetchingNextPage,
-              searchValue: salesChannels.searchValue,
-              onSearchValueChange: salesChannels.onSearchValueChange,
-              placeholder: "Select sales channel",
-              ...field
-            }
-          ) }),
-          /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
-        ] });
-      }
-    }
-  );
-};
 const schema = objectType({
-  sales_channel_id: stringType().min(1)
+  customer_id: stringType().min(1)
 });
 const widgetModule = { widgets: [] };
 const routeModule = {
@@ -13061,14 +13057,14 @@ const routeModule = {
           Component: BillingAddress,
           path: "/draft-orders/:id/billing-address"
         },
-        {
-          Component: CustomItems,
-          path: "/draft-orders/:id/custom-items"
-        },
         {
           Component: Email,
           path: "/draft-orders/:id/email"
         },
+        {
+          Component: CustomItems,
+          path: "/draft-orders/:id/custom-items"
+        },
         {
           Component: Items,
           path: "/draft-orders/:id/items"
@@ -13082,20 +13078,20 @@ const routeModule = {
           path: "/draft-orders/:id/promotions"
         },
         {
-          Component: Shipping,
-          path: "/draft-orders/:id/shipping"
+          Component: SalesChannel,
+          path: "/draft-orders/:id/sales-channel"
         },
         {
           Component: ShippingAddress,
           path: "/draft-orders/:id/shipping-address"
         },
         {
-          Component: TransferOwnership,
-          path: "/draft-orders/:id/transfer-ownership"
+          Component: Shipping,
+          path: "/draft-orders/:id/shipping"
         },
         {
-          Component: SalesChannel,
-          path: "/draft-orders/:id/sales-channel"
+          Component: TransferOwnership,
+          path: "/draft-orders/:id/transfer-ownership"
         }
       ]
     }