@open-mercato/core 0.6.7-develop.6726.1.983ae8a07e → 0.6.7-develop.6749.1.6b54c56dfe

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

@@ -0,0 +1,198 @@
+"use client"
+
+import * as React from 'react'
+import type { ColumnDef } from '@tanstack/react-table'
+import { Plus } from 'lucide-react'
+import { DataTable } from '@open-mercato/ui/backend/DataTable'
+import { RowActions } from '@open-mercato/ui/backend/RowActions'
+import { EmptyState } from '@open-mercato/ui/primitives/empty-state'
+import { Button } from '@open-mercato/ui/primitives/button'
+import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { LineItemDialog } from './LineItemDialog'
+import type { SalesLineRecord } from './lineItemTypes'
+import { formatMoney, normalizeNumber } from './lineItemUtils'
+
+export type SalesOrderLineDraft = {
+  id: string
+  payload: Record<string, unknown>
+  record: SalesLineRecord
+}
+
+type SalesOrderDraftLinesProps = {
+  currencyCode: string | null | undefined
+  organizationId: string | null
+  tenantId: string | null
+  lines: SalesOrderLineDraft[]
+  error?: string | null
+  onChange: (lines: SalesOrderLineDraft[]) => void
+}
+
+function draftId(): string {
+  return typeof crypto !== 'undefined' && typeof crypto.randomUUID === 'function'
+    ? crypto.randomUUID()
+    : `draft-${Date.now()}-${Math.round(performance.now())}`
+}
+
+export function createSalesOrderLineDraft(
+  payload: Record<string, unknown>,
+  id = draftId(),
+): SalesOrderLineDraft {
+  const quantity = normalizeNumber(payload.quantity, 0)
+  const unitPriceNet = normalizeNumber(payload.unitPriceNet, 0)
+  const unitPriceGross = normalizeNumber(payload.unitPriceGross, unitPriceNet)
+  const taxRate = normalizeNumber(payload.taxRate, 0)
+  const totalNet = normalizeNumber(payload.totalNetAmount, unitPriceNet * quantity)
+  const totalGross = normalizeNumber(payload.totalGrossAmount, unitPriceGross * quantity)
+  const metadata = payload.metadata && typeof payload.metadata === 'object'
+    ? payload.metadata as Record<string, unknown>
+    : null
+  const catalogSnapshot = payload.catalogSnapshot && typeof payload.catalogSnapshot === 'object'
+    ? payload.catalogSnapshot as Record<string, unknown>
+    : null
+
+  return {
+    id,
+    payload: { ...payload },
+    record: {
+      id,
+      name: typeof payload.name === 'string' ? payload.name : null,
+      productId: typeof payload.productId === 'string' ? payload.productId : null,
+      productVariantId: typeof payload.productVariantId === 'string' ? payload.productVariantId : null,
+      quantity,
+      quantityUnit: typeof payload.quantityUnit === 'string' ? payload.quantityUnit : null,
+      normalizedQuantity: normalizeNumber(payload.normalizedQuantity, quantity),
+      normalizedUnit: typeof payload.normalizedUnit === 'string' ? payload.normalizedUnit : null,
+      currencyCode: typeof payload.currencyCode === 'string' ? payload.currencyCode : null,
+      unitPriceNet,
+      unitPriceGross,
+      taxRate,
+      totalNet,
+      totalGross,
+      priceMode: payload.priceMode === 'net' ? 'net' : 'gross',
+      uomSnapshot: null,
+      metadata,
+      catalogSnapshot,
+      customFieldSetId: typeof payload.customFieldSetId === 'string' ? payload.customFieldSetId : null,
+      customFields: payload.customFields && typeof payload.customFields === 'object'
+        ? payload.customFields as Record<string, unknown>
+        : null,
+      status: null,
+      statusEntryId: typeof payload.statusEntryId === 'string' ? payload.statusEntryId : null,
+    },
+  }
+}
+
+export function SalesOrderDraftLines({
+  currencyCode,
+  organizationId,
+  tenantId,
+  lines,
+  error,
+  onChange,
+}: SalesOrderDraftLinesProps) {
+  const t = useT()
+  const [dialogOpen, setDialogOpen] = React.useState(false)
+  const [editing, setEditing] = React.useState<SalesOrderLineDraft | null>(null)
+
+  const columns = React.useMemo<ColumnDef<SalesOrderLineDraft>[]>(() => [
+    {
+      id: 'name',
+      header: t('sales.documents.items.table.product', 'Product'),
+      cell: ({ row }) => row.original.record.name ?? t('sales.documents.items.untitled', 'Untitled'),
+    },
+    {
+      id: 'quantity',
+      header: t('sales.documents.items.table.quantity', 'Qty'),
+      cell: ({ row }) => row.original.record.quantityUnit
+        ? `${row.original.record.quantity} ${row.original.record.quantityUnit}`
+        : row.original.record.quantity,
+    },
+    {
+      id: 'unitPrice',
+      header: t('sales.documents.items.table.unit', 'Unit price'),
+      cell: ({ row }) => formatMoney(row.original.record.unitPriceGross, row.original.record.currencyCode ?? currencyCode ?? undefined),
+    },
+    {
+      id: 'total',
+      header: t('sales.documents.items.table.total', 'Total'),
+      cell: ({ row }) => formatMoney(row.original.record.totalGross, row.original.record.currencyCode ?? currencyCode ?? undefined),
+    },
+  ], [currencyCode, t])
+
+  const openCreate = React.useCallback(() => {
+    setEditing(null)
+    setDialogOpen(true)
+  }, [])
+
+  const rowActions = React.useCallback((line: SalesOrderLineDraft) => (
+    <RowActions
+      items={[
+        {
+          id: 'edit',
+          label: t('ui.actions.edit', 'Edit'),
+          onSelect: () => {
+            setEditing(line)
+            setDialogOpen(true)
+          },
+        },
+        {
+          id: 'delete',
+          label: t('ui.actions.delete', 'Delete'),
+          destructive: true,
+          onSelect: () => onChange(lines.filter((candidate) => candidate.id !== line.id)),
+        },
+      ]}
+    />
+  ), [lines, onChange, t])
+
+  return (
+    <div className="space-y-3">
+      <div className="flex items-center justify-between gap-4">
+        <div>
+          <h3 className="text-sm font-medium">{t('sales.orders.form.lines', 'Line Items')}</h3>
+          <p className="text-sm text-muted-foreground">
+            {t('sales.orders.linesRequired', 'Add at least one line item before creating the order.')}
+          </p>
+        </div>
+        <Button type="button" variant="outline" onClick={openCreate}>
+          <Plus className="h-4 w-4" aria-hidden="true" />
+          {t('sales.documents.items.add', 'Add item')}
+        </Button>
+      </div>
+      {error ? <p className="text-sm text-destructive" role="alert">{error}</p> : null}
+      <DataTable
+        columns={columns}
+        data={lines}
+        embedded
+        disableRowClick
+        rowActions={rowActions}
+        emptyState={(
+          <EmptyState
+            size="sm"
+            title={t('sales.documents.items.empty', 'No items yet.')}
+            description={t('sales.orders.linesRequired', 'Add at least one line item before creating the order.')}
+            actions={<Button type="button" variant="outline" size="sm" onClick={openCreate}>{t('sales.documents.items.add', 'Add item')}</Button>}
+          />
+        )}
+      />
+      <LineItemDialog
+        open={dialogOpen}
+        onOpenChange={(open) => {
+          setDialogOpen(open)
+          if (!open) setEditing(null)
+        }}
+        kind="order"
+        currencyCode={currencyCode}
+        organizationId={organizationId}
+        tenantId={tenantId}
+        initialLine={editing?.record ?? null}
+        onDraftSaved={(payload, lineId) => {
+          const draft = createSalesOrderLineDraft(payload, lineId ?? undefined)
+          onChange(lineId
+            ? lines.map((line) => line.id === lineId ? draft : line)
+            : [...lines, draft])
+        }}
+      />
+    </div>
+  )
+}

