@medusajs/draft-order 2.11.2 → 2.11.3-preview-20251031120214

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

@@ -9592,264 +9592,6 @@ const CustomItemsForm = () => {
 const schema$5 = objectType({
   email: stringType().email()
 });
-const Email = () => {
-  const { id } = reactRouterDom.useParams();
-  const { order, isPending, isError, error } = useOrder(id, {
-    fields: "+email"
-  });
-  if (isError) {
-    throw error;
-  }
-  const isReady = !isPending && !!order;
-  return /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer, { children: [
-    /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer.Header, { children: [
-      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Edit Email" }) }),
-      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Description, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "sr-only", children: "Edit the email for the draft order" }) })
-    ] }),
-    isReady && /* @__PURE__ */ jsxRuntime.jsx(EmailForm, { order })
-  ] });
-};
-const EmailForm = ({ order }) => {
-  const form = reactHookForm.useForm({
-    defaultValues: {
-      email: order.email ?? ""
-    },
-    resolver: zod.zodResolver(schema$4)
-  });
-  const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
-  const { handleSuccess } = useRouteModal();
-  const onSubmit = form.handleSubmit(async (data) => {
-    await mutateAsync(
-      { email: data.email },
-      {
-        onSuccess: () => {
-          handleSuccess();
-        },
-        onError: (error) => {
-          ui.toast.error(error.message);
-        }
-      }
-    );
-  });
-  return /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxRuntime.jsxs(
-    KeyboundForm,
-    {
-      className: "flex flex-1 flex-col overflow-hidden",
-      onSubmit,
-      children: [
-        /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Body, { className: "flex flex-col gap-y-6 overflow-y-auto", children: /* @__PURE__ */ jsxRuntime.jsx(
-          Form$2.Field,
-          {
-            control: form.control,
-            name: "email",
-            render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Email" }),
-              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
-              /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-            ] })
-          }
-        ) }),
-        /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-2", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", type: "submit", isLoading: isPending, children: "Save" })
-        ] }) })
-      ]
-    }
-  ) });
-};
-const schema$4 = objectType({
-  email: stringType().email()
-});
-const BillingAddress = () => {
-  const { id } = reactRouterDom.useParams();
-  const { order, isPending, isError, error } = useOrder(id, {
-    fields: "+billing_address"
-  });
-  if (isError) {
-    throw error;
-  }
-  const isReady = !isPending && !!order;
-  return /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer, { children: [
-    /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer.Header, { children: [
-      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Edit Billing Address" }) }),
-      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Description, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "sr-only", children: "Edit the billing address for the draft order" }) })
-    ] }),
-    isReady && /* @__PURE__ */ jsxRuntime.jsx(BillingAddressForm, { order })
-  ] });
-};
-const BillingAddressForm = ({ order }) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
-  const form = reactHookForm.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: zod.zodResolver(schema$3)
-  });
-  const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
-  const { handleSuccess } = useRouteModal();
-  const onSubmit = form.handleSubmit(async (data) => {
-    await mutateAsync(
-      { billing_address: data },
-      {
-        onSuccess: () => {
-          handleSuccess();
-        },
-        onError: (error) => {
-          ui.toast.error(error.message);
-        }
-      }
-    );
-  });
-  return /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxRuntime.jsxs(
-    KeyboundForm,
-    {
-      className: "flex flex-1 flex-col overflow-hidden",
-      onSubmit,
-      children: [
-        /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Body, { className: "flex flex-col gap-y-6 overflow-y-auto", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-y-4", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(
-            Form$2.Field,
-            {
-              control: form.control,
-              name: "country_code",
-              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Country" }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(CountrySelect, { ...field }) }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-              ] })
-            }
-          ),
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-4", children: [
-            /* @__PURE__ */ jsxRuntime.jsx(
-              Form$2.Field,
-              {
-                control: form.control,
-                name: "first_name",
-                render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "First name" }),
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-                ] })
-              }
-            ),
-            /* @__PURE__ */ jsxRuntime.jsx(
-              Form$2.Field,
-              {
-                control: form.control,
-                name: "last_name",
-                render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Last name" }),
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-                ] })
-              }
-            )
-          ] }),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            Form$2.Field,
-            {
-              control: form.control,
-              name: "company",
-              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { optional: true, children: "Company" }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-              ] })
-            }
-          ),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            Form$2.Field,
-            {
-              control: form.control,
-              name: "address_1",
-              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Address" }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-              ] })
-            }
-          ),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            Form$2.Field,
-            {
-              control: form.control,
-              name: "address_2",
-              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { optional: true, children: "Apartment, suite, etc." }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-              ] })
-            }
-          ),
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-4", children: [
-            /* @__PURE__ */ jsxRuntime.jsx(
-              Form$2.Field,
-              {
-                control: form.control,
-                name: "postal_code",
-                render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Postal code" }),
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-                ] })
-              }
-            ),
-            /* @__PURE__ */ jsxRuntime.jsx(
-              Form$2.Field,
-              {
-                control: form.control,
-                name: "city",
-                render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "City" }),
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
-                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-                ] })
-              }
-            )
-          ] }),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            Form$2.Field,
-            {
-              control: form.control,
-              name: "province",
-              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { optional: true, children: "Province / State" }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-              ] })
-            }
-          ),
-          /* @__PURE__ */ jsxRuntime.jsx(
-            Form$2.Field,
-            {
-              control: form.control,
-              name: "phone",
-              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { optional: true, children: "Phone" }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
-                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-              ] })
-            }
-          )
-        ] }) }),
-        /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-2", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", type: "submit", isLoading: isPending, children: "Save" })
-        ] }) })
-      ]
-    }
-  ) });
-};
-const schema$3 = addressSchema;
 const NumberInput = React.forwardRef(
   ({
     value,
@@ -10734,96 +10476,373 @@ const CustomItemForm = ({ orderId, currencyCode }) => {
         ]
       },
       {
-        onSuccess: () => {
-          setIsOpen(STACKED_MODAL_ID, false);
-        },
+        onSuccess: () => {
+          setIsOpen(STACKED_MODAL_ID, false);
+        },
+        onError: (e) => {
+          ui.toast.error(e.message);
+        }
+      }
+    );
+  });
+  return /* @__PURE__ */ jsxRuntime.jsx(Form$2, { ...form, children: /* @__PURE__ */ jsxRuntime.jsx(KeyboundForm, { onSubmit, children: /* @__PURE__ */ jsxRuntime.jsxs(StackedFocusModal.Content, { children: [
+    /* @__PURE__ */ jsxRuntime.jsx(StackedFocusModal.Header, {}),
+    /* @__PURE__ */ jsxRuntime.jsx(StackedFocusModal.Body, { className: "flex flex-1 flex-col overflow-hidden", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-1 flex-col items-center overflow-y-auto", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex w-full max-w-[720px] flex-col gap-y-6 px-2 py-16", children: [
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+        /* @__PURE__ */ jsxRuntime.jsx(StackedFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Add custom item" }) }),
+        /* @__PURE__ */ jsxRuntime.jsx(StackedFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.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__ */ jsxRuntime.jsx(ui.Divider, { variant: "dashed" }),
+      /* @__PURE__ */ jsxRuntime.jsx(
+        Form$2.Field,
+        {
+          control: form.control,
+          name: "title",
+          render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsx(Form$2.Item, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
+            /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Title" }),
+              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Hint, { children: "Enter the title of the item" })
+            ] }),
+            /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
+              /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+            ] })
+          ] }) })
+        }
+      ),
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Divider, { variant: "dashed" }),
+      /* @__PURE__ */ jsxRuntime.jsx(
+        Form$2.Field,
+        {
+          control: form.control,
+          name: "unit_price",
+          render: ({ field: { onChange, ...field } }) => /* @__PURE__ */ jsxRuntime.jsx(Form$2.Item, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
+            /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Unit price" }),
+              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Hint, { children: "Enter the unit price of the item" })
+            ] }),
+            /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(
+                ui.CurrencyInput,
+                {
+                  symbol: getNativeSymbol(currencyCode),
+                  code: currencyCode,
+                  onValueChange: (_value, _name, values) => onChange(values == null ? void 0 : values.value),
+                  ...field
+                }
+              ) }),
+              /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+            ] })
+          ] }) })
+        }
+      ),
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Divider, { variant: "dashed" }),
+      /* @__PURE__ */ jsxRuntime.jsx(
+        Form$2.Field,
+        {
+          control: form.control,
+          name: "quantity",
+          render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsx(Form$2.Item, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
+            /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Quantity" }),
+              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Hint, { children: "Enter the quantity of the item" })
+            ] }),
+            /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "w-full flex-1", children: [
+              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full flex-1", children: /* @__PURE__ */ jsxRuntime.jsx(NumberInput, { ...field, className: "w-full" }) }) }),
+              /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+            ] })
+          ] }) })
+        }
+      )
+    ] }) }) }),
+    /* @__PURE__ */ jsxRuntime.jsx(StackedFocusModal.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-end gap-x-2", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(StackedFocusModal.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", type: "button", children: "Cancel" }) }),
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", type: "button", onClick: onSubmit, children: "Add item" })
+    ] }) })
+  ] }) }) });
+};
+const customItemSchema = objectType({
+  title: stringType().min(1),
+  quantity: numberType(),
+  unit_price: unionType([numberType(), stringType()])
+});
+const PROMOTION_QUERY_KEY = "promotions";
+const promotionsQueryKeys = {
+  list: (query2) => [
+    PROMOTION_QUERY_KEY,
+    query2 ? query2 : void 0
+  ],
+  detail: (id, query2) => [
+    PROMOTION_QUERY_KEY,
+    id,
+    query2 ? query2 : void 0
+  ]
+};
+const usePromotions = (query2, options) => {
+  const { data, ...rest } = reactQuery.useQuery({
+    queryKey: promotionsQueryKeys.list(query2),
+    queryFn: async () => sdk.admin.promotion.list(query2),
+    ...options
+  });
+  return { ...data, ...rest };
+};
+const Promotions = () => {
+  const { id } = reactRouterDom.useParams();
+  const {
+    order: preview,
+    isError: isPreviewError,
+    error: previewError
+  } = useOrderPreview(id, void 0);
+  useInitiateOrderEdit({ preview });
+  const { onCancel } = useCancelOrderEdit({ preview });
+  if (isPreviewError) {
+    throw previewError;
+  }
+  const isReady = !!preview;
+  return /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer, { onClose: onCancel, children: [
+    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Header, { children: /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Edit Promotions" }) }) }),
+    isReady && /* @__PURE__ */ jsxRuntime.jsx(PromotionForm, { preview })
+  ] });
+};
+const PromotionForm = ({ preview }) => {
+  const { items, shipping_methods } = preview;
+  const [isSubmitting, setIsSubmitting] = React.useState(false);
+  const [comboboxValue, setComboboxValue] = React.useState("");
+  const { handleSuccess } = useRouteModal();
+  const { mutateAsync: addPromotions, isPending: isAddingPromotions } = useDraftOrderAddPromotions(preview.id);
+  const promoIds = getPromotionIds(items, shipping_methods);
+  const { promotions, isPending, isError, error } = usePromotions(
+    {
+      id: promoIds
+    },
+    {
+      enabled: !!promoIds.length
+    }
+  );
+  const comboboxData = useComboboxData({
+    queryKey: ["promotions", "combobox", promoIds],
+    queryFn: async (params) => {
+      return await sdk.admin.promotion.list({
+        ...params,
+        id: {
+          $nin: promoIds
+        }
+      });
+    },
+    getOptions: (data) => {
+      return data.promotions.map((promotion) => ({
+        label: promotion.code,
+        value: promotion.code
+      }));
+    }
+  });
+  const add = async (value) => {
+    if (!value) {
+      return;
+    }
+    addPromotions(
+      {
+        promo_codes: [value]
+      },
+      {
         onError: (e) => {
           ui.toast.error(e.message);
+          comboboxData.onSearchValueChange("");
+          setComboboxValue("");
+        },
+        onSuccess: () => {
+          comboboxData.onSearchValueChange("");
+          setComboboxValue("");
         }
       }
     );
-  });
-  return /* @__PURE__ */ jsxRuntime.jsx(Form$2, { ...form, children: /* @__PURE__ */ jsxRuntime.jsx(KeyboundForm, { onSubmit, children: /* @__PURE__ */ jsxRuntime.jsxs(StackedFocusModal.Content, { children: [
-    /* @__PURE__ */ jsxRuntime.jsx(StackedFocusModal.Header, {}),
-    /* @__PURE__ */ jsxRuntime.jsx(StackedFocusModal.Body, { className: "flex flex-1 flex-col overflow-hidden", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-1 flex-col items-center overflow-y-auto", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex w-full max-w-[720px] flex-col gap-y-6 px-2 py-16", children: [
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-        /* @__PURE__ */ jsxRuntime.jsx(StackedFocusModal.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Add custom item" }) }),
-        /* @__PURE__ */ jsxRuntime.jsx(StackedFocusModal.Description, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.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." }) })
+  };
+  const { mutateAsync: confirmOrderEdit } = useDraftOrderConfirmEdit(preview.id);
+  const { mutateAsync: requestOrderEdit } = useOrderEditRequest(preview.id);
+  const onSubmit = async () => {
+    setIsSubmitting(true);
+    let requestSucceeded = false;
+    await requestOrderEdit(void 0, {
+      onError: (e) => {
+        ui.toast.error(e.message);
+      },
+      onSuccess: () => {
+        requestSucceeded = true;
+      }
+    });
+    if (!requestSucceeded) {
+      setIsSubmitting(false);
+      return;
+    }
+    await confirmOrderEdit(void 0, {
+      onError: (e) => {
+        ui.toast.error(e.message);
+      },
+      onSuccess: () => {
+        handleSuccess();
+      },
+      onSettled: () => {
+        setIsSubmitting(false);
+      }
+    });
+  };
+  if (isError) {
+    throw error;
+  }
+  return /* @__PURE__ */ jsxRuntime.jsxs(KeyboundForm, { className: "flex flex-1 flex-col", onSubmit, children: [
+    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Body, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-4", children: [
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-3", children: [
+        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col", children: [
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { size: "small", weight: "plus", htmlFor: "promotion-combobox", children: "Apply promotions" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Hint, { id: "promotion-combobox-hint", children: "Manage promotions that should be applied to the order." })
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsx(
+          Combobox,
+          {
+            id: "promotion-combobox",
+            "aria-describedby": "promotion-combobox-hint",
+            isFetchingNextPage: comboboxData.isFetchingNextPage,
+            fetchNextPage: comboboxData.fetchNextPage,
+            options: comboboxData.options,
+            onSearchValueChange: comboboxData.onSearchValueChange,
+            searchValue: comboboxData.searchValue,
+            disabled: comboboxData.disabled || isAddingPromotions,
+            onChange: add,
+            value: comboboxValue
+          }
+        )
       ] }),
       /* @__PURE__ */ jsxRuntime.jsx(ui.Divider, { variant: "dashed" }),
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-col gap-2", children: promotions == null ? void 0 : promotions.map((promotion) => /* @__PURE__ */ jsxRuntime.jsx(
+        PromotionItem,
+        {
+          promotion,
+          orderId: preview.id,
+          isLoading: isPending
+        },
+        promotion.id
+      )) })
+    ] }) }),
+    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-2", children: [
+      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
       /* @__PURE__ */ jsxRuntime.jsx(
-        Form$2.Field,
+        ui.Button,
         {
-          control: form.control,
-          name: "title",
-          render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsx(Form$2.Item, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
-            /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Title" }),
-              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Hint, { children: "Enter the title of the item" })
-            ] }),
-            /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
-              /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-            ] })
-          ] }) })
+          size: "small",
+          type: "submit",
+          isLoading: isSubmitting || isAddingPromotions,
+          children: "Save"
         }
