order-management 0.0.51 → 0.0.53

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

@@ -5,114 +5,6 @@ const adminSdk = require("@medusajs/admin-sdk");
 const ui = require("@medusajs/ui");
 const icons = require("@medusajs/icons");
 const reactRouterDom = require("react-router-dom");
-const OrderReturnApprovalNoticeWidget = ({ data }) => {
-  const orderId = data == null ? void 0 : data.id;
-  const [returns, setReturns] = react.useState([]);
-  const [loading, setLoading] = react.useState(true);
-  react.useEffect(() => {
-    if (!orderId) {
-      setLoading(false);
-      return;
-    }
-    let cancelled = false;
-    const load = async () => {
-      try {
-        const res = await fetch(
-          `/admin/returns?order_id=${encodeURIComponent(orderId)}&limit=50`,
-          { credentials: "include" }
-        );
-        if (!res.ok || cancelled) return;
-        const payload = await res.json();
-        const list = Array.isArray(payload.returns) ? payload.returns : [];
-        if (!cancelled) setReturns(list);
-      } catch {
-        if (!cancelled) setReturns([]);
-      } finally {
-        if (!cancelled) setLoading(false);
-      }
-    };
-    void load();
-    return () => {
-      cancelled = true;
-    };
-  }, [orderId]);
-  const requestedReturns = returns.filter(
-    (r) => {
-      var _a;
-      return ((_a = r.status) == null ? void 0 : _a.toLowerCase()) === "requested";
-    }
-  );
-  react.useEffect(() => {
-    if (requestedReturns.length === 0) return;
-    const RECEIVE_BUTTON_MARKER = "data-om-receive-items-hidden";
-    const hideReceiveButton = () => {
-      const buttons = document.querySelectorAll(
-        `button:not([${RECEIVE_BUTTON_MARKER}])`
-      );
-      for (const btn of buttons) {
-        const text = (btn.textContent ?? "").trim();
-        if (text === "Receive items" || text.toLowerCase().includes("receive item")) {
-          btn.style.setProperty("display", "none", "important");
-          btn.setAttribute(RECEIVE_BUTTON_MARKER, "true");
-          return true;
-        }
-      }
-      return false;
-    };
-    if (hideReceiveButton()) return;
-    const observer = new MutationObserver(() => {
-      hideReceiveButton();
-    });
-    observer.observe(document.body, { childList: true, subtree: true });
-    const interval = setInterval(() => {
-      if (hideReceiveButton()) {
-        clearInterval(interval);
-      }
-    }, 300);
-    return () => {
-      clearInterval(interval);
-      observer.disconnect();
-      document.querySelectorAll(`button[${RECEIVE_BUTTON_MARKER}]`).forEach((el) => {
-        el.style.removeProperty("display");
-        el.removeAttribute(RECEIVE_BUTTON_MARKER);
-      });
-    };
-  }, [requestedReturns.length]);
-  if (loading || requestedReturns.length === 0) {
-    return null;
-  }
-  return /* @__PURE__ */ jsxRuntime.jsx(ui.Container, { className: "mb-6 overflow-hidden rounded-lg border border-ui-border-base bg-ui-bg-subtle p-4", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-3 sm:flex-row sm:items-center sm:justify-between", children: [
-    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-1", children: [
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2", children: [
-        /* @__PURE__ */ jsxRuntime.jsx(icons.InformationCircle, { className: "text-ui-fg-warning" }),
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { weight: "plus", className: "text-ui-fg-base", children: "Return request(s) pending approval" })
-      ] }),
-      /* @__PURE__ */ jsxRuntime.jsxs(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: [
-        "This order has ",
-        requestedReturns.length,
-        " return request",
-        requestedReturns.length > 1 ? "s" : "",
-        ' that must be approved in Return Orders before you can receive items. Do not use the "Receive items" button until the return has been approved.'
-      ] })
-    ] }),
-    /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex flex-wrap items-center gap-2", children: requestedReturns.slice(0, 3).map((r) => /* @__PURE__ */ jsxRuntime.jsxs(
-      ui.Button,
-      {
-        size: "small",
-        variant: "secondary",
-        onClick: () => window.open(`/app/returns/${r.id}`, "_self"),
-        children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Badge, { className: "mr-1.5 uppercase", color: "orange", children: "Requested" }),
-          "Approve return"
-        ]
-      },
-      r.id
-    )) })
-  ] }) });
-};
-adminSdk.defineWidgetConfig({
-  zone: "order.details.before"
-});
 const useDebounce$1 = (value, delay) => {
   const [debouncedValue, setDebouncedValue] = react.useState(value);
   react.useEffect(() => {
@@ -144,6 +36,7 @@ const ReturnsPage = () => {
   const navigate = reactRouterDom.useNavigate();
   const [items, setItems] = react.useState([]);
   const [statusFilter, setStatusFilter] = react.useState("all");
+  const [createdByFilter, setCreatedByFilter] = react.useState("all");
   const [searchQuery, setSearchQuery] = react.useState("");
   const debouncedSearchQuery = useDebounce$1(searchQuery, 300);
   const [isLoading, setIsLoading] = react.useState(true);
@@ -171,6 +64,9 @@ const ReturnsPage = () => {
         if (debouncedSearchQuery.trim()) {
           params.set("q", debouncedSearchQuery.trim());
         }
+        if (createdByFilter !== "all") {
+          params.set("created_by", createdByFilter);
+        }
         params.set("order", "created_at");
         const response = await fetch(
           `/admin/returns?${params.toString()}`,
@@ -194,11 +90,11 @@ const ReturnsPage = () => {
         setIsFetchingMore(false);
       }
     },
-    [statusFilter, debouncedSearchQuery]
+    [statusFilter, createdByFilter, debouncedSearchQuery]
   );
   react.useEffect(() => {
     void loadReturns(0, true);
-  }, [statusFilter, debouncedSearchQuery, loadReturns]);
+  }, [statusFilter, createdByFilter, debouncedSearchQuery, loadReturns]);
   const hasMore = react.useMemo(() => offset < count, [offset, count]);
   const availableStatuses = react.useMemo(() => {
     const statuses = /* @__PURE__ */ new Set();
@@ -223,18 +119,33 @@ const ReturnsPage = () => {
           className: "md:max-w-sm"
         }
       ),
-      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex gap-3", children: /* @__PURE__ */ jsxRuntime.jsxs(
-        "select",
-        {
-          value: statusFilter,
-          onChange: (event) => setStatusFilter(event.target.value),
-          className: "h-9 rounded-md border border-ui-border-base bg-transparent px-3 text-sm text-ui-fg-base outline-none transition focus:ring-2 focus:ring-ui-fg-interactive md:max-w-xs",
-          children: [
-            /* @__PURE__ */ jsxRuntime.jsx("option", { value: "all", children: "All Statuses" }),
-            availableStatuses.map((status) => /* @__PURE__ */ jsxRuntime.jsx("option", { value: status, children: status.replace(/_/g, " ").toUpperCase() }, status))
-          ]
-        }
-      ) })
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex gap-3", children: [
+        /* @__PURE__ */ jsxRuntime.jsxs(
+          "select",
+          {
+            value: createdByFilter,
+            onChange: (event) => setCreatedByFilter(event.target.value),
+            className: "h-9 rounded-md border border-ui-border-base bg-transparent px-3 text-sm text-ui-fg-base outline-none transition focus:ring-2 focus:ring-ui-fg-interactive md:max-w-xs",
+            children: [
+              /* @__PURE__ */ jsxRuntime.jsx("option", { value: "all", children: "All (Created by)" }),
+              /* @__PURE__ */ jsxRuntime.jsx("option", { value: "customer", children: "Customer" }),
+              /* @__PURE__ */ jsxRuntime.jsx("option", { value: "admin", children: "Admin" })
+            ]
+          }
+        ),
+        /* @__PURE__ */ jsxRuntime.jsxs(
+          "select",
+          {
+            value: statusFilter,
+            onChange: (event) => setStatusFilter(event.target.value),
+            className: "h-9 rounded-md border border-ui-border-base bg-transparent px-3 text-sm text-ui-fg-base outline-none transition focus:ring-2 focus:ring-ui-fg-interactive md:max-w-xs",
+            children: [
+              /* @__PURE__ */ jsxRuntime.jsx("option", { value: "all", children: "All Statuses" }),
+              availableStatuses.map((status) => /* @__PURE__ */ jsxRuntime.jsx("option", { value: status, children: status.replace(/_/g, " ").toUpperCase() }, status))
+            ]
+          }
+        )
+      ] })
     ] }),
     error ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-strong p-6 text-center", children: [
       /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { weight: "plus", className: "text-ui-fg-error", children: error }),
