@mercurjs/admin 2.2.0-canary.9 → 2.2.0-rc.1

package/dist/{chunk-6PLDJPQ3.js → chunk-PDID73QY.js}

@@ -1,6 +1,6 @@
 import {
   By
-} from "./chunk-C4JUURO5.js";
+} from "./chunk-OT5X3VOQ.js";
 import {
   getFormattedAddress,
   isSameAddress
@@ -18,24 +18,26 @@ import {
   useCancelClaim,
   useCancelClaimRequest,
   useClaims
-} from "./chunk-X2T3AU67.js";
+} from "./chunk-QCIDV3AP.js";
 import {
   useCancelExchange,
   useCancelExchangeRequest,
   useExchanges
-} from "./chunk-4AU37UL5.js";
-import {
-  getReturnableQuantity
-} from "./chunk-UM7ZR3VU.js";
+} from "./chunk-PYZ7VL5X.js";
 import {
+  getReturnableQuantity,
   useCancelReturn,
   useCancelReturnRequest,
   useReturns
-} from "./chunk-YDBPAHWU.js";
+} from "./chunk-YXKHBSQJ.js";
 import {
   useCancelOrderEdit,
   useConfirmOrderEdit
-} from "./chunk-5NHDF6SM.js";
+} from "./chunk-IGTR66D2.js";
+import {
+  getPaymentsFromOrder,
+  getReservationsLimitCount
+} from "./chunk-3KOTDGC2.js";
 import {
   formatProvider
 } from "./chunk-VW56KWO2.js";
@@ -44,7 +46,7 @@ import {
 } from "./chunk-XSX255FK.js";
 import {
   DEFAULT_FIELDS
-} from "./chunk-THZ5Q2UG.js";
+} from "./chunk-JHBNG7OD.js";
 import {
   FulfillmentStatusCell,
   FulfillmentStatusHeader,
@@ -63,53 +65,48 @@ import {
   getStylizedAmount,
   isAmountLessThenRoundingError
 } from "./chunk-PXYDR7WQ.js";
-import {
-  getPaymentsFromOrder,
-  getReservationsLimitCount
-} from "./chunk-3KOTDGC2.js";
 import {
   TextCell,
   TextHeader
 } from "./chunk-JHIMVLB2.js";
-import {
-  _DataTable,
-  useDataTable
-} from "./chunk-NQEXDLYH.js";
 import {
   TwoColumnPage
 } from "./chunk-E74OUNA3.js";
 import {
   Thumbnail
 } from "./chunk-WIYFXWRI.js";
+import {
+  _DataTable,
+  useDataTable
+} from "./chunk-GRFWCCUW.js";
 import {
   useDate
 } from "./chunk-UZWFZMOX.js";
 import {
   useCapturePayment,
   useMarkPaymentCollectionAsPaid
-} from "./chunk-LOIFUOOA.js";
+} from "./chunk-ABS7HMLY.js";
 import {
   useStockLocation
-} from "./chunk-EPHVGD5Z.js";
+} from "./chunk-VXW3BCN2.js";
+import {
+  useReservationItems
+} from "./chunk-WX4ABVXL.js";
 import {
   useCancelOrder,
-  useCancelOrderFulfillment,
   useCancelOrderTransfer,
-  useMarkOrderFulfillmentAsDelivered,
   useOrder,
   useOrderChanges,
+  useOrderCommissionLines,
   useOrderLineItems,
   useOrderPreview
-} from "./chunk-2WHSCEKX.js";
-import {
-  useReservationItems
-} from "./chunk-P5XVG4PY.js";
+} from "./chunk-WF3ZDT5Z.js";
 import {
   useOrderGroupByOrderId
-} from "./chunk-VYMODH6P.js";
+} from "./chunk-PYF5EER5.js";
 import {
   useCustomer
-} from "./chunk-PRBE5CM3.js";
+} from "./chunk-AFYILTAC.js";
 import {
   ActionMenu
 } from "./chunk-BDGZ4EQO.js";