-      ),
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Divider, { variant: "dashed" }),
-      /* @__PURE__ */ jsxRuntime.jsx(
-        Form$2.Field,
+      )
+    ] }) })
+  ] });
+};
+const PromotionItem = ({
+  promotion,
+  orderId,
+  isLoading
+}) => {
+  var _a;
+  const { mutateAsync: removePromotions, isPending } = useDraftOrderRemovePromotions(orderId);
+  const onRemove = async () => {
+    removePromotions(
+      {
+        promo_codes: [promotion.code]
+      },
+      {
+        onError: (e) => {
+          ui.toast.error(e.message);
+        }
+      }
+    );
+  };
+  const displayValue = getDisplayValue(promotion);
+  return /* @__PURE__ */ jsxRuntime.jsxs(
+    "div",
+    {
+      className: ui.clx(
+        "bg-ui-bg-component shadow-elevation-card-rest flex items-center justify-between rounded-lg px-3 py-2",
         {
-          control: form.control,
-          name: "unit_price",
-          render: ({ field: { onChange, ...field } }) => /* @__PURE__ */ jsxRuntime.jsx(Form$2.Item, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
-            /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Unit price" }),
-              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Hint, { children: "Enter the unit price of the item" })
-            ] }),
-            /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(
-                ui.CurrencyInput,
-                {
-                  symbol: getNativeSymbol(currencyCode),
-                  code: currencyCode,
-                  onValueChange: (_value, _name, values) => onChange(values == null ? void 0 : values.value),
-                  ...field
-                }
-              ) }),
-              /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-            ] })
-          ] }) })
+          "animate-pulse": isLoading
         }
       ),
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Divider, { variant: "dashed" }),
-      /* @__PURE__ */ jsxRuntime.jsx(
-        Form$2.Field,
-        {
-          control: form.control,
-          name: "quantity",
-          render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsx(Form$2.Item, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-x-3", children: [
-            /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Quantity" }),
-              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Hint, { children: "Enter the quantity of the item" })
+      children: [
+        /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", weight: "plus", leading: "compact", children: promotion.code }),
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "text-ui-fg-subtle flex items-center gap-1.5", children: [
+            displayValue && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-1.5", children: [
+              /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", leading: "compact", children: displayValue }),
+              /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", leading: "compact", children: "·" })
             ] }),
-            /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "w-full flex-1", children: [
-              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full flex-1", children: /* @__PURE__ */ jsxRuntime.jsx(NumberInput, { ...field, className: "w-full" }) }) }),
-              /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
-            ] })
-          ] }) })
-        }
-      )
-    ] }) }) }),
-    /* @__PURE__ */ jsxRuntime.jsx(StackedFocusModal.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-end gap-x-2", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(StackedFocusModal.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", type: "button", children: "Cancel" }) }),
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", type: "button", onClick: onSubmit, children: "Add item" })
-    ] }) })
-  ] }) }) });
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", leading: "compact", className: "capitalize", children: (_a = promotion.application_method) == null ? void 0 : _a.allocation })
+          ] })
+        ] }),
+        /* @__PURE__ */ jsxRuntime.jsx(
+          ui.IconButton,
+          {
+            size: "small",
+            type: "button",
+            variant: "transparent",
+            onClick: onRemove,
+            isLoading: isPending || isLoading,
+            children: /* @__PURE__ */ jsxRuntime.jsx(icons.XMark, {})
+          }
+        )
+      ]
+    },
+    promotion.id
+  );
 };