@@ -301,9 +212,9 @@ const ReturnsPage = () => {
                 size: "small",
                 onClick: (e) => {
                   e.stopPropagation();
-                  navigate(`/returns/${returnOrder.id}`);
+                  navigate(`/app/orders/${returnOrder.order_id}`);
                 },
-                children: "View"
+                children: "Go to order"
               }
             ) })
           ]
@@ -357,6 +268,7 @@ const SwapsPage = () => {
   const navigate = reactRouterDom.useNavigate();
   const [items, setItems] = react.useState([]);
   const [statusFilter, setStatusFilter] = react.useState("all");
+  const [createdByFilter, setCreatedByFilter] = react.useState("all");
   const [searchQuery, setSearchQuery] = react.useState("");
   const debouncedSearchQuery = useDebounce(searchQuery, 300);
   const [isLoading, setIsLoading] = react.useState(true);
@@ -384,6 +296,9 @@ const SwapsPage = () => {
         if (debouncedSearchQuery.trim()) {
           params.set("order_id", debouncedSearchQuery.trim());
         }
+        if (createdByFilter !== "all") {
+          params.set("created_by", createdByFilter);
+        }
         const response = await fetch(
           `/admin/swaps?${params.toString()}`,
           { credentials: "include" }
@@ -406,11 +321,11 @@ const SwapsPage = () => {
         setIsFetchingMore(false);
       }
     },
-    [statusFilter, debouncedSearchQuery]
+    [statusFilter, createdByFilter, debouncedSearchQuery]
   );
   react.useEffect(() => {
     void loadSwaps(0, true);
-  }, [statusFilter, debouncedSearchQuery, loadSwaps]);
+  }, [statusFilter, createdByFilter, debouncedSearchQuery, loadSwaps]);
   const hasMore = react.useMemo(() => offset < count, [offset, count]);
   const availableStatuses = react.useMemo(() => {
     const statuses = /* @__PURE__ */ new Set();
@@ -420,8 +335,8 @@ const SwapsPage = () => {
   return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full p-6", children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Container, { className: "mx-auto flex w-full max-w-7xl flex-col gap-6 p-6", children: [
     /* @__PURE__ */ jsxRuntime.jsxs("header", { className: "flex flex-col gap-3 md:flex-row md:items-center md:justify-between", children: [
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-1", children: [
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h1", children: "Swaps" }),
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "View and manage all customer swap requests" })
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h1", children: "Exchanges" }),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "View and manage all customer exchange requests" })
       ] }),
       /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { variant: "primary", onClick: () => loadSwaps(0, true), children: "Refresh" })
     ] }),
