@medusajs/draft-order 2.10.2-snapshot-20250903073427 → 2.10.2-snapshot-20250903100537

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

@@ -9560,6 +9560,27 @@ const ID = () => {
     /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Outlet, {})
   ] });
 };
+const CustomItems = () => {
+  return /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer, { children: [
+    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Header, { children: /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Edit Custom Items" }) }) }),
+    /* @__PURE__ */ jsxRuntime.jsx(CustomItemsForm, {})
+  ] });
+};
+const CustomItemsForm = () => {
+  const form = reactHookForm.useForm({
+    resolver: zod.zodResolver(schema$5)
+  });
+  return /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxRuntime.jsxs(KeyboundForm, { className: "flex flex-1 flex-col", children: [
+    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Body, {}),
+    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-2", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", type: "submit", children: "Save" })
+    ] }) })
+  ] }) });
+};
+const schema$5 = objectType({
+  email: stringType().email()
+});
 const BillingAddress = () => {
   const { id } = reactRouterDom.useParams();
   const { order, isPending, isError, error } = useOrder(id, {
@@ -9592,7 +9613,7 @@ const BillingAddressForm = ({ order }) => {
       postal_code: ((_i = order.billing_address) == null ? void 0 : _i.postal_code) ?? "",
       phone: ((_j = order.billing_address) == null ? void 0 : _j.phone) ?? ""
     },
-    resolver: zod.zodResolver(schema$5)
+    resolver: zod.zodResolver(schema$4)
   });
   const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
   const { handleSuccess } = useRouteModal();
@@ -9749,26 +9770,73 @@ const BillingAddressForm = ({ order }) => {
     }
   ) });
 };
-const schema$5 = addressSchema;
-const CustomItems = () => {
+const schema$4 = addressSchema;
+const Email = () => {
+  const { id } = reactRouterDom.useParams();
+  const { order, isPending, isError, error } = useOrder(id, {
+    fields: "+email"
+  });
+  if (isError) {
+    throw error;
+  }
+  const isReady = !isPending && !!order;
   return /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer, { children: [
-    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Header, { children: /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Edit Custom Items" }) }) }),
-    /* @__PURE__ */ jsxRuntime.jsx(CustomItemsForm, {})
+    /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer.Header, { children: [
+      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Edit Email" }) }),
+      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Description, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "sr-only", children: "Edit the email for the draft order" }) })
+    ] }),
+    isReady && /* @__PURE__ */ jsxRuntime.jsx(EmailForm, { order })
   ] });
 };
-const CustomItemsForm = () => {
+const EmailForm = ({ order }) => {
   const form = reactHookForm.useForm({
-    resolver: zod.zodResolver(schema$4)
+    defaultValues: {
+      email: order.email ?? ""
+    },
+    resolver: zod.zodResolver(schema$3)
   });
-  return /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxRuntime.jsxs(KeyboundForm, { className: "flex flex-1 flex-col", children: [
-    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Body, {}),
-    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-2", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", type: "submit", children: "Save" })
-    ] }) })
-  ] }) });
+  const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
+  const { handleSuccess } = useRouteModal();
+  const onSubmit = form.handleSubmit(async (data) => {
+    await mutateAsync(
+      { email: data.email },
+      {
+        onSuccess: () => {
+          handleSuccess();
+        },
+        onError: (error) => {
+          ui.toast.error(error.message);
+        }
+      }
+    );
+  });
+  return /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxRuntime.jsxs(
+    KeyboundForm,
+    {
+      className: "flex flex-1 flex-col overflow-hidden",
+      onSubmit,
+      children: [
+        /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Body, { className: "flex flex-col gap-y-6 overflow-y-auto", children: /* @__PURE__ */ jsxRuntime.jsx(
+          Form$2.Field,
+          {
+            control: form.control,
+            name: "email",
+            render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Email" }),
+              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
+              /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+            ] })
+          }
+        ) }),
+        /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-2", children: [
+          /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", type: "submit", isLoading: isPending, children: "Save" })
+        ] }) })
+      ]
+    }
+  ) });
 };
-const schema$4 = objectType({
+const schema$3 = objectType({
   email: stringType().email()
 });
 const InlineTip = React.forwardRef(
@@ -10121,26 +10189,6 @@ function getHasUneditableRows(metadata) {
     (value) => !EDITABLE_TYPES.includes(typeof value)
   );
 }
-const PROMOTION_QUERY_KEY = "promotions";
-const promotionsQueryKeys = {
-  list: (query2) => [
-    PROMOTION_QUERY_KEY,
-    query2 ? query2 : void 0
-  ],
-  detail: (id, query2) => [
-    PROMOTION_QUERY_KEY,
-    id,
-    query2 ? query2 : void 0
-  ]
-};
-const usePromotions = (query2, options) => {
-  const { data, ...rest } = reactQuery.useQuery({
-    queryKey: promotionsQueryKeys.list(query2),
-    queryFn: async () => sdk.admin.promotion.list(query2),
-    ...options
-  });
-  return { ...data, ...rest };
-};
 const useCancelOrderEdit = ({ preview }) => {
   const { mutateAsync: cancelOrderEdit } = useDraftOrderCancelEdit(preview == null ? void 0 : preview.id);
   const onCancel = React.useCallback(async () => {
@@ -10187,85 +10235,80 @@ const useInitiateOrderEdit = ({
     run();
   }, [preview, navigate, mutateAsync]);
 };
-const Promotions = () => {
+function convertNumber(value) {
+  return typeof value === "string" ? Number(value.replace(",", ".")) : value;
+}
+const STACKED_FOCUS_MODAL_ID = "shipping-form";
+const Shipping = () => {
+  var _a;
   const { id } = reactRouterDom.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, void 0);
+  } = useOrderPreview(id);
   useInitiateOrderEdit({ preview });
   const { onCancel } = useCancelOrderEdit({ preview });
+  if (isError) {
+    throw error;
+  }
   if (isPreviewError) {
     throw previewError;
   }
-  const isReady = !!preview;
-  return /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer, { onClose: onCancel, children: [
-    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Header, { children: /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Edit Promotions" }) }) }),
-    isReady && /* @__PURE__ */ jsxRuntime.jsx(PromotionForm, { preview })
-  ] });
+  const orderHasItems = (((_a = order == null ? void 0 : order.items) == null ? void 0 : _a.length) || 0) > 0;
+  const isReady = preview && !isPreviewPending && order && !isPending;
+  return /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal, { onClose: onCancel, children: !orderHasItems ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex h-full flex-col overflow-hidden ", children: [
+    /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Header, {}),
+    /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Body, { className: "flex flex-1 flex-col overflow-hidden", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-1 flex-col items-center overflow-y-auto", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex w-full max-w-[720px] flex-col gap-y-6 py-16 px-6", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Shipping" }) }),
+      /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.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__ */ jsxRuntime.jsx(RouteFocusModal.Footer, { children: /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", type: "button", children: "Cancel" }) }) })
+  ] }) : isReady ? /* @__PURE__ */ jsxRuntime.jsx(ShippingForm, { preview, order }) : /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+    /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "sr-only", children: "Edit Shipping" }) }),
+    /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "sr-only", children: "Loading data for the draft order, please wait..." }) })
+  ] }) });
 };
