@open-mercato/core 0.6.6-develop.6317.1.b3be10ab84 → 0.6.6-develop.6331.1.a33b8e99b7

package/src/modules/sales/commands/shipments.ts

@@ -29,6 +29,8 @@ import {
   ensureSameScope,
   ensureTenantScope,
   extractUndoPayload,
+  enforceSalesDocumentOptimisticLock,
+  SALES_RESOURCE_KIND_ORDER,
 } from './shared'
 import { resolveDictionaryEntryValue } from '../lib/dictionaries'
 import { resolveRedoSnapshot } from '@open-mercato/shared/lib/commands/redo'
@@ -442,6 +444,10 @@ const createShipmentCommand: CommandHandler<ShipmentCreateInput, { shipmentId: s
     const shipment = await em.transactional(async (tx) => {
       const order = await loadOrder(tx, input.orderId, { tenantId: input.tenantId, organizationId: input.organizationId })
       ensureSameScope(order, input.organizationId, input.tenantId)
+      // Guard the parent order's aggregate version (Gap B): a shipment mutation
+      // recalculates the order's fulfilled quantities, so a stale parent must 409
+      // before we touch it.
+      await enforceSalesDocumentOptimisticLock(ctx, order, SALES_RESOURCE_KIND_ORDER)
       const { items: normalizedItems, lineMap } = await validateShipmentItems({
         em: tx,
         order,
@@ -674,6 +680,10 @@ const updateShipmentCommand: CommandHandler<ShipmentUpdateInput, { shipmentId: s
       if (input.orderId && input.orderId !== order.id) {
         throw new CrudHttpError(400, { error: 'sales.shipments.invalid_order' })
       }
+      // Guard the parent order's aggregate version (Gap B): updating a shipment
+      // recalculates the order's fulfilled quantities, so a stale parent must 409
+      // before we touch it.
+      await enforceSalesDocumentOptimisticLock(ctx, order, SALES_RESOURCE_KIND_ORDER)
 
       // Check if order is financially closed - prevent modifications to shipments
       const paidAmount = parseFloat(order.paidTotalAmount || '0')
@@ -976,6 +986,10 @@ const deleteShipmentCommand: CommandHandler<
       if (order.id !== payload.orderId) {
         throw new CrudHttpError(400, { error: translate('sales.shipments.invalid_order', 'Shipment does not belong to this order') })
       }
+      // Guard the parent order's aggregate version (Gap B): deleting a shipment
+      // recalculates the order's fulfilled quantities, so a stale parent must 409
+      // before we touch it.
+      await enforceSalesDocumentOptimisticLock(ctx, order, SALES_RESOURCE_KIND_ORDER)
       const scope = { tenantId: shipmentEntity.tenantId, organizationId: shipmentEntity.organizationId }
       const items = await findWithDecryption(tx, SalesShipmentItem, { shipment: shipmentEntity }, {}, scope)
       items.forEach((item) => tx.remove(item))

package/src/modules/sales/components/documents/PaymentDialog.tsx

@@ -9,7 +9,7 @@ import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimi
 import { collectCustomFieldValues } from '@open-mercato/ui/backend/utils/customFieldValues'
 import { createCrud, updateCrud } from '@open-mercato/ui/backend/utils/crud'
 import { createCrudFormError } from '@open-mercato/ui/backend/utils/serverErrors'
-import { handleSectionMutationError, rowOptimisticVersion } from './optimisticLock'
+import { handleSectionMutationError } from './optimisticLock'
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@open-mercato/ui/primitives/dialog'
 import { useDialogKeyHandler } from '@open-mercato/ui/hooks/useDialogKeyHandler'
 import { Input } from '@open-mercato/ui/primitives/input'
@@ -58,6 +58,7 @@ type PaymentDialogProps = {
   orderId: string
   organizationId: string | null
   tenantId: string | null
+  documentUpdatedAt?: string | null
   onOpenChange: (open: boolean) => void
   onSaved?: (totals?: PaymentTotals | null) => void | Promise<void>
 }
@@ -79,6 +80,7 @@ export function PaymentDialog({
   orderId,
   organizationId,
   tenantId,
+  documentUpdatedAt,
   onOpenChange,
   onSaved,
 }: PaymentDialogProps) {
@@ -539,7 +541,9 @@ export function PaymentDialog({
       const action = payment?.id ? updateCrud : createCrud
       try {
         const result = await withScopedApiRequestHeaders(
-          buildOptimisticLockHeader(payment?.id ? rowOptimisticVersion(payment) : undefined),
+          // The server guards the PARENT order's aggregate version (Gap A) for
+          // both create and update, so send the order's `updated_at`.
+          buildOptimisticLockHeader(documentUpdatedAt ?? undefined),
           () =>
             action(
               'sales/payments',
@@ -569,7 +573,7 @@ export function PaymentDialog({
         throw err
       }
     },
-    [currencyCode, mode, onOpenChange, onSaved, orderId, organizationId, payment?.id, payment?.updatedAt, t, tenantId]
+    [currencyCode, documentUpdatedAt, mode, onOpenChange, onSaved, orderId, organizationId, payment?.id, t, tenantId]
   )
 
   const handleSubmitForm = React.useCallback(

package/src/modules/sales/components/documents/PaymentsSection.tsx

@@ -7,7 +7,7 @@ import { LoadingMessage, ErrorMessage, TabEmptyState } from '@open-mercato/ui/ba
 import { apiCall, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
 import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { deleteCrud } from '@open-mercato/ui/backend/utils/crud'
-import { handleSectionMutationError, readRowUpdatedAt, rowOptimisticVersion } from './optimisticLock'
+import { handleSectionMutationError, readRowUpdatedAt } from './optimisticLock'
 import type { SectionAction } from '@open-mercato/ui/backend/detail'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import { Button } from '@open-mercato/ui/primitives/button'
@@ -41,6 +41,7 @@ type SalesDocumentPaymentsSectionProps = {
   currencyCode: string | null | undefined
   organizationId?: string | null
   tenantId?: string | null
+  documentUpdatedAt?: string | null
   onActionChange?: (action: SectionAction | null) => void
   onTotalsChange?: () => void
   onPaymentsChange?: (payments: PaymentRow[]) => void
@@ -69,6 +70,7 @@ export function SalesDocumentPaymentsSection({
   currencyCode,
   organizationId: orgFromProps,
   tenantId: tenantFromProps,
+  documentUpdatedAt,
   onActionChange,
   onTotalsChange,
   onPaymentsChange,
@@ -216,7 +218,9 @@ export function SalesDocumentPaymentsSection({
     async (row: PaymentRow) => {
       try {
         const result = await withScopedApiRequestHeaders(
-          buildOptimisticLockHeader(rowOptimisticVersion(row)),
+          // The server guards the PARENT order's aggregate version (Gap A), so
+          // send the order's `updated_at`, not the payment row's.
+          buildOptimisticLockHeader(documentUpdatedAt ?? undefined),
           () =>
             deleteCrud<{ orderTotals?: PaymentTotals | null }>('sales/payments', {
               body: {
@@ -242,7 +246,7 @@ export function SalesDocumentPaymentsSection({
         flash(t('sales.documents.payments.errorDelete', 'Failed to delete payment.'), 'error')
       }
     },
-    [loadPayments, onTotalsChange, orderId, resolvedOrganizationId, resolvedTenantId, t]
+    [documentUpdatedAt, loadPayments, onTotalsChange, orderId, resolvedOrganizationId, resolvedTenantId, t]
   )
 
   React.useEffect(() => {
@@ -369,6 +373,7 @@ export function SalesDocumentPaymentsSection({
         orderId={orderId}
         organizationId={resolvedOrganizationId}
         tenantId={resolvedTenantId}
+        documentUpdatedAt={documentUpdatedAt ?? null}
         onSaved={handlePaymentSaved}
       />
     </div>

package/src/modules/sales/components/documents/ShipmentDialog.tsx

@@ -15,7 +15,7 @@ import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimi
 import { createCrud, updateCrud } from '@open-mercato/ui/backend/utils/crud'
 import { collectCustomFieldValues } from '@open-mercato/ui/backend/utils/customFieldValues'
 import { createCrudFormError } from '@open-mercato/ui/backend/utils/serverErrors'
-import { handleSectionMutationError, rowOptimisticVersion } from './optimisticLock'
+import { handleSectionMutationError } from './optimisticLock'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { cn } from '@open-mercato/shared/lib/utils'
 import { E } from '#generated/entities.ids.generated'
@@ -46,6 +46,7 @@ type ShipmentDialogProps = {
   currencyCode?: string | null
   organizationId: string | null
   tenantId: string | null
+  documentUpdatedAt?: string | null
   computeAvailable: (lineId: string, excludeShipmentId?: string | null) => number
   shippingAddressSnapshot?: NormalizedAddressSnapshot | Record<string, unknown> | null
   onClose: () => void
@@ -278,6 +279,7 @@ export function ShipmentDialog({
   currencyCode,
   organizationId,
   tenantId,
+  documentUpdatedAt,
   computeAvailable,
   shippingAddressSnapshot,
   onClose,
@@ -1089,7 +1091,9 @@ export function ShipmentDialog({
       let result
       try {
         result = await withScopedApiRequestHeaders(
-          buildOptimisticLockHeader(shipment?.id ? rowOptimisticVersion(shipment) : undefined),
+          // The server guards the PARENT order's aggregate version (Gap B) for
+          // both create and update, so send the order's `updated_at`.
+          buildOptimisticLockHeader(documentUpdatedAt ?? undefined),
           () =>
             action(
               'sales/shipments',
@@ -1219,6 +1223,7 @@ export function ShipmentDialog({
     },
     [
       currencyCode,
+      documentUpdatedAt,
       lines,
       mode,
       onAddComment,
@@ -1226,7 +1231,6 @@ export function ShipmentDialog({
       orderId,
       organizationId,
       shipment?.id,
-      shipment?.updatedAt,
       addressOptions,
       addressOptionsMap,
       shippingMethods,

package/src/modules/sales/components/documents/ShipmentsSection.tsx

@@ -20,7 +20,7 @@ import type { SectionAction } from '@open-mercato/core/modules/customers/compone
 import { generateTempId } from '@open-mercato/core/modules/customers/lib/detailHelpers'
 import { formatAddressString, type AddressValue } from '@open-mercato/core/modules/customers/utils/addressFormat'
 import { ShipmentDialog } from './ShipmentDialog'
-import { handleSectionMutationError, readRowUpdatedAt, rowOptimisticVersion } from './optimisticLock'
+import { handleSectionMutationError, readRowUpdatedAt } from './optimisticLock'
 import { extractCustomFieldValues } from './customFieldHelpers'
 import type { OrderLine, ShipmentRow, ShipmentItem } from './shipmentTypes'
 
@@ -33,6 +33,7 @@ type SalesShipmentsSectionProps = {
   shippingAddressSnapshot?: Record<string, unknown> | null
   organizationId?: string | null
   tenantId?: string | null
+  documentUpdatedAt?: string | null
   onActionChange?: (action: SectionAction | null) => void
   onAddComment?: (body: string) => Promise<void>
 }
@@ -114,6 +115,7 @@ export function SalesShipmentsSection({
   shippingAddressSnapshot,
   organizationId: organizationIdProp,
   tenantId: tenantIdProp,
+  documentUpdatedAt,
   onActionChange,
   onAddComment,
 }: SalesShipmentsSectionProps) {
@@ -401,7 +403,9 @@ export function SalesShipmentsSection({
       if (!confirmed) return
       try {
         const result = await withScopedApiRequestHeaders(
-          buildOptimisticLockHeader(rowOptimisticVersion(shipment)),
+          // The server guards the PARENT order's aggregate version (Gap B), so
+          // send the order's `updated_at`, not the shipment row's.
+          buildOptimisticLockHeader(documentUpdatedAt ?? undefined),
           () =>
             deleteCrud('sales/shipments', {
               body: {
@@ -425,7 +429,7 @@ export function SalesShipmentsSection({
         flash(t('sales.documents.shipments.errorDelete', 'Failed to delete shipment.'), 'error')
       }
     },
-    [confirm, loadShipments, orderId, resolvedOrganizationId, resolvedTenantId, t]
+    [confirm, documentUpdatedAt, loadShipments, orderId, resolvedOrganizationId, resolvedTenantId, t]
   )
 
   const renderItemList = (items: ShipmentItem[]) => (
@@ -573,6 +577,7 @@ export function SalesShipmentsSection({
         currencyCode={currencyCode}
         organizationId={resolvedOrganizationId}
         tenantId={resolvedTenantId}
+        documentUpdatedAt={documentUpdatedAt ?? null}
         computeAvailable={computeAvailable}
         shippingAddressSnapshot={shippingAddressSnapshot}
         onClose={() => setDialogState(null)}

package/src/modules/sales/di.ts

@@ -42,15 +42,20 @@ type AppCradle = AppContainer['cradle'] & {
 }
 
 const RESOURCE_KIND_ORDER = 'sales.order'
+const RESOURCE_KIND_PAYMENT = 'sales.payment'
+const RESOURCE_KIND_SHIPMENT = 'sales.shipment'
 
-const readSalesOrderUpdatedAt: OptimisticLockCurrentReader = async (
+async function readOrderUpdatedAtById(
   em: EntityManager,
-  { resourceId, tenantId, organizationId },
-) => {
+  orderId: string | null | undefined,
+  tenantId: string,
+  organizationId: string | null | undefined,
+): Promise<string | null> {
+  if (!orderId) return null
   const row = await em.findOne(
     SalesOrder,
     {
-      id: resourceId,
+      id: orderId,
       tenantId,
       ...(organizationId ? { organizationId } : {}),
       deletedAt: null,
@@ -60,13 +65,67 @@ const readSalesOrderUpdatedAt: OptimisticLockCurrentReader = async (
   return row?.updatedAt instanceof Date ? row.updatedAt.toISOString() : null
 }
 
-// Hand-wired sales.order reader registered at module-load time so the
-// `customer_entities`-style polymorphic-table override pattern stays
-// observable for downstream modules. Functionally identical to the
-// auto-registered generic reader; kept here as a reference example. The
-// guard's mode check short-circuits when `OM_OPTIMISTIC_LOCK=off`.
+const readSalesOrderUpdatedAt: OptimisticLockCurrentReader = async (
+  em: EntityManager,
+  { resourceId, tenantId, organizationId },
+) => readOrderUpdatedAtById(em, resourceId, tenantId, organizationId)
+
+// Payments and shipments are guarded against the PARENT ORDER's aggregate
+// version (their mutations recalc order totals / fulfilled quantities, so the
+// order is the consistency boundary — same model as lines/adjustments/returns).
+// The CRUD-layer guard therefore must compare against the order, not the
+// payment/shipment row: resolve the parent order from the sub-resource id and
+// return its `updated_at`. This keeps the single optimistic-lock header
+// consistent across the makeCrudRoute guard and the command-level
+// `enforceSalesDocumentOptimisticLock` guard (both read the order version).
+const readPaymentParentOrderUpdatedAt: OptimisticLockCurrentReader = async (
+  em: EntityManager,
+  { resourceId, tenantId, organizationId },
+) => {
+  const payment = await em.findOne(
+    SalesPayment,
+    {
+      id: resourceId,
+      tenantId,
+      ...(organizationId ? { organizationId } : {}),
+      deletedAt: null,
+    },
+    { fields: ['order'] as const },
+  )
+  const orderId = (payment as { order?: { id?: string } | string | null } | null)?.order
+  const resolvedOrderId = typeof orderId === 'string' ? orderId : orderId?.id ?? null
+  return readOrderUpdatedAtById(em, resolvedOrderId, tenantId, organizationId)
+}
+
+const readShipmentParentOrderUpdatedAt: OptimisticLockCurrentReader = async (
+  em: EntityManager,
+  { resourceId, tenantId, organizationId },
+) => {
+  const shipment = await em.findOne(
+    SalesShipment,
+    {
+      id: resourceId,
+      tenantId,
+      ...(organizationId ? { organizationId } : {}),
+      deletedAt: null,
+    },
+    { fields: ['order'] as const },
+  )
+  const orderId = (shipment as { order?: { id?: string } | string | null } | null)?.order
+  const resolvedOrderId = typeof orderId === 'string' ? orderId : orderId?.id ?? null
+  return readOrderUpdatedAtById(em, resolvedOrderId, tenantId, organizationId)
+}
+
+// Hand-wired sales readers registered at module-load time. `sales.order` mirrors
+// the auto-registered generic reader (kept as the polymorphic-table override
+// reference). `sales.payment`/`sales.shipment` redirect the CRUD-layer guard to
+// the parent order so payments/shipments guard the aggregate (Phase 3 Gap A/B)
+// instead of their own row. The guard's mode check short-circuits when
+// `OM_OPTIMISTIC_LOCK=off`.
 registerOptimisticLockReaders({
   [RESOURCE_KIND_ORDER]: readSalesOrderUpdatedAt,
+  [RESOURCE_KIND_PAYMENT]: readPaymentParentOrderUpdatedAt,
+  [RESOURCE_KIND_SHIPMENT]: readShipmentParentOrderUpdatedAt,
 })
 
 export function register(container: AppContainer) {

package/src/modules/sales/setup.ts

@@ -51,7 +51,9 @@ export const setup: ModuleSetupConfig = {
     admin: ['sales.*', 'sales.documents.number.edit'],
     employee: [
       'sales.channels.view',
+      'sales.channels.manage',
       'sales.settings.view',
+      'sales.settings.manage',
       'sales.orders.view',
       'sales.orders.manage',
       'sales.orders.approve',

package/src/modules/shipping_carriers/i18n/de.json

@@ -70,5 +70,15 @@
   "shipping_carriers.create.summary.to": "Nach",
   "shipping_carriers.create.title": "Sendung beim Transporteur erstellen",
   "shipping_carriers.feature.manage": "Versanddienstleister-Vorgaenge verwalten",
-  "shipping_carriers.feature.view": "Sendungen der Versanddienstleister anzeigen"
+  "shipping_carriers.feature.view": "Sendungen der Versanddienstleister anzeigen",
+  "shipping_carriers.status.cancelled": "Storniert",
+  "shipping_carriers.status.delivered": "Zugestellt",
+  "shipping_carriers.status.failed_delivery": "Zustellung fehlgeschlagen",
+  "shipping_carriers.status.in_transit": "Unterwegs",
+  "shipping_carriers.status.label_created": "Label erstellt",
+  "shipping_carriers.status.out_for_delivery": "In Zustellung",
+  "shipping_carriers.status.pending": "Ausstehend",
+  "shipping_carriers.status.picked_up": "Abgeholt",
+  "shipping_carriers.status.returned": "Zuruckgesendet",
+  "shipping_carriers.status.unknown": "Unbekannt"
 }

package/src/modules/shipping_carriers/i18n/en.json

@@ -70,5 +70,15 @@
   "shipping_carriers.create.summary.to": "To",
   "shipping_carriers.create.title": "Create carrier shipment",
   "shipping_carriers.feature.manage": "Manage shipping carrier operations",
-  "shipping_carriers.feature.view": "View shipping carrier shipments"
+  "shipping_carriers.feature.view": "View shipping carrier shipments",
+  "shipping_carriers.status.cancelled": "Cancelled",
+  "shipping_carriers.status.delivered": "Delivered",
+  "shipping_carriers.status.failed_delivery": "Delivery failed",
+  "shipping_carriers.status.in_transit": "In transit",
+  "shipping_carriers.status.label_created": "Label created",
+  "shipping_carriers.status.out_for_delivery": "Out for delivery",
+  "shipping_carriers.status.pending": "Pending",
+  "shipping_carriers.status.picked_up": "Picked up",
+  "shipping_carriers.status.returned": "Returned",
+  "shipping_carriers.status.unknown": "Unknown"
 }

package/src/modules/shipping_carriers/i18n/en.ts

@@ -4,4 +4,14 @@ export default {
   'shipping_carriers.column.trackingStatus': 'Tracking status',
   'shipping_carriers.column.shippingStatus': 'Shipping status',
   'shipping_carriers.action.createShipment': 'Create shipment',
+  'shipping_carriers.status.cancelled': 'Cancelled',
+  'shipping_carriers.status.delivered': 'Delivered',
+  'shipping_carriers.status.failed_delivery': 'Delivery failed',
+  'shipping_carriers.status.in_transit': 'In transit',
+  'shipping_carriers.status.label_created': 'Label created',
+  'shipping_carriers.status.out_for_delivery': 'Out for delivery',
+  'shipping_carriers.status.pending': 'Pending',
+  'shipping_carriers.status.picked_up': 'Picked up',
+  'shipping_carriers.status.returned': 'Returned',
+  'shipping_carriers.status.unknown': 'Unknown',
 }

package/src/modules/shipping_carriers/i18n/es.json

@@ -70,5 +70,15 @@
   "shipping_carriers.create.summary.to": "Hasta",
   "shipping_carriers.create.title": "Crear envio con transportista",
   "shipping_carriers.feature.manage": "Gestionar operaciones de transportistas",
-  "shipping_carriers.feature.view": "Ver envios de transportistas"
+  "shipping_carriers.feature.view": "Ver envios de transportistas",
+  "shipping_carriers.status.cancelled": "Cancelado",
+  "shipping_carriers.status.delivered": "Entregado",
+  "shipping_carriers.status.failed_delivery": "Entrega fallida",
+  "shipping_carriers.status.in_transit": "En transito",
+  "shipping_carriers.status.label_created": "Etiqueta creada",
+  "shipping_carriers.status.out_for_delivery": "En reparto",
+  "shipping_carriers.status.pending": "Pendiente",
+  "shipping_carriers.status.picked_up": "Recogido",
+  "shipping_carriers.status.returned": "Devuelto",
+  "shipping_carriers.status.unknown": "Desconocido"
 }

package/src/modules/shipping_carriers/i18n/pl.json

@@ -70,5 +70,15 @@
   "shipping_carriers.create.summary.to": "Odbiór",
   "shipping_carriers.create.title": "Utwórz przesyłkę u przewoźnika",
   "shipping_carriers.feature.manage": "Zarzadzanie operacjami przewoznikow",
-  "shipping_carriers.feature.view": "Podglad przesylek przewoznikow"
+  "shipping_carriers.feature.view": "Podglad przesylek przewoznikow",
+  "shipping_carriers.status.cancelled": "Anulowano",
+  "shipping_carriers.status.delivered": "Doreczono",
+  "shipping_carriers.status.failed_delivery": "Doreczenie nieudane",
+  "shipping_carriers.status.in_transit": "W transporcie",
+  "shipping_carriers.status.label_created": "Etykieta utworzona",
+  "shipping_carriers.status.out_for_delivery": "W doreczeniu",
+  "shipping_carriers.status.pending": "Oczekuje",
+  "shipping_carriers.status.picked_up": "Odebrano",
+  "shipping_carriers.status.returned": "Zwrocono",
+  "shipping_carriers.status.unknown": "Nieznany"
 }

package/src/modules/shipping_carriers/i18n/pl.ts

@@ -4,4 +4,14 @@ export default {
   'shipping_carriers.column.trackingStatus': 'Status śledzenia',
   'shipping_carriers.column.shippingStatus': 'Status wysyłki',
   'shipping_carriers.action.createShipment': 'Utwórz przesyłkę',
+  'shipping_carriers.status.cancelled': 'Anulowano',
+  'shipping_carriers.status.delivered': 'Doręczono',
+  'shipping_carriers.status.failed_delivery': 'Doręczenie nieudane',
+  'shipping_carriers.status.in_transit': 'W transporcie',
+  'shipping_carriers.status.label_created': 'Etykieta utworzona',
+  'shipping_carriers.status.out_for_delivery': 'W doręczeniu',
+  'shipping_carriers.status.pending': 'Oczekuje',
+  'shipping_carriers.status.picked_up': 'Odebrano',
+  'shipping_carriers.status.returned': 'Zwrócono',
+  'shipping_carriers.status.unknown': 'Nieznany',
 }

package/src/modules/shipping_carriers/widgets/injection/tracking-status-badge/widget.client.tsx

@@ -0,0 +1,35 @@
+'use client'
+
+import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { StatusBadge, type StatusMap } from '@open-mercato/ui/primitives/status-badge'
+import type { UnifiedShipmentStatus } from '../../../lib/adapter'
+
+type ShippingStatus = UnifiedShipmentStatus | 'pending'
+
+const shippingStatusVariantMap: StatusMap<ShippingStatus> = {
+  pending: 'neutral',
+  label_created: 'info',
+  picked_up: 'info',
+  in_transit: 'info',
+  out_for_delivery: 'info',
+  delivered: 'success',
+  failed_delivery: 'error',
+  returned: 'warning',
+  cancelled: 'error',
+  unknown: 'neutral',
+}
+
+export type ShippingStatusBadgeWidgetProps = {
+  status: string
+}
+
+export default function ShippingStatusBadgeWidget({ status }: ShippingStatusBadgeWidgetProps) {
+  const t = useT()
+  const variant = shippingStatusVariantMap[status as ShippingStatus] ?? 'neutral'
+
+  return (
+    <StatusBadge variant={variant} dot>
+      {t(`shipping_carriers.status.${status}`, status)}
+    </StatusBadge>
+  )
+}

package/src/modules/shipping_carriers/widgets/injection/tracking-status-badge/widget.tsx

@@ -1,20 +1,6 @@
+import * as React from 'react'
 import type { InjectionColumnWidget } from '@open-mercato/shared/modules/widgets/injection'
-
-const SHIPPING_STATUS_COLORS: Record<string, string> = {
-  pending: 'bg-gray-100 text-gray-700',
-  label_created: 'bg-slate-100 text-slate-700',
-  picked_up: 'bg-sky-100 text-sky-700',
-  in_transit: 'bg-blue-100 text-blue-700',
-  out_for_delivery: 'bg-indigo-100 text-indigo-700',
-  delivered: 'bg-green-100 text-green-700',
-  returned: 'bg-amber-100 text-amber-700',
-  cancelled: 'bg-red-100 text-red-700',
-  failed_delivery: 'bg-orange-100 text-orange-700',
-}
-
-function formatShippingStatusLabel(value: string): string {
-  return value.replace(/_/g, ' ')
-}
+import ShippingStatusBadgeWidget from './widget.client'
 
 const widget: InjectionColumnWidget = {
   metadata: {
@@ -30,12 +16,7 @@ const widget: InjectionColumnWidget = {
       cell: ({ getValue }) => {
         const value = getValue()
         if (typeof value !== 'string' || value.length === 0) return null
-        const colors = SHIPPING_STATUS_COLORS[value] ?? 'bg-gray-100 text-gray-700'
-        return (
-          <span className={`inline-flex items-center rounded-full px-2 py-0.5 text-xs font-medium ${colors}`}>
-            {formatShippingStatusLabel(value)}
-          </span>
-        )
+        return React.createElement(ShippingStatusBadgeWidget, { status: value })
       },
     },
   ],

package/src/modules/staff/backend/staff/leave-requests/[id]/page.tsx

@@ -1,7 +1,7 @@
 "use client"
 
 import * as React from 'react'
-import { useRouter } from 'next/navigation'
+import { usePathname, useRouter } from 'next/navigation'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { Badge } from '@open-mercato/ui/primitives/badge'
 import { Button } from '@open-mercato/ui/primitives/button'
@@ -14,12 +14,14 @@ import { updateCrud } from '@open-mercato/ui/backend/utils/crud'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 import { LeaveRequestForm, buildLeaveRequestPayload, type LeaveRequestFormValues } from '@open-mercato/core/modules/staff/components/LeaveRequestForm'
+import { buildRecordInjectionContext, useSetCurrentRecordInjectionContext } from '@open-mercato/ui/backend/injection/recordContext'
 import { type LeaveRequestRecord, type LeaveRequestsResponse, type NormalizedLeaveRequest, normalizeLeaveRequest, resolveStatusVariant, formatDateLabel, formatDateRange } from '../../../../lib/leaveRequestHelpers'
 
 export default function StaffLeaveRequestDetailPage({ params }: { params?: { id?: string } }) {
   const id = params?.id
   const t = useT()
   const router = useRouter()
+  const pathname = usePathname()
   const [isLoading, setIsLoading] = React.useState(true)
   const [error, setError] = React.useState<string | null>(null)
   const [isNotFound, setIsNotFound] = React.useState(false)
@@ -123,6 +125,20 @@ const handleSubmit = React.useCallback(async (values: LeaveRequestFormValues) =>
     router.refresh()
   }, [decisionComment, record?.id, record?.updatedAt, router, t])
 
+  // Publish page-load record context to the AppShell-owned `backend:record:current`
+  // mount so the enterprise record_locks widget resolves `staff.leaveRequest` + id
+  // explicitly. The resourceKind follows the module's camelCase version-history
+  // convention so the held lock matches the leave request's save-time conflict surface.
+  useSetCurrentRecordInjectionContext(
+    buildRecordInjectionContext({
+      resourceKind: 'staff.leaveRequest',
+      resourceId: id || null,
+      updatedAt: record?.updatedAt ?? null,
+      data: record as Record<string, unknown> | null,
+      path: pathname,
+    }),
+  )
+
   if (isLoading) {
     return (
       <Page>

package/src/modules/staff/backend/staff/team-members/[id]/page.tsx

@@ -2,7 +2,7 @@
 
 import * as React from 'react'
 import Link from 'next/link'
-import { useRouter, useSearchParams } from 'next/navigation'
+import { usePathname, useRouter, useSearchParams } from 'next/navigation'
 import { Page, PageBody } from '@open-mercato/ui/backend/Page'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { readApiResultOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
@@ -15,6 +15,7 @@ import { createTranslatorWithFallback } from '@open-mercato/shared/lib/i18n/tran
 import { AvailabilityRulesEditor } from '@open-mercato/core/modules/planner/components/AvailabilityRulesEditor'
 import { buildMemberScheduleItems } from '@open-mercato/core/modules/staff/lib/memberSchedule'
 import { TeamMemberForm, buildTeamMemberPayload, type TeamMemberFormValues } from '@open-mercato/core/modules/staff/components/TeamMemberForm'
+import { buildRecordInjectionContext, useSetCurrentRecordInjectionContext } from '@open-mercato/ui/backend/injection/recordContext'
 import { NotesSection } from '@open-mercato/ui/backend/detail'
 import { ActivitiesSection, type SectionAction } from '@open-mercato/ui/backend/detail'
 import { AddressesSection as SharedAddressesSection } from '@open-mercato/ui/backend/detail'
@@ -71,6 +72,7 @@ export default function StaffTeamMemberDetailPage({ params }: { params?: { id?:
   const t = useT()
   const detailTranslator = React.useMemo(() => createTranslatorWithFallback(t), [t])
   const router = useRouter()
+  const pathname = usePathname()
   const searchParams = useSearchParams()
   const [initialValues, setInitialValues] = React.useState<TeamMemberFormValues | null>(null)
   const [memberRecord, setMemberRecord] = React.useState<TeamMemberRecord | null>(null)
@@ -341,6 +343,20 @@ export default function StaffTeamMemberDetailPage({ params }: { params?: { id?:
     : [t('staff.teamMembers.detail.roles.unassigned', 'No roles assigned')]
   const userEmail = memberRecord?.user?.email ?? null
 
+  // Publish page-load record context to the AppShell-owned `backend:record:current`
+  // mount so the enterprise record_locks widget resolves `staff.teamMember` + id
+  // explicitly. The resourceKind mirrors the TeamMemberForm `versionHistory` so the held
+  // lock matches the save-time conflict surface for the same team member.
+  useSetCurrentRecordInjectionContext(
+    buildRecordInjectionContext({
+      resourceKind: 'staff.teamMember',
+      resourceId: memberId || null,
+      updatedAt: initialValues?.updatedAt ?? null,
+      data: initialValues as Record<string, unknown> | null,
+      path: pathname,
+    }),
+  )
+
   if (isNotFound) {
     return (
       <Page>