@@ -435,18 +350,33 @@ const SwapsPage = () => {
           className: "md:max-w-sm"
         }
       ),
-      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex gap-3", children: /* @__PURE__ */ jsxRuntime.jsxs(
-        "select",
-        {
-          value: statusFilter,
-          onChange: (event) => setStatusFilter(event.target.value),
-          className: "h-9 rounded-md border border-ui-border-base bg-transparent px-3 text-sm text-ui-fg-base outline-none transition focus:ring-2 focus:ring-ui-fg-interactive md:max-w-xs",
-          children: [
-            /* @__PURE__ */ jsxRuntime.jsx("option", { value: "all", children: "All Statuses" }),
-            availableStatuses.map((status) => /* @__PURE__ */ jsxRuntime.jsx("option", { value: status, children: status.replace(/_/g, " ").toUpperCase() }, status))
-          ]
-        }
-      ) })
+      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex gap-3", children: [
+        /* @__PURE__ */ jsxRuntime.jsxs(
+          "select",
+          {
+            value: createdByFilter,
+            onChange: (event) => setCreatedByFilter(event.target.value),
+            className: "h-9 rounded-md border border-ui-border-base bg-transparent px-3 text-sm text-ui-fg-base outline-none transition focus:ring-2 focus:ring-ui-fg-interactive md:max-w-xs",
+            children: [
+              /* @__PURE__ */ jsxRuntime.jsx("option", { value: "all", children: "All (Created by)" }),
+              /* @__PURE__ */ jsxRuntime.jsx("option", { value: "customer", children: "Customer" }),
+              /* @__PURE__ */ jsxRuntime.jsx("option", { value: "admin", children: "Admin" })
+            ]
+          }
+        ),
+        /* @__PURE__ */ jsxRuntime.jsxs(
+          "select",
+          {
+            value: statusFilter,
+            onChange: (event) => setStatusFilter(event.target.value),
+            className: "h-9 rounded-md border border-ui-border-base bg-transparent px-3 text-sm text-ui-fg-base outline-none transition focus:ring-2 focus:ring-ui-fg-interactive md:max-w-xs",
+            children: [
+              /* @__PURE__ */ jsxRuntime.jsx("option", { value: "all", children: "All Statuses" }),
+              availableStatuses.map((status) => /* @__PURE__ */ jsxRuntime.jsx("option", { value: status, children: status.replace(/_/g, " ").toUpperCase() }, status))
+            ]
+          }
+        )
+      ] })
     ] }),
     error ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-strong p-6 text-center", children: [
       /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { weight: "plus", className: "text-ui-fg-error", children: error }),