-const PromotionForm = ({ preview }) => {
-  const { items, shipping_methods } = preview;
+const ShippingForm = ({ preview, order }) => {
+  var _a;
+  const { setIsOpen } = useStackedModal();
   const [isSubmitting, setIsSubmitting] = React.useState(false);
-  const [comboboxValue, setComboboxValue] = React.useState("");
-  const { handleSuccess } = useRouteModal();
-  const { mutateAsync: addPromotions, isPending: isAddingPromotions } = useDraftOrderAddPromotions(preview.id);
-  const promoCodes = getPromotionCodes(items, shipping_methods);
-  const { promotions, isPending, isError, error } = usePromotions(
+  const [data, setData] = React.useState(null);
+  const appliedShippingOptionIds = (_a = preview.shipping_methods) == null ? void 0 : _a.map((method) => method.shipping_option_id).filter(Boolean);
+  const { shipping_options } = useShippingOptions(
     {
-      code: promoCodes
+      id: appliedShippingOptionIds,
+      fields: "+service_zone.*,+service_zone.fulfillment_set.*,+service_zone.fulfillment_set.location.*"
     },
     {
-      enabled: !!promoCodes.length
+      enabled: appliedShippingOptionIds.length > 0
     }
   );
-  const comboboxData = useComboboxData({
-    queryKey: ["promotions", "combobox", promoCodes],
-    queryFn: async (params) => {
-      return await sdk.admin.promotion.list({
-        ...params,
-        code: {
-          $nin: promoCodes
-        }
-      });
-    },
-    getOptions: (data) => {
-      return data.promotions.map((promotion) => ({
-        label: promotion.code,
-        value: promotion.code
-      }));
-    }
-  });
-  const add = async (value) => {
-    if (!value) {
-      return;
-    }
-    addPromotions(
-      {
-        promo_codes: [value]
-      },
-      {
-        onError: (e) => {
-          ui.toast.error(e.message);
-          comboboxData.onSearchValueChange("");
-          setComboboxValue("");
-        },
-        onSuccess: () => {
-          comboboxData.onSearchValueChange("");
-          setComboboxValue("");
-        }
-      }
-    );
-  };
+  const uniqueShippingProfiles = React.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 } = useOrderEditRequest(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) => {
-        ui.toast.error(e.message);
+        ui.toast.error(`Failed to request order edit: ${e.message}`);
       },
       onSuccess: () => {
         requestSucceeded = true;
@@ -10277,7 +10320,7 @@ const PromotionForm = ({ preview }) => {
     }
     await confirmOrderEdit(void 0, {
       onError: (e) => {
-        ui.toast.error(e.message);
+        ui.toast.error(`Failed to confirm order edit: ${e.message}`);
       },
       onSuccess: () => {
         handleSuccess();
@@ -10287,388 +10330,30 @@ const PromotionForm = ({ preview }) => {
       }
     });
   };
-  if (isError) {
-    throw error;
-  }
-  return /* @__PURE__ */ jsxRuntime.jsxs(KeyboundForm, { className: "flex flex-1 flex-col", onSubmit, children: [
-    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Body, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-4", children: [
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-3", children: [
-        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { size: "small", weight: "plus", htmlFor: "promotion-combobox", children: "Apply promotions" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Hint, { id: "promotion-combobox-hint", children: "Manage promotions that should be applied to the order." })
-        ] }),
-        /* @__PURE__ */ jsxRuntime.jsx(
-          Combobox,
-          {
-            id: "promotion-combobox",
-            "aria-describedby": "promotion-combobox-hint",
-            isFetchingNextPage: comboboxData.isFetchingNextPage,
-            fetchNextPage: comboboxData.fetchNextPage,
-            options: comboboxData.options,
-            onSearchValueChange: comboboxData.onSearchValueChange,
-            searchValue: comboboxData.searchValue,
-            disabled: comboboxData.disabled || isAddingPromotions,
-            onChange: add,
-            value: comboboxValue
-          }
-        )
-      ] }),
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Divider, { variant: "dashed" }),
-      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-col gap-2", children: promotions == null ? void 0 : promotions.map((promotion) => /* @__PURE__ */ jsxRuntime.jsx(
-        PromotionItem,
-        {
-          promotion,
-          orderId: preview.id,
-          isLoading: isPending
-        },
-        promotion.id
-      )) })
-    ] }) }),
-    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-2", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
-      /* @__PURE__ */ jsxRuntime.jsx(
-        ui.Button,
-        {
-          size: "small",
-          type: "submit",
-          isLoading: isSubmitting || isAddingPromotions,
-          children: "Save"
-        }
-      )
-    ] }) })
-  ] });
-};
-const PromotionItem = ({
-  promotion,
-  orderId,
-  isLoading
-}) => {
-  var _a;
-  const { mutateAsync: removePromotions, isPending } = useDraftOrderRemovePromotions(orderId);
-  const onRemove = async () => {
-    removePromotions(
-      {
-        promo_codes: [promotion.code]
-      },
-      {
-        onError: (e) => {
-          ui.toast.error(e.message);
-        }
-      }
-    );
-  };
-  const displayValue = getDisplayValue(promotion);
-  return /* @__PURE__ */ jsxRuntime.jsxs(
-    "div",
-    {
-      className: ui.clx(
-        "px-3 py-2 rounded-lg bg-ui-bg-component shadow-elevation-card-rest flex items-center justify-between",
-        {
-          "animate-pulse": isLoading
-        }
-      ),
-      children: [
-        /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", weight: "plus", leading: "compact", children: promotion.code }),
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-1.5 text-ui-fg-subtle", children: [
-            displayValue && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-1.5", children: [
-              /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", leading: "compact", children: displayValue }),
-              /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", leading: "compact", children: "·" })
-            ] }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", leading: "compact", className: "capitalize", children: (_a = promotion.application_method) == null ? void 0 : _a.allocation })
-          ] })
-        ] }),
-        /* @__PURE__ */ jsxRuntime.jsx(
-          ui.IconButton,
-          {
-            size: "small",
-            type: "button",
-            variant: "transparent",
-            onClick: onRemove,
-            isLoading: isPending || isLoading,
-            children: /* @__PURE__ */ jsxRuntime.jsx(icons.XMark, {})
-          }
-        )
-      ]
-    },
-    promotion.id
-  );
-};
-function getDisplayValue(promotion) {
-  var _a, _b, _c, _d;
-  const value = (_a = promotion.application_method) == null ? void 0 : _a.value;
-  if (!value) {
-    return null;
-  }
-  if (((_b = promotion.application_method) == null ? void 0 : _b.type) === "fixed") {
-    const currency = (_c = promotion.application_method) == null ? void 0 : _c.currency_code;
-    if (!currency) {
-      return null;
-    }
-    return getLocaleAmount(value, currency);
-  } else if (((_d = promotion.application_method) == null ? void 0 : _d.type) === "percentage") {
-    return formatPercentage(value);
-  }
-  return null;
-}
-const formatter = new Intl.NumberFormat([], {
-  style: "percent",
-  minimumFractionDigits: 2
-});
-const formatPercentage = (value, isPercentageValue = false) => {
-  let val = value || 0;
-  if (!isPercentageValue) {
-    val = val / 100;
-  }
-  return formatter.format(val);
-};
-function getPromotionCodes(items, shippingMethods) {
-  const codes = /* @__PURE__ */ new Set();
-  for (const item of items) {
-    if (item.adjustments) {
-      for (const adjustment of item.adjustments) {
-        if (adjustment.code) {
-          codes.add(adjustment.code);
-        }
-      }
-    }
-  }
-  for (const shippingMethod of shippingMethods) {
-    if (shippingMethod.adjustments) {
-      for (const adjustment of shippingMethod.adjustments) {
-        if (adjustment.code) {
-          codes.add(adjustment.code);
-        }
-      }
-    }
-  }
-  return Array.from(codes);
-}
-const SalesChannel = () => {
-  const { id } = reactRouterDom.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__ */ jsxRuntime.jsxs(RouteDrawer, { children: [
-    /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer.Header, { children: [
-      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Edit Sales Channel" }) }),
-      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Description, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "sr-only", children: "Update which sales channel the draft order is associated with" }) })
-    ] }),
-    ISrEADY && /* @__PURE__ */ jsxRuntime.jsx(SalesChannelForm, { order: draft_order })
-  ] });
-};
-const SalesChannelForm = ({ order }) => {
-  const form = reactHookForm.useForm({
-    defaultValues: {
-      sales_channel_id: order.sales_channel_id || ""
-    },
-    resolver: zod.zodResolver(schema$3)
-  });
-  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: () => {
-          ui.toast.success("Sales channel updated");
-          handleSuccess();
-        },
-        onError: (error) => {
-          ui.toast.error(error.message);
-        }
-      }
-    );
-  });
-  return /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxRuntime.jsxs(
-    KeyboundForm,
-    {
-      className: "flex flex-1 flex-col overflow-hidden",
-      onSubmit,
-      children: [
-        /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Body, { className: "flex flex-col gap-y-6 overflow-y-auto", children: /* @__PURE__ */ jsxRuntime.jsx(SalesChannelField, { control: form.control, order }) }),
-        /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-2", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.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__ */ jsxRuntime.jsx(
-    Form$2.Field,
-    {
-      control,
-      name: "sales_channel_id",
-      render: ({ field }) => {
-        return /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Sales Channel" }),
-          /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(
-            Combobox,
-            {
-              options: salesChannels.options,
-              fetchNextPage: salesChannels.fetchNextPage,
-              isFetchingNextPage: salesChannels.isFetchingNextPage,
-              searchValue: salesChannels.searchValue,
-              onSearchValueChange: salesChannels.onSearchValueChange,
-              placeholder: "Select sales channel",
-              ...field
-            }
-          ) }),
-          /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-        ] });
-      }
-    }
-  );
-};
-const schema$3 = objectType({
-  sales_channel_id: stringType().min(1)
-});
-function convertNumber(value) {
-  return typeof value === "string" ? Number(value.replace(",", ".")) : value;
-}
-const STACKED_FOCUS_MODAL_ID = "shipping-form";
-const Shipping = () => {
-  var _a;
-  const { id } = reactRouterDom.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__ */ jsxRuntime.jsx(RouteFocusModal, { onClose: onCancel, children: !orderHasItems ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex h-full flex-col overflow-hidden ", children: [
-    /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Header, {}),
-    /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Body, { className: "flex flex-1 flex-col overflow-hidden", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-1 flex-col items-center overflow-y-auto", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex w-full max-w-[720px] flex-col gap-y-6 py-16 px-6", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Shipping" }) }),
-      /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.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__ */ jsxRuntime.jsx(RouteFocusModal.Footer, { children: /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", type: "button", children: "Cancel" }) }) })
-  ] }) : isReady ? /* @__PURE__ */ jsxRuntime.jsx(ShippingForm, { preview, order }) : /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-    /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "sr-only", children: "Edit Shipping" }) }),
-    /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsxRuntime.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] = React.useState(false);
-  const [data, setData] = React.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
-    }
-  );
-  const uniqueShippingProfiles = React.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) => {
-        ui.toast.error(`Failed to request order edit: ${e.message}`);
-      },
-      onSuccess: () => {
-        requestSucceeded = true;
-      }
-    });
-    if (!requestSucceeded) {
-      setIsSubmitting(false);
-      return;
-    }
-    await confirmOrderEdit(void 0, {
-      onError: (e) => {
-        ui.toast.error(`Failed to confirm order edit: ${e.message}`);
-      },
-      onSuccess: () => {
-        handleSuccess();
-      },
-      onSettled: () => {
-        setIsSubmitting(false);
-      }
-    });
-  };
-  const onKeydown = React.useCallback(
-    (e) => {
-      if (e.key === "Enter" && (e.ctrlKey || e.metaKey)) {
-        if (data || isSubmitting) {
-          return;
-        }
-        onSubmit();
-      }
-    },
-    [data, isSubmitting, onSubmit]
-  );
-  React.useEffect(() => {
-    document.addEventListener("keydown", onKeydown);
-    return () => {
-      document.removeEventListener("keydown", onKeydown);
-    };
-  }, [onKeydown]);
-  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex h-full flex-col overflow-hidden", children: [
-    /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Header, {}),
-    /* @__PURE__ */ jsxRuntime.jsxs(RouteFocusModal.Body, { className: "flex flex-1 flex-col overflow-hidden", children: [
-      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-1 flex-col items-center overflow-y-auto", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex w-full max-w-[720px] flex-col gap-y-6 py-16 px-6", children: [
-        /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Shipping" }) }),
-          /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Choose which shipping method(s) to use for the items in the order." }) })
+  const onKeydown = React.useCallback(
+    (e) => {
+      if (e.key === "Enter" && (e.ctrlKey || e.metaKey)) {
+        if (data || isSubmitting) {
+          return;
+        }
+        onSubmit();
+      }
+    },
+    [data, isSubmitting, onSubmit]
+  );
+  React.useEffect(() => {
+    document.addEventListener("keydown", onKeydown);
+    return () => {
+      document.removeEventListener("keydown", onKeydown);
+    };
+  }, [onKeydown]);
+  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex h-full flex-col overflow-hidden", children: [
+    /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Header, {}),
+    /* @__PURE__ */ jsxRuntime.jsxs(RouteFocusModal.Body, { className: "flex flex-1 flex-col overflow-hidden", children: [
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-1 flex-col items-center overflow-y-auto", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex w-full max-w-[720px] flex-col gap-y-6 py-16 px-6", children: [
+        /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+          /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Shipping" }) }),
+          /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Choose which shipping method(s) to use for the items in the order." }) })
         ] }),
         /* @__PURE__ */ jsxRuntime.jsx(ui.Divider, { variant: "dashed" }),
         /* @__PURE__ */ jsxRuntime.jsx(radixUi.Accordion.Root, { type: "multiple", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "bg-ui-bg-subtle rounded-xl shadow-elevation-card-rest", children: [
@@ -10937,429 +10622,812 @@ const ShippingForm = ({ preview, order }) => {
                   ] })
                 ]
               },
-              profile.id
-            );
-          }) })
-        ] }) })
-      ] }) }),
-      /* @__PURE__ */ jsxRuntime.jsx(
-        StackedFocusModal,
-        {
-          id: STACKED_FOCUS_MODAL_ID,
-          onOpenChangeCallback: (open) => {
-            if (!open) {
-              setData(null);
+              profile.id
+            );
+          }) })
+        ] }) })
+      ] }) }),
+      /* @__PURE__ */ jsxRuntime.jsx(
+        StackedFocusModal,
+        {
+          id: STACKED_FOCUS_MODAL_ID,
+          onOpenChangeCallback: (open) => {
+            if (!open) {
+              setData(null);
+            }
+            return open;
+          },
+          children: data && /* @__PURE__ */ jsxRuntime.jsx(ShippingProfileForm, { data, order, preview })
+        }
+      )
+    ] }),
+    /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-x-2", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", type: "button", children: "Cancel" }) }),
+      /* @__PURE__ */ jsxRuntime.jsx(
+        ui.Button,
+        {
+          size: "small",
+          type: "button",
+          isLoading: isSubmitting,
+          onClick: onSubmit,
+          children: "Save"
+        }
+      )
+    ] }) })
+  ] });
+};
+const StackedModalTrigger$1 = ({
+  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__ */ jsxRuntime.jsx(
+    ui.Button,
+    {
+      size: "small",
+      variant: "secondary",
+      onClick: onToggle,
+      className: "text-ui-fg-primary shrink-0",
+      children
+    }
+  );
+};
+const ShippingProfileForm = ({
+  data,
+  order,
+  preview
+}) => {
+  var _a, _b, _c, _d, _e, _f;
+  const { setIsOpen } = useStackedModal();
+  const form = reactHookForm.useForm({
+    resolver: zod.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 { mutateAsync: addShippingMethod, isPending } = useDraftOrderAddShippingMethod(order.id);
+  const {
+    mutateAsync: updateShippingMethod,
+    isPending: isUpdatingShippingMethod
+  } = useDraftOrderUpdateShippingMethod(order.id);
+  const onSubmit = form.handleSubmit(async (values) => {
+    if (lodash.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) => {
+            ui.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
+      },
+      {
+        onError: (e) => {
+          ui.toast.error(e.message);
+        },
+        onSuccess: () => {
+          setIsOpen(STACKED_FOCUS_MODAL_ID, false);
+        }
+      }
+    );
+  });
+  return /* @__PURE__ */ jsxRuntime.jsx(StackedFocusModal.Content, { children: /* @__PURE__ */ jsxRuntime.jsx(Form$2, { ...form, children: /* @__PURE__ */ jsxRuntime.jsxs(
+    KeyboundForm,
+    {
+      className: "flex h-full flex-col overflow-hidden",
+      onSubmit,
+      children: [
+        /* @__PURE__ */ jsxRuntime.jsx(StackedFocusModal.Header, {}),
+        /* @__PURE__ */ jsxRuntime.jsx(StackedFocusModal.Body, { className: "flex flex-1 flex-col overflow-hidden", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-1 flex-col items-center overflow-y-auto", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex w-full max-w-[720px] flex-col gap-y-6 py-16 px-6", children: [
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+            /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Shipping" }) }),
+            /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.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__ */ jsxRuntime.jsx(ui.Divider, { variant: "dashed" }),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            LocationField,
+            {
+              control: form.control,
+              setValue: form.setValue
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Divider, { variant: "dashed" }),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            ShippingOptionField,
+            {
+              shippingProfileId: data.shippingProfileId,
+              preview,
+              control: form.control
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Divider, { variant: "dashed" }),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            CustomAmountField,
+            {
+              control: form.control,
+              currencyCode: order.currency_code
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Divider, { variant: "dashed" }),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            ItemsPreview,
+            {
+              order,
+              shippingProfileId: data.shippingProfileId
+            }
+          )
+        ] }) }) }),
+        /* @__PURE__ */ jsxRuntime.jsx(StackedFocusModal.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-x-2", children: [
+          /* @__PURE__ */ jsxRuntime.jsx(StackedFocusModal.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", type: "button", children: "Cancel" }) }),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            ui.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__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-y-6", children: [
+    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "grid grid-cols-2 items-center gap-3", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", weight: "plus", leading: "compact", children: "Items to ship" }),
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Items with the selected shipping profile." })
+    ] }) }),
+    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "bg-ui-bg-subtle shadow-elevation-card-rest rounded-xl", children: [
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-3 px-4 py-2 text-ui-fg-muted", children: [
+        /* @__PURE__ */ jsxRuntime.jsx("div", { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", weight: "plus", children: "Item" }) }),
+        /* @__PURE__ */ jsxRuntime.jsx("div", { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", weight: "plus", children: "Quantity" }) })
+      ] }),
+      /* @__PURE__ */ jsxRuntime.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__ */ jsxRuntime.jsxs(
+        "div",
+        {
+          className: "grid grid-cols-2 gap-3 px-4 py-2 bg-ui-bg-base shadow-elevation-card-rest rounded-lg items-center",
+          children: [
+            /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-x-3", children: [
+              /* @__PURE__ */ jsxRuntime.jsx(
+                Thumbnail,
+                {
+                  thumbnail: item.thumbnail,
+                  alt: item.product_title ?? void 0
+                }
+              ),
+              /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col", children: [
+                /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-x-1", children: [
+                  /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", weight: "plus", leading: "compact", children: item.product_title }),
+                  /* @__PURE__ */ jsxRuntime.jsxs(
+                    ui.Text,
+                    {
+                      size: "small",
+                      leading: "compact",
+                      className: "text-ui-fg-subtle",
+                      children: [
+                        "(",
+                        item.variant_title,
+                        ")"
+                      ]
+                    }
+                  )
+                ] }),
+                /* @__PURE__ */ jsxRuntime.jsx(
+                  ui.Text,
+                  {
+                    size: "small",
+                    leading: "compact",
+                    className: "text-ui-fg-subtle",
+                    children: item.variant_sku
+                  }
+                )
+              ] })
+            ] }),
+            /* @__PURE__ */ jsxRuntime.jsxs(
+              ui.Text,
+              {
+                size: "small",
+                leading: "compact",
+                className: "text-ui-fg-subtle",
+                children: [
+                  item.quantity,
+                  "x"
+                ]
+              }
+            )
+          ]
+        },
+        item.id
+      )) : /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-center gap-x-3 bg-ui-bg-base rounded-lg p-4 shadow-elevation-card-rest flex-col gap-1", children: [
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", weight: "plus", leading: "compact", children: "No items found" }),
+        /* @__PURE__ */ jsxRuntime.jsxs(ui.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__ */ jsxRuntime.jsx(
+    Form$2.Field,
+    {
+      control,
+      name: "location_id",
+      render: ({ field: { onChange, ...field } }) => {
+        return /* @__PURE__ */ jsxRuntime.jsx(Form$2.Item, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+            /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Location" }),
+            /* @__PURE__ */ jsxRuntime.jsx(Form$2.Hint, { children: "Choose where you want to ship the items from." })
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.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
             }
-            return open;
-          },
-          children: data && /* @__PURE__ */ jsxRuntime.jsx(ShippingProfileForm, { data, order, preview })
+          ) })
+        ] }) });
+      }
+    }
+  );
+};
+const ShippingOptionField = ({
+  shippingProfileId,
+  preview,
+  control
+}) => {
+  var _a;
+  const locationId = reactHookForm.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__ */ jsxRuntime.jsx(
+    Form$2.Field,
+    {
+      control,
+      name: "shipping_option_id",
+      render: ({ field }) => {
+        return /* @__PURE__ */ jsxRuntime.jsx(Form$2.Item, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col", children: [
+            /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Shipping option" }),
+            /* @__PURE__ */ jsxRuntime.jsx(Form$2.Hint, { children: "Choose the shipping option to use." })
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            ConditionalTooltip,
+            {
+              content: tooltipContent,
+              showTooltip: !locationId || !shippingProfileId,
+              children: /* @__PURE__ */ jsxRuntime.jsx("div", { children: /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.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__ */ jsxRuntime.jsx(
+    Form$2.Field,
+    {
+      control,
+      name: "custom_amount",
+      render: ({ field: { onChange, ...field } }) => {
+        return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col", children: [
+            /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { optional: true, children: "Custom amount" }),
+            /* @__PURE__ */ jsxRuntime.jsx(Form$2.Hint, { children: "Set a custom amount for the shipping option." })
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(
+            ui.CurrencyInput,
+            {
+              ...field,
+              onValueChange: (value) => onChange(value),
+              symbol: getNativeSymbol(currencyCode),
+              code: currencyCode
+            }
+          ) })
+        ] });
+      }
+    }
+  );
+};
+const PROMOTION_QUERY_KEY = "promotions";
+const promotionsQueryKeys = {
+  list: (query2) => [
+    PROMOTION_QUERY_KEY,
+    query2 ? query2 : void 0
+  ],
+  detail: (id, query2) => [
+    PROMOTION_QUERY_KEY,
+    id,
+    query2 ? query2 : void 0
+  ]
+};
+const usePromotions = (query2, options) => {
+  const { data, ...rest } = reactQuery.useQuery({
+    queryKey: promotionsQueryKeys.list(query2),
+    queryFn: async () => sdk.admin.promotion.list(query2),
+    ...options
+  });
+  return { ...data, ...rest };
+};
+const Promotions = () => {
+  const { id } = reactRouterDom.useParams();
+  const {
+    order: preview,
+    isError: isPreviewError,
+    error: previewError
+  } = useOrderPreview(id, void 0);
+  useInitiateOrderEdit({ preview });
+  const { onCancel } = useCancelOrderEdit({ preview });
+  if (isPreviewError) {
+    throw previewError;
+  }
+  const isReady = !!preview;
+  return /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer, { onClose: onCancel, children: [
+    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Header, { children: /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Edit Promotions" }) }) }),
+    isReady && /* @__PURE__ */ jsxRuntime.jsx(PromotionForm, { preview })
+  ] });
+};
+const PromotionForm = ({ preview }) => {
+  const { items, shipping_methods } = preview;
+  const [isSubmitting, setIsSubmitting] = React.useState(false);
+  const [comboboxValue, setComboboxValue] = React.useState("");
+  const { handleSuccess } = useRouteModal();
+  const { mutateAsync: addPromotions, isPending: isAddingPromotions } = useDraftOrderAddPromotions(preview.id);
+  const promoCodes = getPromotionCodes(items, shipping_methods);
+  const { promotions, isPending, isError, error } = usePromotions(
+    {
+      code: promoCodes
+    },
+    {
+      enabled: !!promoCodes.length
+    }
+  );
+  const comboboxData = useComboboxData({
+    queryKey: ["promotions", "combobox", promoCodes],
+    queryFn: async (params) => {
+      return await sdk.admin.promotion.list({
+        ...params,
+        code: {
+          $nin: promoCodes
         }
-      )
-    ] }),
-    /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-x-2", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", type: "button", children: "Cancel" }) }),
+      });
+    },
+    getOptions: (data) => {
+      return data.promotions.map((promotion) => ({
+        label: promotion.code,
+        value: promotion.code
+      }));
+    }
+  });
+  const add = async (value) => {
+    if (!value) {
+      return;
+    }
+    addPromotions(
+      {
+        promo_codes: [value]
+      },
+      {
+        onError: (e) => {
+          ui.toast.error(e.message);
+          comboboxData.onSearchValueChange("");
+          setComboboxValue("");
+        },
+        onSuccess: () => {
+          comboboxData.onSearchValueChange("");
+          setComboboxValue("");
+        }
+      }
+    );
+  };
+  const { mutateAsync: confirmOrderEdit } = useDraftOrderConfirmEdit(preview.id);
+  const { mutateAsync: requestOrderEdit } = useOrderEditRequest(preview.id);
+  const onSubmit = async () => {
+    setIsSubmitting(true);
+    let requestSucceeded = false;
+    await requestOrderEdit(void 0, {
+      onError: (e) => {
+        ui.toast.error(e.message);
+      },
+      onSuccess: () => {
+        requestSucceeded = true;
+      }
+    });
+    if (!requestSucceeded) {
+      setIsSubmitting(false);
+      return;
+    }
+    await confirmOrderEdit(void 0, {
+      onError: (e) => {
+        ui.toast.error(e.message);
+      },
+      onSuccess: () => {
+        handleSuccess();
+      },
+      onSettled: () => {
+        setIsSubmitting(false);
+      }
+    });
+  };
+  if (isError) {
+    throw error;
+  }
+  return /* @__PURE__ */ jsxRuntime.jsxs(KeyboundForm, { className: "flex flex-1 flex-col", onSubmit, children: [
+    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Body, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-4", children: [
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-3", children: [
+        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col", children: [
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { size: "small", weight: "plus", htmlFor: "promotion-combobox", children: "Apply promotions" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Hint, { id: "promotion-combobox-hint", children: "Manage promotions that should be applied to the order." })
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsx(
+          Combobox,
+          {
+            id: "promotion-combobox",
+            "aria-describedby": "promotion-combobox-hint",
+            isFetchingNextPage: comboboxData.isFetchingNextPage,
+            fetchNextPage: comboboxData.fetchNextPage,
+            options: comboboxData.options,
+            onSearchValueChange: comboboxData.onSearchValueChange,
+            searchValue: comboboxData.searchValue,
+            disabled: comboboxData.disabled || isAddingPromotions,
+            onChange: add,
+            value: comboboxValue
+          }
+        )
+      ] }),
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Divider, { variant: "dashed" }),
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-col gap-2", children: promotions == null ? void 0 : promotions.map((promotion) => /* @__PURE__ */ jsxRuntime.jsx(
+        PromotionItem,
+        {
+          promotion,
+          orderId: preview.id,
+          isLoading: isPending
+        },
+        promotion.id
+      )) })
+    ] }) }),
+    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-2", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
       /* @__PURE__ */ jsxRuntime.jsx(
         ui.Button,
         {
           size: "small",
-          type: "button",
-          isLoading: isSubmitting,
-          onClick: onSubmit,
+          type: "submit",
+          isLoading: isSubmitting || isAddingPromotions,
           children: "Save"
         }
       )
     ] }) })
   ] });
 };
