@medusajs/draft-order 2.10.2-preview-20250902210158 → 2.10.2-preview-20250903030934

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

@@ -4,7 +4,7 @@ import { Tooltip, DropdownMenu, clx, IconButton, useDataTable, DataTable as Data
 import { useQuery, useQueryClient, useMutation, keepPreviousData, useInfiniteQuery } from "@tanstack/react-query";
 import React, { useState, useCallback, useMemo, Fragment, createContext, forwardRef, useId, useContext, useTransition, useRef, useImperativeHandle, useDeferredValue, useEffect, Suspense } from "react";
 import { useSearchParams, Link, useNavigate, Outlet, useBlocker, useLocation, useParams } from "react-router-dom";
-import { EllipsisHorizontal, XMark, InformationCircleSolid, XMarkMini, TrianglesMini, CheckMini, EllipseMiniSolid, PlusMini, ExclamationCircleSolid, ArrowPath, FlyingBox, CurrencyDollar, Envelope, Channels, Trash, ArrowUpRightOnBox, TriangleDownMini, Check, SquareTwoStack, Photo, TriangleRightMini, Shopping, Buildings, TruckFast, Plus, ReceiptPercent, EllipsisVertical, ArrowUpMini, ArrowDownMini, Minus, PencilSquare } from "@medusajs/icons";
+import { EllipsisHorizontal, XMark, InformationCircleSolid, XMarkMini, TrianglesMini, CheckMini, EllipseMiniSolid, PlusMini, ExclamationCircleSolid, ArrowPath, FlyingBox, CurrencyDollar, Envelope, Channels, Trash, ArrowUpRightOnBox, TriangleDownMini, Check, SquareTwoStack, Photo, TriangleRightMini, Shopping, Buildings, TruckFast, Plus, ReceiptPercent, Minus, PencilSquare, EllipsisVertical, ArrowUpMini, ArrowDownMini } from "@medusajs/icons";
 import Medusa from "@medusajs/js-sdk";
 import { format, formatDistance, sub, subDays, subMonths } from "date-fns";
 import { enUS } from "date-fns/locale";
@@ -9554,6 +9554,196 @@ 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;
+  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$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" })
+        ] }) })
+      ]
+    }
+  ) });
+};
+const schema$5 = addressSchema;
 const CustomItems = () => {
   return /* @__PURE__ */ jsxs(RouteDrawer, { children: [
     /* @__PURE__ */ jsx(RouteDrawer.Header, { children: /* @__PURE__ */ jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsx(Heading, { children: "Edit Custom Items" }) }) }),
@@ -9562,7 +9752,7 @@ const CustomItems = () => {
 };
 const CustomItemsForm = () => {
   const form = useForm({
-    resolver: zodResolver(schema$5)
+    resolver: zodResolver(schema$4)
   });
   return /* @__PURE__ */ jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxs(KeyboundForm, { className: "flex flex-1 flex-col", children: [
     /* @__PURE__ */ jsx(RouteDrawer.Body, {}),
@@ -9572,7 +9762,7 @@ const CustomItemsForm = () => {
     ] }) })
   ] }) });
 };
-const schema$5 = objectType({
+const schema$4 = objectType({
   email: stringType().email()
 });
 const Email = () => {
@@ -9597,7 +9787,7 @@ const EmailForm = ({ order }) => {
     defaultValues: {
       email: order.email ?? ""
     },
-    resolver: zodResolver(schema$4)
+    resolver: zodResolver(schema$3)
   });
   const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
   const { handleSuccess } = useRouteModal();
@@ -9640,608 +9830,258 @@ const EmailForm = ({ order }) => {
     }
   ) });
 };
-const schema$4 = objectType({
+const schema$3 = objectType({
   email: stringType().email()
 });
-const InlineTip = forwardRef(
-  ({ variant = "tip", label, className, children, ...props }, ref) => {
-    const labelValue = label || (variant === "warning" ? "Warning" : "Tip");
+const NumberInput = forwardRef(
+  ({
+    value,
+    onChange,
+    size = "base",
+    min = 0,
+    max = 100,
+    step = 1,
+    className,
+    disabled,
+    ...props
+  }, ref) => {
+    const handleChange = (event) => {
+      const newValue = event.target.value === "" ? min : Number(event.target.value);
+      if (!isNaN(newValue) && (max === void 0 || newValue <= max) && (min === void 0 || newValue >= min)) {
+        onChange(newValue);
+      }
+    };
+    const handleIncrement = () => {
+      const newValue = value + step;
+      if (max === void 0 || newValue <= max) {
+        onChange(newValue);
+      }
+    };
+    const handleDecrement = () => {
+      const newValue = value - step;
+      if (min === void 0 || newValue >= min) {
+        onChange(newValue);
+      }
+    };
     return /* @__PURE__ */ jsxs(
       "div",
       {
-        ref,
         className: clx(
-          "bg-ui-bg-component txt-small text-ui-fg-subtle grid grid-cols-[4px_1fr] items-start gap-3 rounded-lg border p-3",
+          "inline-flex rounded-md bg-ui-bg-field shadow-borders-base overflow-hidden divide-x transition-fg",
+          "[&:has(input:focus)]:shadow-borders-interactive-with-active",
+          {
+            "h-7": size === "small",
+            "h-8": size === "base"
+          },
           className
         ),
-        ...props,
         children: [
           /* @__PURE__ */ jsx(
-            "div",
+            "input",
             {
-              role: "presentation",
-              className: clx("w-4px bg-ui-tag-neutral-icon h-full rounded-full", {
-                "bg-ui-tag-orange-icon": variant === "warning"
-              })
-            }
-          ),
-          /* @__PURE__ */ jsxs("div", { className: "text-pretty", children: [
-            /* @__PURE__ */ jsxs("strong", { className: "txt-small-plus text-ui-fg-base", children: [
-              labelValue,
-              ":"
-            ] }),
-            " ",
-            children
-          ] })
-        ]
-      }
+              ref,
+              type: "number",
+              value,
+              onChange: handleChange,
+              min,
+              max,
+              step,
+              className: clx(
+                "flex-1 px-2 py-1 bg-transparent txt-compact-small text-ui-fg-base outline-none [appearance:textfield]",
+                "[&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none",
+                "placeholder:text-ui-fg-muted"
+              ),
+              ...props
+            }
+          ),
+          /* @__PURE__ */ jsxs(
+            "button",
+            {
+              className: clx(
+                "flex items-center justify-center outline-none transition-fg",
+                "disabled:cursor-not-allowed disabled:text-ui-fg-muted",
+                "focus:bg-ui-bg-field-component-hover",
+                "hover:bg-ui-bg-field-component-hover",
+                {
+                  "size-7": size === "small",
+                  "size-8": size === "base"
+                }
+              ),
+              type: "button",
+              onClick: handleDecrement,
+              disabled: min !== void 0 && value <= min || disabled,
+              children: [
+                /* @__PURE__ */ jsx(Minus, {}),
+                /* @__PURE__ */ jsx("span", { className: "sr-only", children: `Decrease by ${step}` })
+              ]
+            }
+          ),
+          /* @__PURE__ */ jsxs(
+            "button",
+            {
+              className: clx(
+                "flex items-center justify-center outline-none transition-fg",
+                "disabled:cursor-not-allowed disabled:text-ui-fg-muted",
+                "focus:bg-ui-bg-field-hover",
+                "hover:bg-ui-bg-field-hover",
+                {
+                  "size-7": size === "small",
+                  "size-8": size === "base"
+                }
+              ),
+              type: "button",
+              onClick: handleIncrement,
+              disabled: max !== void 0 && value >= max || disabled,
+              children: [
+                /* @__PURE__ */ jsx(Plus, {}),
+                /* @__PURE__ */ jsx("span", { className: "sr-only", children: `Increase by ${step}` })
+              ]
+            }
+          )
+        ]
+      }
     );
   }
 );
-InlineTip.displayName = "InlineTip";
-const MetadataFieldSchema = objectType({
-  key: stringType(),
-  disabled: booleanType().optional(),
-  value: anyType()
-});
-const MetadataSchema = objectType({
-  metadata: arrayType(MetadataFieldSchema)
-});
-const Metadata = () => {
+const PRODUCT_VARIANTS_QUERY_KEY = "product-variants";
+const productVariantsQueryKeys = {
+  list: (query2) => [
+    PRODUCT_VARIANTS_QUERY_KEY,
+    query2 ? query2 : void 0
+  ]
+};
+const useProductVariants = (query2, options) => {
+  const { data, ...rest } = useQuery({
+    queryKey: productVariantsQueryKeys.list(query2),
+    queryFn: async () => await sdk.admin.productVariant.list(query2),
+    ...options
+  });
+  return { ...data, ...rest };
+};
+const useCancelOrderEdit = ({ preview }) => {
+  const { mutateAsync: cancelOrderEdit } = useDraftOrderCancelEdit(preview == null ? void 0 : preview.id);
+  const onCancel = useCallback(async () => {
+    if (!preview) {
+      return true;
+    }
+    let res = false;
+    await cancelOrderEdit(void 0, {
+      onError: (e) => {
+        toast.error(e.message);
+      },
+      onSuccess: () => {
+        res = true;
+      }
+    });
+    return res;
+  }, [preview, cancelOrderEdit]);
+  return { onCancel };
+};
+let IS_REQUEST_RUNNING = false;
+const useInitiateOrderEdit = ({
+  preview
+}) => {
+  const navigate = useNavigate();
+  const { mutateAsync } = useDraftOrderBeginEdit(preview == null ? void 0 : preview.id);
+  useEffect(() => {
+    async function run() {
+      if (IS_REQUEST_RUNNING || !preview) {
+        return;
+      }
+      if (preview.order_change) {
+        return;
+      }
+      IS_REQUEST_RUNNING = true;
+      await mutateAsync(void 0, {
+        onError: (e) => {
+          toast.error(e.message);
+          navigate(`/draft-orders/${preview.id}`, { replace: true });
+          return;
+        }
+      });
+      IS_REQUEST_RUNNING = false;
+    }
+    run();
+  }, [preview, navigate, mutateAsync]);
+};
+function convertNumber(value) {
+  return typeof value === "string" ? Number(value.replace(",", ".")) : value;
+}
+const STACKED_MODAL_ID = "items_stacked_modal";
+const Items = () => {
   const { id } = useParams();
-  const { order, isPending, isError, error } = useOrder(id, {
-    fields: "metadata"
+  const {
+    order: preview,
+    isPending: isPreviewPending,
+    isError: isPreviewError,
+    error: previewError
+  } = useOrderPreview(id, void 0, {
+    placeholderData: keepPreviousData
   });
+  useInitiateOrderEdit({ preview });
+  const { draft_order, isPending, isError, error } = useDraftOrder(
+    id,
+    {
+      fields: "currency_code"
+    },
+    {
+      enabled: !!id
+    }
+  );
+  const { onCancel } = useCancelOrderEdit({ preview });
   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: "Metadata" }) }),