@@ -460,11 +390,11 @@ const SwapsPage = () => {
       ) })
     ] }) : null,
     isLoading ? /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center py-16", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { children: "Loading swaps..." }) }) : items.length === 0 ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-dashed border-ui-border-strong p-10 text-center", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h3", className: "text-xl", children: "No swaps yet" }),
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "mt-2 text-ui-fg-subtle", children: "Swap requests created by customers will appear here." })
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h3", className: "text-xl", children: "No exchanges yet" }),
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "mt-2 text-ui-fg-subtle", children: "Exchange requests created by customers will appear here." })
     ] }) : /* @__PURE__ */ jsxRuntime.jsx("div", { className: "overflow-hidden rounded-xl border border-ui-border-base", children: /* @__PURE__ */ jsxRuntime.jsxs("table", { className: "min-w-full divide-y divide-ui-border-base", children: [
       /* @__PURE__ */ jsxRuntime.jsx("thead", { className: "bg-ui-bg-subtle", children: /* @__PURE__ */ jsxRuntime.jsxs("tr", { children: [
-        /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Swap ID" }),
+        /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Exchange ID" }),
         /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Order ID" }),
         /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Status" }),
         /* @__PURE__ */ jsxRuntime.jsx("th", { className: "px-4 py-3 text-left text-xs font-semibold uppercase tracking-wide text-ui-fg-muted", children: "Difference Due" }),
@@ -512,9 +442,9 @@ const SwapsPage = () => {
                 size: "small",
                 onClick: (e) => {
                   e.stopPropagation();
-                  navigate(`/swaps/${swap.id}`);
+                  navigate(`/app/orders/${swap.order_id}`);
                 },
-                children: "View"
+                children: "Go to order"
               }
             ) })
           ]
@@ -534,7 +464,7 @@ const SwapsPage = () => {
   ] }) });
 };
 const config$2 = adminSdk.defineRouteConfig({
-  label: "Swaps",
+  label: "Exchanges",
   icon: icons.ArrowPath
 });
 const getStatusBadgeClass$1 = (status) => {
@@ -568,7 +498,6 @@ const ReturnDetailPage = () => {
   const { id } = reactRouterDom.useParams();
   const [returnOrder, setReturnOrder] = react.useState(null);
   const [isLoading, setIsLoading] = react.useState(true);
-  const [isApproving, setIsApproving] = react.useState(false);
   const [isRejecting, setIsRejecting] = react.useState(false);
   const [error, setError] = react.useState(null);
   const [updateError, setUpdateError] = react.useState(null);
@@ -600,48 +529,6 @@ const ReturnDetailPage = () => {
     };
     void loadReturn();
   }, [id, navigate]);
-  const handleApprove = async () => {
-    if (!id) {
-      return;
-    }
-    try {
-      setIsApproving(true);
-      setUpdateError(null);
-      setUpdateSuccess(false);
-      const response = await fetch(`/admin/returns/${id}/approve`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        credentials: "include"
-      });
-      if (!response.ok) {
-        const message = await response.text();
-        throw new Error(message || "Unable to approve return");
-      }
-      const payload = await response.json();
-      setReturnOrder(payload.return);
-      setUpdateSuccess(true);
-      const orderId = payload.return.order_id;
-      if (orderId) {
-        window.location.href = `/app/orders/${orderId}`;
-        return;
-      }
-      setTimeout(() => setUpdateSuccess(false), 3e3);
-      const detailResponse = await fetch(`/admin/returns/${id}`, {
-        credentials: "include"
-      });
-      if (detailResponse.ok) {
-        const detailPayload = await detailResponse.json();
-        setReturnOrder(detailPayload.return);
-      }
-    } catch (approveErr) {
-      const message = approveErr instanceof Error ? approveErr.message : "Unable to approve return";
-      setUpdateError(message);
-    } finally {
-      setIsApproving(false);
-    }
-  };
   const handleReject = async () => {
     if (!id) {
       return;
@@ -721,37 +608,24 @@ const ReturnDetailPage = () => {
       ] })
     ] }),
     returnOrder.status === "requested" && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-3", children: [
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex gap-3", children: [
-        /* @__PURE__ */ jsxRuntime.jsx(
-          ui.Button,
-          {
-            variant: "primary",
-            onClick: handleApprove,
-            disabled: isApproving || isRejecting,
-            isLoading: isApproving,
-            children: "Approve & Process Return"
-          }
-        ),
-        /* @__PURE__ */ jsxRuntime.jsx(
-          ui.Button,
-          {
-            variant: "danger",
-            onClick: handleReject,
-            disabled: isApproving || isRejecting,
-            isLoading: isRejecting,
-            children: "Reject Return"
-          }
-        )
-      ] }),
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Approving will create a Medusa return entity and process the return request" })
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex gap-3", children: /* @__PURE__ */ jsxRuntime.jsx(
+        ui.Button,
+        {
+          variant: "danger",
+          onClick: handleReject,
+          disabled: isRejecting,
+          isLoading: isRejecting,
+          children: "Reject (Cancel) Return"
+        }
+      ) }),
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: 'Cancel this return request. Use "Mark as received" when items are received.' })
     ] }),
