@mercurjs/vendor 2.3.4 → 2.3.5

package/dist/{[id]-QMNKZKT4.js → [id]-HP4YGPRA.js}

@@ -580,6 +580,7 @@ import { DisplayExtensionZone as DisplayExtensionZone5 } from "@mercurjs/dashboa
 // src/pages/orders/[id]/_components/order-activity-section/hooks/use-activity-items.tsx
 import { useMemo as useMemo3 } from "react";
 import { useTranslation as useTranslation14 } from "react-i18next";
+import { useExtensionActivity } from "@mercurjs/dashboard-shared";
 import { Text as Text15 } from "@medusajs/ui";
 
 // src/components/common/user-link/user-link.tsx
@@ -1055,6 +1056,7 @@ var OrderActivityCollapsible = ({
 import { jsx as jsx14, jsxs as jsxs15 } from "react/jsx-runtime";
 var useActivityItems = (order) => {
   const { t } = useTranslation14();
+  const extensionActivity = useExtensionActivity("order", order);
   const { order_changes: orderChanges = [] } = useOrderChanges(order.id);
   const itemsMap = useMemo3(() => {
     return new Map(
@@ -1339,6 +1341,7 @@ var useActivityItems = (order) => {
         timestamp: order.canceled_at
       });
     }
+    items.push(...extensionActivity);
     const sortedActivities = items.sort((a, b) => {
       return new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime();
     });
@@ -1354,7 +1357,8 @@ var useActivityItems = (order) => {
     orderChanges,
     payments,
     isLoading,
-    itemsMap
+    itemsMap,
+    extensionActivity
   ]);
 };
 
@@ -2268,7 +2272,11 @@ import {
   Text as Text21,
   Tooltip as Tooltip5
 } from "@medusajs/ui";
-import { DisplayExtensionZone as DisplayExtensionZone10, WidgetZone } from "@mercurjs/dashboard-shared";
+import {
+  DisplayExtensionZone as DisplayExtensionZone10,
+  useActionLocks,
+  WidgetZone
+} from "@mercurjs/dashboard-shared";
 import { isOrderAwaitingAction as isOrderAwaitingAction2 } from "@mercurjs/dashboard-shared";
 
 // src/pages/orders/[id]/_components/order-summary-section/return-info-popover.tsx
@@ -2503,6 +2511,11 @@ var Header3 = ({
   orderPreview
 }) => {
   const { t } = useTranslation23();
+  const lock = useActionLocks("order", order);
+  const editLock = lock("edit");
+  const returnLock = lock("return");
+  const exchangeLock = lock("exchange");
+  const claimLock = lock("claim");
   const isAwaitingAction = isOrderAwaitingAction2(order);
   const isLocked = !!order.canceled_at || isAwaitingAction;
   const awaitingActionTooltip = isAwaitingAction ? t("orders.requiresAction.actionUnavailable") : void 0;
@@ -2535,8 +2548,8 @@ var Header3 = ({
                   isOrderEditPending ? "orders.summary.editOrderContinue" : "orders.edits.create"
                 ),
                 to: "edit",
-                disabled: editDisabled,
-                disabledTooltip: awaitingActionTooltip,
+                disabled: editDisabled || !!editLock,
+                disabledTooltip: editLock ?? awaitingActionTooltip,
                 icon: /* @__PURE__ */ jsx24(PencilSquare, {})
               }
             ]
@@ -2546,8 +2559,8 @@ var Header3 = ({
               {
                 label: t("orders.returns.create"),
                 to: "returns/create",
-                disabled: isLocked || returnOutOfPolicy || shouldDisableReturn || returnDisabledByChange,
-                disabledTooltip: awaitingActionTooltip ?? (returnOutOfPolicy ? t("orders.returns.outOfPolicy", {
+                disabled: isLocked || returnOutOfPolicy || shouldDisableReturn || returnDisabledByChange || !!returnLock,
+                disabledTooltip: returnLock ?? awaitingActionTooltip ?? (returnOutOfPolicy ? t("orders.returns.outOfPolicy", {
                   days: RETURN_POLICY_DAYS
                 }) : void 0),
                 icon: /* @__PURE__ */ jsx24(ArrowUturnLeft2, {})
@@ -2555,8 +2568,8 @@ var Header3 = ({
               {
                 label: orderChange?.id && orderChange?.exchange_id ? t("orders.exchanges.manage") : t("orders.exchanges.create"),
                 to: "exchanges/create",
-                disabled: isLocked || exchangeOutOfPolicy || shouldDisableReturn || exchangeDisabledByChange,
-                disabledTooltip: awaitingActionTooltip ?? (exchangeOutOfPolicy ? t("orders.exchanges.outOfPolicy", {
+                disabled: isLocked || exchangeOutOfPolicy || shouldDisableReturn || exchangeDisabledByChange || !!exchangeLock,
+                disabledTooltip: exchangeLock ?? awaitingActionTooltip ?? (exchangeOutOfPolicy ? t("orders.exchanges.outOfPolicy", {
                   days: EXCHANGE_POLICY_DAYS
                 }) : void 0),
                 icon: /* @__PURE__ */ jsx24(ArrowPath2, {})
@@ -2564,8 +2577,8 @@ var Header3 = ({
               {
                 label: orderChange?.id && orderChange?.claim_id ? t("orders.claims.manage") : t("orders.claims.create"),
                 to: "claims/create",
-                disabled: isLocked || claimOutOfPolicy || shouldDisableReturn || claimDisabledByChange,
-                disabledTooltip: awaitingActionTooltip ?? (claimOutOfPolicy ? t("orders.claims.outOfPolicy", {
+                disabled: isLocked || claimOutOfPolicy || shouldDisableReturn || claimDisabledByChange || !!claimLock,
+                disabledTooltip: claimLock ?? awaitingActionTooltip ?? (claimOutOfPolicy ? t("orders.claims.outOfPolicy", {
                   days: CLAIM_POLICY_DAYS
                 }) : void 0),
                 icon: /* @__PURE__ */ jsx24(ExclamationCircle2, {})
@@ -2578,6 +2591,7 @@ var Header3 = ({
   ] });
 };
 var Item = ({
+  order,
   item,
   currencyCode,
   returns,
@@ -2627,14 +2641,17 @@ var Item = ({
                 /* @__PURE__ */ jsx24("span", { className: "tabular-nums", children: item.quantity }),
                 "x"
               ] }) }),
-              /* @__PURE__ */ jsx24("div", { className: "overflow-visible", children: isInventoryManaged && hasUnfulfilledItems && /* @__PURE__ */ jsx24(
-                StatusBadge4,
-                {
-                  color: reservation ? "green" : "orange",
-                  className: "text-nowrap",
-                  children: reservation ? t("orders.reservations.allocatedLabel") : t("orders.reservations.notAllocatedLabel")
-                }
-              ) })
+              /* @__PURE__ */ jsxs25("div", { className: "overflow-visible", children: [
+                isInventoryManaged && hasUnfulfilledItems && /* @__PURE__ */ jsx24(
+                  StatusBadge4,
+                  {
+                    color: reservation ? "green" : "orange",
+                    className: "text-nowrap",
+                    children: reservation ? t("orders.reservations.allocatedLabel") : t("orders.reservations.notAllocatedLabel")
+                  }
+                ),
+                /* @__PURE__ */ jsx24(WidgetZone, { id: "orders.detail.item", data: { order, item } })
+              ] })
             ] }),
             /* @__PURE__ */ jsx24("div", { className: "flex items-center justify-end", children: /* @__PURE__ */ jsx24(Text21, { size: "small", className: "pt-[1px]", children: getLocaleAmount(item.original_total || 0, currencyCode) }) })
           ] })
@@ -2665,6 +2682,7 @@ var ItemBreakdown = ({
     return /* @__PURE__ */ jsx24(
       Item,
       {
+        order,
         item,
         currencyCode: order.currency_code,
         returns,

package/dist/extension-targets.d.ts

@@ -58,6 +58,8 @@ declare module "@mercurjs/dashboard-sdk" {
     "offers.detail.side.before": true
     "offers.list.after": true
     "offers.list.before": true
+    "orders.detail.item.after": true
+    "orders.detail.item.before": true
     "orders.detail.main.after": true
     "orders.detail.main.before": true
     "orders.detail.side.after": true

package/dist/index.js

@@ -3213,7 +3213,7 @@ function getRouteMap({
                       {
                         path: ":id",
                         lazy: async () => {
-                          const { loader } = await import("./[id]-QMNKZKT4.js");
+                          const { loader } = await import("./[id]-HP4YGPRA.js");
                           const { Breadcrumb } = await import("./breadcrumb-RQ52GELM.js");
                           return {
                             Component: Outlet4,
@@ -3227,7 +3227,7 @@ function getRouteMap({
                           {
                             path: "",
                             lazy: async () => {
-                              const { OrderDetailPage } = await import("./[id]-QMNKZKT4.js");
+                              const { OrderDetailPage } = await import("./[id]-HP4YGPRA.js");
                               return { Component: OrderDetailPage };
                             },
                             children: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mercurjs/vendor",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "repository": {
     "type": "git",
     "url": "https://github.com/mercurjs/mercur",
@@ -37,8 +37,8 @@
     "lint": "oxlint --max-warnings 0"
   },
   "dependencies": {
-    "@mercurjs/dashboard-shared": "2.3.4",
-    "@mercurjs/client": "2.3.4",
+    "@mercurjs/dashboard-shared": "2.3.5",
+    "@mercurjs/client": "2.3.5",
     "@ariakit/react": "^0.4.15",
     "@babel/runtime": "^8.0.0",
     "@dnd-kit/core": "^6.1.0",
@@ -91,9 +91,9 @@
     "tsup": "^8.0.2",
     "typescript": "5.9.3",
     "@medusajs/types": "2.20.1",
-    "@mercurjs/core": "2.3.4",
-    "@mercurjs/dashboard-sdk": "2.3.4",
-    "@mercurjs/types": "2.3.4",
+    "@mercurjs/core": "2.3.5",
+    "@mercurjs/dashboard-sdk": "2.3.5",
+    "@mercurjs/types": "2.3.5",
     "react-router-dom": "7.18.1"
   }
 }