-const customItemSchema = objectType({
-  title: stringType().min(1),
-  quantity: numberType(),
-  unit_price: unionType([numberType(), stringType()])
+function getDisplayValue(promotion) {
+  var _a, _b, _c, _d;
+  const value = (_a = promotion.application_method) == null ? void 0 : _a.value;
+  if (!value) {
+    return null;
+  }
+  if (((_b = promotion.application_method) == null ? void 0 : _b.type) === "fixed") {
+    const currency = (_c = promotion.application_method) == null ? void 0 : _c.currency_code;
+    if (!currency) {
+      return null;
+    }
+    return getLocaleAmount(value, currency);
+  } else if (((_d = promotion.application_method) == null ? void 0 : _d.type) === "percentage") {
+    return formatPercentage(value);
+  }
+  return null;
+}
+const formatter = new Intl.NumberFormat([], {
+  style: "percent",
+  minimumFractionDigits: 2
 });
+const formatPercentage = (value, isPercentageValue = false) => {
+  let val = value || 0;
+  if (!isPercentageValue) {
+    val = val / 100;
+  }
+  return formatter.format(val);
+};
+function getPromotionIds(items, shippingMethods) {
+  const promotionIds = /* @__PURE__ */ new Set();
+  for (const item of items) {
+    if (item.adjustments) {
+      for (const adjustment of item.adjustments) {
+        if (adjustment.promotion_id) {
+          promotionIds.add(adjustment.promotion_id);
+        }
+      }
+    }
+  }
+  for (const shippingMethod of shippingMethods) {
+    if (shippingMethod.adjustments) {
+      for (const adjustment of shippingMethod.adjustments) {
+        if (adjustment.promotion_id) {
+          promotionIds.add(adjustment.promotion_id);
+        }
+      }
+    }
+  }
+  return Array.from(promotionIds);
+}
 const InlineTip = React.forwardRef(
   ({ variant = "tip", label, className, children, ...props }, ref) => {
     const labelValue = label || (variant === "warning" ? "Warning" : "Tip");
@@ -11202,7 +11221,7 @@ const SalesChannelForm = ({ order }) => {
     defaultValues: {
       sales_channel_id: order.sales_channel_id || ""
     },
-    resolver: zod.zodResolver(schema$2)
+    resolver: zod.zodResolver(schema$4)
   });
   const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
   const { handleSuccess } = useRouteModal();
@@ -11277,7 +11296,7 @@ const SalesChannelField = ({ control, order }) => {
     }
   );
 };
-const schema$2 = objectType({
+const schema$4 = objectType({
   sales_channel_id: stringType().min(1)
 });
 const STACKED_FOCUS_MODAL_ID = "shipping-form";
@@ -12119,7 +12138,7 @@ const ShippingAddressForm = ({ order }) => {
       postal_code: ((_i = order.shipping_address) == null ? void 0 : _i.postal_code) ?? "",
       phone: ((_j = order.shipping_address) == null ? void 0 : _j.phone) ?? ""
     },
-    resolver: zod.zodResolver(schema$1)
+    resolver: zod.zodResolver(schema$3)
   });
   const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
   const { handleSuccess } = useRouteModal();
@@ -12289,7 +12308,7 @@ const ShippingAddressForm = ({ order }) => {
     }
   ) });
 };
