@open-mercato/core 0.6.4-develop.4371.1.8f3030407e → 0.6.4

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

@@ -8,10 +8,12 @@ import { Textarea } from '@open-mercato/ui/primitives/textarea'
 import { Label } from '@open-mercato/ui/primitives/label'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
-import { apiCallOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { apiCallOrThrow, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useGuardedMutation } from '@open-mercato/ui/backend/injection/useGuardedMutation'
 import { computeAvailableReturnQuantity } from '@open-mercato/core/modules/sales/lib/returnQuantity'
+import { handleSectionMutationError } from './optimisticLock'
 
 export type ReturnOrderLine = {
   id: string
@@ -26,6 +28,7 @@ type ReturnDialogProps = {
   open: boolean
   orderId: string
   lines: ReturnOrderLine[]
+  documentUpdatedAt?: string | null
   onClose: () => void
   onSaved: () => Promise<void>
 }
@@ -39,7 +42,7 @@ const normalizeNumber = (value: unknown): number => {
   return 0
 }
 
-export function ReturnDialog({ open, orderId, lines, onClose, onSaved }: ReturnDialogProps) {
+export function ReturnDialog({ open, orderId, lines, documentUpdatedAt, onClose, onSaved }: ReturnDialogProps) {
   const t = useT()
   const { runMutation } = useGuardedMutation({ contextId: `sales-returns-${orderId}` })
   const [reason, setReason] = React.useState('')
@@ -104,19 +107,23 @@ export function ReturnDialog({ open, orderId, lines, onClose, onSaved }: ReturnD
         context: { kind: 'order', record: { id: orderId } },
         mutationPayload: { orderId, lines: linesForRequest, reason, notes },
         operation: async () => {
-          const response = await apiCallOrThrow<{ id: string | null }>(
-            '/api/sales/returns',
-            {
-              method: 'POST',
-              headers: { 'content-type': 'application/json' },
-              body: JSON.stringify({
-                orderId,
-                lines: linesForRequest,
-                ...(reason.trim().length ? { reason: reason.trim() } : {}),
-                ...(notes.trim().length ? { notes: notes.trim() } : {}),
-              }),
-            },
-            { errorMessage: t('sales.returns.errors.create', 'Failed to create return.') },
+          const response = await withScopedApiRequestHeaders(
+            buildOptimisticLockHeader(documentUpdatedAt),
+            () =>
+              apiCallOrThrow<{ id: string | null }>(
+                '/api/sales/returns',
+                {
+                  method: 'POST',
+                  headers: { 'content-type': 'application/json' },
+                  body: JSON.stringify({
+                    orderId,
+                    lines: linesForRequest,
+                    ...(reason.trim().length ? { reason: reason.trim() } : {}),
+                    ...(notes.trim().length ? { notes: notes.trim() } : {}),
+                  }),
+                },
+                { errorMessage: t('sales.returns.errors.create', 'Failed to create return.') },
+              ),
           )
           return response.result?.id ?? null
         },
@@ -124,12 +131,16 @@ export function ReturnDialog({ open, orderId, lines, onClose, onSaved }: ReturnD
       flash(t('sales.returns.created', 'Return created.'), 'success')
       onClose()
       await onSaved()
-    } catch {
+    } catch (err) {
+      if (handleSectionMutationError(err, t, () => void onSaved())) {
+        onClose()
+        return
+      }
       flash(t('sales.returns.errors.create', 'Failed to create return.'), 'error')
     } finally {
       setSaving(false)
     }
-  }, [availableLines, notes, onClose, onSaved, orderId, quantities, reason, runMutation, saving, t])
+  }, [availableLines, documentUpdatedAt, notes, onClose, onSaved, orderId, quantities, reason, runMutation, saving, t])
 
   const onKeyDown = React.useCallback(
     (e: React.KeyboardEvent) => {

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

@@ -26,6 +26,7 @@ type ReturnRow = {
 type SalesReturnsSectionProps = {
   orderId: string
   currencyCode?: string | null
+  documentUpdatedAt?: string | null
 }
 
 function formatDisplayDate(value: string | null | undefined): string | null {
@@ -35,7 +36,7 @@ function formatDisplayDate(value: string | null | undefined): string | null {
   return new Intl.DateTimeFormat(undefined, { dateStyle: 'medium' }).format(date)
 }
 
-export function SalesReturnsSection({ orderId, currencyCode }: SalesReturnsSectionProps) {
+export function SalesReturnsSection({ orderId, currencyCode, documentUpdatedAt }: SalesReturnsSectionProps) {
   const t = useT()
   const [returns, setReturns] = React.useState<ReturnRow[]>([])
   const [lines, setLines] = React.useState<ReturnOrderLine[]>([])
@@ -208,6 +209,7 @@ export function SalesReturnsSection({ orderId, currencyCode }: SalesReturnsSecti
           open={dialogOpen}
           orderId={orderId}
           lines={lines}
+          documentUpdatedAt={documentUpdatedAt}
           onClose={() => setDialogOpen(false)}
           onSaved={async () => {
             emitSalesDocumentTotalsRefresh({ documentId: orderId, kind: 'order' })
@@ -258,6 +260,7 @@ export function SalesReturnsSection({ orderId, currencyCode }: SalesReturnsSecti
         open={dialogOpen}
         orderId={orderId}
         lines={lines}
+        documentUpdatedAt={documentUpdatedAt}
         onClose={() => setDialogOpen(false)}
         onSaved={async () => {
           emitSalesDocumentTotalsRefresh({ documentId: orderId, kind: 'order' })

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

@@ -841,6 +841,7 @@ export function SalesDocumentForm({ onCreated, isSubmitting = false, initialKind
           allowInlineCreate={false}
           manageHref="/backend/config/dictionaries?key=currency"
           selectClassName="w-full"
+          sortOptions="none"
           labels={currencyLabels}
         />
       ),

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

@@ -9,7 +9,8 @@ import { DataTable, type DataTableExportFormat, withDataTableNamespaces } from '
 import type { FilterDef, FilterValues } from '@open-mercato/ui/backend/FilterBar'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import { Button } from '@open-mercato/ui/primitives/button'
-import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+import { apiCall, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 import { buildCrudExportUrl, deleteCrud } from '@open-mercato/ui/backend/utils/crud'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useOrganizationScopeVersion } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
@@ -76,6 +77,7 @@ type SalesDocumentRow = {
   totalGross?: number | null
   currency?: string | null
   date?: string | null
+  updatedAt?: string | null
 }
 
 const PAGE_SIZE = 20
@@ -251,7 +253,7 @@ export function SalesDocumentsTable({ kind }: { kind: SalesDocumentKind }) {
         undefined,
         { fallback: { items: [] } }
       )
-      const entries = normalizeDictionaryEntries(response.result?.items ?? [])
+      const entries = normalizeDictionaryEntries(response.result?.items ?? [], { sort: false })
       setStatusMap(createDictionaryMap(entries))
     } catch (err) {
       console.error('sales.documents.statuses.load', err)
@@ -464,6 +466,7 @@ export function SalesDocumentsTable({ kind }: { kind: SalesDocumentKind }) {
         totalGross,
         currency: doc.currencyCode ?? null,
         date,
+        updatedAt: doc.updatedAt ?? null,
       }, item)
     },
     [kind]
@@ -540,9 +543,13 @@ export function SalesDocumentsTable({ kind }: { kind: SalesDocumentKind }) {
       })
       if (!confirmed) return
       try {
-        const result = await deleteCrud(`sales/${resource}`, row.id, {
-          errorMessage: t('sales.documents.list.table.deleteError', 'Failed to delete document.'),
-        })
+        const result = await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(row.updatedAt),
+          () =>
+            deleteCrud(`sales/${resource}`, row.id, {
+              errorMessage: t('sales.documents.list.table.deleteError', 'Failed to delete document.'),
+            }),
+        )
         if (result.ok) {
           flash(
             kind === 'order'

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

@@ -10,10 +10,12 @@ import { Label } from '@open-mercato/ui/primitives/label'
 import { Switch } from '@open-mercato/ui/primitives/switch'
 import { CrudForm, type CrudCustomFieldRenderProps, type CrudField, type CrudFormGroup } from '@open-mercato/ui/backend/CrudForm'
 import { LookupSelect, type LookupSelectItem } from '@open-mercato/ui/backend/inputs'
-import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+import { apiCall, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/utils/apiCall'
+import { buildOptimisticLockHeader } from '@open-mercato/ui/backend/utils/optimisticLock'
 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 { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { cn } from '@open-mercato/shared/lib/utils'
 import { E } from '#generated/entities.ids.generated'
@@ -65,6 +67,34 @@ type StatusOption = {
   color: string | null
 }
 
+function mergeShippingMethodOptions(
+  options: ShippingMethodOption[],
+  selected: ShippingMethodOption | null,
+): ShippingMethodOption[] {
+  if (!selected) return options
+  if (options.some((option) => option.id === selected.id)) return options
+  return [selected, ...options]
+}
+
+function mergeStatusOptions(options: StatusOption[], selected: StatusOption | null): StatusOption[] {
+  if (!selected) return options
+  if (options.some((option) => option.id === selected.id)) return options
+  return [selected, ...options]
+}
+
+function mapStatusOption(entry: Record<string, unknown>): StatusOption | null {
+  const id = typeof entry.id === 'string' ? entry.id : null
+  const value = typeof entry.value === 'string' ? entry.value : null
+  if (!id || !value) return null
+  const label =
+    typeof entry.label === 'string' && entry.label.trim().length
+      ? entry.label
+      : value
+  const color =
+    typeof entry.color === 'string' && entry.color.trim().length ? entry.color : null
+  return { id, value, label, color }
+}
+
 const ADDRESS_SNAPSHOT_KEY = 'shipmentAddressSnapshot'
 const ADDRESS_FORMAT: AddressFormatStrategy = 'line_first'
 const SHIPPING_ADJUSTMENT_TOGGLE_ID = 'shipment-add-shipping-adjustment'
@@ -524,7 +554,12 @@ export function ShipmentDialog({
           .map((item) => mapShippingMethod(item))
           .filter((entry): entry is ShippingMethodOption => !!entry)
         if (!query) {
-          setShippingMethods(options)
+          setShippingMethods((current) =>
+            current.reduce(
+              (next, selected) => mergeShippingMethodOptions(next, selected),
+              options,
+            ),
+          )
         }
         return options
       } catch (err) {
@@ -588,6 +623,21 @@ export function ShipmentDialog({
     [],
   )
 
+  const shippingMethodLookupOptions = React.useMemo<LookupSelectItem[]>(
+    () =>
+      shippingMethods.map((option) => ({
+        id: option.id,
+        title: option.name,
+        subtitle: [option.code, buildPriceSubtitle(option)].filter(Boolean).join(' • ') || undefined,
+        icon: (
+          <div className="flex h-8 w-8 items-center justify-center rounded-md bg-primary/10 text-primary">
+            <Truck className="h-4 w-4" />
+          </div>
+        ),
+      })),
+    [buildPriceSubtitle, shippingMethods],
+  )
+
   const loadDocumentStatuses = React.useCallback(async (): Promise<StatusOption[]> => {
     setDocumentStatusLoading(true)
     try {
@@ -669,20 +719,14 @@ export function ShipmentDialog({
       )
       const items = Array.isArray(response.result?.items) ? response.result.items : []
       const mapped = items
-        .map((entry) => {
-          const id = typeof entry.id === 'string' ? entry.id : null
-          const value = typeof entry.value === 'string' ? entry.value : null
-          if (!id || !value) return null
-          const label =
-            typeof entry.label === 'string' && entry.label.trim().length
-              ? entry.label
-              : value
-          const color =
-            typeof entry.color === 'string' && entry.color.trim().length ? entry.color : null
-          return { id, value, label, color }
-        })
+        .map((entry) => mapStatusOption(entry))
         .filter((entry): entry is StatusOption => Boolean(entry))
-      setShipmentStatuses(mapped)
+      setShipmentStatuses((current) =>
+        current.reduce(
+          (next, selected) => mergeStatusOptions(next, selected),
+          mapped,
+        ),
+      )
       return mapped
     } catch (err) {
       console.error('sales.shipments.statuses.load', err)
@@ -693,6 +737,20 @@ export function ShipmentDialog({
     }
   }, [])
 
+  const loadShipmentStatusById = React.useCallback(async (statusEntryId: string): Promise<StatusOption | null> => {
+    const response = await apiCall<{ items?: Array<Record<string, unknown>> }>(
+      `/api/sales/shipment-statuses?id=${encodeURIComponent(statusEntryId)}&pageSize=1`,
+      undefined,
+      { fallback: { items: [] } },
+    )
+    const items = Array.isArray(response.result?.items) ? response.result.items : []
+    return (
+      items
+        .map((entry) => mapStatusOption(entry))
+        .find((entry): entry is StatusOption => entry?.id === statusEntryId) ?? null
+    )
+  }, [])
+
   const fetchDocumentStatusItems = React.useCallback(
     async (query?: string): Promise<LookupSelectItem[]> => {
       const options =
@@ -758,6 +816,17 @@ export function ShipmentDialog({
     [loadShipmentStatuses, renderStatusIcon, shipmentStatuses],
   )
 
+  const shipmentStatusLookupOptions = React.useMemo<LookupSelectItem[]>(
+    () =>
+      shipmentStatuses.map((option) => ({
+        id: option.id,
+        title: option.label,
+        subtitle: option.value,
+        icon: renderStatusIcon(option.color),
+      })),
+    [renderStatusIcon, shipmentStatuses],
+  )
+
   React.useEffect(() => {
     if (!open) return
     setFormResetKey((prev) => prev + 1)
@@ -814,6 +883,32 @@ export function ShipmentDialog({
     shipment?.shippingMethodName,
   ])
 
+  React.useEffect(() => {
+    const statusEntryId = shipment?.statusEntryId
+    if (!statusEntryId || shipmentStatuses.some((status) => status.id === statusEntryId)) return
+    const fallback =
+      shipment.status || shipment.statusLabel
+        ? {
+            id: statusEntryId,
+            value: shipment.status ?? statusEntryId,
+            label: shipment.statusLabel ?? shipment.status ?? statusEntryId,
+            color: null,
+          }
+        : null
+    setShipmentStatuses((current) => mergeStatusOptions(current, fallback))
+    loadShipmentStatusById(statusEntryId)
+      .then((selected) => {
+        setShipmentStatuses((current) => mergeStatusOptions(current, selected))
+      })
+      .catch(() => {})
+  }, [
+    loadShipmentStatusById,
+    shipment?.status,
+    shipment?.statusEntryId,
+    shipment?.statusLabel,
+    shipmentStatuses,
+  ])
+
   React.useEffect(() => {
     if (!open) return
     mergeAddressOptions(baseAddressOptions)
@@ -973,13 +1068,25 @@ export function ShipmentDialog({
       }
 
       const action = shipment?.id ? updateCrud : createCrud
-      const result = await action(
-        'sales/shipments',
-        shipment?.id ? { id: shipment.id, ...payload } : payload,
-        {
-          errorMessage: t('sales.documents.shipments.errorSave', 'Failed to save shipment.'),
-        },
-      )
+      let result
+      try {
+        result = await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(shipment?.id ? rowOptimisticVersion(shipment) : undefined),
+          () =>
+            action(
+              'sales/shipments',
+              shipment?.id ? { id: shipment.id, ...payload } : payload,
+              {
+                errorMessage: t('sales.documents.shipments.errorSave', 'Failed to save shipment.'),
+              },
+            ),
+        )
+      } catch (err) {
+        if (handleSectionMutationError(err, t, () => void onSaved())) {
+          return
+        }
+        throw err
+      }
       if (result.ok) {
         const shipmentId = ((result.result as any)?.id as string | undefined) ?? shipment?.id ?? null
         const shouldAddShippingAdjustment =
@@ -1101,6 +1208,7 @@ export function ShipmentDialog({
       orderId,
       organizationId,
       shipment?.id,
+      shipment?.updatedAt,
       addressOptions,
       addressOptionsMap,
       shippingMethods,
@@ -1293,6 +1401,7 @@ export function ShipmentDialog({
               value={currentValue}
               onChange={(next) => setValue(next ?? '')}
               fetchItems={fetchShippingMethodItems}
+              options={shippingMethodLookupOptions}
               placeholder={t('sales.documents.shipments.shippingMethodPlaceholder', 'Select method')}
               loading={shippingMethodLoading}
               minQuery={0}
@@ -1311,6 +1420,7 @@ export function ShipmentDialog({
               value={currentValue}
               onChange={(next) => setValue(next ?? '')}
               fetchItems={fetchShipmentStatusItems}
+              options={shipmentStatusLookupOptions}
               placeholder={t('sales.documents.shipments.statusPlaceholder', 'Select shipment status')}
               loading={shipmentStatusLoading}
               minQuery={0}

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

@@ -6,7 +6,8 @@ import { Button } from '@open-mercato/ui/primitives/button'
 import { Badge } from '@open-mercato/ui/primitives/badge'
 import { ErrorMessage, LoadingMessage, TabEmptyState } from '@open-mercato/ui/backend/detail'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
-import { apiCall } from '@open-mercato/ui/backend/utils/apiCall'
+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 { useOrganizationScopeDetail } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
@@ -19,6 +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 { extractCustomFieldValues } from './customFieldHelpers'
 import type { OrderLine, ShipmentRow, ShipmentItem } from './shipmentTypes'
 
@@ -267,6 +269,7 @@ export function SalesShipmentsSection({
           const customValues = extractCustomFieldValues(item as Record<string, unknown>)
           return {
             id,
+            updatedAt: readRowUpdatedAt(item),
             shipmentNumber:
               typeof (item as any).shipment_number === 'string'
                 ? (item as any).shipment_number
@@ -397,20 +400,27 @@ export function SalesShipmentsSection({
       })
       if (!confirmed) return
       try {
-        const result = await deleteCrud('sales/shipments', {
-          body: {
-            id: shipment.id,
-            orderId,
-            organizationId: resolvedOrganizationId,
-            tenantId: resolvedTenantId,
-          },
-          errorMessage: t('sales.documents.shipments.errorDelete', 'Failed to delete shipment.'),
-        })
+        const result = await withScopedApiRequestHeaders(
+          buildOptimisticLockHeader(rowOptimisticVersion(shipment)),
+          () =>
+            deleteCrud('sales/shipments', {
+              body: {
+                id: shipment.id,
+                orderId,
+                organizationId: resolvedOrganizationId,
+                tenantId: resolvedTenantId,
+              },
+              errorMessage: t('sales.documents.shipments.errorDelete', 'Failed to delete shipment.'),
+            })
+        )
         if (result.ok) {
           await loadShipments()
           emitSalesDocumentTotalsRefresh({ documentId: orderId, kind: 'order' })
         }
       } catch (err) {
+        if (handleSectionMutationError(err, t, () => void loadShipments())) {
+          return
+        }
         console.error('sales.shipments.delete', err)
         flash(t('sales.documents.shipments.errorDelete', 'Failed to delete shipment.'), 'error')
       }

package/src/modules/sales/components/documents/optimisticLock.ts

@@ -0,0 +1,34 @@
+import { surfaceRecordConflict } from '@open-mercato/ui/backend/conflicts'
+
+type Translate = (key: string, fallback?: string) => string
+
+export function rowOptimisticVersion(row: { updatedAt?: string | null } | null | undefined): string | undefined {
+  const value = row?.updatedAt
+  return typeof value === 'string' && value.length ? value : undefined
+}
+
+/**
+ * Read a row's `updated_at` / `updatedAt` version from an untyped API record
+ * without `any`. Returns `null` when neither key holds a non-empty string.
+ */
+export function readRowUpdatedAt(source: unknown): string | null {
+  if (!source || typeof source !== 'object') return null
+  const record = source as Record<string, unknown>
+  const snake = record.updated_at
+  if (typeof snake === 'string' && snake.length) return snake
+  const camel = record.updatedAt
+  if (typeof camel === 'string' && camel.length) return camel
+  return null
+}
+
+export function handleSectionMutationError(
+  err: unknown,
+  t: Translate,
+  refresh: () => void,
+): boolean {
+  if (surfaceRecordConflict(err, t, { onRefresh: refresh })) {
+    refresh()
+    return true
+  }
+  return false
+}

package/src/modules/sales/components/documents/shipmentTypes.ts

@@ -9,6 +9,7 @@ export type ShipmentItem = {
 
 export type ShipmentRow = {
   id: string
+  updatedAt: string | null
   shipmentNumber: string | null
   shippingMethodId: string | null
   shippingMethodCode: string | null

package/src/modules/sales/di.ts

@@ -2,6 +2,8 @@ import { asFunction, asValue } from 'awilix'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import type { EventBus } from '@open-mercato/events'
 import type { AppContainer } from '@open-mercato/shared/lib/di/container'
+import type { OptimisticLockCurrentReader } from '@open-mercato/shared/lib/crud/optimistic-lock'
+import { registerOptimisticLockReaders } from '@open-mercato/shared/lib/crud/optimistic-lock-store'
 import { DefaultSalesCalculationService } from './services/salesCalculationService'
 import { DefaultTaxCalculationService } from './services/taxCalculationService'
 import { SalesDocumentNumberGenerator } from './services/salesDocumentNumberGenerator'
@@ -38,6 +40,34 @@ type AppCradle = AppContainer['cradle'] & {
   eventBus?: EventBus | null
 }
 
+const RESOURCE_KIND_ORDER = 'sales.order'
+
+const readSalesOrderUpdatedAt: OptimisticLockCurrentReader = async (
+  em: EntityManager,
+  { resourceId, tenantId, organizationId },
+) => {
+  const row = await em.findOne(
+    SalesOrder,
+    {
+      id: resourceId,
+      tenantId,
+      ...(organizationId ? { organizationId } : {}),
+      deletedAt: null,
+    },
+    { fields: ['updatedAt'] as const },
+  )
+  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`.
+registerOptimisticLockReaders({
+  [RESOURCE_KIND_ORDER]: readSalesOrderUpdatedAt,
+})
+
 export function register(container: AppContainer) {
   container.register({
     salesCalculationService: asFunction(({ eventBus }: AppCradle) => {
@@ -81,4 +111,9 @@ export function register(container: AppContainer) {
     SalesPaymentMethod: asValue(SalesPaymentMethod),
     SalesTaxRate: asValue(SalesTaxRate),
   })
+
+  // `crudMutationGuardService` is registered platform-wide in the shared
+  // DI bootstrap (`packages/shared/src/lib/di/container.ts`). The
+  // hand-wired sales.order reader above already lives in the global store,
+  // so this module no longer needs its own DI binding.
 }

package/src/modules/sales/frontend/quote/[token]/page.tsx

@@ -4,6 +4,8 @@ import * as React from 'react'
 import { apiCallOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Spinner } from '@open-mercato/ui/primitives/spinner'
+import { EmptyState } from '@open-mercato/ui/primitives/empty-state'
+import { SearchX } from 'lucide-react'
 import { useT } from '@open-mercato/shared/lib/i18n/context'
 
 type PublicQuoteResponse = {
@@ -110,7 +112,12 @@ export default function QuotePublicPage({ params }: { params: { token: string }
     return (
       <main className="mx-auto max-w-3xl p-6 space-y-2">
         <h1 className="text-2xl font-semibold">{t('sales.quotes.public.pageTitle')}</h1>
-        <p className="text-sm text-destructive">{error ?? t('sales.quotes.public.notFound')}</p>
+        <EmptyState
+          variant="subtle"
+          size="lg"
+          icon={<SearchX className="h-6 w-6" aria-hidden />}
+          title={error ?? t('sales.quotes.public.notFound')}
+        />
       </main>
     )
   }

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

@@ -15,6 +15,9 @@
   "sales.audit.delivery-windows.create": "Create delivery window",
   "sales.audit.delivery-windows.delete": "Delete delivery window",
   "sales.audit.delivery-windows.update": "Update delivery window",
+  "sales.audit.document_addresses.create": "Dokumentadresse hinzufügen",
+  "sales.audit.document_addresses.delete": "Dokumentadresse entfernen",
+  "sales.audit.document_addresses.update": "Dokumentadresse aktualisieren",
   "sales.audit.invoices.create": "Rechnung erstellen",
   "sales.audit.invoices.delete": "Rechnung löschen",
   "sales.audit.invoices.update": "Rechnung aktualisieren",
@@ -91,6 +94,7 @@
   "sales.channels.form.updateSubmit": "Änderungen speichern",
   "sales.channels.form.websiteUrl": "Website-URL",
   "sales.channels.nav.title": "Vertriebskanäle",
+  "sales.channels.offers.actions.backToList": "Zurück zu Angeboten",
   "sales.channels.offers.actions.create": "Angebot hinzufügen",
   "sales.channels.offers.actions.delete": "Löschen",
   "sales.channels.offers.actions.edit": "Bearbeiten",

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

@@ -15,6 +15,9 @@
   "sales.audit.delivery-windows.create": "Create delivery window",
   "sales.audit.delivery-windows.delete": "Delete delivery window",
   "sales.audit.delivery-windows.update": "Update delivery window",
+  "sales.audit.document_addresses.create": "Add document address",
+  "sales.audit.document_addresses.delete": "Remove document address",
+  "sales.audit.document_addresses.update": "Update document address",
   "sales.audit.invoices.create": "Create invoice",
   "sales.audit.invoices.delete": "Delete invoice",
   "sales.audit.invoices.update": "Update invoice",
@@ -91,6 +94,7 @@
   "sales.channels.form.updateSubmit": "Save changes",
   "sales.channels.form.websiteUrl": "Website URL",
   "sales.channels.nav.title": "Sales channels",
+  "sales.channels.offers.actions.backToList": "Back to offers",
   "sales.channels.offers.actions.create": "Add offer",
   "sales.channels.offers.actions.delete": "Delete",
   "sales.channels.offers.actions.edit": "Edit",

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

@@ -15,6 +15,9 @@
   "sales.audit.delivery-windows.create": "Create delivery window",
   "sales.audit.delivery-windows.delete": "Delete delivery window",
   "sales.audit.delivery-windows.update": "Update delivery window",
+  "sales.audit.document_addresses.create": "Agregar dirección del documento",
+  "sales.audit.document_addresses.delete": "Eliminar dirección del documento",
+  "sales.audit.document_addresses.update": "Actualizar dirección del documento",
   "sales.audit.invoices.create": "Crear factura",
   "sales.audit.invoices.delete": "Eliminar factura",
   "sales.audit.invoices.update": "Actualizar factura",
@@ -91,6 +94,7 @@
   "sales.channels.form.updateSubmit": "Guardar cambios",
   "sales.channels.form.websiteUrl": "URL del sitio web",
   "sales.channels.nav.title": "Canales de ventas",
+  "sales.channels.offers.actions.backToList": "Volver a ofertas",
   "sales.channels.offers.actions.create": "Añadir oferta",
   "sales.channels.offers.actions.delete": "Eliminar",
   "sales.channels.offers.actions.edit": "Editar",