-      /* @__PURE__ */ jsx(RouteDrawer.Description, { asChild: true, children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: "Add metadata to the draft order." }) })
-    ] }),
-    !isReady ? /* @__PURE__ */ jsx(PlaceholderInner, {}) : /* @__PURE__ */ jsx(MetadataForm, { orderId: id, metadata: order == null ? void 0 : order.metadata })
-  ] });
+  if (isPreviewError) {
+    throw previewError;
+  }
+  const ready = !!preview && !isPreviewPending && !!draft_order && !isPending;
+  return /* @__PURE__ */ jsx(RouteFocusModal, { onClose: onCancel, children: ready ? /* @__PURE__ */ jsx(ItemsForm, { preview, currencyCode: draft_order.currency_code }) : /* @__PURE__ */ jsxs("div", { children: [
+    /* @__PURE__ */ jsx(RouteFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: "Edit Items" }) }),
+    /* @__PURE__ */ jsx(RouteFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: "Loading data for the draft order, please wait..." }) })
+  ] }) });
 };
-const METADATA_KEY_LABEL_ID = "metadata-form-key-label";
-const METADATA_VALUE_LABEL_ID = "metadata-form-value-label";
-const MetadataForm = ({ orderId, metadata }) => {
+const ItemsForm = ({ preview, currencyCode }) => {
+  var _a;
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  const [modalContent, setModalContent] = useState(
+    null
+  );
   const { handleSuccess } = useRouteModal();
-  const hasUneditableRows = getHasUneditableRows(metadata);
-  const { mutateAsync, isPending } = useUpdateDraftOrder(orderId);
-  const form = useForm({
-    defaultValues: {
-      metadata: getDefaultValues(metadata)
-    },
-    resolver: zodResolver(MetadataSchema)
-  });
-  const handleSubmit = form.handleSubmit(async (data) => {
-    const parsedData = parseValues(data);
-    await mutateAsync(
-      {
-        metadata: parsedData
+  const { searchValue, onSearchValueChange, query: query2 } = useDebouncedSearch();
+  const { mutateAsync: confirmOrderEdit } = useDraftOrderConfirmEdit(preview.id);
+  const { mutateAsync: requestOrderEdit } = useDraftOrderRequestEdit(preview.id);
+  const itemCount = ((_a = preview.items) == null ? void 0 : _a.reduce((acc, item) => acc + item.quantity, 0)) || 0;
+  const matches = useMemo(() => {
+    return matchSorter(preview.items, query2, {
+      keys: ["product_title", "variant_title", "variant_sku", "title"]
+    });
+  }, [preview.items, query2]);
+  const onSubmit = async () => {
+    setIsSubmitting(true);
+    let requestSucceeded = false;
+    await requestOrderEdit(void 0, {
+      onError: (e) => {
+        toast.error(`Failed to request order edit: ${e.message}`);
       },
-      {
-        onSuccess: () => {
-          toast.success("Metadata updated");
-          handleSuccess();
-        },
-        onError: (error) => {
-          toast.error(error.message);
-        }
+      onSuccess: () => {
+        requestSucceeded = true;
       }
-    );
-  });
-  const { fields, insert, remove } = useFieldArray({
-    control: form.control,
-    name: "metadata"
-  });
-  function deleteRow(index) {
-    remove(index);
-    if (fields.length === 1) {
-      insert(0, {
-        key: "",
-        value: "",
-        disabled: false
-      });
+    });
+    if (!requestSucceeded) {
+      setIsSubmitting(false);
+      return;
     }
-  }
-  function insertRow(index, position) {
-    insert(index + (position === "above" ? 0 : 1), {
-      key: "",
-      value: "",
-      disabled: false
-    });
-  }
-  return /* @__PURE__ */ jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxs(
-    KeyboundForm,
-    {
-      onSubmit: handleSubmit,
-      className: "flex flex-1 flex-col overflow-hidden",
-      children: [
-        /* @__PURE__ */ jsxs(RouteDrawer.Body, { className: "flex flex-1 flex-col gap-y-8 overflow-y-auto", children: [
-          /* @__PURE__ */ jsxs("div", { className: "bg-ui-bg-base shadow-elevation-card-rest grid grid-cols-1 divide-y rounded-lg", children: [
-            /* @__PURE__ */ jsxs("div", { className: "bg-ui-bg-subtle grid grid-cols-2 divide-x rounded-t-lg", children: [
-              /* @__PURE__ */ jsx("div", { className: "txt-compact-small-plus text-ui-fg-subtle px-2 py-1.5", children: /* @__PURE__ */ jsx("label", { id: METADATA_KEY_LABEL_ID, children: "Key" }) }),
-              /* @__PURE__ */ jsx("div", { className: "txt-compact-small-plus text-ui-fg-subtle px-2 py-1.5", children: /* @__PURE__ */ jsx("label", { id: METADATA_VALUE_LABEL_ID, children: "Value" }) })
-            ] }),
-            fields.map((field, index) => {
-              const isDisabled = field.disabled || false;
-              let placeholder = "-";
-              if (typeof field.value === "object") {
-                placeholder = "{ ... }";
-              }
-              if (Array.isArray(field.value)) {
-                placeholder = "[ ... ]";
-              }
-              return /* @__PURE__ */ jsx(
-                ConditionalTooltip,
-                {
-                  showTooltip: isDisabled,
-                  content: "This row is disabled because it contains non-primitive data.",
-                  children: /* @__PURE__ */ jsxs("div", { className: "group/table relative", children: [
-                    /* @__PURE__ */ jsxs(
-                      "div",
-                      {
-                        className: clx("grid grid-cols-2 divide-x", {
-                          "overflow-hidden rounded-b-lg": index === fields.length - 1
-                        }),
-                        children: [
-                          /* @__PURE__ */ jsx(
-                            Form$2.Field,
-                            {
-                              control: form.control,
-                              name: `metadata.${index}.key`,
-                              render: ({ field: field2 }) => {
-                                return /* @__PURE__ */ jsx(Form$2.Item, { children: /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(
-                                  GridInput,
-                                  {
-                                    "aria-labelledby": METADATA_KEY_LABEL_ID,
-                                    ...field2,
-                                    disabled: isDisabled,
-                                    placeholder: "Key"
-                                  }
-                                ) }) });
-                              }
-                            }
-                          ),
-                          /* @__PURE__ */ jsx(
-                            Form$2.Field,
-                            {
-                              control: form.control,
-                              name: `metadata.${index}.value`,
-                              render: ({ field: { value, ...field2 } }) => {
-                                return /* @__PURE__ */ jsx(Form$2.Item, { children: /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(
-                                  GridInput,
-                                  {
-                                    "aria-labelledby": METADATA_VALUE_LABEL_ID,
-                                    ...field2,
-                                    value: isDisabled ? placeholder : value,
-                                    disabled: isDisabled,
-                                    placeholder: "Value"
-                                  }
-                                ) }) });
-                              }
-                            }
-                          )
-                        ]
-                      }
-                    ),
-                    /* @__PURE__ */ jsxs(DropdownMenu, { children: [
-                      /* @__PURE__ */ jsx(
-                        DropdownMenu.Trigger,
-                        {
-                          className: clx(
-                            "invisible absolute inset-y-0 -right-2.5 my-auto group-hover/table:visible data-[state='open']:visible",
-                            {
-                              hidden: isDisabled
-                            }
-                          ),
-                          disabled: isDisabled,
-                          asChild: true,
-                          children: /* @__PURE__ */ jsx(IconButton, { size: "2xsmall", children: /* @__PURE__ */ jsx(EllipsisVertical, {}) })
-                        }
-                      ),
-                      /* @__PURE__ */ jsxs(DropdownMenu.Content, { children: [
-                        /* @__PURE__ */ jsxs(
-                          DropdownMenu.Item,
-                          {
-                            className: "gap-x-2",
-                            onClick: () => insertRow(index, "above"),
-                            children: [
-                              /* @__PURE__ */ jsx(ArrowUpMini, { className: "text-ui-fg-subtle" }),
-                              "Insert row above"
-                            ]
-                          }
-                        ),
-                        /* @__PURE__ */ jsxs(
-                          DropdownMenu.Item,
-                          {
-                            className: "gap-x-2",
-                            onClick: () => insertRow(index, "below"),
-                            children: [
-                              /* @__PURE__ */ jsx(ArrowDownMini, { className: "text-ui-fg-subtle" }),
-                              "Insert row below"
-                            ]
-                          }
-                        ),
-                        /* @__PURE__ */ jsx(DropdownMenu.Separator, {}),
-                        /* @__PURE__ */ jsxs(
-                          DropdownMenu.Item,
-                          {
-                            className: "gap-x-2",
-                            onClick: () => deleteRow(index),
-                            children: [
-                              /* @__PURE__ */ jsx(Trash, { className: "text-ui-fg-subtle" }),
-                              "Delete row"
-                            ]
-                          }
-                        )
-                      ] })
-                    ] })
-                  ] })
-                },
-                field.id
-              );
-            })
-          ] }),
-          hasUneditableRows && /* @__PURE__ */ jsx(InlineTip, { variant: "warning", label: "Some rows are disabled", children: "This object contains non-primitive metadata, such as arrays or objects, that can't be edited here. To edit the disabled rows, use the API directly." })
-        ] }),
-        /* @__PURE__ */ jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-end gap-x-2", children: [
-          /* @__PURE__ */ jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsx(Button, { size: "small", variant: "secondary", type: "button", children: "Cancel" }) }),
-          /* @__PURE__ */ jsx(Button, { size: "small", type: "submit", isLoading: isPending, children: "Save" })
-        ] }) })
-      ]
-    }
-  ) });
-};
-const GridInput = forwardRef(({ className, ...props }, ref) => {
-  return /* @__PURE__ */ jsx(
-    "input",
-    {
-      ref,
-      ...props,
-      autoComplete: "off",
-      className: clx(
-        "txt-compact-small text-ui-fg-base placeholder:text-ui-fg-muted disabled:text-ui-fg-disabled disabled:bg-ui-bg-base bg-transparent px-2 py-1.5 outline-none",
-        className
-      )
-    }
-  );
-});
-GridInput.displayName = "MetadataForm.GridInput";
-const PlaceholderInner = () => {
-  return /* @__PURE__ */ jsxs("div", { className: "flex flex-1 flex-col overflow-hidden", children: [
-    /* @__PURE__ */ jsx(RouteDrawer.Body, { children: /* @__PURE__ */ jsx(Skeleton, { className: "h-[148ox] w-full rounded-lg" }) }),
-    /* @__PURE__ */ jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-end gap-x-2", children: [
-      /* @__PURE__ */ jsx(Skeleton, { className: "h-7 w-12 rounded-md" }),
-      /* @__PURE__ */ jsx(Skeleton, { className: "h-7 w-12 rounded-md" })
-    ] }) })
-  ] });
-};
-const EDITABLE_TYPES = ["string", "number", "boolean"];
-function getDefaultValues(metadata) {
-  if (!metadata || !Object.keys(metadata).length) {
-    return [
-      {
-        key: "",
-        value: "",
-        disabled: false
-      }
-    ];
-  }
-  return Object.entries(metadata).map(([key, value]) => {
-    if (!EDITABLE_TYPES.includes(typeof value)) {
-      return {
-        key,
-        value,
-        disabled: true
-      };
-    }
-    let stringValue = value;
-    if (typeof value !== "string") {
-      stringValue = JSON.stringify(value);
-    }
-    return {
-      key,
-      value: stringValue,
-      original_key: key
-    };
-  });
-}
-function parseValues(values) {
-  const metadata = values.metadata;
-  const isEmpty = !metadata.length || metadata.length === 1 && !metadata[0].key && !metadata[0].value;
-  if (isEmpty) {
-    return null;
-  }
-  const update = {};
-  metadata.forEach((field) => {
-    let key = field.key;
-    let value = field.value;
-    const disabled = field.disabled;
-    if (!key || !value) {
-      return;
-    }
-    if (disabled) {
-      update[key] = value;
-      return;
-    }
-    key = key.trim();
-    value = value.trim();
-    if (value === "true") {
-      update[key] = true;
-    } else if (value === "false") {
-      update[key] = false;
-    } else {
-      const parsedNumber = parseFloat(value);
-      if (!isNaN(parsedNumber)) {
-        update[key] = parsedNumber;
-      } else {
-        update[key] = value;
-      }
-    }
-  });
-  return update;
-}
-function getHasUneditableRows(metadata) {
-  if (!metadata) {
-    return false;
-  }
-  return Object.values(metadata).some(
-    (value) => !EDITABLE_TYPES.includes(typeof value)
-  );
-}
-const NumberInput = forwardRef(
-  ({
-    value,
-    onChange,
-    size = "base",
-    min = 0,
-    max = 100,
-    step = 1,
-    className,
-    disabled,
-    ...props
-  }, ref) => {
-    const handleChange = (event) => {
-      const newValue = event.target.value === "" ? min : Number(event.target.value);
-      if (!isNaN(newValue) && (max === void 0 || newValue <= max) && (min === void 0 || newValue >= min)) {
-        onChange(newValue);
-      }
-    };
-    const handleIncrement = () => {
-      const newValue = value + step;
-      if (max === void 0 || newValue <= max) {
-        onChange(newValue);
-      }
-    };
-    const handleDecrement = () => {
-      const newValue = value - step;
-      if (min === void 0 || newValue >= min) {
-        onChange(newValue);
-      }
-    };
-    return /* @__PURE__ */ jsxs(
-      "div",
-      {
-        className: clx(
-          "inline-flex rounded-md bg-ui-bg-field shadow-borders-base overflow-hidden divide-x transition-fg",
-          "[&:has(input:focus)]:shadow-borders-interactive-with-active",
-          {
-            "h-7": size === "small",
-            "h-8": size === "base"
-          },
-          className
-        ),
-        children: [
-          /* @__PURE__ */ jsx(
-            "input",
-            {
-              ref,
-              type: "number",
-              value,
-              onChange: handleChange,
-              min,
-              max,
-              step,
-              className: clx(
-                "flex-1 px-2 py-1 bg-transparent txt-compact-small text-ui-fg-base outline-none [appearance:textfield]",
-                "[&::-webkit-outer-spin-button]:appearance-none [&::-webkit-inner-spin-button]:appearance-none",
-                "placeholder:text-ui-fg-muted"
-              ),
-              ...props
-            }
-          ),
-          /* @__PURE__ */ jsxs(
-            "button",
-            {
-              className: clx(
-                "flex items-center justify-center outline-none transition-fg",
-                "disabled:cursor-not-allowed disabled:text-ui-fg-muted",
-                "focus:bg-ui-bg-field-component-hover",
-                "hover:bg-ui-bg-field-component-hover",
-                {
-                  "size-7": size === "small",
-                  "size-8": size === "base"
-                }
-              ),
-              type: "button",
-              onClick: handleDecrement,
-              disabled: min !== void 0 && value <= min || disabled,
-              children: [
-                /* @__PURE__ */ jsx(Minus, {}),
-                /* @__PURE__ */ jsx("span", { className: "sr-only", children: `Decrease by ${step}` })
-              ]
-            }
-          ),
-          /* @__PURE__ */ jsxs(
-            "button",
-            {
-              className: clx(
-                "flex items-center justify-center outline-none transition-fg",
-                "disabled:cursor-not-allowed disabled:text-ui-fg-muted",
-                "focus:bg-ui-bg-field-hover",
-                "hover:bg-ui-bg-field-hover",
-                {
-                  "size-7": size === "small",
-                  "size-8": size === "base"
-                }
-              ),
-              type: "button",
-              onClick: handleIncrement,
-              disabled: max !== void 0 && value >= max || disabled,
-              children: [
-                /* @__PURE__ */ jsx(Plus, {}),
-                /* @__PURE__ */ jsx("span", { className: "sr-only", children: `Increase by ${step}` })
-              ]
-            }
-          )
-        ]
-      }
-    );
-  }
-);
-const PRODUCT_VARIANTS_QUERY_KEY = "product-variants";
-const productVariantsQueryKeys = {
-  list: (query2) => [
-    PRODUCT_VARIANTS_QUERY_KEY,
-    query2 ? query2 : void 0
-  ]
-};
-const useProductVariants = (query2, options) => {
-  const { data, ...rest } = useQuery({
-    queryKey: productVariantsQueryKeys.list(query2),
-    queryFn: async () => await sdk.admin.productVariant.list(query2),
-    ...options
-  });
-  return { ...data, ...rest };
-};
-const useCancelOrderEdit = ({ preview }) => {
-  const { mutateAsync: cancelOrderEdit } = useDraftOrderCancelEdit(preview == null ? void 0 : preview.id);
-  const onCancel = useCallback(async () => {
-    if (!preview) {
-      return true;
-    }
-    let res = false;
-    await cancelOrderEdit(void 0, {
-      onError: (e) => {
-        toast.error(e.message);
-      },
-      onSuccess: () => {
-        res = true;
-      }
-    });
-    return res;
-  }, [preview, cancelOrderEdit]);
-  return { onCancel };
-};
-let IS_REQUEST_RUNNING = false;
-const useInitiateOrderEdit = ({
-  preview
-}) => {
-  const navigate = useNavigate();
-  const { mutateAsync } = useDraftOrderBeginEdit(preview == null ? void 0 : preview.id);
-  useEffect(() => {
-    async function run() {
-      if (IS_REQUEST_RUNNING || !preview) {
-        return;
-      }
-      if (preview.order_change) {
-        return;
-      }
-      IS_REQUEST_RUNNING = true;
-      await mutateAsync(void 0, {
-        onError: (e) => {
-          toast.error(e.message);
-          navigate(`/draft-orders/${preview.id}`, { replace: true });
-          return;
-        }
-      });
-      IS_REQUEST_RUNNING = false;
-    }
-    run();
-  }, [preview, navigate, mutateAsync]);
-};
-function convertNumber(value) {
-  return typeof value === "string" ? Number(value.replace(",", ".")) : value;
-}
-const STACKED_MODAL_ID = "items_stacked_modal";
-const Items = () => {
-  const { id } = useParams();
-  const {
-    order: preview,
-    isPending: isPreviewPending,
-    isError: isPreviewError,
-    error: previewError
-  } = useOrderPreview(id, void 0, {
-    placeholderData: keepPreviousData
-  });
-  useInitiateOrderEdit({ preview });
-  const { draft_order, isPending, isError, error } = useDraftOrder(
-    id,
-    {
-      fields: "currency_code"
-    },
-    {
-      enabled: !!id
-    }
-  );
-  const { onCancel } = useCancelOrderEdit({ preview });
-  if (isError) {
-    throw error;
-  }
-  if (isPreviewError) {
-    throw previewError;
-  }
-  const ready = !!preview && !isPreviewPending && !!draft_order && !isPending;
-  return /* @__PURE__ */ jsx(RouteFocusModal, { onClose: onCancel, children: ready ? /* @__PURE__ */ jsx(ItemsForm, { preview, currencyCode: draft_order.currency_code }) : /* @__PURE__ */ jsxs("div", { children: [
-    /* @__PURE__ */ jsx(RouteFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: "Edit Items" }) }),
-    /* @__PURE__ */ jsx(RouteFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: "Loading data for the draft order, please wait..." }) })
-  ] }) });
-};
-const ItemsForm = ({ preview, currencyCode }) => {
-  var _a;
-  const [isSubmitting, setIsSubmitting] = useState(false);
-  const [modalContent, setModalContent] = useState(
-    null
-  );
-  const { handleSuccess } = useRouteModal();
-  const { searchValue, onSearchValueChange, query: query2 } = useDebouncedSearch();
-  const { mutateAsync: confirmOrderEdit } = useDraftOrderConfirmEdit(preview.id);
-  const { mutateAsync: requestOrderEdit } = useDraftOrderRequestEdit(preview.id);
-  const itemCount = ((_a = preview.items) == null ? void 0 : _a.reduce((acc, item) => acc + item.quantity, 0)) || 0;
-  const matches = useMemo(() => {
-    return matchSorter(preview.items, query2, {
-      keys: ["product_title", "variant_title", "variant_sku", "title"]
-    });
-  }, [preview.items, query2]);
-  const onSubmit = async () => {
-    setIsSubmitting(true);
-    let requestSucceeded = false;
-    await requestOrderEdit(void 0, {
-      onError: (e) => {
-        toast.error(`Failed to request order edit: ${e.message}`);
-      },
-      onSuccess: () => {
-        requestSucceeded = true;
-      }
-    });
-    if (!requestSucceeded) {
-      setIsSubmitting(false);
-      return;
-    }
-    await confirmOrderEdit(void 0, {
-      onError: (e) => {
-        toast.error(`Failed to confirm order edit: ${e.message}`);
-      },
-      onSuccess: () => {
-        handleSuccess();
-      },
-      onSettled: () => {
-        setIsSubmitting(false);
-      }
+    await confirmOrderEdit(void 0, {
+      onError: (e) => {
+        toast.error(`Failed to confirm order edit: ${e.message}`);
+      },
+      onSuccess: () => {
+        handleSuccess();
+      },
+      onSettled: () => {
+        setIsSubmitting(false);
+      }
     });
   };
   const onKeyDown = useCallback(
@@ -10398,20 +10238,168 @@ const VariantItem = ({ item, preview, currencyCode }) => {
   const [editing, setEditing] = useState(false);
   const form = useForm({
     defaultValues: {
-      quantity: item.quantity,
-      unit_price: item.unit_price
+      quantity: item.quantity,
+      unit_price: item.unit_price
+    },
+    resolver: zodResolver(variantItemSchema)
+  });
+  const actionId = useMemo(() => {
+    var _a, _b;
+    return (_b = (_a = item.actions) == null ? void 0 : _a.find((a) => a.action === "ITEM_ADD")) == null ? void 0 : _b.id;
+  }, [item]);
+  const { mutateAsync: updateActionItem, isPending: isUpdatingActionItem } = useDraftOrderUpdateActionItem(preview.id);
+  const { mutateAsync: updateOriginalItem, isPending: isUpdatingOriginalItem } = useDraftOrderUpdateItem(preview.id);
+  const isPending = isUpdatingActionItem || isUpdatingOriginalItem;
+  const onSubmit = form.handleSubmit(async (data) => {
+    if (convertNumber(data.unit_price) === item.unit_price && data.quantity === item.quantity) {
+      setEditing(false);
+      return;
+    }
+    if (!actionId) {
+      await updateOriginalItem(
+        {
+          item_id: item.id,
+          quantity: data.quantity,
+          unit_price: convertNumber(data.unit_price)
+        },
+        {
+          onSuccess: () => {
+            setEditing(false);
+          },
+          onError: (e) => {
+            toast.error(e.message);
+          }
+        }
+      );
+      return;
+    }
+    await updateActionItem(
+      {
+        action_id: actionId,
+        quantity: data.quantity,
+        unit_price: convertNumber(data.unit_price)
+      },
+      {
+        onSuccess: () => {
+          setEditing(false);
+        },
+        onError: (e) => {
+          toast.error(e.message);
+        }
+      }
+    );
+  });
+  return /* @__PURE__ */ jsx(Form$2, { ...form, children: /* @__PURE__ */ jsx("form", { onSubmit, children: /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-[minmax(0,1fr)_minmax(0,1fr)_minmax(0,1fr)_28px] 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 w-full", children: [
+      /* @__PURE__ */ jsx(
+        Thumbnail,
+        {
+          thumbnail: item.thumbnail,
+          alt: item.product_title ?? void 0
+        }
+      ),
+      /* @__PURE__ */ jsxs("div", { className: "flex flex-col", children: [
+        /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-x-1", children: [
+          /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", leading: "compact", children: item.product_title }),
+          /* @__PURE__ */ jsxs(
+            Text,
+            {
+              size: "small",
+              leading: "compact",
+              className: "text-ui-fg-subtle",
+              children: [
+                "(",
+                item.variant_title,
+                ")"
+              ]
+            }
+          )
+        ] }),
+        /* @__PURE__ */ jsx(
+          Text,
+          {
+            size: "small",
+            leading: "compact",
+            className: "text-ui-fg-subtle",
+            children: item.variant_sku
+          }
+        )
+      ] })
+    ] }),
+    editing ? /* @__PURE__ */ jsx("div", { className: "flex-1 w-full", children: /* @__PURE__ */ jsx(
+      Form$2.Field,
+      {
+        control: form.control,
+        name: "quantity",
+        render: ({ field }) => {
+          return /* @__PURE__ */ jsx(Form$2.Item, { children: /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(NumberInput, { ...field }) }) });
+        }
+      }
+    ) }) : /* @__PURE__ */ jsx("div", { className: "flex-1 w-full", children: /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", children: item.quantity }) }),
+    editing ? /* @__PURE__ */ jsx("div", { className: "flex-1 w-full", children: /* @__PURE__ */ jsx(
+      Form$2.Field,
+      {
+        control: form.control,
+        name: "unit_price",
+        render: ({ field: { onChange, ...field } }) => {
+          return /* @__PURE__ */ jsx(Form$2.Item, { children: /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(
+            CurrencyInput,
+            {
+              ...field,
+              symbol: getNativeSymbol(currencyCode),
+              code: currencyCode,
+              onValueChange: (_value, _name, values) => onChange(values == null ? void 0 : values.value)
+            }
+          ) }) });
+        }
+      }
+    ) }) : /* @__PURE__ */ jsx("div", { className: "flex-1 flex items-center justify-end w-full", children: /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", children: getLocaleAmount(item.unit_price, currencyCode) }) }),
+    /* @__PURE__ */ jsx(
+      IconButton,
+      {
+        type: "button",
+        size: "small",
+        onClick: editing ? onSubmit : () => {
+          setEditing(true);
+        },
+        disabled: isPending,
+        children: editing ? /* @__PURE__ */ jsx(Check, {}) : /* @__PURE__ */ jsx(PencilSquare, {})
+      }
+    )
+  ] }) }) });
+};
+const variantItemSchema = objectType({
+  quantity: numberType(),
+  unit_price: unionType([numberType(), stringType()])
+});
+const CustomItem = ({ item, preview, currencyCode }) => {
+  const [editing, setEditing] = useState(false);
+  const { quantity, unit_price, title } = item;
+  const form = useForm({
+    defaultValues: {
+      title,
+      quantity,
+      unit_price
     },
-    resolver: zodResolver(variantItemSchema)
+    resolver: zodResolver(customItemSchema)
   });
+  useEffect(() => {
+    form.reset({
+      title,
+      quantity,
+      unit_price
+    });
+  }, [form, title, quantity, unit_price]);
   const actionId = useMemo(() => {
     var _a, _b;
     return (_b = (_a = item.actions) == null ? void 0 : _a.find((a) => a.action === "ITEM_ADD")) == null ? void 0 : _b.id;
   }, [item]);
   const { mutateAsync: updateActionItem, isPending: isUpdatingActionItem } = useDraftOrderUpdateActionItem(preview.id);
+  const { mutateAsync: removeActionItem, isPending: isRemovingActionItem } = useDraftOrderRemoveActionItem(preview.id);
   const { mutateAsync: updateOriginalItem, isPending: isUpdatingOriginalItem } = useDraftOrderUpdateItem(preview.id);
   const isPending = isUpdatingActionItem || isUpdatingOriginalItem;
   const onSubmit = form.handleSubmit(async (data) => {
-    if (convertNumber(data.unit_price) === item.unit_price && data.quantity === item.quantity) {
+    if (convertNumber(data.unit_price) === item.unit_price && data.quantity === item.quantity && data.title === item.title) {
       setEditing(false);
       return;
     }
@@ -10433,6 +10421,17 @@ const VariantItem = ({ item, preview, currencyCode }) => {
       );
       return;
     }
+    if (data.quantity === 0) {
+      await removeActionItem(actionId, {
+        onSuccess: () => {
+          setEditing(false);
+        },
+        onError: (e) => {
+          toast.error(e.message);
+        }
+      });
+      return;
+    }
     await updateActionItem(
       {
         action_id: actionId,
@@ -10450,43 +10449,26 @@ const VariantItem = ({ item, preview, currencyCode }) => {
     );
   });
   return /* @__PURE__ */ jsx(Form$2, { ...form, children: /* @__PURE__ */ jsx("form", { onSubmit, children: /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-[minmax(0,1fr)_minmax(0,1fr)_minmax(0,1fr)_28px] 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 w-full", children: [
+    /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-x-3", children: [
       /* @__PURE__ */ jsx(
         Thumbnail,
         {
           thumbnail: item.thumbnail,
-          alt: item.product_title ?? void 0
+          alt: item.title ?? void 0
         }
       ),
-      /* @__PURE__ */ jsxs("div", { className: "flex flex-col", children: [
-        /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-x-1", children: [
-          /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", leading: "compact", children: item.product_title }),
-          /* @__PURE__ */ jsxs(
-            Text,
-            {
-              size: "small",
-              leading: "compact",
-              className: "text-ui-fg-subtle",
-              children: [
-                "(",
-                item.variant_title,
-                ")"
-              ]
-            }
-          )
-        ] }),
-        /* @__PURE__ */ jsx(
-          Text,
-          {
-            size: "small",
-            leading: "compact",
-            className: "text-ui-fg-subtle",
-            children: item.variant_sku
+      editing ? /* @__PURE__ */ jsx(
+        Form$2.Field,
+        {
+          control: form.control,
+          name: "title",
+          render: ({ field }) => {
+            return /* @__PURE__ */ jsx(Form$2.Item, { children: /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(Input, { ...field }) }) });
           }
-        )
-      ] })
+        }
+      ) : /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", children: item.title })
     ] }),