package/src/modules/sales/data/validators.ts

@@ -679,6 +679,8 @@ const quoteTotalsSchema = z.object({
   lineItemCount: z.coerce.number().int().min(0).optional(),
 })
 
+export const SALES_ORDER_LINES_REQUIRED_MESSAGE_KEY = 'sales.orders.linesRequired'
+
 export const orderCreateSchema = scoped.extend({
   orderNumber: z.string().trim().min(1).max(191).optional(),
   externalReference: z.string().trim().max(191).optional(),
@@ -715,7 +717,11 @@ export const orderCreateSchema = scoped.extend({
   paymentMethodSnapshot: jsonRecord.optional(),
   metadata,
   customFieldSetId: uuid().optional(),
-  lines: z.array(orderLineCreateSchema.omit({ organizationId: true, tenantId: true, orderId: true })).optional(),
+  lines: z
+    .array(orderLineCreateSchema.omit({ organizationId: true, tenantId: true, orderId: true }), {
+      error: SALES_ORDER_LINES_REQUIRED_MESSAGE_KEY,
+    })
+    .min(1, SALES_ORDER_LINES_REQUIRED_MESSAGE_KEY),
   adjustments: z.array(orderAdjustmentCreateSchema.omit({ organizationId: true, tenantId: true, orderId: true })).optional(),
   tags: z.array(uuid()).optional(),
   ...orderTotalsSchema.shape,

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

@@ -950,6 +950,7 @@
   "sales.documents.items.empty": "Noch keine Positionen.",
   "sales.documents.items.errorCurrency": "Währung ist erforderlich.",
   "sales.documents.items.errorDelete": "Position konnte nicht gelöscht werden.",
+  "sales.documents.items.errorDeleteLast": "Eine Bestellung muss mindestens eine Position enthalten.",
   "sales.documents.items.errorDeleteShipped": "Positionen mit versandten Artikeln können nicht gelöscht werden.",
   "sales.documents.items.errorLoad": "Positionen konnten nicht geladen werden.",
   "sales.documents.items.errorNameRequired": "Name ist für benutzerdefinierte Positionen erforderlich.",
@@ -1226,6 +1227,7 @@
   "sales.orders.form.shipments": "Sendungen",
   "sales.orders.lines.delete": "Bestellposition löschen",
   "sales.orders.lines.upsert": "Bestellposition aktualisieren",
+  "sales.orders.linesRequired": "Fügen Sie vor dem Erstellen der Bestellung mindestens eine Position hinzu.",
   "sales.orders.list.title": "Aufträge",
   "sales.orders.status_change.actor_api_key": "API-Schlüssel {name}",
   "sales.orders.status_change.actor_unknown": "Unbekannter Benutzer",

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

@@ -950,6 +950,7 @@
   "sales.documents.items.empty": "No items yet.",
   "sales.documents.items.errorCurrency": "Currency is required.",
   "sales.documents.items.errorDelete": "Failed to delete line.",
+  "sales.documents.items.errorDeleteLast": "An order must contain at least one line item.",
   "sales.documents.items.errorDeleteShipped": "You cannot delete a line that has shipped items.",
   "sales.documents.items.errorLoad": "Failed to load items.",
   "sales.documents.items.errorNameRequired": "Name is required for custom lines.",
@@ -1226,6 +1227,7 @@
   "sales.orders.form.shipments": "Shipments",
   "sales.orders.lines.delete": "Delete order line",
   "sales.orders.lines.upsert": "Update order line",
+  "sales.orders.linesRequired": "Add at least one line item before creating the order.",
   "sales.orders.list.title": "Orders",
   "sales.orders.status_change.actor_api_key": "API key {name}",
   "sales.orders.status_change.actor_unknown": "Unknown user",

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

@@ -950,6 +950,7 @@
   "sales.documents.items.empty": "Aún no hay artículos.",
   "sales.documents.items.errorCurrency": "La moneda es obligatoria.",
   "sales.documents.items.errorDelete": "No se pudo eliminar la línea.",
+  "sales.documents.items.errorDeleteLast": "Un pedido debe contener al menos una línea.",
   "sales.documents.items.errorDeleteShipped": "No puedes eliminar una línea que ya tiene envíos.",
   "sales.documents.items.errorLoad": "No se pudieron cargar los artículos.",
   "sales.documents.items.errorNameRequired": "El nombre es obligatorio para líneas personalizadas.",
@@ -1226,6 +1227,7 @@
   "sales.orders.form.shipments": "Envíos",
   "sales.orders.lines.delete": "Eliminar línea de pedido",
   "sales.orders.lines.upsert": "Actualizar línea de pedido",
+  "sales.orders.linesRequired": "Añade al menos una línea antes de crear el pedido.",
   "sales.orders.list.title": "Pedidos",
   "sales.orders.status_change.actor_api_key": "Clave API {name}",
   "sales.orders.status_change.actor_unknown": "Usuario desconocido",

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

@@ -950,6 +950,7 @@
   "sales.documents.items.empty": "Brak pozycji.",
   "sales.documents.items.errorCurrency": "Waluta jest wymagana.",
   "sales.documents.items.errorDelete": "Nie udało się usunąć pozycji.",
+  "sales.documents.items.errorDeleteLast": "Zamówienie musi zawierać co najmniej jedną pozycję.",
   "sales.documents.items.errorDeleteShipped": "Nie można usunąć pozycji, która ma wysłane sztuki.",
   "sales.documents.items.errorLoad": "Nie udało się załadować pozycji.",
   "sales.documents.items.errorNameRequired": "Nazwa jest wymagana dla niestandardowych pozycji.",
@@ -1226,6 +1227,7 @@
   "sales.orders.form.shipments": "Wysyłki",
   "sales.orders.lines.delete": "Usuń pozycję zamówienia",
   "sales.orders.lines.upsert": "Zaktualizuj pozycję zamówienia",
+  "sales.orders.linesRequired": "Dodaj co najmniej jedną pozycję przed utworzeniem zamówienia.",
   "sales.orders.list.title": "Zamówienia",
   "sales.orders.status_change.actor_api_key": "Klucz API {name}",
   "sales.orders.status_change.actor_unknown": "Nieznany użytkownik",

package/src/modules/staff/components/detail/dictionaries.ts

@@ -1,6 +1,7 @@
 "use client"
 
 import { apiCall, apiCallOrThrow } from '@open-mercato/ui/backend/utils/apiCall'
+import { fetchAllDictionaryEntries } from '@open-mercato/core/modules/dictionaries/lib/fetchAllEntries'
 
 export type DictionaryEntryOption = {
   value: string
@@ -51,10 +52,9 @@ export async function loadStaffDictionary(
   const name = kind === 'activityTypes' ? 'Staff activity types' : 'Staff address types'
   const dictionary = await ensureDictionary(key, name)
   if (!dictionary) return { dictionary: null, entries: [] }
-  const entriesCall = await apiCall<{ items?: Record<string, unknown>[] }>(`/api/dictionaries/${dictionary.id}/entries`)
+  const entriesCall = await fetchAllDictionaryEntries(dictionary.id)
   if (!entriesCall.ok) return { dictionary, entries: [] }
-  const items = Array.isArray(entriesCall.result?.items) ? entriesCall.result?.items ?? [] : []
-  const entries = items
+  const entries = entriesCall.items
     .map((entry) => {
       if (!entry || typeof entry !== 'object') return null
       const record = entry as Record<string, unknown>

package/src/modules/workflows/widgets/injection/order-approval/widget.client.tsx

@@ -10,6 +10,7 @@ import { Spinner } from '@open-mercato/ui/primitives/spinner'
 import { Textarea } from '@open-mercato/ui/primitives/textarea'
 import { Badge } from '@open-mercato/ui/primitives/badge'
 import { emitSalesDocumentDataRefresh } from '@open-mercato/core/modules/sales/lib/frontend/documentDataEvents'
+import { fetchAllDictionaryEntries } from '@open-mercato/core/modules/dictionaries/lib/fetchAllEntries'
 
 type OrderRecord = {
   id: string
@@ -165,12 +166,18 @@ export default function OrderApprovalWidget({ data }: InjectionWidgetComponentPr
   // Fetch order status dictionary entries using the dictionary ID
   const { data: statusEntriesData } = useQuery({
     queryKey: ['dictionary-entries', orderStatusDictionaryId],
-    queryFn: async () => {
+    queryFn: async (): Promise<{ items: DictionaryEntry[] }> => {
       if (!orderStatusDictionaryId) return { items: [] }
-      const result = await apiCall<{ items: DictionaryEntry[] }>(
-        `/api/dictionaries/${orderStatusDictionaryId}/entries`
-      )
-      return result.ok ? result.result : { items: [] }
+      const result = await fetchAllDictionaryEntries(orderStatusDictionaryId)
+      if (!result.ok) return { items: [] }
+      const items = result.items.flatMap((entry) => {
+        const id = typeof entry.id === 'string' ? entry.id : null
+        const value = typeof entry.value === 'string' ? entry.value : null
+        if (!id || !value) return []
+        const label = typeof entry.label === 'string' && entry.label.trim().length ? entry.label : value
+        return [{ id, value, label }]
+      })
+      return { items }
     },
     enabled: Boolean(orderStatusDictionaryId),
     staleTime: 60_000,