-const StackedModalTrigger$1 = ({
-  shippingProfileId,
-  shippingOption,
-  shippingMethod,
-  setData,
-  children
+const PromotionItem = ({
+  promotion,
+  orderId,
+  isLoading
 }) => {
-  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
-      });
-    }
+  var _a;
+  const { mutateAsync: removePromotions, isPending } = useDraftOrderRemovePromotions(orderId);
+  const onRemove = async () => {
+    removePromotions(
+      {
+        promo_codes: [promotion.code]
+      },
+      {
+        onError: (e) => {
+          ui.toast.error(e.message);
+        }
+      }
+    );
   };
-  return /* @__PURE__ */ jsxRuntime.jsx(
-    ui.Button,
+  const displayValue = getDisplayValue(promotion);
+  return /* @__PURE__ */ jsxRuntime.jsxs(
+    "div",
     {
-      size: "small",
-      variant: "secondary",
-      onClick: onToggle,
-      className: "text-ui-fg-primary shrink-0",
-      children
-    }
-  );
-};
-const ShippingProfileForm = ({
-  data,
-  order,
-  preview
-}) => {
-  var _a, _b, _c, _d, _e, _f;
-  const { setIsOpen } = useStackedModal();
-  const form = reactHookForm.useForm({
-    resolver: zod.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 { mutateAsync: addShippingMethod, isPending } = useDraftOrderAddShippingMethod(order.id);
-  const {
-    mutateAsync: updateShippingMethod,
-    isPending: isUpdatingShippingMethod
-  } = useDraftOrderUpdateShippingMethod(order.id);
-  const onSubmit = form.handleSubmit(async (values) => {
-    if (lodash.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
-        },
+      className: ui.clx(
+        "px-3 py-2 rounded-lg bg-ui-bg-component shadow-elevation-card-rest flex items-center justify-between",
         {
-          onError: (e) => {
-            ui.toast.error(e.message);
-          },
-          onSuccess: () => {
-            setIsOpen(STACKED_FOCUS_MODAL_ID, false);
+          "animate-pulse": isLoading
+        }
+      ),
+      children: [
+        /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", weight: "plus", leading: "compact", children: promotion.code }),
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-1.5 text-ui-fg-subtle", children: [
+            displayValue && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-1.5", children: [
+              /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", leading: "compact", children: displayValue }),
+              /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", leading: "compact", children: "·" })
+            ] }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", leading: "compact", className: "capitalize", children: (_a = promotion.application_method) == null ? void 0 : _a.allocation })
+          ] })
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsx(
+          ui.IconButton,
+          {
+            size: "small",
+            type: "button",
+            variant: "transparent",
+            onClick: onRemove,
+            isLoading: isPending || isLoading,
+            children: /* @__PURE__ */ jsxRuntime.jsx(icons.XMark, {})
           }
+        )
+      ]
+    },
+    promotion.id
+  );
+};
+function getDisplayValue(promotion) {
+  var _a, _b, _c, _d;
+  const value = (_a = promotion.application_method) == null ? void 0 : _a.value;
+  if (!value) {
+    return null;
+  }
+  if (((_b = promotion.application_method) == null ? void 0 : _b.type) === "fixed") {
+    const currency = (_c = promotion.application_method) == null ? void 0 : _c.currency_code;
+    if (!currency) {
+      return null;
+    }
+    return getLocaleAmount(value, currency);
+  } else if (((_d = promotion.application_method) == null ? void 0 : _d.type) === "percentage") {
+    return formatPercentage(value);
+  }
+  return null;
+}
+const formatter = new Intl.NumberFormat([], {
+  style: "percent",
+  minimumFractionDigits: 2
+});
+const formatPercentage = (value, isPercentageValue = false) => {
+  let val = value || 0;
+  if (!isPercentageValue) {
+    val = val / 100;
+  }
+  return formatter.format(val);
+};
+function getPromotionCodes(items, shippingMethods) {
+  const codes = /* @__PURE__ */ new Set();
+  for (const item of items) {
+    if (item.adjustments) {
+      for (const adjustment of item.adjustments) {
+        if (adjustment.code) {
+          codes.add(adjustment.code);
         }
-      );
-      return;
+      }
     }
-    await addShippingMethod(
-      {
-        shipping_option_id: values.shipping_option_id,
-        custom_amount: values.custom_amount ? convertNumber(values.custom_amount) : void 0
-      },
-      {
-        onError: (e) => {
-          ui.toast.error(e.message);
-        },
-        onSuccess: () => {
-          setIsOpen(STACKED_FOCUS_MODAL_ID, false);
+  }
+  for (const shippingMethod of shippingMethods) {
+    if (shippingMethod.adjustments) {
+      for (const adjustment of shippingMethod.adjustments) {
+        if (adjustment.code) {
+          codes.add(adjustment.code);
         }
       }
-    );
-  });
-  return /* @__PURE__ */ jsxRuntime.jsx(StackedFocusModal.Content, { children: /* @__PURE__ */ jsxRuntime.jsx(Form$2, { ...form, children: /* @__PURE__ */ jsxRuntime.jsxs(
-    KeyboundForm,
-    {
-      className: "flex h-full flex-col overflow-hidden",
-      onSubmit,
-      children: [
-        /* @__PURE__ */ jsxRuntime.jsx(StackedFocusModal.Header, {}),
-        /* @__PURE__ */ jsxRuntime.jsx(StackedFocusModal.Body, { className: "flex flex-1 flex-col overflow-hidden", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-1 flex-col items-center overflow-y-auto", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex w-full max-w-[720px] flex-col gap-y-6 py-16 px-6", children: [
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Shipping" }) }),
-            /* @__PURE__ */ jsxRuntime.jsx(RouteFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.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__ */ jsxRuntime.jsx(ui.Divider, { variant: "dashed" }),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            LocationField,
-            {
-              control: form.control,
-              setValue: form.setValue
-            }
-          ),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Divider, { variant: "dashed" }),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            ShippingOptionField,
-            {
-              shippingProfileId: data.shippingProfileId,
-              preview,
-              control: form.control
-            }
-          ),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Divider, { variant: "dashed" }),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            CustomAmountField,
-            {
-              control: form.control,
-              currencyCode: order.currency_code
-            }
-          ),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Divider, { variant: "dashed" }),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            ItemsPreview,
-            {
-              order,
-              shippingProfileId: data.shippingProfileId
-            }
-          )
-        ] }) }) }),
-        /* @__PURE__ */ jsxRuntime.jsx(StackedFocusModal.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-x-2", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(StackedFocusModal.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", type: "button", children: "Cancel" }) }),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            ui.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 Array.from(codes);
+}
+const SalesChannel = () => {
+  const { id } = reactRouterDom.useParams();
+  const { draft_order, isPending, isError, error } = useDraftOrder(
+    id,
+    {
+      fields: "+sales_channel_id"
+    },
+    {
+      enabled: !!id
     }
   );
-  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-y-6", children: [
-    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "grid grid-cols-2 items-center gap-3", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", weight: "plus", leading: "compact", children: "Items to ship" }),
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Items with the selected shipping profile." })
-    ] }) }),
-    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "bg-ui-bg-subtle shadow-elevation-card-rest rounded-xl", children: [
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-3 px-4 py-2 text-ui-fg-muted", children: [
-        /* @__PURE__ */ jsxRuntime.jsx("div", { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", weight: "plus", children: "Item" }) }),
-        /* @__PURE__ */ jsxRuntime.jsx("div", { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", weight: "plus", children: "Quantity" }) })
-      ] }),
-      /* @__PURE__ */ jsxRuntime.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__ */ jsxRuntime.jsxs(
-        "div",
-        {
-          className: "grid grid-cols-2 gap-3 px-4 py-2 bg-ui-bg-base shadow-elevation-card-rest rounded-lg items-center",
-          children: [
-            /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-x-3", children: [
-              /* @__PURE__ */ jsxRuntime.jsx(
-                Thumbnail,
-                {
-                  thumbnail: item.thumbnail,
-                  alt: item.product_title ?? void 0
-                }
-              ),
-              /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col", children: [
-                /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-x-1", children: [
-                  /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", weight: "plus", leading: "compact", children: item.product_title }),
-                  /* @__PURE__ */ jsxRuntime.jsxs(
-                    ui.Text,
-                    {
-                      size: "small",
-                      leading: "compact",
-                      className: "text-ui-fg-subtle",
-                      children: [
-                        "(",
-                        item.variant_title,
-                        ")"
-                      ]
-                    }
-                  )
-                ] }),
-                /* @__PURE__ */ jsxRuntime.jsx(
-                  ui.Text,
-                  {
-                    size: "small",
-                    leading: "compact",
-                    className: "text-ui-fg-subtle",
-                    children: item.variant_sku
-                  }
-                )
-              ] })
-            ] }),
-            /* @__PURE__ */ jsxRuntime.jsxs(
-              ui.Text,
-              {
-                size: "small",
-                leading: "compact",
-                className: "text-ui-fg-subtle",
-                children: [
-                  item.quantity,
-                  "x"
-                ]
-              }
-            )
-          ]
-        },
-        item.id
-      )) : /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-center gap-x-3 bg-ui-bg-base rounded-lg p-4 shadow-elevation-card-rest flex-col gap-1", children: [
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", weight: "plus", leading: "compact", children: "No items found" }),
-        /* @__PURE__ */ jsxRuntime.jsxs(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: [
-          'No items found for "',
-          query,
-          '".'
-        ] })
-      ] }) })
-    ] })
+  if (isError) {
+    throw error;
+  }
+  const ISrEADY = !!draft_order && !isPending;
+  return /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer, { children: [
+    /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer.Header, { children: [
+      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Edit Sales Channel" }) }),
+      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Description, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "sr-only", children: "Update which sales channel the draft order is associated with" }) })
+    ] }),
+    ISrEADY && /* @__PURE__ */ jsxRuntime.jsx(SalesChannelForm, { order: draft_order })
   ] });
 };