-    editing ? /* @__PURE__ */ jsx("div", { className: "flex-1 w-full", children: /* @__PURE__ */ jsx(
+    editing ? /* @__PURE__ */ jsx(
       Form$2.Field,
       {
         control: form.control,
@@ -10495,8 +10477,8 @@ const VariantItem = ({ item, preview, currencyCode }) => {
           return /* @__PURE__ */ jsx(Form$2.Item, { children: /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(NumberInput, { ...field }) }) });
         }
       }
-    ) }) : /* @__PURE__ */ jsx("div", { className: "flex-1 w-full", children: /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", children: item.quantity }) }),
-    editing ? /* @__PURE__ */ jsx("div", { className: "flex-1 w-full", children: /* @__PURE__ */ jsx(
+    ) : /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", children: item.quantity }),
+    editing ? /* @__PURE__ */ jsx(
       Form$2.Field,
       {
         control: form.control,
@@ -10513,7 +10495,7 @@ const VariantItem = ({ item, preview, currencyCode }) => {
           ) }) });
         }
       }
-    ) }) : /* @__PURE__ */ jsx("div", { className: "flex-1 flex items-center justify-end w-full", children: /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", children: getLocaleAmount(item.unit_price, currencyCode) }) }),
+    ) : /* @__PURE__ */ jsx("div", { className: "flex-1 flex items-center justify-end", children: /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", children: getLocaleAmount(item.unit_price, currencyCode) }) }),
     /* @__PURE__ */ jsx(
       IconButton,
       {
@@ -10522,85 +10504,221 @@ const VariantItem = ({ item, preview, currencyCode }) => {
         onClick: editing ? onSubmit : () => {
           setEditing(true);
         },
-        disabled: isPending,
-        children: editing ? /* @__PURE__ */ jsx(Check, {}) : /* @__PURE__ */ jsx(PencilSquare, {})
-      }
-    )
-  ] }) }) });
+        disabled: isPending,
+        children: editing ? /* @__PURE__ */ jsx(Check, {}) : /* @__PURE__ */ jsx(PencilSquare, {})
+      }
+    )
+  ] }) }) });
+};
+const StackedModalTrigger$1 = ({
+  type,
+  setModalContent
+}) => {
+  const { setIsOpen } = useStackedModal();
+  const onClick = useCallback(() => {
+    setModalContent(type);
+    setIsOpen(STACKED_MODAL_ID, true);
+  }, [setModalContent, setIsOpen, type]);
+  return /* @__PURE__ */ jsx(StackedFocusModal.Trigger, { asChild: true, children: /* @__PURE__ */ jsx(DropdownMenu.Item, { onClick, children: type === "add-items" ? "Add items" : "Add custom item" }) });
+};
+const VARIANT_PREFIX = "items";
+const LIMIT = 50;
+const ExistingItemsForm = ({ orderId, items }) => {
+  const { setIsOpen } = useStackedModal();
+  const [rowSelection, setRowSelection] = useState(
+    items.reduce((acc, item) => {
+      acc[item.variant_id] = true;
+      return acc;
+    }, {})
+  );
+  useEffect(() => {
+    setRowSelection(
+      items.reduce((acc, item) => {
+        if (item.variant_id) {
+          acc[item.variant_id] = true;
+        }
+        return acc;
+      }, {})
+    );
+  }, [items]);
+  const { q, order, offset } = useQueryParams(
+    ["q", "order", "offset"],
+    VARIANT_PREFIX
+  );
+  const { variants, count, isPending, isError, error } = useProductVariants(
+    {
+      q,
+      order,
+      offset: offset ? parseInt(offset) : void 0,
+      limit: LIMIT
+    },
+    {
+      placeholderData: keepPreviousData
+    }
+  );
+  const columns = useColumns();
+  const { mutateAsync } = useDraftOrderAddItems(orderId);
+  const onSubmit = async () => {
+    const ids = Object.keys(rowSelection).filter(
+      (id) => !items.find((i) => i.variant_id === id)
+    );
+    await mutateAsync(
+      {
+        items: ids.map((id) => ({
+          variant_id: id,
+          quantity: 1
+        }))
+      },
+      {
+        onSuccess: () => {
+          setRowSelection({});
+          setIsOpen(STACKED_MODAL_ID, false);
+        },
+        onError: (e) => {
+          toast.error(e.message);
+        }
+      }
+    );
+  };
+  if (isError) {
+    throw error;
+  }
+  return /* @__PURE__ */ jsxs(
+    StackedFocusModal.Content,
+    {
+      onOpenAutoFocus: (e) => {
+        e.preventDefault();
+        const searchInput = document.querySelector(
+          "[data-modal-id='modal-search-input']"
+        );
+        if (searchInput) {
+          searchInput.focus();
+        }
+      },
+      children: [
+        /* @__PURE__ */ jsxs(StackedFocusModal.Header, { children: [
+          /* @__PURE__ */ jsx(StackedFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: "Product Variants" }) }),
+          /* @__PURE__ */ jsx(StackedFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: "Choose product variants to add to the order." }) })
+        ] }),
+        /* @__PURE__ */ jsx(StackedFocusModal.Body, { className: "flex-1 overflow-hidden", children: /* @__PURE__ */ jsx(
+          DataTable,
+          {
+            data: variants,
+            columns,
+            isLoading: isPending,
+            getRowId: (row) => row.id,
+            rowCount: count,
+            prefix: VARIANT_PREFIX,
+            layout: "fill",
+            rowSelection: {
+              state: rowSelection,
+              onRowSelectionChange: setRowSelection,
+              enableRowSelection: (row) => {
+                return !items.find((i) => i.variant_id === row.original.id);
+              }
+            },
+            autoFocusSearch: true
+          }
+        ) }),
+        /* @__PURE__ */ jsx(StackedFocusModal.Footer, { children: /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-x-2 justify-end", children: [
+          /* @__PURE__ */ jsx(StackedFocusModal.Close, { asChild: true, children: /* @__PURE__ */ jsx(Button, { size: "small", variant: "secondary", type: "button", children: "Cancel" }) }),
+          /* @__PURE__ */ jsx(Button, { size: "small", type: "button", onClick: onSubmit, children: "Update items" })
+        ] }) })
+      ]
+    }
+  );
+};
+const columnHelper = createDataTableColumnHelper();
+const useColumns = () => {
+  return useMemo(() => {
+    return [
+      columnHelper.select(),
+      columnHelper.accessor("product.title", {
+        header: "Product",
+        cell: ({ row }) => {
+          var _a, _b, _c;
+          return /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-x-2", children: [
+            /* @__PURE__ */ jsx(
+              Thumbnail,
+              {
+                thumbnail: (_a = row.original.product) == null ? void 0 : _a.thumbnail,
+                alt: (_b = row.original.product) == null ? void 0 : _b.title
+              }
+            ),
+            /* @__PURE__ */ jsx("span", { children: (_c = row.original.product) == null ? void 0 : _c.title })
+          ] });
+        },
+        enableSorting: true
+      }),
+      columnHelper.accessor("title", {
+        header: "Variant",
+        enableSorting: true
+      }),
+      columnHelper.accessor("sku", {
+        header: "SKU",
+        cell: ({ getValue }) => {
+          return getValue() ?? "-";
+        },
+        enableSorting: true
+      }),
+      columnHelper.accessor("updated_at", {
+        header: "Updated",
+        cell: ({ getValue }) => {
+          return /* @__PURE__ */ jsx(
+            Tooltip,
+            {
+              content: getFullDate({ date: getValue(), includeTime: true }),
+              children: /* @__PURE__ */ jsx("span", { children: getFullDate({ date: getValue() }) })
+            }
+          );
+        },
+        enableSorting: true,
+        sortAscLabel: "Oldest first",
+        sortDescLabel: "Newest first"
+      }),
+      columnHelper.accessor("created_at", {
+        header: "Created",
+        cell: ({ getValue }) => {
+          return /* @__PURE__ */ jsx(
+            Tooltip,
+            {
+              content: getFullDate({ date: getValue(), includeTime: true }),
+              children: /* @__PURE__ */ jsx("span", { children: getFullDate({ date: getValue() }) })
+            }
+          );
+        },
+        enableSorting: true,
+        sortAscLabel: "Oldest first",
+        sortDescLabel: "Newest first"
+      })
+    ];
+  }, []);
 };