-    (returnOrder.status === "approved" || returnOrder.status === "received" || returnOrder.status === "refunded") && returnOrder.medusa_return_id && /* @__PURE__ */ jsxRuntime.jsx("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-subtle p-4", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Receive item and process refund from the order detail page (same flow as admin-created returns)." }) }),
-    returnOrder.status === "approved" && returnOrder.medusa_return_id && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
+    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
       /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-4 text-lg", children: "Return Information" }),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-3", children: [
         /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Medusa Return ID" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.medusa_return_id })
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Return ID" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: returnOrder.id })
         ] }),
         /* @__PURE__ */ jsxRuntime.jsx("div", { children: /* @__PURE__ */ jsxRuntime.jsx(
           ui.Button,
@@ -763,7 +637,7 @@ const ReturnDetailPage = () => {
                 "_blank"
               );
             },
-            children: "View in Medusa"
+            children: "View order"
           }
         ) })
       ] })
@@ -885,26 +759,26 @@ const getStatusBadgeClass = (status) => {
   if (statusLower === "completed") {
     return "bg-ui-tag-green-bg text-ui-tag-green-text";
   }
-  if (statusLower === "cancelled") {
+  if (statusLower === "cancelled" || statusLower === "canceled") {
     return "bg-ui-tag-grey-bg text-ui-tag-grey-text";
   }
+  if (statusLower === "pending") {
+    return "bg-ui-tag-orange-bg text-ui-tag-orange-text";
+  }
   return "bg-ui-tag-purple-bg text-ui-tag-purple-text";
 };
 const SwapDetailPage = () => {
-  var _a, _b;
+  var _a, _b, _c;
   const navigate = reactRouterDom.useNavigate();
   const { id } = reactRouterDom.useParams();
   const [swap, setSwap] = react.useState(null);
   const [order, setOrder] = react.useState(null);
-  const [selectedStatus, setSelectedStatus] = react.useState("");
   const [isLoading, setIsLoading] = react.useState(true);
-  const [isUpdating, setIsUpdating] = react.useState(false);
-  const [isApproving, setIsApproving] = react.useState(false);
-  const [isRejecting, setIsRejecting] = react.useState(false);
+  react.useState(false);
+  const [isCancelling, setIsCancelling] = react.useState(false);
   const [error, setError] = react.useState(null);
   const [updateError, setUpdateError] = react.useState(null);
   const [updateSuccess, setUpdateSuccess] = react.useState(false);
-  const availableStatuses = ["requested", "approved", "rejected"];
   react.useEffect(() => {
     if (!id) {
       navigate("/swaps");
@@ -924,7 +798,6 @@ const SwapDetailPage = () => {
         const payload = await response.json();
         setSwap(payload.swap);
         setOrder(payload.order || null);
-        setSelectedStatus("");
       } catch (loadError) {
         const message = loadError instanceof Error ? loadError.message : "Unable to load swap";
         setError(message);
@@ -934,55 +807,15 @@ const SwapDetailPage = () => {
     };
     void loadSwap();
   }, [id, navigate]);
-  const handleStatusUpdate = async () => {
-    if (!id || !selectedStatus) {
-      return;
-    }
-    try {
-      setIsUpdating(true);
-      setUpdateError(null);
-      setUpdateSuccess(false);
-      const response = await fetch(`/admin/swaps/${id}/status`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        credentials: "include",
-        body: JSON.stringify({ status: selectedStatus })
-      });
-      if (!response.ok) {
-        const message = await response.text();
-        throw new Error(message || "Unable to update status");
-      }
-      const payload = await response.json();
-      setSwap(payload.swap);
-      setSelectedStatus("");
-      setUpdateSuccess(true);
-      setTimeout(() => setUpdateSuccess(false), 3e3);
-      const detailResponse = await fetch(`/admin/swaps/${id}`, {
-        credentials: "include"
-      });
-      if (detailResponse.ok) {
-        const detailPayload = await detailResponse.json();
-        setSwap(detailPayload.swap);
-        setOrder(detailPayload.order || null);
-      }
-    } catch (updateErr) {
-      const message = updateErr instanceof Error ? updateErr.message : "Unable to update status";
-      setUpdateError(message);
-    } finally {
-      setIsUpdating(false);
-    }
-  };
-  const handleAutoCreateExchange = async () => {
+  const handleCancelExchange = async () => {
     if (!id) {
       return;
     }
     try {
-      setIsApproving(true);
+      setIsCancelling(true);
       setUpdateError(null);
       setUpdateSuccess(false);
-      const response = await fetch(`/admin/swaps/${id}/create-exchange`, {
+      const response = await fetch(`/admin/swaps/${id}/cancel`, {
         method: "POST",
         headers: {
           "Content-Type": "application/json"
@@ -991,51 +824,7 @@ const SwapDetailPage = () => {
       });
       if (!response.ok) {
         const message = await response.text();
-        throw new Error(message || "Unable to create exchange from swap");
-      }
-      const payload = await response.json();
-      setSwap(payload.swap);
-      setUpdateSuccess(true);
-      const orderId = payload.swap.order_id;
-      if (orderId) {
-        window.location.href = `/app/orders/${orderId}`;
-        return;
-      }
-      setTimeout(() => setUpdateSuccess(false), 3e3);
-      const detailResponse = await fetch(`/admin/swaps/${id}`, {
-        credentials: "include"
-      });
-      if (detailResponse.ok) {
-        const detailPayload = await detailResponse.json();
-        setSwap(detailPayload.swap);
-        setOrder(detailPayload.order || null);
-      }
-    } catch (approveErr) {
-      const message = approveErr instanceof Error ? approveErr.message : "Unable to create exchange from swap";
-      setUpdateError(message);
-    } finally {
-      setIsApproving(false);
-    }
-  };
-  const handleReject = async () => {
-    if (!id) {
-      return;
-    }
-    try {
-      setIsRejecting(true);
-      setUpdateError(null);
-      setUpdateSuccess(false);
-      const response = await fetch(`/admin/swaps/${id}/reject`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        credentials: "include",
-        body: JSON.stringify({ reason: "Rejected by admin" })
-      });
-      if (!response.ok) {
-        const message = await response.text();
-        throw new Error(message || "Unable to reject swap");
+        throw new Error(message || "Unable to cancel exchange");
       }
       const payload = await response.json();
       setSwap(payload.swap);
@@ -1049,13 +838,17 @@ const SwapDetailPage = () => {
         setSwap(detailPayload.swap);
         setOrder(detailPayload.order || null);
       }
-    } catch (updateErr) {
-      const message = updateErr instanceof Error ? updateErr.message : "Unable to reject swap";
+    } catch (cancelErr) {
+      const message = cancelErr instanceof Error ? cancelErr.message : "Unable to cancel exchange";
       setUpdateError(message);
     } finally {
-      setIsRejecting(false);
+      setIsCancelling(false);
     }
   };
+  const isOrderExchange = Boolean(swap == null ? void 0 : swap.exchange_id);
+  const canCancelExchange = isOrderExchange && swap && !["cancelled", "canceled", "completed", "declined"].includes(
+    ((_a = swap.status) == null ? void 0 : _a.toLowerCase()) ?? ""
+  );
   if (isLoading) {
     return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full p-6", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Container, { className: "mx-auto flex w-full max-w-5xl flex-col gap-6 p-6", children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex justify-center py-16", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { children: "Loading swap..." }) }) }) });
   }