-const LocationField = ({ control, setValue }) => {
-  const locations = useComboboxData({
-    queryKey: ["locations"],
-    queryFn: async (params) => {
-      return await sdk.admin.stockLocation.list(params);
+const SalesChannelForm = ({ order }) => {
+  const form = reactHookForm.useForm({
+    defaultValues: {
+      sales_channel_id: order.sales_channel_id || ""
     },
-    getOptions: (data) => {
-      return data.stock_locations.map((location) => ({
-        label: location.name,
-        value: location.id
-      }));
-    }
+    resolver: zod.zodResolver(schema$2)
+  });
+  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: () => {
+          ui.toast.success("Sales channel updated");
+          handleSuccess();
+        },
+        onError: (error) => {
+          ui.toast.error(error.message);
+        }
+      }
+    );
   });
-  return /* @__PURE__ */ jsxRuntime.jsx(
-    Form$2.Field,
+  return /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxRuntime.jsxs(
+    KeyboundForm,
     {
-      control,
-      name: "location_id",
-      render: ({ field: { onChange, ...field } }) => {
-        return /* @__PURE__ */ jsxRuntime.jsx(Form$2.Item, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Location" }),
-            /* @__PURE__ */ jsxRuntime.jsx(Form$2.Hint, { children: "Choose where you want to ship the items from." })
-          ] }),
-          /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.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
-            }
-          ) })
-        ] }) });
-      }
+      className: "flex flex-1 flex-col overflow-hidden",
+      onSubmit,
+      children: [
+        /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Body, { className: "flex flex-col gap-y-6 overflow-y-auto", children: /* @__PURE__ */ jsxRuntime.jsx(SalesChannelField, { control: form.control, order }) }),
+        /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-2", children: [
+          /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", type: "submit", isLoading: isPending, children: "Save" })
+        ] }) })
+      ]
     }