-const variantItemSchema = objectType({
-  quantity: numberType(),
-  unit_price: unionType([numberType(), stringType()])
-});
-const CustomItem = ({ item, preview, currencyCode }) => {
-  const [editing, setEditing] = useState(false);
-  const { quantity, unit_price, title } = item;
+const CustomItemForm = ({ orderId, currencyCode }) => {
+  const { setIsOpen } = useStackedModal();
+  const { mutateAsync: addItems } = useDraftOrderAddItems(orderId);
   const form = useForm({
     defaultValues: {
-      title,
-      quantity,
-      unit_price
+      title: "",
+      quantity: 1,
+      unit_price: ""
     },
     resolver: zodResolver(customItemSchema)
   });
-  useEffect(() => {
-    form.reset({
-      title,
-      quantity,
-      unit_price
-    });
-  }, [form, title, quantity, unit_price]);
-  const actionId = useMemo(() => {
-    var _a, _b;
-    return (_b = (_a = item.actions) == null ? void 0 : _a.find((a) => a.action === "ITEM_ADD")) == null ? void 0 : _b.id;
-  }, [item]);
-  const { mutateAsync: updateActionItem, isPending: isUpdatingActionItem } = useDraftOrderUpdateActionItem(preview.id);
-  const { mutateAsync: removeActionItem, isPending: isRemovingActionItem } = useDraftOrderRemoveActionItem(preview.id);
-  const { mutateAsync: updateOriginalItem, isPending: isUpdatingOriginalItem } = useDraftOrderUpdateItem(preview.id);
-  const isPending = isUpdatingActionItem || isUpdatingOriginalItem;
   const onSubmit = form.handleSubmit(async (data) => {
-    if (convertNumber(data.unit_price) === item.unit_price && data.quantity === item.quantity && data.title === item.title) {
-      setEditing(false);
-      return;
-    }
-    if (!actionId) {
-      await updateOriginalItem(
-        {
-          item_id: item.id,
-          quantity: data.quantity,
-          unit_price: convertNumber(data.unit_price)
-        },
-        {
-          onSuccess: () => {
-            setEditing(false);
-          },
-          onError: (e) => {
-            toast.error(e.message);
-          }
-        }
-      );
-      return;
-    }
-    if (data.quantity === 0) {
-      await removeActionItem(actionId, {
-        onSuccess: () => {
-          setEditing(false);
-        },
-        onError: (e) => {
-          toast.error(e.message);
-        }
-      });
-      return;
-    }
-    await updateActionItem(
+    await addItems(
       {
-        action_id: actionId,
-        quantity: data.quantity,
-        unit_price: convertNumber(data.unit_price)
+        items: [
+          {
+            title: data.title,
+            quantity: data.quantity,
+            unit_price: convertNumber(data.unit_price)
+          }
+        ]
       },
       {
         onSuccess: () => {
-          setEditing(false);
+          setIsOpen(STACKED_MODAL_ID, false);
         },
         onError: (e) => {
           toast.error(e.message);
@@ -10608,365 +10726,437 @@ const CustomItem = ({ item, preview, currencyCode }) => {
       }
     );
   });
-  return /* @__PURE__ */ jsx(Form$2, { ...form, children: /* @__PURE__ */ jsx("form", { onSubmit, children: /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-[minmax(0,1fr)_minmax(0,1fr)_minmax(0,1fr)_28px] 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: [
+  return /* @__PURE__ */ jsx(Form$2, { ...form, children: /* @__PURE__ */ jsx(KeyboundForm, { onSubmit, children: /* @__PURE__ */ jsxs(StackedFocusModal.Content, { 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-2 py-16", children: [
+      /* @__PURE__ */ jsxs("div", { children: [
+        /* @__PURE__ */ jsx(StackedFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsx(Heading, { children: "Add custom item" }) }),
+        /* @__PURE__ */ jsx(StackedFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsx(Text, { size: "small", className: "text-ui-fg-subtle", children: "Add a custom item to the order. This will add a new line item that is not associated with an existing product." }) })
+      ] }),
+      /* @__PURE__ */ jsx(Divider, { variant: "dashed" }),
       /* @__PURE__ */ jsx(
-        Thumbnail,
+        Form$2.Field,
         {
-          thumbnail: item.thumbnail,
-          alt: item.title ?? void 0
+          control: form.control,
+          name: "title",
+          render: ({ field }) => /* @__PURE__ */ jsx(Form$2.Item, { children: /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
+            /* @__PURE__ */ jsxs("div", { children: [
+              /* @__PURE__ */ jsx(Form$2.Label, { children: "Title" }),
+              /* @__PURE__ */ jsx(Form$2.Hint, { children: "Enter the title of the item" })
+            ] }),
+            /* @__PURE__ */ jsxs("div", { children: [
+              /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(Input, { ...field }) }),
+              /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
+            ] })
+          ] }) })
         }
       ),
-      editing ? /* @__PURE__ */ jsx(
+      /* @__PURE__ */ jsx(Divider, { variant: "dashed" }),
+      /* @__PURE__ */ jsx(
         Form$2.Field,
         {
           control: form.control,
-          name: "title",
-          render: ({ field }) => {
-            return /* @__PURE__ */ jsx(Form$2.Item, { children: /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(Input, { ...field }) }) });
-          }
-        }
-      ) : /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", children: item.title })
-    ] }),
-    editing ? /* @__PURE__ */ jsx(
-      Form$2.Field,
-      {
-        control: form.control,
-        name: "quantity",
-        render: ({ field }) => {
-          return /* @__PURE__ */ jsx(Form$2.Item, { children: /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(NumberInput, { ...field }) }) });
+          name: "unit_price",
+          render: ({ field: { onChange, ...field } }) => /* @__PURE__ */ jsx(Form$2.Item, { children: /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
+            /* @__PURE__ */ jsxs("div", { children: [
+              /* @__PURE__ */ jsx(Form$2.Label, { children: "Unit price" }),
+              /* @__PURE__ */ jsx(Form$2.Hint, { children: "Enter the unit price of the item" })
+            ] }),
+            /* @__PURE__ */ jsxs("div", { children: [
+              /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(
+                CurrencyInput,
+                {
+                  symbol: getNativeSymbol(currencyCode),
+                  code: currencyCode,
+                  onValueChange: (_value, _name, values) => onChange(values == null ? void 0 : values.value),
+                  ...field
+                }
+              ) }),
+              /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
+            ] })
+          ] }) })
         }