-const schema$1 = addressSchema;
+const schema$3 = addressSchema;
 const TransferOwnership = () => {
   const { id } = reactRouterDom.useParams();
   const { draft_order, isPending, isError, error } = useDraftOrder(id, {
@@ -12313,7 +12332,7 @@ const TransferOwnershipForm = ({ order }) => {
     defaultValues: {
       customer_id: order.customer_id || ""
     },
-    resolver: zod.zodResolver(schema)
+    resolver: zod.zodResolver(schema$2)
   });
   const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
   const { handleSuccess } = useRouteModal();
@@ -12763,286 +12782,267 @@ const Illustration = () => {
     }
   );
 };
-const schema = objectType({
+const schema$2 = objectType({
   customer_id: stringType().min(1)
 });
-const PROMOTION_QUERY_KEY = "promotions";
-const promotionsQueryKeys = {
-  list: (query2) => [
-    PROMOTION_QUERY_KEY,
-    query2 ? query2 : void 0
-  ],
-  detail: (id, query2) => [
-    PROMOTION_QUERY_KEY,
-    id,
-    query2 ? query2 : void 0
-  ]
-};
-const usePromotions = (query2, options) => {
-  const { data, ...rest } = reactQuery.useQuery({
-    queryKey: promotionsQueryKeys.list(query2),
-    queryFn: async () => sdk.admin.promotion.list(query2),
-    ...options
-  });
-  return { ...data, ...rest };
-};
-const Promotions = () => {
+const Email = () => {
   const { id } = reactRouterDom.useParams();
-  const {
-    order: preview,
-    isError: isPreviewError,
-    error: previewError
-  } = useOrderPreview(id, void 0);
-  useInitiateOrderEdit({ preview });
-  const { onCancel } = useCancelOrderEdit({ preview });
-  if (isPreviewError) {
-    throw previewError;
+  const { order, isPending, isError, error } = useOrder(id, {
+    fields: "+email"
+  });
+  if (isError) {
+    throw error;
   }
-  const isReady = !!preview;
-  return /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer, { onClose: onCancel, children: [
-    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Header, { children: /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Edit Promotions" }) }) }),
-    isReady && /* @__PURE__ */ jsxRuntime.jsx(PromotionForm, { preview })
+  const isReady = !isPending && !!order;
+  return /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer, { children: [
+    /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer.Header, { children: [
+      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Edit Email" }) }),
+      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Description, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "sr-only", children: "Edit the email for the draft order" }) })
+    ] }),
+    isReady && /* @__PURE__ */ jsxRuntime.jsx(EmailForm, { order })
   ] });
 };
-const PromotionForm = ({ preview }) => {
-  const { items, shipping_methods } = preview;
-  const [isSubmitting, setIsSubmitting] = React.useState(false);
-  const [comboboxValue, setComboboxValue] = React.useState("");
-  const { handleSuccess } = useRouteModal();
-  const { mutateAsync: addPromotions, isPending: isAddingPromotions } = useDraftOrderAddPromotions(preview.id);
-  const promoIds = getPromotionIds(items, shipping_methods);
-  const { promotions, isPending, isError, error } = usePromotions(
-    {
-      id: promoIds
-    },
-    {
-      enabled: !!promoIds.length
-    }
-  );
-  const comboboxData = useComboboxData({
-    queryKey: ["promotions", "combobox", promoIds],
-    queryFn: async (params) => {
-      return await sdk.admin.promotion.list({
-        ...params,
-        id: {
-          $nin: promoIds
-        }
-      });
+const EmailForm = ({ order }) => {
+  const form = reactHookForm.useForm({
+    defaultValues: {
+      email: order.email ?? ""
     },
-    getOptions: (data) => {
-      return data.promotions.map((promotion) => ({
-        label: promotion.code,
-        value: promotion.code
-      }));
-    }
+    resolver: zod.zodResolver(schema$1)
   });
-  const add = async (value) => {
-    if (!value) {
-      return;
-    }
-    addPromotions(
-      {
-        promo_codes: [value]
-      },
+  const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
+  const { handleSuccess } = useRouteModal();
+  const onSubmit = form.handleSubmit(async (data) => {
+    await mutateAsync(
+      { email: data.email },
       {
-        onError: (e) => {
-          ui.toast.error(e.message);
-          comboboxData.onSearchValueChange("");
-          setComboboxValue("");
-        },
         onSuccess: () => {
-          comboboxData.onSearchValueChange("");
-          setComboboxValue("");
+          handleSuccess();
+        },
+        onError: (error) => {
+          ui.toast.error(error.message);
         }
       }
     );
-  };
-  const { mutateAsync: confirmOrderEdit } = useDraftOrderConfirmEdit(preview.id);
-  const { mutateAsync: requestOrderEdit } = useOrderEditRequest(preview.id);
-  const onSubmit = async () => {
-    setIsSubmitting(true);
-    let requestSucceeded = false;
-    await requestOrderEdit(void 0, {
-      onError: (e) => {
-        ui.toast.error(e.message);
-      },
-      onSuccess: () => {
-        requestSucceeded = true;
-      }
-    });
-    if (!requestSucceeded) {
-      setIsSubmitting(false);
-      return;
+  });
+  return /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxRuntime.jsxs(
+    KeyboundForm,
+    {
+      className: "flex flex-1 flex-col overflow-hidden",
+      onSubmit,
+      children: [
+        /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Body, { className: "flex flex-col gap-y-6 overflow-y-auto", children: /* @__PURE__ */ jsxRuntime.jsx(
+          Form$2.Field,
+          {
+            control: form.control,
+            name: "email",
+            render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Email" }),
+              /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
+              /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+            ] })
+          }
+        ) }),
+        /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-2", children: [
+          /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", type: "submit", isLoading: isPending, children: "Save" })
+        ] }) })
+      ]
     }
-    await confirmOrderEdit(void 0, {
-      onError: (e) => {
-        ui.toast.error(e.message);
-      },
-      onSuccess: () => {
-        handleSuccess();
-      },
-      onSettled: () => {
-        setIsSubmitting(false);
-      }
-    });
-  };
+  ) });
+};
+const schema$1 = objectType({
+  email: stringType().email()
+});
+const BillingAddress = () => {
+  const { id } = reactRouterDom.useParams();
+  const { order, isPending, isError, error } = useOrder(id, {
+    fields: "+billing_address"
+  });
   if (isError) {
     throw error;
   }
-  return /* @__PURE__ */ jsxRuntime.jsxs(KeyboundForm, { className: "flex flex-1 flex-col", onSubmit, children: [
-    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Body, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-4", children: [
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-3", children: [
-        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Label, { size: "small", weight: "plus", htmlFor: "promotion-combobox", children: "Apply promotions" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Hint, { id: "promotion-combobox-hint", children: "Manage promotions that should be applied to the order." })
-        ] }),
-        /* @__PURE__ */ jsxRuntime.jsx(
-          Combobox,
-          {
-            id: "promotion-combobox",
-            "aria-describedby": "promotion-combobox-hint",
-            isFetchingNextPage: comboboxData.isFetchingNextPage,
-            fetchNextPage: comboboxData.fetchNextPage,
-            options: comboboxData.options,
-            onSearchValueChange: comboboxData.onSearchValueChange,
-            searchValue: comboboxData.searchValue,
-            disabled: comboboxData.disabled || isAddingPromotions,
-            onChange: add,
-            value: comboboxValue
-          }
-        )
-      ] }),
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Divider, { variant: "dashed" }),
-      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-col gap-2", children: promotions == null ? void 0 : promotions.map((promotion) => /* @__PURE__ */ jsxRuntime.jsx(
-        PromotionItem,
-        {
-          promotion,
-          orderId: preview.id,
-          isLoading: isPending
-        },
-        promotion.id
-      )) })
-    ] }) }),
-    /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-2", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
-      /* @__PURE__ */ jsxRuntime.jsx(
-        ui.Button,
-        {
-          size: "small",
-          type: "submit",
-          isLoading: isSubmitting || isAddingPromotions,
-          children: "Save"
-        }
-      )
-    ] }) })
+  const isReady = !isPending && !!order;
+  return /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer, { children: [
+    /* @__PURE__ */ jsxRuntime.jsxs(RouteDrawer.Header, { children: [
+      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Title, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { children: "Edit Billing Address" }) }),
+      /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Description, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx("span", { className: "sr-only", children: "Edit the billing address for the draft order" }) })
+    ] }),
+    isReady && /* @__PURE__ */ jsxRuntime.jsx(BillingAddressForm, { order })
   ] });
 };