-  );
+  ) });
 };
-const ShippingOptionField = ({
-  shippingProfileId,
-  preview,
-  control
-}) => {
-  var _a;
-  const locationId = reactHookForm.useWatch({ control, name: "location_id" });
-  const shippingOptions = useComboboxData({
-    queryKey: ["shipping_options", locationId, shippingProfileId],
+const SalesChannelField = ({ control, order }) => {
+  const salesChannels = useComboboxData({
     queryFn: async (params) => {
-      return await sdk.admin.shippingOption.list({
-        ...params,
-        stock_location_id: locationId,
-        shipping_profile_id: shippingProfileId
-      });
+      return await sdk.admin.salesChannel.list(params);
     },
+    queryKey: ["sales-channels"],
     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);
+      return data.sales_channels.map((salesChannel) => ({
+        label: salesChannel.name,
+        value: salesChannel.id
+      }));
     },
-    enabled: !!locationId && !!shippingProfileId,
-    defaultValue: ((_a = preview.shipping_methods[0]) == null ? void 0 : _a.shipping_option_id) || void 0
+    defaultValue: order.sales_channel_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__ */ jsxRuntime.jsx(
     Form$2.Field,
     {
       control,
-      name: "shipping_option_id",
+      name: "sales_channel_id",
       render: ({ field }) => {
-        return /* @__PURE__ */ jsxRuntime.jsx(Form$2.Item, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col", children: [
-            /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Shipping option" }),
-            /* @__PURE__ */ jsxRuntime.jsx(Form$2.Hint, { children: "Choose the shipping option to use." })
-          ] }),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            ConditionalTooltip,
-            {
-              content: tooltipContent,
-              showTooltip: !locationId || !shippingProfileId,
-              children: /* @__PURE__ */ jsxRuntime.jsx("div", { children: /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.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__ */ jsxRuntime.jsx(
-    Form$2.Field,
-    {
-      control,
-      name: "custom_amount",
-      render: ({ field: { onChange, ...field } }) => {
-        return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col", children: [
-            /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { optional: true, children: "Custom amount" }),
-            /* @__PURE__ */ jsxRuntime.jsx(Form$2.Hint, { children: "Set a custom amount for the shipping option." })
-          ] }),
+        return /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+          /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Sales Channel" }),
           /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(
-            ui.CurrencyInput,
+            Combobox,
             {
-              ...field,
-              onValueChange: (value) => onChange(value),
-              symbol: getNativeSymbol(currencyCode),
-              code: currencyCode
+              options: salesChannels.options,
+              fetchNextPage: salesChannels.fetchNextPage,
+              isFetchingNextPage: salesChannels.isFetchingNextPage,
+              searchValue: salesChannels.searchValue,
+              onSearchValueChange: salesChannels.onSearchValueChange,
+              placeholder: "Select sales channel",
+              ...field
             }
-          ) })
+          ) }),
+          /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
         ] });
       }
     }
   );
 };