@@ -121,6 +118,7 @@ import {
 // src/pages/orders/order-detail/order-detail.tsx
 import { Children } from "react";
 import { useLoaderData, useParams as useParams2 } from "react-router-dom";
+import { useLinkQuery, WidgetZone } from "@mercurjs/dashboard-shared";
 
 // src/pages/orders/order-detail/components/active-order-claim-section/active-order-claim-section.tsx
 import { ExclamationCircle } from "@medusajs/icons";
@@ -457,6 +455,7 @@ var OrderActiveEditSection = ({
 
 // src/pages/orders/order-detail/components/order-activity-section/order-activity-section.tsx
 import { Container as Container5, Heading as Heading5 } from "@medusajs/ui";
+import { DisplayExtensionZone } from "@mercurjs/dashboard-shared";
 import { useTranslation as useTranslation8 } from "react-i18next";
 
 // src/pages/orders/order-detail/components/order-activity-section/order-timeline.tsx
@@ -1382,13 +1381,15 @@ var OrderActivitySection = ({ order }) => {
   const { t } = useTranslation8();
   return /* @__PURE__ */ jsxs8(Container5, { className: "flex flex-col gap-y-8 px-6 py-4", "data-testid": "order-activity-section", children: [
     /* @__PURE__ */ jsx8("div", { className: "flex flex-col gap-y-4", children: /* @__PURE__ */ jsx8("div", { className: "flex items-center justify-between", "data-testid": "order-activity-header", children: /* @__PURE__ */ jsx8(Heading5, { level: "h2", "data-testid": "order-activity-heading", children: t("orders.activity.header") }) }) }),
-    /* @__PURE__ */ jsx8(OrderTimeline, { order })
+    /* @__PURE__ */ jsx8(OrderTimeline, { order }),
+    /* @__PURE__ */ jsx8(DisplayExtensionZone, { model: "order", zone: "activity", data: order })
   ] });
 };
 
 // src/pages/orders/order-detail/components/order-customer-section/order-customer-section.tsx
 import { ArrowPath as ArrowPath2, CurrencyDollar, Envelope, FlyingBox } from "@medusajs/icons";
 import { Container as Container6, Heading as Heading6 } from "@medusajs/ui";
+import { DisplayExtensionZone as DisplayExtensionZone2 } from "@mercurjs/dashboard-shared";
 import { useTranslation as useTranslation10 } from "react-i18next";
 
 // src/components/common/customer-info/customer-info.tsx
@@ -1546,7 +1547,8 @@ var OrderCustomerSection = ({ order }) => {
         /* @__PURE__ */ jsx10(CustomerInfo.ID, { data: order }),
         /* @__PURE__ */ jsx10(CustomerInfo.Contact, { data: order }),
         /* @__PURE__ */ jsx10(CustomerInfo.Company, { data: order }),
-        /* @__PURE__ */ jsx10(CustomerInfo.Addresses, { data: order })
+        /* @__PURE__ */ jsx10(CustomerInfo.Addresses, { data: order }),
+        /* @__PURE__ */ jsx10(DisplayExtensionZone2, { model: "order", zone: "customer", data: order })
       ]
     }
   );
@@ -1614,21 +1616,17 @@ var Header = ({ order }) => {
 };
 
 // src/pages/orders/order-detail/components/order-fulfillment-section/order-fulfillment-section.tsx
-import { Buildings, XCircle } from "@medusajs/icons";
 import {
-  Button as Button6,
   Container as Container7,
   Copy as Copy3,
   Heading as Heading7,
   StatusBadge,
   Text as Text8,
-  Tooltip as Tooltip2,
-  toast as toast6,
-  usePrompt as usePrompt2
+  Tooltip as Tooltip2
 } from "@medusajs/ui";
 import { format } from "date-fns";
 import { useTranslation as useTranslation11 } from "react-i18next";
-import { Link as Link2, useNavigate as useNavigate5 } from "react-router-dom";
+import { Link as Link2 } from "react-router-dom";
 import { Fragment as Fragment2, jsx as jsx11, jsxs as jsxs11 } from "react/jsx-runtime";
 var OrderFulfillmentSection = ({
   order
@@ -1721,24 +1719,7 @@ var UnfulfilledItemDisplay = ({
       /* @__PURE__ */ jsx11(Heading7, { level: "h2", "data-testid": "order-fulfillment-unfulfilled-heading", children: t("orders.fulfillment.unfulfilledItems") }),
       /* @__PURE__ */ jsxs11("div", { className: "flex items-center gap-x-4", "data-testid": "order-fulfillment-unfulfilled-badges", children: [
         requiresShipping && /* @__PURE__ */ jsx11(StatusBadge, { color: "red", className: "text-nowrap", "data-testid": "order-fulfillment-unfulfilled-requires-shipping-badge", children: t("orders.fulfillment.requiresShipping") }),
-        /* @__PURE__ */ jsx11(StatusBadge, { color: "red", className: "text-nowrap", "data-testid": "order-fulfillment-unfulfilled-awaiting-badge", children: t("orders.fulfillment.awaitingFulfillmentBadge") }),
-        /* @__PURE__ */ jsx11(
-          ActionMenu,
-          {
-            groups: [
-              {
-                actions: [
-                  {
-                    label: t("orders.fulfillment.fulfillItems"),
-                    icon: /* @__PURE__ */ jsx11(Buildings, {}),
-                    to: `/orders/${order.id}/fulfillment?requires_shipping=${requiresShipping}`
-                  }
-                ]
-              }
-            ],
-            "data-testid": "order-fulfillment-unfulfilled-action-menu"
-          }
-        )
+        /* @__PURE__ */ jsx11(StatusBadge, { color: "red", className: "text-nowrap", "data-testid": "order-fulfillment-unfulfilled-awaiting-badge", children: t("orders.fulfillment.awaitingFulfillmentBadge") })
       ] })
     ] }),
     /* @__PURE__ */ jsx11("div", { "data-testid": "order-fulfillment-unfulfilled-items", children: unfulfilledItems.map((item) => /* @__PURE__ */ jsx11(
@@ -1753,12 +1734,9 @@ var UnfulfilledItemDisplay = ({
 };
 var Fulfillment = ({
   fulfillment,
-  order,
   index
 }) => {
   const { t } = useTranslation11();
-  const prompt = usePrompt2();
-  const navigate = useNavigate5();
   const showLocation = !!fulfillment.location_id;
   const isPickUpFulfillment = fulfillment.shipping_option?.service_zone.fulfillment_set.type === "pickup" /* Pickup */;
   const { stock_location, isError, error } = useStockLocation(
@@ -1784,58 +1762,6 @@ var Fulfillment = ({
     statusColor = "green";
     statusTimestamp = fulfillment.shipped_at;
   }
-  const { mutateAsync } = useCancelOrderFulfillment(order.id, fulfillment.id);
-  const { mutateAsync: markAsDelivered } = useMarkOrderFulfillmentAsDelivered(
-    order.id,
-    fulfillment.id
-  );
-  const showShippingButton = !fulfillment.canceled_at && !fulfillment.shipped_at && !fulfillment.delivered_at && fulfillment.requires_shipping && !isPickUpFulfillment;
-  const showDeliveryButton = !fulfillment.canceled_at && !fulfillment.delivered_at;
-  const handleMarkAsDelivered = async () => {
-    const res = await prompt({
-      title: t("general.areYouSure"),
-      description: t("orders.fulfillment.markAsDeliveredWarning"),
-      confirmText: t("actions.continue"),
-      cancelText: t("actions.cancel"),
-      variant: "confirmation"
-    });
-    if (res) {
-      await markAsDelivered(void 0, {
-        onSuccess: () => {
-          toast6.success(
-            t(
-              isPickUpFulfillment ? "orders.fulfillment.toast.fulfillmentPickedUp" : "orders.fulfillment.toast.fulfillmentDelivered"
-            )
-          );
-        },
-        onError: (e) => {
-          toast6.error(e.message);
-        }
-      });
-    }
-  };
-  const handleCancel = async () => {
-    if (fulfillment.shipped_at) {
-      toast6.warning(t("orders.fulfillment.toast.fulfillmentShipped"));
-      return;
-    }
-    const res = await prompt({
-      title: t("general.areYouSure"),
-      description: t("orders.fulfillment.cancelWarning"),
-      confirmText: t("actions.continue"),
-      cancelText: t("actions.cancel")
-    });
-    if (res) {
-      await mutateAsync(void 0, {
-        onSuccess: () => {
-          toast6.success(t("orders.fulfillment.toast.canceled"));
-        },
-        onError: (e) => {
-          toast6.error(e.message);
-        }
-      });
-    }
-  };
   if (isError) {
     throw error;
   }
@@ -1845,36 +1771,16 @@ var Fulfillment = ({
       /* @__PURE__ */ jsx11(Heading7, { level: "h2", "data-testid": `order-fulfillment-${fulfillment.id}-heading`, children: t("orders.fulfillment.number", {
         number: index + 1
       }) }),
-      /* @__PURE__ */ jsxs11("div", { className: "flex items-center gap-x-4", "data-testid": `order-fulfillment-${fulfillment.id}-status-container`, children: [
-        /* @__PURE__ */ jsx11(
-          Tooltip2,
-          {
-            content: format(
-              new Date(statusTimestamp),
-              "dd MMM, yyyy, HH:mm:ss"
-            ),
-            children: /* @__PURE__ */ jsx11(StatusBadge, { color: statusColor, className: "text-nowrap", "data-testid": `order-fulfillment-${fulfillment.id}-status-badge`, children: statusText })
-          }
-        ),
-        /* @__PURE__ */ jsx11(
-          ActionMenu,
-          {
-            groups: [
-              {
-                actions: [
-                  {
-                    label: t("actions.cancel"),
-                    icon: /* @__PURE__ */ jsx11(XCircle, {}),
-                    onClick: handleCancel,
-                    disabled: !!fulfillment.canceled_at || !!fulfillment.shipped_at || !!fulfillment.delivered_at
-                  }
-                ]
-              }
-            ],
-            "data-testid": `order-fulfillment-${fulfillment.id}-action-menu`
-          }
-        )
-      ] })
+      /* @__PURE__ */ jsx11("div", { className: "flex items-center gap-x-4", "data-testid": `order-fulfillment-${fulfillment.id}-status-container`, children: /* @__PURE__ */ jsx11(
+        Tooltip2,
+        {
+          content: format(
+            new Date(statusTimestamp),
+            "dd MMM, yyyy, HH:mm:ss"
+          ),
+          children: /* @__PURE__ */ jsx11(StatusBadge, { color: statusColor, className: "text-nowrap", "data-testid": `order-fulfillment-${fulfillment.id}-status-badge`, children: statusText })
+        }
+      ) })
     ] }),
     /* @__PURE__ */ jsxs11("div", { className: "text-ui-fg-subtle grid grid-cols-2 items-start px-6 py-4", children: [
       /* @__PURE__ */ jsx11(Text8, { size: "small", leading: "compact", weight: "plus", children: t("orders.fulfillment.itemsLabel") }),
@@ -1931,48 +1837,42 @@ var Fulfillment = ({
         }
         return /* @__PURE__ */ jsx11("li", { children: /* @__PURE__ */ jsx11(Text8, { size: "small", leading: "compact", children: tlink.tracking_number }) }, tlink.tracking_number);
       }) }) : /* @__PURE__ */ jsx11(Text8, { size: "small", leading: "compact", children: "-" }) })
-    ] }),
-    (showShippingButton || showDeliveryButton) && /* @__PURE__ */ jsxs11("div", { className: "bg-ui-bg-subtle flex items-center justify-end gap-x-2 rounded-b-xl px-4 py-4", "data-testid": `order-fulfillment-${fulfillment.id}-actions`, children: [
-      showDeliveryButton && /* @__PURE__ */ jsx11(Button6, { onClick: handleMarkAsDelivered, variant: "secondary", "data-testid": `order-fulfillment-${fulfillment.id}-mark-delivered-button`, children: t(
-        isPickUpFulfillment ? "orders.fulfillment.markAsPickedUp" : "orders.fulfillment.markAsDelivered"
-      ) }),
-      showShippingButton && /* @__PURE__ */ jsx11(
-        Button6,
-        {
-          onClick: () => navigate(`./${fulfillment.id}/create-shipment`),
-          variant: "secondary",
-          "data-testid": `order-fulfillment-${fulfillment.id}-mark-shipped-button`,
-          children: t("orders.fulfillment.markAsShipped")
-        }
-      )
     ] })
   ] });
 };
 
 // src/pages/orders/order-detail/components/order-general-section/order-general-section.tsx