@@ -1065,7 +858,7 @@ const SwapDetailPage = () => {
       /* @__PURE__ */ jsxRuntime.jsx("div", { className: "mt-4 flex justify-center", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Button, { variant: "secondary", onClick: () => navigate("/swaps"), children: "Back to list" }) })
     ] }) }) });
   }
-  const statusHistory = ((_a = swap.metadata) == null ? void 0 : _a.status_history) || [];
+  const statusHistory = ((_b = swap.metadata) == null ? void 0 : _b.status_history) || [];
   return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full p-6", children: /* @__PURE__ */ jsxRuntime.jsxs(ui.Container, { className: "mx-auto flex w-full max-w-5xl flex-col gap-6 p-6", children: [
     /* @__PURE__ */ jsxRuntime.jsxs("header", { className: "flex flex-col gap-3", children: [
       /* @__PURE__ */ jsxRuntime.jsxs(
@@ -1083,7 +876,7 @@ const SwapDetailPage = () => {
       ),
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-1 md:flex-row md:items-center md:justify-between", children: [
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-1", children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h1", children: "Swap Details" }),
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h1", children: "Exchange Details" }),
           /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: swap.id })
         ] }),
         /* @__PURE__ */ jsxRuntime.jsx(
@@ -1096,88 +889,25 @@ const SwapDetailPage = () => {
         )
       ] })
     ] }),