+const schema$2 = objectType({
+  sales_channel_id: stringType().min(1)
+});
 const ShippingAddress = () => {
   const { id } = reactRouterDom.useParams();
   const { order, isPending, isError, error } = useOrder(id, {
@@ -11392,7 +11460,7 @@ const ShippingAddressForm = ({ order }) => {
       postal_code: ((_i = order.shipping_address) == null ? void 0 : _i.postal_code) ?? "",
       phone: ((_j = order.shipping_address) == null ? void 0 : _j.phone) ?? ""
     },
-    resolver: zod.zodResolver(schema$2)
+    resolver: zod.zodResolver(schema$1)
   });
   const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
   const { handleSuccess } = useRouteModal();
@@ -11562,7 +11630,7 @@ const ShippingAddressForm = ({ order }) => {
     }
   ) });
 };
-const schema$2 = addressSchema;
+const schema$1 = addressSchema;
 const TransferOwnership = () => {
   const { id } = reactRouterDom.useParams();
   const { draft_order, isPending, isError, error } = useDraftOrder(id, {
@@ -11586,7 +11654,7 @@ const TransferOwnershipForm = ({ order }) => {
     defaultValues: {
       customer_id: order.customer_id || ""
     },
-    resolver: zod.zodResolver(schema$1)
+    resolver: zod.zodResolver(schema)
   });
   const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
   const { handleSuccess } = useRouteModal();
@@ -12036,76 +12104,8 @@ const Illustration = () => {
     }
   );
 };