-import {
-  ArrowPath as ArrowPath3,
-  ArrowUturnLeft as ArrowUturnLeft2,
-  ExclamationCircle as ExclamationCircle2,
-  PencilSquare,
-  XCircle as XCircle2
-} from "@medusajs/icons";
+import { XCircle } from "@medusajs/icons";
 import {
   Container as Container8,
   Copy as Copy4,
   Heading as Heading8,
   StatusBadge as StatusBadge2,
   Text as Text9,
-  toast as toast7,
-  usePrompt as usePrompt3
+  toast as toast6,
+  usePrompt as usePrompt2
 } from "@medusajs/ui";
 import { useTranslation as useTranslation12 } from "react-i18next";
+import { DisplayExtensionZone as DisplayExtensionZone3, DisplayField } from "@mercurjs/dashboard-shared";
 import { jsx as jsx12, jsxs as jsxs12 } from "react/jsx-runtime";
+var GENERAL_FIELD_IDS = [
+  "display_id",
+  "created_at",
+  "status",
+  "payment_status",
+  "fulfillment_status"
+];
 var OrderGeneralSection = ({ order }) => {
   const { t } = useTranslation12();
-  const prompt = usePrompt3();
+  const prompt = usePrompt2();
   const { getFullDate } = useDate();
   const { mutateAsync: cancelOrder } = useCancelOrder(order.id);
+  const hasAnyFulfilledItem = order.items?.some(
+    // @ts-ignore — detail.fulfilled_quantity is exposed via Mercur query-config
+    (i) => (i.detail?.fulfilled_quantity ?? 0) > 0
+  );
+  const cancelDisabled = !!order.canceled_at || !!hasAnyFulfilledItem;
+  const cancelDisabledTooltip = order.canceled_at ? void 0 : hasAnyFulfilledItem ? t("orders.actions.cancelDisabledFulfilled") : void 0;
   const handleCancel = async () => {
     const res = await prompt({
       title: t("general.areYouSure"),
@@ -1987,72 +1887,45 @@ var OrderGeneralSection = ({ order }) => {
     }
     await cancelOrder(void 0, {
       onSuccess: () => {
-        toast7.success(t("orders.orderCanceled"));
+        toast6.success(t("orders.orderCanceled"));
       },
       onError: (e) => {
-        toast7.error(e.message);
+        toast6.error(e.message);
       }
     });
   };
   return /* @__PURE__ */ jsxs12(Container8, { className: "flex items-center justify-between px-6 py-4", "data-testid": "order-general-section", children: [
     /* @__PURE__ */ jsxs12("div", { children: [
-      /* @__PURE__ */ jsxs12("div", { className: "flex items-center gap-x-1", "data-testid": "order-general-section-id-container", children: [
+      /* @__PURE__ */ jsx12(DisplayField, { model: "order", zone: "general", id: "display_id", data: order, children: /* @__PURE__ */ jsxs12("div", { className: "flex items-center gap-x-1", "data-testid": "order-general-section-id-container", children: [
         /* @__PURE__ */ jsxs12(Heading8, { "data-testid": "order-general-section-id-heading", children: [
           "#",
           order.display_id
         ] }),
         /* @__PURE__ */ jsx12(Copy4, { content: `#${order.display_id}`, className: "text-ui-fg-muted", "data-testid": "order-general-section-id-copy" })
-      ] }),
-      /* @__PURE__ */ jsx12(Text9, { size: "small", className: "text-ui-fg-subtle", "data-testid": "order-general-section-date", children: t("orders.onDateFromSalesChannel", {
+      ] }) }),
+      /* @__PURE__ */ jsx12(DisplayField, { model: "order", zone: "general", id: "created_at", data: order, children: /* @__PURE__ */ jsx12(Text9, { size: "small", className: "text-ui-fg-subtle", "data-testid": "order-general-section-date", children: t("orders.onDateFromSalesChannel", {
         date: getFullDate({ date: order.created_at, includeTime: true }),
         salesChannel: order.sales_channel?.name
-      }) })
+      }) }) })
     ] }),
     /* @__PURE__ */ jsxs12("div", { className: "flex items-center gap-x-4", "data-testid": "order-general-section-badges-container", children: [
       /* @__PURE__ */ jsxs12("div", { className: "flex items-center gap-x-1.5", "data-testid": "order-general-section-badges", children: [
-        /* @__PURE__ */ jsx12(OrderBadge, { order }),
-        /* @__PURE__ */ jsx12(PaymentBadge, { order }),
-        /* @__PURE__ */ jsx12(FulfillmentBadge, { order })
+        /* @__PURE__ */ jsx12(DisplayField, { model: "order", zone: "general", id: "status", data: order, children: /* @__PURE__ */ jsx12(OrderBadge, { order }) }),
+        /* @__PURE__ */ jsx12(DisplayField, { model: "order", zone: "general", id: "payment_status", data: order, children: /* @__PURE__ */ jsx12(PaymentBadge, { order }) }),
+        /* @__PURE__ */ jsx12(DisplayField, { model: "order", zone: "general", id: "fulfillment_status", data: order, children: /* @__PURE__ */ jsx12(FulfillmentBadge, { order }) })
       ] }),
       /* @__PURE__ */ jsx12(
         ActionMenu,
         {
           groups: [
-            {
-              actions: [
-                {
-                  label: t("orders.edits.create"),
-                  to: "edits",
-                  disabled: order.status === "canceled",
-                  icon: /* @__PURE__ */ jsx12(PencilSquare, {})
-                },
-                {
-                  label: t("orders.returns.create"),
-                  to: "returns",
-                  disabled: order.status === "canceled",
-                  icon: /* @__PURE__ */ jsx12(ArrowUturnLeft2, {})
-                },
-                {
-                  label: t("orders.exchanges.create"),
-                  to: "exchanges",
-                  disabled: order.status === "canceled",
-                  icon: /* @__PURE__ */ jsx12(ArrowPath3, {})
-                },
-                {
-                  label: t("orders.claims.create"),
-                  to: "claims",
-                  disabled: order.status === "canceled",
-                  icon: /* @__PURE__ */ jsx12(ExclamationCircle2, {})
-                }
-              ]
-            },
             {
               actions: [
                 {
                   label: t("actions.cancel"),
                   onClick: handleCancel,
-                  disabled: order.status === "canceled",
-                  icon: /* @__PURE__ */ jsx12(XCircle2, {})
+                  disabled: cancelDisabled,
+                  disabledTooltip: cancelDisabledTooltip,
+                  icon: /* @__PURE__ */ jsx12(XCircle, {})
                 }
               ]
             }
@@ -2060,7 +1933,16 @@ var OrderGeneralSection = ({ order }) => {
           "data-testid": "order-general-section-action-menu"
         }
       )
-    ] })
+    ] }),
+    /* @__PURE__ */ jsx12(
+      DisplayExtensionZone3,
+      {
+        model: "order",
+        zone: "general",
+        data: order,
+        builtInFieldIds: GENERAL_FIELD_IDS
+      }
+    )
   ] });
 };
 var FulfillmentBadge = ({ order }) => {
@@ -2089,14 +1971,14 @@ var OrderBadge = ({ order }) => {
 import { useTranslation as useTranslation13 } from "react-i18next";
 import { useState as useState4 } from "react";
 import copy from "copy-to-clipboard";
-import { clx as clx2, toast as toast8, Tooltip as Tooltip3 } from "@medusajs/ui";
+import { clx as clx2, toast as toast7, Tooltip as Tooltip3 } from "@medusajs/ui";
 import { jsx as jsx13, jsxs as jsxs13 } from "react/jsx-runtime";
 function DisplayId({ id, className }) {
   const { t } = useTranslation13();
   const [open, setOpen] = useState4(false);
   const onClick = () => {
     copy(id);
-    toast8.success(t("actions.idCopiedToClipboard"));
+    toast7.success(t("actions.idCopiedToClipboard"));
   };
   return /* @__PURE__ */ jsx13(Tooltip3, { maxWidth: 260, content: id, open, onOpenChange: setOpen, children: /* @__PURE__ */ jsxs13("span", { onClick, className: clx2("cursor-pointer", className), children: [
     "#",
@@ -2116,18 +1998,19 @@ var getTotalPending = (paymentCollections) => paymentCollections.filter((pc) =>
 }, 0);
 
 // src/pages/orders/order-detail/components/order-payment-section/order-payment-section.tsx
-import { ArrowDownRightMini, DocumentText, XCircle as XCircle3 } from "@medusajs/icons";
+import { ArrowDownRightMini, DocumentText, XCircle as XCircle2 } from "@medusajs/icons";
 import {
   Badge,
-  Button as Button7,
+  Button as Button6,
   Container as Container9,
   Heading as Heading9,
   StatusBadge as StatusBadge3,
   Text as Text10,
-  toast as toast9,
+  toast as toast8,
   Tooltip as Tooltip4,
-  usePrompt as usePrompt4
+  usePrompt as usePrompt3
 } from "@medusajs/ui";
+import { DisplayExtensionZone as DisplayExtensionZone4 } from "@mercurjs/dashboard-shared";
 import { format as format2 } from "date-fns";
 import { Trans, useTranslation as useTranslation14 } from "react-i18next";
 import { jsx as jsx14, jsxs as jsxs14 } from "react/jsx-runtime";
@@ -2150,7 +2033,8 @@ var OrderPaymentSection = ({ order }) => {
             currencyCode: order.currency_code
           }
         ),
-        /* @__PURE__ */ jsx14(Total, { order })
+        /* @__PURE__ */ jsx14(Total, { order }),
+        /* @__PURE__ */ jsx14(DisplayExtensionZone4, { model: "order", zone: "payment", data: order })
       ]
     }
   );
@@ -2224,7 +2108,7 @@ var Payment = ({
   currencyCode
 }) => {
   const { t } = useTranslation14();
-  const prompt = usePrompt4();
+  const prompt = usePrompt3();
   const { mutateAsync } = useCapturePayment(order.id, payment.id);
   const handleCapture = async () => {
     const res = await prompt({
@@ -2243,14 +2127,14 @@ var Payment = ({
       { amount: payment.amount },
       {
         onSuccess: () => {
-          toast9.success(
+          toast8.success(
             t("orders.payment.capturePaymentSuccess", {
               amount: formatCurrency(payment.amount, currencyCode)
             })
           );
         },
         onError: (error) => {
-          toast9.error(error.message);
+          toast8.error(error.message);
         }
       }
     );
@@ -2337,7 +2221,7 @@ var Payment = ({
                       actions: [
                         {
                           label: t("orders.payment.createRefund"),
-                          icon: /* @__PURE__ */ jsx14(XCircle3, {}),
+                          icon: /* @__PURE__ */ jsx14(XCircle2, {}),
                           to: `/orders/${order.id}/refund?paymentId=${payment.id}`,
                           disabled: !payment.captured_at || !!payment.canceled_at || totalRefunded >= payment.amount
                         }
@@ -2367,7 +2251,7 @@ var Payment = ({
                 ) })
               ] }),
               /* @__PURE__ */ jsxs14(
-                Button7,
+                Button6,
                 {
                   className: "shrink-0",
                   size: "small",
@@ -2515,7 +2399,7 @@ var Total = ({ order }) => {
             className: "flex items-center justify-between",
             "data-testid": "order-payment-total-pending",
             children: [
-              /* @__PURE__ */ jsx14(Text10, { size: "small", weight: "plus", leading: "compact", children: "Total pending" }),
+              /* @__PURE__ */ jsx14(Text10, { size: "small", weight: "plus", leading: "compact", children: t("orders.payment.totalPending") }),
               /* @__PURE__ */ jsx14(Text10, { size: "small", weight: "plus", leading: "compact", children: getStylizedAmount(totalPending, order.currency_code) })
             ]
           }
@@ -2531,27 +2415,27 @@ import { useTranslation as useTranslation17 } from "react-i18next";
 import { Link as Link3 } from "react-router-dom";
 import {
   ArrowDownRightMini as ArrowDownRightMini2,
-  ArrowLongRight,
-  ArrowPath as ArrowPath4,
-  ArrowUturnLeft as ArrowUturnLeft3,
+  ArrowPath as ArrowPath3,
+  ArrowUturnLeft as ArrowUturnLeft2,
   DocumentText as DocumentText2,
-  ExclamationCircle as ExclamationCircle3,
-  PencilSquare as PencilSquare2,
+  ExclamationCircle as ExclamationCircle2,
+  PencilSquare,
   TriangleDownMini
 } from "@medusajs/icons";
 import {
   Badge as Badge4,
-  Button as Button8,
+  Button as Button7,
   clx as clx3,
   Container as Container10,
   Copy as Copy5,
   Heading as Heading10,
   StatusBadge as StatusBadge4,
   Text as Text12,
-  toast as toast10,
+  toast as toast9,
   Tooltip as Tooltip6,
-  usePrompt as usePrompt5
+  usePrompt as usePrompt4
 } from "@medusajs/ui";
+import { DisplayExtensionZone as DisplayExtensionZone5 } from "@mercurjs/dashboard-shared";
 import { format as format3 } from "date-fns";
 
 // src/lib/credit-line.ts
@@ -2674,7 +2558,7 @@ var shipping_info_popover_default = ShippingInfoPopover;
 import { Fragment as Fragment3, jsx as jsx17, jsxs as jsxs17 } from "react/jsx-runtime";
 var OrderSummarySection = ({ order }) => {
   const { t } = useTranslation17();
-  const prompt = usePrompt5();
+  const prompt = usePrompt4();
   const { reservations } = useReservationItems(
     {
       line_item_id: order?.items?.map((i) => i.id),
@@ -2683,34 +2567,6 @@ var OrderSummarySection = ({ order }) => {
     { enabled: Array.isArray(order?.items) }
   );
   const { order: orderPreview } = useOrderPreview(order.id);
-  const { returns = [] } = useReturns({
-    status: "requested",
-    order_id: order.id,
-    fields: "+received_at"
-  });
-  const receivableReturns = useMemo3(
-    () => returns.filter((r) => !r.canceled_at),
-    [returns]
-  );
-  const showReturns = !!receivableReturns.length;
-  const showAllocateButton = useMemo3(() => {
-    if (!reservations) {
-      return false;
-    }
-    const reservationsMap = new Map(
-      reservations.map((r) => [r.line_item_id, r.id])
-    );
-    for (const item of order.items) {
-      if (item.variant?.manage_inventory) {
-        if (item.quantity - item.detail.fulfilled_quantity > 0) {
-          if (!reservationsMap.has(item.id)) {
-            return true;
-          }
-        }
-      }
-    }
-    return false;
-  }, [order.items, reservations]);
   const unpaidPaymentCollection = order.payment_collections.find(
     (pc) => pc.status === "not_paid"
   );
@@ -2745,7 +2601,7 @@ var OrderSummarySection = ({ order }) => {
       { order_id: order.id },
       {
         onSuccess: () => {
-          toast10.success(
+          toast9.success(
             t("orders.payment.markAsPaidPaymentSuccess", {
               amount: formatCurrency(
                 paymentCollection.amount,
@@ -2755,7 +2611,7 @@ var OrderSummarySection = ({ order }) => {
           );
         },
         onError: (error) => {
-          toast10.error(error.message);
+          toast9.error(error.message);
         }
       }
     );
@@ -2771,70 +2627,14 @@ var OrderSummarySection = ({ order }) => {
         /* @__PURE__ */ jsx17(CostBreakdown, { order }),
         /* @__PURE__ */ jsx17(DiscountAndTotalBreakdown, { order }),
         /* @__PURE__ */ jsx17(Total2, { order }),
-        (showAllocateButton || showReturns || showPayment || showRefund) && /* @__PURE__ */ jsxs17(
+        (showPayment || showRefund) && /* @__PURE__ */ jsxs17(
           "div",
           {
             className: "bg-ui-bg-subtle flex items-center justify-end gap-x-2 rounded-b-xl px-4 py-4",
             "data-testid": "order-summary-actions",
             children: [
-              showReturns && (receivableReturns.length === 1 ? /* @__PURE__ */ jsx17(
-                Button8,
-                {
-                  asChild: true,
-                  variant: "secondary",
-                  size: "small",
-                  "data-testid": "order-summary-receive-return-button",
-                  children: /* @__PURE__ */ jsx17(
-                    Link3,
-                    {
-                      to: `/orders/${order.id}/returns/${receivableReturns[0].id}/receive`,
-                      children: t("orders.returns.receive.action")
-                    }
-                  )
-                }
-              ) : /* @__PURE__ */ jsx17(
-                ActionMenu,
-                {
-                  groups: [
-                    {
-                      actions: receivableReturns.map((r) => {
-                        let id = r.id;
-                        let returnType = "Return";
-                        if (r.exchange_id) {
-                          id = r.exchange_id;
-                          returnType = "Exchange";
-                        }
-                        if (r.claim_id) {
-                          id = r.claim_id;
-                          returnType = "Claim";
-                        }
-                        return {
-                          label: t("orders.returns.receive.receiveItems", {
-                            id: `#${id.slice(-7)}`,
-                            returnType
-                          }),
-                          icon: /* @__PURE__ */ jsx17(ArrowLongRight, {}),
-                          to: `/orders/${order.id}/returns/${r.id}/receive`
-                        };
-                      })
-                    }
-                  ],
-                  "data-testid": "order-summary-receive-returns-menu",
-                  children: /* @__PURE__ */ jsx17(Button8, { variant: "secondary", size: "small", children: t("orders.returns.receive.action") })
-                }
-              )),
-              showAllocateButton && /* @__PURE__ */ jsx17(
-                Button8,
-                {
-                  asChild: true,
-                  variant: "secondary",
-                  size: "small",
-                  "data-testid": "order-summary-allocate-items-button",
-                  children: /* @__PURE__ */ jsx17(Link3, { to: "allocate-items", children: t("orders.allocateItems.action") })
-                }
-              ),
               showPayment && /* @__PURE__ */ jsx17(
-                Button8,
+                Button7,
                 {
                   size: "small",
                   variant: "secondary",
@@ -2844,7 +2644,7 @@ var OrderSummarySection = ({ order }) => {
                 }
               ),
               showRefund && /* @__PURE__ */ jsx17(
-                Button8,
+                Button7,
                 {
                   size: "small",
                   variant: "secondary",
@@ -2860,7 +2660,8 @@ var OrderSummarySection = ({ order }) => {
               )
             ]
           }
-        )
+        ),
+        /* @__PURE__ */ jsx17(DisplayExtensionZone5, { model: "order", zone: "summary", data: order })
       ]
     }
   );
@@ -2893,7 +2694,7 @@ var Header3 = ({
                       isOrderEditPending ? "orders.summary.editOrderContinue" : "orders.summary.editOrder"
                     ),
                     to: `/orders/${order.id}/edits`,
-                    icon: /* @__PURE__ */ jsx17(PencilSquare2, {}),
+                    icon: /* @__PURE__ */ jsx17(PencilSquare, {}),
                     disabled: order.status === "canceled" || orderPreview?.order_change && orderPreview?.order_change?.change_type !== "edit" || orderPreview?.order_change?.change_type === "edit" && orderPreview?.order_change?.status === "requested"
                   }
                 ]
@@ -2903,19 +2704,19 @@ var Header3 = ({
                   {
                     label: t("orders.returns.create"),
                     to: `/orders/${order.id}/returns`,
-                    icon: /* @__PURE__ */ jsx17(ArrowUturnLeft3, {}),
+                    icon: /* @__PURE__ */ jsx17(ArrowUturnLeft2, {}),
                     disabled: shouldDisableReturn || isOrderEditActive || !!orderPreview?.order_change?.exchange_id || !!orderPreview?.order_change?.claim_id
                   },
                   {
                     label: orderPreview?.order_change?.id && orderPreview?.order_change?.exchange_id ? t("orders.exchanges.manage") : t("orders.exchanges.create"),
                     to: `/orders/${order.id}/exchanges`,
-                    icon: /* @__PURE__ */ jsx17(ArrowPath4, {}),
+                    icon: /* @__PURE__ */ jsx17(ArrowPath3, {}),
                     disabled: shouldDisableReturn || isOrderEditActive || !!orderPreview?.order_change?.return_id && !orderPreview?.order_change?.exchange_id || !!orderPreview?.order_change?.claim_id
                   },
                   {
                     label: orderPreview?.order_change?.id && orderPreview?.order_change?.claim_id ? t("orders.claims.manage") : t("orders.claims.create"),
                     to: `/orders/${order.id}/claims`,
-                    icon: /* @__PURE__ */ jsx17(ExclamationCircle3, {}),
+                    icon: /* @__PURE__ */ jsx17(ExclamationCircle2, {}),
                     disabled: shouldDisableReturn || isOrderEditActive || !!orderPreview?.order_change?.return_id && !orderPreview?.order_change?.claim_id || !!orderPreview?.order_change?.exchange_id
                   }
                 ]
@@ -2937,9 +2738,12 @@ var Item = ({
   exchanges
 }) => {
   const { t } = useTranslation17();
-  const isInventoryManaged = item.variant?.manage_inventory;
-  const hasInventoryKit = isInventoryManaged && ((item.variant?.inventory_items?.length || 0) > 1 || item.variant?.inventory_items?.some((i) => i.required_quantity > 1));
+  const offerInventoryLinks = item.offer?.inventory_item_link ?? [];
+  const isInventoryManaged = !!offerInventoryLinks.length;
+  const hasInventoryKit = (item.variant?.inventory_items?.length || 0) > 1 || item.variant?.inventory_items?.some((i) => i.required_quantity > 1);
   const hasUnfulfilledItems = item.quantity - item.detail.fulfilled_quantity > 0;
+  const offerSku = item.offer?.sku ?? null;
+  const captionSku = offerSku ?? item.variant_sku ?? null;
   return /* @__PURE__ */ jsxs17(Fragment3, { children: [
     /* @__PURE__ */ jsxs17(
       "div",
@@ -2965,14 +2769,14 @@ var Item = ({
                       children: item.title
                     }
                   ),
-                  item.variant_sku && /* @__PURE__ */ jsxs17(
+                  captionSku && /* @__PURE__ */ jsxs17(
                     "div",
                     {
                       className: "flex items-center gap-x-1",
                       "data-testid": `order-summary-item-${item.id}-sku`,
                       children: [
-                        /* @__PURE__ */ jsx17(Text12, { size: "small", children: item.variant_sku }),
-                        /* @__PURE__ */ jsx17(Copy5, { content: item.variant_sku, className: "text-ui-fg-muted" })
+                        /* @__PURE__ */ jsx17(Text12, { size: "small", children: captionSku }),
+                        /* @__PURE__ */ jsx17(Copy5, { content: captionSku, className: "text-ui-fg-muted" })
                       ]
                     }
                   ),
@@ -3109,6 +2913,20 @@ var CostBreakdown = ({
   const { t } = useTranslation17();
   const [isTaxOpen, setIsTaxOpen] = useState6(false);
   const [isShippingOpen, setIsShippingOpen] = useState6(false);
+  const [isCommissionOpen, setIsCommissionOpen] = useState6(false);
+  const { commission_lines } = useOrderCommissionLines(order.id);
+  const hasCommission = commission_lines.length > 0;
+  const commissionTotal = commission_lines.reduce(
+    (acc, line) => acc + (line.amount ?? 0),
+    0
+  );
+  const commissionItemTitleById = useMemo3(() => {
+    const map = /* @__PURE__ */ new Map();
+    order.items?.forEach((item) => {
+      map.set(item.id, item.product_title ?? item.title);
+    });
+    return map;
+  }, [order.items]);
   const taxCodes = useMemo3(() => {
     const taxCodeMap = {};
     order.items.forEach((item) => {
@@ -3241,6 +3059,44 @@ var CostBreakdown = ({
             );
           }) })
         ] }),
+        hasCommission && /* @__PURE__ */ jsxs17(Fragment3, { children: [
+          /* @__PURE__ */ jsxs17("div", { className: "flex justify-between", children: [
+            /* @__PURE__ */ jsxs17(
+              "div",
+              {
+                onClick: () => setIsCommissionOpen((o) => !o),
+                className: "flex cursor-pointer items-center gap-1",
+                children: [
+                  /* @__PURE__ */ jsx17("span", { className: "txt-small select-none", children: t("fields.commission") }),
+                  /* @__PURE__ */ jsx17(
+                    TriangleDownMini,
+                    {
+                      style: {
+                        transform: `rotate(${isCommissionOpen ? 0 : -90}deg)`
+                      }
+                    }
+                  )
+                ]
+              }
+            ),
+            /* @__PURE__ */ jsx17("div", { className: "text-right", children: /* @__PURE__ */ jsx17(Text12, { size: "small", leading: "compact", children: getLocaleAmount(commissionTotal, order.currency_code) }) })
+          ] }),
+          isCommissionOpen && /* @__PURE__ */ jsx17("div", { className: "flex flex-col gap-1 pl-5", children: commission_lines.map((line) => {
+            const label = line.shipping_method_id ? t("fields.shipping") : commissionItemTitleById.get(line.item_id ?? "") ?? line.code;
+            return /* @__PURE__ */ jsxs17(
+              "div",
+              {
+                className: "flex items-center justify-between gap-x-2",
+                children: [
+                  /* @__PURE__ */ jsx17("div", { children: /* @__PURE__ */ jsx17("span", { className: "txt-small", children: label }) }),
+                  /* @__PURE__ */ jsx17("div", { className: "relative flex-1", children: /* @__PURE__ */ jsx17("div", { className: "bottom-[calc(50% - 2px)] absolute h-[1px] w-full border-b border-dashed" }) }),
+                  /* @__PURE__ */ jsx17("span", { className: "txt-small text-ui-fg-muted", children: getLocaleAmount(line.amount, order.currency_code) })
+                ]
+              },
+              line.id
+            );
+          }) })
+        ] }),
         /* @__PURE__ */ jsxs17("div", { className: "text-ui-fg-base flex items-center justify-between", children: [
           /* @__PURE__ */ jsx17(Text12, { className: "text-ui-fg-subtle", size: "small", leading: "compact", children: t("fields.total") }),
           /* @__PURE__ */ jsx17(
@@ -3732,6 +3588,7 @@ var Total2 = ({ order }) => {
 
 // src/pages/orders/order-detail/components/order-remaining-orders-group-section/order-remaining-orders-group-section.tsx
 import { Container as Container11, Heading as Heading11 } from "@medusajs/ui";
+import { DisplayExtensionZone as DisplayExtensionZone6 } from "@mercurjs/dashboard-shared";
 import { createColumnHelper } from "@tanstack/react-table";
 import { useMemo as useMemo4 } from "react";
 import { useTranslation as useTranslation18 } from "react-i18next";
@@ -3776,10 +3633,7 @@ var OrderRemainingOrdersGroupSection = () => {
           {
             className: "flex items-center justify-between px-6 py-4",
             "data-testid": "order-remaining-orders-group-header",
-            children: /* @__PURE__ */ jsxs18(Heading11, { level: "h2", "data-testid": "order-remaining-orders-group-heading", children: [
-              t("orders.domain"),
-              " in group"
-            ] })
+            children: /* @__PURE__ */ jsx18(Heading11, { level: "h2", "data-testid": "order-remaining-orders-group-heading", children: t("orders.group.heading") })
           }
         ),
         /* @__PURE__ */ jsx18(
@@ -3792,9 +3646,17 @@ var OrderRemainingOrdersGroupSection = () => {
             isLoading,
             pageSize: orders.length,
             noRecords: {
-              message: "No other orders in this group"
+              message: t("orders.group.noOtherOrders")
             }
           }
+        ),
+        /* @__PURE__ */ jsx18(
+          DisplayExtensionZone6,
+          {
+            model: "order",
+            zone: "order-group",
+            data: order_group
+          }
         )
       ]
     }
@@ -3810,7 +3672,7 @@ var useColumns = () => {
       }),
       columnHelper.display({
         id: "seller",
-        header: () => /* @__PURE__ */ jsx18(TextHeader, { text: "Seller" }),
+        header: () => /* @__PURE__ */ jsx18(TextHeader, { text: "Store" }),
         cell: ({ row }) => {
           const seller = row.original.seller;
           return /* @__PURE__ */ jsx18(TextCell, { text: seller?.name ?? "-" });
@@ -3848,11 +3710,10 @@ import { jsx as jsx19, jsxs as jsxs19 } from "react/jsx-runtime";
 var Root = ({ children }) => {
   const initialData = useLoaderData();
   const { id } = useParams2();
+  const query = useLinkQuery("order", DEFAULT_FIELDS);
   const { order: rawOrder, isLoading, isError, error } = useOrder(
     id,
-    {
-      fields: DEFAULT_FIELDS
-    },
+    query,
     {
       initialData
     }
@@ -3897,7 +3758,7 @@ var Root = ({ children }) => {
       hasOutlet: true,
       "data-testid": "order-detail-page",
       children: [
-        /* @__PURE__ */ jsxs19(TwoColumnPage.Main, { "data-testid": "order-detail-main", children: [
+        /* @__PURE__ */ jsx19(TwoColumnPage.Main, { "data-testid": "order-detail-main", children: /* @__PURE__ */ jsxs19(WidgetZone, { id: "orders.detail.main", data: order, children: [
           /* @__PURE__ */ jsx19(OrderActiveEditSection, { order }),
           /* @__PURE__ */ jsx19(ActiveOrderClaimSection, { orderPreview }),
           /* @__PURE__ */ jsx19(ActiveOrderExchangeSection, { orderPreview }),
@@ -3906,12 +3767,12 @@ var Root = ({ children }) => {
           /* @__PURE__ */ jsx19(OrderSummarySection, { order }),
           /* @__PURE__ */ jsx19(OrderPaymentSection, { order }),
           /* @__PURE__ */ jsx19(OrderFulfillmentSection, { order })
-        ] }),
-        /* @__PURE__ */ jsxs19(TwoColumnPage.Sidebar, { "data-testid": "order-detail-sidebar", children: [
+        ] }) }),
+        /* @__PURE__ */ jsx19(TwoColumnPage.Sidebar, { "data-testid": "order-detail-sidebar", children: /* @__PURE__ */ jsxs19(WidgetZone, { id: "orders.detail.side", data: order, children: [
           /* @__PURE__ */ jsx19(OrderCustomerSection, { order }),
           /* @__PURE__ */ jsx19(OrderActivitySection, { order }),
           /* @__PURE__ */ jsx19(OrderRemainingOrdersGroupSection, {})
-        ] })
+        ] }) })
       ]
     }
   );