-      }
-    ) : /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", children: item.quantity }),
-    editing ? /* @__PURE__ */ jsx(
-      Form$2.Field,
-      {
-        control: form.control,
-        name: "unit_price",
-        render: ({ field: { onChange, ...field } }) => {
-          return /* @__PURE__ */ jsx(Form$2.Item, { children: /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(
-            CurrencyInput,
-            {
-              ...field,
-              symbol: getNativeSymbol(currencyCode),
-              code: currencyCode,
-              onValueChange: (_value, _name, values) => onChange(values == null ? void 0 : values.value)
-            }
-          ) }) });
+      ),
+      /* @__PURE__ */ jsx(Divider, { variant: "dashed" }),
+      /* @__PURE__ */ jsx(
+        Form$2.Field,
+        {
+          control: form.control,
+          name: "quantity",
+          render: ({ field }) => /* @__PURE__ */ jsx(Form$2.Item, { children: /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
+            /* @__PURE__ */ jsxs("div", { children: [
+              /* @__PURE__ */ jsx(Form$2.Label, { children: "Quantity" }),
+              /* @__PURE__ */ jsx(Form$2.Hint, { children: "Enter the quantity of the item" })
+            ] }),
+            /* @__PURE__ */ jsxs("div", { className: "flex-1 w-full", children: [
+              /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx("div", { className: "flex-1 w-full", children: /* @__PURE__ */ jsx(NumberInput, { ...field, className: "w-full" }) }) }),
+              /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
+            ] })
+          ] }) })
         }