-const PromotionItem = ({
-  promotion,
-  orderId,
-  isLoading
-}) => {
-  var _a;
-  const { mutateAsync: removePromotions, isPending } = useDraftOrderRemovePromotions(orderId);
-  const onRemove = async () => {
-    removePromotions(
-      {
-        promo_codes: [promotion.code]
-      },
+const BillingAddressForm = ({ order }) => {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  const form = reactHookForm.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: zod.zodResolver(schema)
+  });
+  const { mutateAsync, isPending } = useUpdateDraftOrder(order.id);
+  const { handleSuccess } = useRouteModal();
+  const onSubmit = form.handleSubmit(async (data) => {
+    await mutateAsync(
+      { billing_address: data },
       {
-        onError: (e) => {
-          ui.toast.error(e.message);
+        onSuccess: () => {
+          handleSuccess();
+        },
+        onError: (error) => {
+          ui.toast.error(error.message);
         }
       }
     );
-  };
-  const displayValue = getDisplayValue(promotion);
-  return /* @__PURE__ */ jsxRuntime.jsxs(
-    "div",
+  });
+  return /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Form, { form, children: /* @__PURE__ */ jsxRuntime.jsxs(
+    KeyboundForm,
     {
-      className: ui.clx(
-        "bg-ui-bg-component shadow-elevation-card-rest flex items-center justify-between rounded-lg px-3 py-2",
-        {
-          "animate-pulse": isLoading
-        }
-      ),
+      className: "flex flex-1 flex-col overflow-hidden",
+      onSubmit,
       children: [
-        /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", weight: "plus", leading: "compact", children: promotion.code }),
-          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "text-ui-fg-subtle flex items-center gap-1.5", children: [
-            displayValue && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-1.5", children: [
-              /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", leading: "compact", children: displayValue }),
-              /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", leading: "compact", children: "·" })
-            ] }),
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", leading: "compact", className: "capitalize", children: (_a = promotion.application_method) == null ? void 0 : _a.allocation })
-          ] })
-        ] }),
-        /* @__PURE__ */ jsxRuntime.jsx(
-          ui.IconButton,
-          {
-            size: "small",
-            type: "button",
-            variant: "transparent",
-            onClick: onRemove,
-            isLoading: isPending || isLoading,
-            children: /* @__PURE__ */ jsxRuntime.jsx(icons.XMark, {})
-          }
-        )
+        /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Body, { className: "flex flex-col gap-y-6 overflow-y-auto", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-y-4", children: [
+          /* @__PURE__ */ jsxRuntime.jsx(
+            Form$2.Field,
+            {
+              control: form.control,
+              name: "country_code",
+              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Country" }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(CountrySelect, { ...field }) }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+              ] })
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-4", children: [
+            /* @__PURE__ */ jsxRuntime.jsx(
+              Form$2.Field,
+              {
+                control: form.control,
+                name: "first_name",
+                render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "First name" }),
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+                ] })
+              }
+            ),
+            /* @__PURE__ */ jsxRuntime.jsx(
+              Form$2.Field,
+              {
+                control: form.control,
+                name: "last_name",
+                render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Last name" }),
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+                ] })
+              }
+            )
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            Form$2.Field,
+            {
+              control: form.control,
+              name: "company",
+              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { optional: true, children: "Company" }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+              ] })
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            Form$2.Field,
+            {
+              control: form.control,
+              name: "address_1",
+              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Address" }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+              ] })
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            Form$2.Field,
+            {
+              control: form.control,
+              name: "address_2",
+              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { optional: true, children: "Apartment, suite, etc." }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+              ] })
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid grid-cols-2 gap-4", children: [
+            /* @__PURE__ */ jsxRuntime.jsx(
+              Form$2.Field,
+              {
+                control: form.control,
+                name: "postal_code",
+                render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "Postal code" }),
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+                ] })
+              }
+            ),
+            /* @__PURE__ */ jsxRuntime.jsx(
+              Form$2.Field,
+              {
+                control: form.control,
+                name: "city",
+                render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { children: "City" }),
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
+                  /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+                ] })
+              }
+            )
+          ] }),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            Form$2.Field,
+            {
+              control: form.control,
+              name: "province",
+              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { optional: true, children: "Province / State" }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+              ] })
+            }
+          ),
+          /* @__PURE__ */ jsxRuntime.jsx(
+            Form$2.Field,
+            {
+              control: form.control,
+              name: "phone",
+              render: ({ field }) => /* @__PURE__ */ jsxRuntime.jsxs(Form$2.Item, { children: [
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Label, { optional: true, children: "Phone" }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.Control, { children: /* @__PURE__ */ jsxRuntime.jsx(ui.Input, { ...field }) }),
+                /* @__PURE__ */ jsxRuntime.jsx(Form$2.ErrorMessage, {})
+              ] })
+            }
+          )
+        ] }) }),
+        /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Footer, { children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex justify-end gap-2", children: [
+          /* @__PURE__ */ jsxRuntime.jsx(RouteDrawer.Close, { asChild: true, children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", variant: "secondary", children: "Cancel" }) }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { size: "small", type: "submit", isLoading: isPending, children: "Save" })
+        ] }) })
       ]
