@medusajs/draft-order 2.11.2-snapshot-20251030153804 → 2.11.2-snapshot-20251030163249

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

@@ -13,9 +13,9 @@ import { FormProvider, Controller, useFormContext, useFormState, useForm, useWat
 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";
-import debounce from "lodash.debounce";
+import debounce from "lodash/debounce";
 import Primitive from "@uiw/react-json-view";
-import isEqual from "lodash.isequal";
+import { isEqual } from "lodash";
 function useQueryParams(keys, prefix) {
   const [params] = useSearchParams();
   const result = {};
@@ -9565,196 +9565,27 @@ const ID = () => {
     /* @__PURE__ */ jsx(Outlet, {})
   ] });
 };
-const BillingAddress = () => {
-  const { id } = useParams();
-  const { order, isPending, isError, error } = useOrder(id, {
-    fields: "+billing_address"
-  });
-  if (isError) {
-    throw error;
-  }
-  const isReady = !isPending && !!order;
+const CustomItems = () => {
   return /* @__PURE__ */ jsxs(RouteDrawer, { children: [
-    /* @__PURE__ */ jsxs(RouteDrawer.Header, { children: [
-      /* @__PURE__ */ jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsx(Heading, { children: "Edit Billing Address" }) }),
-      /* @__PURE__ */ jsx(RouteDrawer.Description, { asChild: true, children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: "Edit the billing address for the draft order" }) })
-    ] }),
-    isReady && /* @__PURE__ */ jsx(BillingAddressForm, { order })
+    /* @__PURE__ */ jsx(RouteDrawer.Header, { children: /* @__PURE__ */ jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsx(Heading, { children: "Edit Custom Items" }) }) }),
+    /* @__PURE__ */ jsx(CustomItemsForm, {})
   ] });
 };