-      }
-    ) : /* @__PURE__ */ jsx("div", { className: "flex-1 flex items-center justify-end", children: /* @__PURE__ */ jsx(Text, { size: "small", weight: "plus", children: getLocaleAmount(item.unit_price, currencyCode) }) }),
-    /* @__PURE__ */ jsx(
-      IconButton,
-      {
-        type: "button",
-        size: "small",
-        onClick: editing ? onSubmit : () => {
-          setEditing(true);
-        },
-        disabled: isPending,
-        children: editing ? /* @__PURE__ */ jsx(Check, {}) : /* @__PURE__ */ jsx(PencilSquare, {})
-      }
-    )
+      )
+    ] }) }) }),
+    /* @__PURE__ */ jsx(StackedFocusModal.Footer, { children: /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-x-2 justify-end", children: [
+      /* @__PURE__ */ jsx(StackedFocusModal.Close, { asChild: true, children: /* @__PURE__ */ jsx(Button, { size: "small", variant: "secondary", type: "button", children: "Cancel" }) }),
+      /* @__PURE__ */ jsx(Button, { size: "small", type: "button", onClick: onSubmit, children: "Add item" })
+    ] }) })
   ] }) }) });
 };
-const StackedModalTrigger$1 = ({
-  type,
-  setModalContent
-}) => {
-  const { setIsOpen } = useStackedModal();
-  const onClick = useCallback(() => {
-    setModalContent(type);
-    setIsOpen(STACKED_MODAL_ID, true);
-  }, [setModalContent, setIsOpen, type]);
-  return /* @__PURE__ */ jsx(StackedFocusModal.Trigger, { asChild: true, children: /* @__PURE__ */ jsx(DropdownMenu.Item, { onClick, children: type === "add-items" ? "Add items" : "Add custom item" }) });
-};
-const VARIANT_PREFIX = "items";
-const LIMIT = 50;
-const ExistingItemsForm = ({ orderId, items }) => {
-  const { setIsOpen } = useStackedModal();
-  const [rowSelection, setRowSelection] = useState(
-    items.reduce((acc, item) => {
-      acc[item.variant_id] = true;
-      return acc;
-    }, {})
-  );
-  useEffect(() => {
-    setRowSelection(
-      items.reduce((acc, item) => {
-        if (item.variant_id) {
-          acc[item.variant_id] = true;
-        }
-        return acc;
-      }, {})
+const customItemSchema = objectType({
+  title: stringType().min(1),
+  quantity: numberType(),
+  unit_price: unionType([numberType(), stringType()])
+});
+const InlineTip = forwardRef(
+  ({ variant = "tip", label, className, children, ...props }, ref) => {
+    const labelValue = label || (variant === "warning" ? "Warning" : "Tip");
+    return /* @__PURE__ */ jsxs(
+      "div",
+      {
+        ref,
+        className: clx(
+          "bg-ui-bg-component txt-small text-ui-fg-subtle grid grid-cols-[4px_1fr] items-start gap-3 rounded-lg border p-3",
+          className
+        ),
+        ...props,
+        children: [
+          /* @__PURE__ */ jsx(
+            "div",
+            {
+              role: "presentation",
+              className: clx("w-4px bg-ui-tag-neutral-icon h-full rounded-full", {
+                "bg-ui-tag-orange-icon": variant === "warning"
+              })
+            }
+          ),
+          /* @__PURE__ */ jsxs("div", { className: "text-pretty", children: [
+            /* @__PURE__ */ jsxs("strong", { className: "txt-small-plus text-ui-fg-base", children: [
+              labelValue,
+              ":"
+            ] }),
+            " ",
+            children
+          ] })
+        ]
+      }
     );
-  }, [items]);
-  const { q, order, offset } = useQueryParams(
-    ["q", "order", "offset"],
-    VARIANT_PREFIX
-  );
-  const { variants, count, isPending, isError, error } = useProductVariants(
-    {
-      q,
-      order,
-      offset: offset ? parseInt(offset) : void 0,
-      limit: LIMIT
+  }
+);
+InlineTip.displayName = "InlineTip";
+const MetadataFieldSchema = objectType({
+  key: stringType(),
+  disabled: booleanType().optional(),
+  value: anyType()
+});
+const MetadataSchema = objectType({
+  metadata: arrayType(MetadataFieldSchema)
+});
+const Metadata = () => {
+  const { id } = useParams();
+  const { order, isPending, isError, error } = useOrder(id, {
+    fields: "metadata"
+  });
+  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: "Metadata" }) }),
+      /* @__PURE__ */ jsx(RouteDrawer.Description, { asChild: true, children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: "Add metadata to the draft order." }) })
+    ] }),
+    !isReady ? /* @__PURE__ */ jsx(PlaceholderInner, {}) : /* @__PURE__ */ jsx(MetadataForm, { orderId: id, metadata: order == null ? void 0 : order.metadata })
+  ] });
+};
+const METADATA_KEY_LABEL_ID = "metadata-form-key-label";
+const METADATA_VALUE_LABEL_ID = "metadata-form-value-label";
+const MetadataForm = ({ orderId, metadata }) => {
+  const { handleSuccess } = useRouteModal();
+  const hasUneditableRows = getHasUneditableRows(metadata);
+  const { mutateAsync, isPending } = useUpdateDraftOrder(orderId);
+  const form = useForm({
+    defaultValues: {
+      metadata: getDefaultValues(metadata)
     },
-    {
-      placeholderData: keepPreviousData
-    }
-  );
-  const columns = useColumns();
-  const { mutateAsync } = useDraftOrderAddItems(orderId);
-  const onSubmit = async () => {
-    const ids = Object.keys(rowSelection).filter(
-      (id) => !items.find((i) => i.variant_id === id)
-    );
+    resolver: zodResolver(MetadataSchema)
+  });
+  const handleSubmit = form.handleSubmit(async (data) => {
+    const parsedData = parseValues(data);
     await mutateAsync(
       {
-        items: ids.map((id) => ({
-          variant_id: id,
-          quantity: 1
-        }))
+        metadata: parsedData
       },
       {
         onSuccess: () => {
-          setRowSelection({});
-          setIsOpen(STACKED_MODAL_ID, false);
+          toast.success("Metadata updated");
+          handleSuccess();
         },
-        onError: (e) => {
-          toast.error(e.message);
+        onError: (error) => {
+          toast.error(error.message);
         }
       }
     );
-  };
-  if (isError) {
-    throw error;
+  });
+  const { fields, insert, remove } = useFieldArray({
+    control: form.control,
+    name: "metadata"
+  });
+  function deleteRow(index) {
+    remove(index);
+    if (fields.length === 1) {
+      insert(0, {
+        key: "",
+        value: "",
+        disabled: false
+      });
+    }
   }
-  return /* @__PURE__ */ jsxs(
-    StackedFocusModal.Content,
+  function insertRow(index, position) {
+    insert(index + (position === "above" ? 0 : 1), {
+      key: "",
+      value: "",
+      disabled: false
+    });
+  }
+  return /* @__PURE__ */ jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxs(
+    KeyboundForm,
     {
-      onOpenAutoFocus: (e) => {
-        e.preventDefault();
-        const searchInput = document.querySelector(
-          "[data-modal-id='modal-search-input']"
-        );
-        if (searchInput) {
-          searchInput.focus();
-        }
-      },
+      onSubmit: handleSubmit,
+      className: "flex flex-1 flex-col overflow-hidden",
       children: [
-        /* @__PURE__ */ jsxs(StackedFocusModal.Header, { children: [
-          /* @__PURE__ */ jsx(StackedFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: "Product Variants" }) }),
-          /* @__PURE__ */ jsx(StackedFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsx("span", { className: "sr-only", children: "Choose product variants to add to the order." }) })
+        /* @__PURE__ */ jsxs(RouteDrawer.Body, { className: "flex flex-1 flex-col gap-y-8 overflow-y-auto", children: [
+          /* @__PURE__ */ jsxs("div", { className: "bg-ui-bg-base shadow-elevation-card-rest grid grid-cols-1 divide-y rounded-lg", children: [
+            /* @__PURE__ */ jsxs("div", { className: "bg-ui-bg-subtle grid grid-cols-2 divide-x rounded-t-lg", children: [
+              /* @__PURE__ */ jsx("div", { className: "txt-compact-small-plus text-ui-fg-subtle px-2 py-1.5", children: /* @__PURE__ */ jsx("label", { id: METADATA_KEY_LABEL_ID, children: "Key" }) }),
+              /* @__PURE__ */ jsx("div", { className: "txt-compact-small-plus text-ui-fg-subtle px-2 py-1.5", children: /* @__PURE__ */ jsx("label", { id: METADATA_VALUE_LABEL_ID, children: "Value" }) })
+            ] }),
+            fields.map((field, index) => {
+              const isDisabled = field.disabled || false;
+              let placeholder = "-";
+              if (typeof field.value === "object") {
+                placeholder = "{ ... }";
+              }
+              if (Array.isArray(field.value)) {
+                placeholder = "[ ... ]";
+              }
+              return /* @__PURE__ */ jsx(
+                ConditionalTooltip,
+                {
+                  showTooltip: isDisabled,
+                  content: "This row is disabled because it contains non-primitive data.",
+                  children: /* @__PURE__ */ jsxs("div", { className: "group/table relative", children: [
+                    /* @__PURE__ */ jsxs(
+                      "div",
+                      {
+                        className: clx("grid grid-cols-2 divide-x", {
+                          "overflow-hidden rounded-b-lg": index === fields.length - 1
+                        }),
+                        children: [
+                          /* @__PURE__ */ jsx(
+                            Form$2.Field,
+                            {
+                              control: form.control,
+                              name: `metadata.${index}.key`,
+                              render: ({ field: field2 }) => {
+                                return /* @__PURE__ */ jsx(Form$2.Item, { children: /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(
+                                  GridInput,
+                                  {
+                                    "aria-labelledby": METADATA_KEY_LABEL_ID,
+                                    ...field2,
+                                    disabled: isDisabled,
+                                    placeholder: "Key"
+                                  }
+                                ) }) });
+                              }
+                            }
+                          ),
+                          /* @__PURE__ */ jsx(
+                            Form$2.Field,
+                            {
+                              control: form.control,
+                              name: `metadata.${index}.value`,
+                              render: ({ field: { value, ...field2 } }) => {
+                                return /* @__PURE__ */ jsx(Form$2.Item, { children: /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(
+                                  GridInput,
+                                  {
+                                    "aria-labelledby": METADATA_VALUE_LABEL_ID,
+                                    ...field2,
+                                    value: isDisabled ? placeholder : value,
+                                    disabled: isDisabled,
+                                    placeholder: "Value"
+                                  }
+                                ) }) });
+                              }
+                            }
+                          )
+                        ]
+                      }
+                    ),
+                    /* @__PURE__ */ jsxs(DropdownMenu, { children: [
+                      /* @__PURE__ */ jsx(
+                        DropdownMenu.Trigger,
+                        {
+                          className: clx(
+                            "invisible absolute inset-y-0 -right-2.5 my-auto group-hover/table:visible data-[state='open']:visible",
+                            {
+                              hidden: isDisabled
+                            }
+                          ),
+                          disabled: isDisabled,
+                          asChild: true,
+                          children: /* @__PURE__ */ jsx(IconButton, { size: "2xsmall", children: /* @__PURE__ */ jsx(EllipsisVertical, {}) })
+                        }
+                      ),
+                      /* @__PURE__ */ jsxs(DropdownMenu.Content, { children: [
+                        /* @__PURE__ */ jsxs(
+                          DropdownMenu.Item,
+                          {
+                            className: "gap-x-2",
+                            onClick: () => insertRow(index, "above"),
+                            children: [
+                              /* @__PURE__ */ jsx(ArrowUpMini, { className: "text-ui-fg-subtle" }),
+                              "Insert row above"
+                            ]
+                          }
+                        ),
+                        /* @__PURE__ */ jsxs(
+                          DropdownMenu.Item,
+                          {
+                            className: "gap-x-2",
+                            onClick: () => insertRow(index, "below"),
+                            children: [
+                              /* @__PURE__ */ jsx(ArrowDownMini, { className: "text-ui-fg-subtle" }),
+                              "Insert row below"
+                            ]
+                          }
+                        ),
+                        /* @__PURE__ */ jsx(DropdownMenu.Separator, {}),
+                        /* @__PURE__ */ jsxs(
+                          DropdownMenu.Item,
+                          {
+                            className: "gap-x-2",
+                            onClick: () => deleteRow(index),
+                            children: [
+                              /* @__PURE__ */ jsx(Trash, { className: "text-ui-fg-subtle" }),
+                              "Delete row"
+                            ]
+                          }
+                        )
+                      ] })
+                    ] })
+                  ] })
+                },
+                field.id
+              );
+            })
+          ] }),
+          hasUneditableRows && /* @__PURE__ */ jsx(InlineTip, { variant: "warning", label: "Some rows are disabled", children: "This object contains non-primitive metadata, such as arrays or objects, that can't be edited here. To edit the disabled rows, use the API directly." })
         ] }),
-        /* @__PURE__ */ jsx(StackedFocusModal.Body, { className: "flex-1 overflow-hidden", children: /* @__PURE__ */ jsx(
-          DataTable,
-          {
-            data: variants,
-            columns,
-            isLoading: isPending,
-            getRowId: (row) => row.id,
-            rowCount: count,
-            prefix: VARIANT_PREFIX,
-            layout: "fill",
-            rowSelection: {
-              state: rowSelection,
-              onRowSelectionChange: setRowSelection,
-              enableRowSelection: (row) => {
-                return !items.find((i) => i.variant_id === row.original.id);
-              }
-            },
-            autoFocusSearch: true
-          }
-        ) }),
-        /* @__PURE__ */ jsx(StackedFocusModal.Footer, { children: /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-x-2 justify-end", children: [
-          /* @__PURE__ */ jsx(StackedFocusModal.Close, { asChild: true, children: /* @__PURE__ */ jsx(Button, { size: "small", variant: "secondary", type: "button", children: "Cancel" }) }),
-          /* @__PURE__ */ jsx(Button, { size: "small", type: "button", onClick: onSubmit, children: "Update items" })
+        /* @__PURE__ */ jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-end gap-x-2", children: [
+          /* @__PURE__ */ jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsx(Button, { size: "small", variant: "secondary", type: "button", children: "Cancel" }) }),
+          /* @__PURE__ */ jsx(Button, { size: "small", type: "submit", isLoading: isPending, children: "Save" })
         ] }) })
       ]
     }