-    swap.status === "requested" && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-3", children: [
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex gap-3", children: [
-        /* @__PURE__ */ jsxRuntime.jsx(
-          ui.Button,
-          {
-            variant: "primary",
-            onClick: handleAutoCreateExchange,
-            disabled: isApproving || isRejecting,
-            isLoading: isApproving,
-            children: "Approve & Create Exchange"
-          }
-        ),
-        /* @__PURE__ */ jsxRuntime.jsx(
-          ui.Button,
-          {
-            variant: "danger",
-            onClick: handleReject,
-            disabled: isApproving || isRejecting,
-            isLoading: isRejecting,
-            children: "Reject Swap"
-          }
-        )
-      ] }),
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Approving will automatically create an exchange with return items and new items from the swap request" })
-    ] }),
-    swap.status === "requested" && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-4 text-lg", children: "Update Status" }),
-      /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-3 md:flex-row md:items-end", children: [
-        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex-1", children: [
-          /* @__PURE__ */ jsxRuntime.jsx("label", { className: "mb-2 block text-sm font-medium text-ui-fg-base", children: "New Status" }),
-          /* @__PURE__ */ jsxRuntime.jsxs(
-            "select",
-            {
-              value: selectedStatus,
-              onChange: (event) => setSelectedStatus(event.target.value),
-              className: "h-9 w-full rounded-md border border-ui-border-base bg-transparent px-3 text-sm text-ui-fg-base outline-none transition focus:ring-2 focus:ring-ui-fg-interactive",
-              children: [
-                /* @__PURE__ */ jsxRuntime.jsx("option", { value: "", children: "Select new status" }),
-                availableStatuses.filter((status) => status !== swap.status).map((status) => /* @__PURE__ */ jsxRuntime.jsx("option", { value: status, children: status.replace(/_/g, " ").toUpperCase() }, status))
-              ]
-            }
-          )
-        ] }),
-        /* @__PURE__ */ jsxRuntime.jsx(
-          ui.Button,
-          {
-            variant: "primary",
-            onClick: handleStatusUpdate,
-            disabled: !selectedStatus || isUpdating,
-            isLoading: isUpdating,
-            children: "Update Status"
-          }
-        )
-      ] }),
-      updateError && /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "mt-2 text-ui-fg-error", children: updateError }),
-      updateSuccess && /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "mt-2 text-ui-fg-success", children: "Status updated successfully" })
-    ] }),
-    swap.status === "approved" && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-4 text-lg", children: "Exchange Information" }),
-      swap.exchange_id ? /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-3", children: [
-        /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Exchange ID" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: swap.exchange_id })
-        ] }),
-        /* @__PURE__ */ jsxRuntime.jsx("div", { children: /* @__PURE__ */ jsxRuntime.jsx(
-          ui.Button,
-          {
-            variant: "secondary",
-            onClick: () => {
-              window.open(`/app/orders/${swap.order_id}/exchanges/${swap.exchange_id}`, "_blank");
-            },
-            children: "View Exchange"
-          }
-        ) })
-      ] }) : /* @__PURE__ */ jsxRuntime.jsx("div", { className: "space-y-3", children: /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Exchange is being created. Please refresh the page to see the exchange details." }) })
+    canCancelExchange && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex flex-col gap-3", children: [
+      /* @__PURE__ */ jsxRuntime.jsx("div", { className: "flex gap-3", children: /* @__PURE__ */ jsxRuntime.jsx(
+        ui.Button,
+        {
+          variant: "danger",
+          onClick: handleCancelExchange,
+          disabled: isCancelling,
+          isLoading: isCancelling,
+          children: "Cancel Exchange"
+        }
+      ) }),
+      /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "This will cancel the exchange request. The order will remain unchanged." })
     ] }),
     /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "grid gap-6 md:grid-cols-2", children: [
       /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "rounded-lg border border-ui-border-base bg-ui-bg-base p-6", children: [
-        /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-4 text-lg", children: "Swap Information" }),
+        /* @__PURE__ */ jsxRuntime.jsx(ui.Heading, { level: "h2", className: "mb-4 text-lg", children: "Exchange Information" }),
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-3", children: [
           /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
-            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Swap ID" }),
+            /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Exchange ID" }),
             /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: swap.id })
           ] }),
           /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