-const BillingAddressForm = ({ order }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+const CustomItemsForm = () => {
   const form = useForm({
-    defaultValues: {
-      first_name: ((_a = order.billing_address) == null ? void 0 : _a.first_name) ?? "",
-      last_name: ((_b = order.billing_address) == null ? void 0 : _b.last_name) ?? "",
-      company: ((_c = order.billing_address) == null ? void 0 : _c.company) ?? "",
-      address_1: ((_d = order.billing_address) == null ? void 0 : _d.address_1) ?? "",
-      address_2: ((_e = order.billing_address) == null ? void 0 : _e.address_2) ?? "",
-      city: ((_f = order.billing_address) == null ? void 0 : _f.city) ?? "",
-      province: ((_g = order.billing_address) == null ? void 0 : _g.province) ?? "",
-      country_code: ((_h = order.billing_address) == null ? void 0 : _h.country_code) ?? "",
-      postal_code: ((_i = order.billing_address) == null ? void 0 : _i.postal_code) ?? "",
-      phone: ((_j = order.billing_address) == null ? void 0 : _j.phone) ?? ""
-    },
     resolver: zodResolver(schema$5)
   });
-  const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
-  const { handleSuccess } = useRouteModal();
-  const onSubmit = form.handleSubmit(async (data) => {
-    await mutateAsync(
-      { billing_address: data },
-      {
-        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(
-            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,
-              {
-                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, {})
-              ] })
-            }
-          ),
-          /* @__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" })
-        ] }) })
-      ]
-    }
-  ) });
+  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$5 = addressSchema;
+const schema$5 = objectType({
+  email: stringType().email()
+});
 const Email = () => {
   const { id } = useParams();
   const { order, isPending, isError, error } = useOrder(id, {
@@ -9823,27 +9654,6 @@ 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()
-});
 const NumberInput = forwardRef(
   ({
     value,
@@ -11473,7 +11283,7 @@ const SalesChannelForm = ({ order }) => {
     defaultValues: {
       sales_channel_id: order.sales_channel_id || ""
     },
-    resolver: zodResolver(schema$2)
+    resolver: zodResolver(schema$3)
   });
   const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
   const { handleSuccess } = useRouteModal();
@@ -11548,7 +11358,7 @@ const SalesChannelField = ({ control, order }) => {
     }
   );
 };
-const schema$2 = objectType({
+const schema$3 = objectType({
   sales_channel_id: stringType().min(1)
 });
 const STACKED_FOCUS_MODAL_ID = "shipping-form";
@@ -11576,7 +11386,7 @@ const Shipping = () => {
   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.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 py-16 px-6", 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." }) })
     ] }) }) }),
@@ -11663,14 +11473,14 @@ const ShippingForm = ({ preview, order }) => {
   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__ */ 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 py-16 px-6", 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(Accordion.Root, { type: "multiple", children: /* @__PURE__ */ jsxs("div", { className: "bg-ui-bg-subtle rounded-xl shadow-elevation-card-rest", children: [
+          /* @__PURE__ */ jsxs("div", { className: "px-4 py-2 flex items-center justify-between", children: [
             /* @__PURE__ */ jsx(
               Text,
               {
@@ -11712,8 +11522,8 @@ const ShippingForm = ({ preview, order }) => {
                 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__ */ jsxs("div", { className: "px-3 py-2 flex items-center justify-between gap-3", children: [
+                    /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-x-3 w-full overflow-hidden", children: [
                       /* @__PURE__ */ jsx(Accordion.Trigger, { asChild: true, children: /* @__PURE__ */ jsx(
                         IconButton,
                         {
@@ -11721,12 +11531,12 @@ const ShippingForm = ({ preview, order }) => {
                           variant: "transparent",
                           className: "group/trigger",
                           disabled: !hasItems,
-                          children: /* @__PURE__ */ jsx(TriangleRightMini, { className: "transition-transform group-data-[state=open]/trigger:rotate-90" })
+                          children: /* @__PURE__ */ jsx(TriangleRightMini, { className: "group-data-[state=open]/trigger:rotate-90 transition-transform" })
                         }
                       ) }),
                       !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("div", { className: "size-7 rounded-md shadow-borders-base flex items-center justify-center", children: /* @__PURE__ */ jsx("div", { className: "size-6 rounded bg-ui-bg-component-hover flex items-center justify-center", children: /* @__PURE__ */ jsx(Shopping, { className: "text-ui-fg-subtle" }) }) }),
+                        /* @__PURE__ */ jsxs("div", { className: "flex flex-col flex-1", children: [
                           /* @__PURE__ */ jsx(
                             Text,
                             {
@@ -11750,7 +11560,7 @@ const ShippingForm = ({ preview, order }) => {
                             }
                           )
                         ] })
-                      ] }) : /* @__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__ */ jsxs("div", { className: "flex items-center gap-[5px] max-sm:flex-col max-sm:items-start flex-1 w-full overflow-hidden", children: [
                         /* @__PURE__ */ jsx(
                           Tooltip,
                           {
@@ -11767,7 +11577,7 @@ const ShippingForm = ({ preview, order }) => {
                             children: /* @__PURE__ */ jsxs(
                               Badge,
                               {
-                                className: "flex cursor-default items-center gap-x-[3px] overflow-hidden",
+                                className: "flex items-center gap-x-[3px] overflow-hidden cursor-default",
                                 size: "xsmall",
                                 children: [
                                   /* @__PURE__ */ jsx(Shopping, { className: "shrink-0" }),
@@ -11792,7 +11602,7 @@ const ShippingForm = ({ preview, order }) => {
                             children: /* @__PURE__ */ jsxs(
                               Badge,
                               {
-                                className: "flex cursor-default items-center gap-x-[3px] overflow-hidden",
+                                className: "flex items-center gap-x-[3px] overflow-hidden cursor-default",
                                 size: "xsmall",
                                 children: [
                                   /* @__PURE__ */ jsx(Buildings, { className: "shrink-0" }),
@@ -11805,7 +11615,7 @@ const ShippingForm = ({ preview, order }) => {
                         /* @__PURE__ */ jsx(Tooltip, { content: shippingOption.name, children: /* @__PURE__ */ jsxs(
                           Badge,
                           {
-                            className: "flex cursor-default items-center gap-x-[3px] overflow-hidden",
+                            className: "flex items-center gap-x-[3px] overflow-hidden cursor-default",
                             size: "xsmall",
                             children: [
                               /* @__PURE__ */ jsx(TruckFast, { className: "shrink-0" }),
@@ -11876,17 +11686,17 @@ const ShippingForm = ({ preview, order }) => {
                         /* @__PURE__ */ jsxs(
                           "div",
                           {
-                            className: "flex items-center gap-x-3 px-3",
+                            className: "px-3 flex items-center gap-x-3",
                             children: [
-                              /* @__PURE__ */ jsx("div", { className: "flex h-[56px] w-5 flex-col items-center justify-center", children: /* @__PURE__ */ jsx(
+                              /* @__PURE__ */ jsx("div", { className: "w-5 h-[56px] flex flex-col justify-center items-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(
+                              /* @__PURE__ */ jsxs("div", { className: "py-2 flex items-center gap-x-3", children: [
+                                /* @__PURE__ */ jsx("div", { className: "size-7 flex items-center justify-center tabular-nums", children: /* @__PURE__ */ jsxs(
                                   Text,
                                   {
                                     size: "small",
@@ -12067,7 +11877,7 @@ const ShippingProfileForm = ({
       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__ */ 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 py-16 px-6", 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." }) })
@@ -12140,14 +11950,14 @@ const ItemsPreview = ({ order, shippingProfileId }) => {
       /* @__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__ */ jsxs("div", { className: "grid grid-cols-2 gap-3 px-4 py-2 text-ui-fg-muted", 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",
+          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__ */ jsxs("div", { className: "flex items-center gap-x-3", children: [
               /* @__PURE__ */ jsx(
@@ -12200,7 +12010,7 @@ const ItemsPreview = ({ order, shippingProfileId }) => {
           ]
         },
         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__ */ 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__ */ 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 "',
@@ -12390,7 +12200,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: zodResolver(schema$1)
+    resolver: zodResolver(schema$2)
   });
   const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
   const { handleSuccess } = useRouteModal();
@@ -12560,7 +12370,7 @@ const ShippingAddressForm = ({ order }) => {
     }
   ) });
 };
-const schema$1 = addressSchema;
+const schema$2 = addressSchema;
 const TransferOwnership = () => {
   const { id } = useParams();
   const { draft_order, isPending, isError, error } = useDraftOrder(id, {
@@ -12584,7 +12394,7 @@ const TransferOwnershipForm = ({ order }) => {
     defaultValues: {
       customer_id: order.customer_id || ""
     },
-    resolver: zodResolver(schema)
+    resolver: zodResolver(schema$1)
   });
   const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
   const { handleSuccess } = useRouteModal();
@@ -13034,9 +12844,199 @@ const Illustration = () => {
     }
   );
 };
-const schema = objectType({
+const schema$1 = objectType({
   customer_id: stringType().min(1)
 });
+const BillingAddress = () => {
+  const { id } = useParams();
+  const { order, isPending, isError, error } = useOrder(id, {
+    fields: "+billing_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 Billing Address" }) }),
+      /* @__PURE__ */ jsx(RouteDrawer.Description, { asChild: true, children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: "Edit the billing address for the draft order" }) })
+    ] }),
+    isReady && /* @__PURE__ */ jsx(BillingAddressForm, { order })
+  ] });
+};
+const BillingAddressForm = ({ order }) => {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  const form = useForm({
+    defaultValues: {
+      first_name: ((_a = order.billing_address) == null ? void 0 : _a.first_name) ?? "",
+      last_name: ((_b = order.billing_address) == null ? void 0 : _b.last_name) ?? "",
+      company: ((_c = order.billing_address) == null ? void 0 : _c.company) ?? "",
+      address_1: ((_d = order.billing_address) == null ? void 0 : _d.address_1) ?? "",
+      address_2: ((_e = order.billing_address) == null ? void 0 : _e.address_2) ?? "",
+      city: ((_f = order.billing_address) == null ? void 0 : _f.city) ?? "",
+      province: ((_g = order.billing_address) == null ? void 0 : _g.province) ?? "",
+      country_code: ((_h = order.billing_address) == null ? void 0 : _h.country_code) ?? "",
+      postal_code: ((_i = order.billing_address) == null ? void 0 : _i.postal_code) ?? "",
+      phone: ((_j = order.billing_address) == null ? void 0 : _j.phone) ?? ""
+    },
+    resolver: zodResolver(schema)
+  });
+  const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
+  const { handleSuccess } = useRouteModal();
+  const onSubmit = form.handleSubmit(async (data) => {
+    await mutateAsync(
+      { billing_address: data },
+      {
+        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(
+            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,
+              {
+                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, {})
+              ] })
+            }
+          ),
+          /* @__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 schema = addressSchema;
 const widgetModule = { widgets: [] };
 const routeModule = {
   routes: [
@@ -13058,17 +13058,13 @@ const routeModule = {
       loader,
       children: [
         {
-          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"
@@ -13096,6 +13092,10 @@ const routeModule = {
         {
           Component: TransferOwnership,
           path: "/draft-orders/:id/transfer-ownership"
+        },
+        {
+          Component: BillingAddress,
+          path: "/draft-orders/:id/billing-address"
         }
       ]
     }