+  ) });
+};
+const GridInput = forwardRef(({ className, ...props }, ref) => {
+  return /* @__PURE__ */ jsx(
+    "input",
+    {
+      ref,
+      ...props,
+      autoComplete: "off",
+      className: clx(
+        "txt-compact-small text-ui-fg-base placeholder:text-ui-fg-muted disabled:text-ui-fg-disabled disabled:bg-ui-bg-base bg-transparent px-2 py-1.5 outline-none",
+        className
+      )
+    }
   );
+});
+GridInput.displayName = "MetadataForm.GridInput";
+const PlaceholderInner = () => {
+  return /* @__PURE__ */ jsxs("div", { className: "flex flex-1 flex-col overflow-hidden", children: [
+    /* @__PURE__ */ jsx(RouteDrawer.Body, { children: /* @__PURE__ */ jsx(Skeleton, { className: "h-[148ox] w-full rounded-lg" }) }),
+    /* @__PURE__ */ jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxs("div", { className: "flex items-center justify-end gap-x-2", children: [
+      /* @__PURE__ */ jsx(Skeleton, { className: "h-7 w-12 rounded-md" }),
+      /* @__PURE__ */ jsx(Skeleton, { className: "h-7 w-12 rounded-md" })
+    ] }) })
+  ] });
 };