-    },
-    promotion.id
-  );
-};
-function getDisplayValue(promotion) {
-  var _a, _b, _c, _d;
-  const value = (_a = promotion.application_method) == null ? void 0 : _a.value;
-  if (!value) {
-    return null;
-  }
-  if (((_b = promotion.application_method) == null ? void 0 : _b.type) === "fixed") {
-    const currency = (_c = promotion.application_method) == null ? void 0 : _c.currency_code;
-    if (!currency) {
-      return null;
     }
-    return getLocaleAmount(value, currency);
-  } else if (((_d = promotion.application_method) == null ? void 0 : _d.type) === "percentage") {
-    return formatPercentage(value);
-  }
-  return null;
-}
-const formatter = new Intl.NumberFormat([], {
-  style: "percent",
-  minimumFractionDigits: 2
-});
-const formatPercentage = (value, isPercentageValue = false) => {
-  let val = value || 0;
-  if (!isPercentageValue) {
-    val = val / 100;
-  }
-  return formatter.format(val);
+  ) });
 };
-function getPromotionIds(items, shippingMethods) {
-  const promotionIds = /* @__PURE__ */ new Set();
-  for (const item of items) {
-    if (item.adjustments) {
-      for (const adjustment of item.adjustments) {
-        if (adjustment.promotion_id) {
-          promotionIds.add(adjustment.promotion_id);
-        }
-      }
-    }
-  }
-  for (const shippingMethod of shippingMethods) {
-    if (shippingMethod.adjustments) {
-      for (const adjustment of shippingMethod.adjustments) {
-        if (adjustment.promotion_id) {
-          promotionIds.add(adjustment.promotion_id);
-        }
-      }
-    }
-  }
-  return Array.from(promotionIds);
-}
+const schema = addressSchema;
 const widgetModule = { widgets: [] };
 const routeModule = {
   routes: [
@@ -13067,18 +13067,14 @@ const routeModule = {
           Component: CustomItems,
           path: "/draft-orders/:id/custom-items"
         },
-        {
-          Component: Email,
-          path: "/draft-orders/:id/email"
-        },
-        {
-          Component: BillingAddress,
-          path: "/draft-orders/:id/billing-address"
-        },
         {
           Component: Items,
           path: "/draft-orders/:id/items"
         },
+        {
+          Component: Promotions,
+          path: "/draft-orders/:id/promotions"
+        },
         {
           Component: Metadata,
           path: "/draft-orders/:id/metadata"
@@ -13100,8 +13096,12 @@ const routeModule = {
           path: "/draft-orders/:id/transfer-ownership"
         },
         {
-          Component: Promotions,
-          path: "/draft-orders/:id/promotions"
+          Component: Email,
+          path: "/draft-orders/:id/email"
+        },
+        {
+          Component: BillingAddress,
+          path: "/draft-orders/:id/billing-address"
         }
       ]
     }