-const schema$1 = objectType({
-  customer_id: stringType().min(1)
-});
-const Email = () => {
-  const { id } = reactRouterDom.useParams();
-  const { order, isPending, isError, error } = useOrder(id, {
-    fields: "+email"
-  });
-  if (isError) {
-    throw error;
-  }
-  const isReady = !isPending && !!order;
-  return /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer, { children: [
-    /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer.Header, { children: [
-      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Edit Email" }) }),
-      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Description, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "sr-only", children: "Edit the email for the draft order" }) })
-    ] }),
-    isReady && /* @__PURE__ */ jsxRuntime.jsx(EmailForm, { order })
-  ] });
-};
-const EmailForm = ({ order }) => {
-  const form = reactHookForm.useForm({
-    defaultValues: {
-      email: order.email ?? ""
-    },
-    resolver: zod.zodResolver(schema)
-  });
-  const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
-  const { handleSuccess } = useRouteModal();
-  const onSubmit = form.handleSubmit(async (data) => {
-    await mutateAsync(
-      { email: data.email },
-      {
-        onSuccess: () => {
-          handleSuccess();
-        },
-        onError: (error) => {
-          ui.toast.error(error.message);
-        }
-      }
-    );
-  });
-  return /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxRuntime.jsxs(
-    KeyboundForm,
-    {
-      className: "flex flex-1 flex-col overflow-hidden",
-      onSubmit,
-      children: [
-        /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Body, { className: "flex flex-col gap-y-6 overflow-y-auto", children: /* @__PURE__ */ jsxRuntime.jsx(
-          Form$2.Field,
-          {
-            control: form.control,
-            name: "email",
-            render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Email" }),
-              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
-              /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-            ] })
-          }
-        ) }),
-        /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-2", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", type: "submit", isLoading: isPending, children: "Save" })
-        ] }) })
-      ]
-    }
-  ) });
-};
 const schema = objectType({
-  email: stringType().email()
+  customer_id: stringType().min(1)
 });
 const NumberInput = React.forwardRef(
   ({
@@ -13052,18 +13052,26 @@ const routeModule = {
       handle,
       loader,
       children: [
+        {
+          Component: CustomItems,
+          path: "/draft-orders/:id/custom-items"
+        },
         {
           Component: BillingAddress,
           path: "/draft-orders/:id/billing-address"
         },
         {
-          Component: CustomItems,
-          path: "/draft-orders/:id/custom-items"
+          Component: Email,
+          path: "/draft-orders/:id/email"
         },
         {
           Component: Metadata,
           path: "/draft-orders/:id/metadata"
         },
+        {
+          Component: Shipping,
+          path: "/draft-orders/:id/shipping"
+        },
         {
           Component: Promotions,
           path: "/draft-orders/:id/promotions"
@@ -13072,10 +13080,6 @@ const routeModule = {
           Component: SalesChannel,
           path: "/draft-orders/:id/sales-channel"
         },
-        {
-          Component: Shipping,
-          path: "/draft-orders/:id/shipping"
-        },
         {
           Component: ShippingAddress,
           path: "/draft-orders/:id/shipping-address"
@@ -13084,10 +13088,6 @@ const routeModule = {
           Component: TransferOwnership,
           path: "/draft-orders/:id/transfer-ownership"
         },
-        {
-          Component: Email,
-          path: "/draft-orders/:id/email"
-        },
         {
           Component: Items,
           path: "/draft-orders/:id/items"