-const columnHelper = createDataTableColumnHelper();
-const useColumns = () => {
-  return useMemo(() => {
+const EDITABLE_TYPES = ["string", "number", "boolean"];
+function getDefaultValues(metadata) {
+  if (!metadata || !Object.keys(metadata).length) {
     return [
-      columnHelper.select(),
-      columnHelper.accessor("product.title", {
-        header: "Product",
-        cell: ({ row }) => {
-          var _a, _b, _c;
-          return /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-x-2", children: [
-            /* @__PURE__ */ jsx(
-              Thumbnail,
-              {
-                thumbnail: (_a = row.original.product) == null ? void 0 : _a.thumbnail,
-                alt: (_b = row.original.product) == null ? void 0 : _b.title
-              }
-            ),
-            /* @__PURE__ */ jsx("span", { children: (_c = row.original.product) == null ? void 0 : _c.title })
-          ] });
-        },
-        enableSorting: true
-      }),
-      columnHelper.accessor("title", {
-        header: "Variant",
-        enableSorting: true
-      }),
-      columnHelper.accessor("sku", {
-        header: "SKU",
-        cell: ({ getValue }) => {
-          return getValue() ?? "-";
-        },
-        enableSorting: true
-      }),
-      columnHelper.accessor("updated_at", {
-        header: "Updated",
-        cell: ({ getValue }) => {
-          return /* @__PURE__ */ jsx(
-            Tooltip,
-            {
-              content: getFullDate({ date: getValue(), includeTime: true }),
-              children: /* @__PURE__ */ jsx("span", { children: getFullDate({ date: getValue() }) })
-            }
-          );
-        },
-        enableSorting: true,
-        sortAscLabel: "Oldest first",
-        sortDescLabel: "Newest first"
-      }),
-      columnHelper.accessor("created_at", {
-        header: "Created",
-        cell: ({ getValue }) => {
-          return /* @__PURE__ */ jsx(
-            Tooltip,
-            {
-              content: getFullDate({ date: getValue(), includeTime: true }),
-              children: /* @__PURE__ */ jsx("span", { children: getFullDate({ date: getValue() }) })
-            }
-          );
-        },
-        enableSorting: true,
-        sortAscLabel: "Oldest first",
-        sortDescLabel: "Newest first"
-      })
-    ];
-  }, []);
-};
-const CustomItemForm = ({ orderId, currencyCode }) => {
-  const { setIsOpen } = useStackedModal();
-  const { mutateAsync: addItems } = useDraftOrderAddItems(orderId);
-  const form = useForm({
-    defaultValues: {
-      title: "",
-      quantity: 1,
-      unit_price: ""
-    },
-    resolver: zodResolver(customItemSchema)
-  });
-  const onSubmit = form.handleSubmit(async (data) => {
-    await addItems(
-      {
-        items: [
-          {
-            title: data.title,
-            quantity: data.quantity,
-            unit_price: convertNumber(data.unit_price)
-          }
-        ]
-      },
       {
-        onSuccess: () => {
-          setIsOpen(STACKED_MODAL_ID, false);
-        },
-        onError: (e) => {
-          toast.error(e.message);
-        }
+        key: "",
+        value: "",
+        disabled: false
       }
-    );
+    ];
+  }
+  return Object.entries(metadata).map(([key, value]) => {
+    if (!EDITABLE_TYPES.includes(typeof value)) {
+      return {
+        key,
+        value,
+        disabled: true
+      };
+    }
+    let stringValue = value;
+    if (typeof value !== "string") {
+      stringValue = JSON.stringify(value);
+    }
+    return {
+      key,
+      value: stringValue,
+      original_key: key
+    };
   });
-  return /* @__PURE__ */ jsx(Form$2, { ...form, children: /* @__PURE__ */ jsx(KeyboundForm, { onSubmit, children: /* @__PURE__ */ jsxs(StackedFocusModal.Content, { 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-2 py-16", children: [
-      /* @__PURE__ */ jsxs("div", { children: [
-        /* @__PURE__ */ jsx(StackedFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsx(Heading, { children: "Add custom item" }) }),
-        /* @__PURE__ */ jsx(StackedFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsx(Text, { size: "small", className: "text-ui-fg-subtle", children: "Add a custom item to the order. This will add a new line item that is not associated with an existing product." }) })
-      ] }),
-      /* @__PURE__ */ jsx(Divider, { variant: "dashed" }),
-      /* @__PURE__ */ jsx(
-        Form$2.Field,
-        {
-          control: form.control,
-          name: "title",
-          render: ({ field }) => /* @__PURE__ */ jsx(Form$2.Item, { children: /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
-            /* @__PURE__ */ jsxs("div", { children: [
-              /* @__PURE__ */ jsx(Form$2.Label, { children: "Title" }),
-              /* @__PURE__ */ jsx(Form$2.Hint, { children: "Enter the title of the item" })
-            ] }),
-            /* @__PURE__ */ jsxs("div", { children: [
-              /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(Input, { ...field }) }),
-              /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
-            ] })
-          ] }) })
-        }
-      ),
-      /* @__PURE__ */ jsx(Divider, { variant: "dashed" }),
-      /* @__PURE__ */ jsx(
-        Form$2.Field,
-        {
-          control: form.control,
-          name: "unit_price",
-          render: ({ field: { onChange, ...field } }) => /* @__PURE__ */ jsx(Form$2.Item, { children: /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
-            /* @__PURE__ */ jsxs("div", { children: [
-              /* @__PURE__ */ jsx(Form$2.Label, { children: "Unit price" }),
-              /* @__PURE__ */ jsx(Form$2.Hint, { children: "Enter the unit price of the item" })
-            ] }),
-            /* @__PURE__ */ jsxs("div", { children: [
-              /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx(
-                CurrencyInput,
-                {
-                  symbol: getNativeSymbol(currencyCode),
-                  code: currencyCode,
-                  onValueChange: (_value, _name, values) => onChange(values == null ? void 0 : values.value),
-                  ...field
-                }
-              ) }),
-              /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
-            ] })
-          ] }) })
-        }
-      ),
-      /* @__PURE__ */ jsx(Divider, { variant: "dashed" }),
-      /* @__PURE__ */ jsx(
-        Form$2.Field,
-        {
-          control: form.control,
-          name: "quantity",
-          render: ({ field }) => /* @__PURE__ */ jsx(Form$2.Item, { children: /* @__PURE__ */ jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
-            /* @__PURE__ */ jsxs("div", { children: [
-              /* @__PURE__ */ jsx(Form$2.Label, { children: "Quantity" }),
-              /* @__PURE__ */ jsx(Form$2.Hint, { children: "Enter the quantity of the item" })
-            ] }),
-            /* @__PURE__ */ jsxs("div", { className: "flex-1 w-full", children: [
-              /* @__PURE__ */ jsx(Form$2.Control, { children: /* @__PURE__ */ jsx("div", { className: "flex-1 w-full", children: /* @__PURE__ */ jsx(NumberInput, { ...field, className: "w-full" }) }) }),
-              /* @__PURE__ */ jsx(Form$2.ErrorMessage, {})
-            ] })
-          ] }) })
-        }
-      )
-    ] }) }) }),
-    /* @__PURE__ */ jsx(StackedFocusModal.Footer, { children: /* @__PURE__ */ jsxs("div", { className: "flex items-center gap-x-2 justify-end", children: [
-      /* @__PURE__ */ jsx(StackedFocusModal.Close, { asChild: true, children: /* @__PURE__ */ jsx(Button, { size: "small", variant: "secondary", type: "button", children: "Cancel" }) }),
-      /* @__PURE__ */ jsx(Button, { size: "small", type: "button", onClick: onSubmit, children: "Add item" })
-    ] }) })
-  ] }) }) });
-};
-const customItemSchema = objectType({
-  title: stringType().min(1),
-  quantity: numberType(),
-  unit_price: unionType([numberType(), stringType()])
-});
+}
+function parseValues(values) {
+  const metadata = values.metadata;
+  const isEmpty = !metadata.length || metadata.length === 1 && !metadata[0].key && !metadata[0].value;
+  if (isEmpty) {
+    return null;
+  }
+  const update = {};
+  metadata.forEach((field) => {
+    let key = field.key;
+    let value = field.value;
+    const disabled = field.disabled;
+    if (!key || !value) {
+      return;
+    }
+    if (disabled) {
+      update[key] = value;
+      return;
+    }
+    key = key.trim();
+    value = value.trim();
+    if (value === "true") {
+      update[key] = true;
+    } else if (value === "false") {
+      update[key] = false;
+    } else {
+      const parsedNumber = parseFloat(value);
+      if (!isNaN(parsedNumber)) {
+        update[key] = parsedNumber;
+      } else {
+        update[key] = value;
+      }
+    }
+  });
+  return update;
+}
+function getHasUneditableRows(metadata) {
+  if (!metadata) {
+    return false;
+  }
+  return Object.values(metadata).some(
+    (value) => !EDITABLE_TYPES.includes(typeof value)
+  );
+}
 const PROMOTION_QUERY_KEY = "promotions";
 const promotionsQueryKeys = {
   list: (query2) => [
@@ -11272,7 +11462,7 @@ const SalesChannelForm = ({ order }) => {
     defaultValues: {
       sales_channel_id: order.sales_channel_id || ""
     },
-    resolver: zodResolver(schema$3)
+    resolver: zodResolver(schema$2)
   });
   const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
   const { handleSuccess } = useRouteModal();
@@ -11347,7 +11537,7 @@ const SalesChannelField = ({ control, order }) => {
     }
   );
 };
-const schema$3 = objectType({
+const schema$2 = objectType({
   sales_channel_id: stringType().min(1)
 });
 const STACKED_FOCUS_MODAL_ID = "shipping-form";
@@ -12189,7 +12379,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$2)
+    resolver: zodResolver(schema$1)
   });
   const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
   const { handleSuccess } = useRouteModal();
@@ -12359,7 +12549,7 @@ const ShippingAddressForm = ({ order }) => {
     }
   ) });
 };
-const schema$2 = addressSchema;
+const schema$1 = addressSchema;
 const TransferOwnership = () => {
   const { id } = useParams();
   const { draft_order, isPending, isError, error } = useDraftOrder(id, {
@@ -12383,7 +12573,7 @@ const TransferOwnershipForm = ({ order }) => {
     defaultValues: {
       customer_id: order.customer_id || ""
     },
-    resolver: zodResolver(schema$1)
+    resolver: zodResolver(schema)
   });
   const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
   const { handleSuccess } = useRouteModal();
@@ -12833,199 +13023,9 @@ const Illustration = () => {
     }
   );
 };
-const schema$1 = objectType({
+const schema = 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: [
@@ -13046,6 +13046,10 @@ const routeModule = {
       handle,
       loader,
       children: [
+        {
+          Component: BillingAddress,
+          path: "/draft-orders/:id/billing-address"
+        },
         {
           Component: CustomItems,
           path: "/draft-orders/:id/custom-items"
@@ -13054,14 +13058,14 @@ const routeModule = {
           Component: Email,
           path: "/draft-orders/:id/email"
         },
-        {
-          Component: Metadata,
-          path: "/draft-orders/:id/metadata"
-        },
         {
           Component: Items,
           path: "/draft-orders/:id/items"
         },
+        {
+          Component: Metadata,
+          path: "/draft-orders/:id/metadata"
+        },
         {
           Component: Promotions,
           path: "/draft-orders/:id/promotions"
@@ -13081,10 +13085,6 @@ const routeModule = {
         {
           Component: TransferOwnership,
           path: "/draft-orders/:id/transfer-ownership"
-        },
-        {
-          Component: BillingAddress,
-          path: "/draft-orders/:id/billing-address"
         }
       ]
     }