@@ -1249,7 +979,7 @@ const SwapDetailPage = () => {
         ] }),
         /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
           /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Customer" }),
-          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: ((_b = order.customer) == null ? void 0 : _b.email) || order.email || "—" })
+          /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { className: "font-medium", children: ((_c = order.customer) == null ? void 0 : _c.email) || order.email || "—" })
         ] }),
         order.total && /* @__PURE__ */ jsxRuntime.jsxs("div", { children: [
           /* @__PURE__ */ jsxRuntime.jsx(ui.Text, { size: "small", className: "text-ui-fg-subtle", children: "Order Total" }),
@@ -1295,12 +1025,7 @@ const config = adminSdk.defineRouteConfig({
   icon: icons.ArrowPath
 });
 const i18nTranslations0 = {};
-const widgetModule = { widgets: [
-  {
-    Component: OrderReturnApprovalNoticeWidget,
-    zone: ["order.details.before"]
-  }
-] };
+const widgetModule = { widgets: [] };
 const routeModule = {
   routes: [
     {
@@ -1323,12 +1048,6 @@ const routeModule = {
 };
 const menuItemModule = {
   menuItems: [
-    {
-      label: config$3.label,
-      icon: config$3.icon,
-      path: "/returns",
-      nested: void 0
-    },
     {
       label: config$2.label,
       icon: config$2.icon,
@@ -1336,9 +1055,9 @@ const menuItemModule = {
       nested: void 0
     },
     {
-      label: config$1.label,
-      icon: config$1.icon,
-      path: "/returns/:id",
+      label: config$3.label,
+      icon: config$3.icon,
+      path: "/returns",
       nested: void 0
     },
     {
@@ -1346,6 +1065,12 @@ const menuItemModule = {
       icon: config.icon,
       path: "/swaps/:id",
       nested: void 0
+    },
+    {
+      label: config$1.label,
+      icon: config$1.icon,
+      path: "/returns/:id",
+      nested: void 0
     }
   ]
 };