@open-mercato/core 0.7.1-develop.7153.1.7145d295e6 → 0.7.1-develop.7170.1.d95074d7ba

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

@@ -56,6 +56,7 @@ import {
   extractCustomFieldValues,
 } from "./customFieldHelpers";
 import { canonicalizeUnitCode } from "@open-mercato/shared/lib/units/unitCodes";
+import { parseLocaleNumber } from "@open-mercato/shared/lib/number";
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('sales')
@@ -490,6 +491,30 @@ export function LineItemDialog({
 }: SalesLineDialogProps) {
   const t = useT();
   const locale = useLocale();
+  // These fields are hand-rolled text inputs, so the raw string a user typed reaches the
+  // submit handler. It carries the separator the surrounding UI displays, which follows the
+  // application locale — `110,70` under Polish (issue #5552). A blank field keeps its old
+  // "must be greater than 0" message; only genuinely unparseable input returns null.
+  const parseUserNumber = React.useCallback(
+    (value: unknown): number | null => {
+      if (value == null) return 0;
+      if (typeof value === "number") return Number.isFinite(value) ? value : null;
+      if (typeof value !== "string") return null;
+      if (!value.trim()) return 0;
+      return parseLocaleNumber(value, locale);
+    },
+    [locale],
+  );
+  const numberExample = React.useMemo(() => {
+    try {
+      return new Intl.NumberFormat(locale, {
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 2,
+      }).format(110.7);
+    } catch {
+      return "110.70";
+    }
+  }, [locale]);
   const scope = useOrganizationScopeDetail();
   const resolvedOrganizationId = organizationId ?? scope.organizationId ?? null;
   const resolvedTenantId = tenantId ?? scope.tenantId ?? null;
@@ -952,7 +977,7 @@ export function LineItemDialog({
       try {
         const params = new URLSearchParams({ productId, pageSize: "20" });
         if (variantId) params.set("variantId", variantId);
-        const quantityValue = normalizeNumber(quantity, Number.NaN);
+        const quantityValue = parseUserNumber(quantity) ?? Number.NaN;
         if (Number.isFinite(quantityValue) && quantityValue > 0) {
           params.set("quantity", String(quantityValue));
         }
@@ -1093,7 +1118,7 @@ export function LineItemDialog({
         setPriceLoading(false);
       }
     },
-    [t],
+    [parseUserNumber, t],
   );
 
   const selectPriceAfterRefresh = React.useCallback(
@@ -1136,7 +1161,7 @@ export function LineItemDialog({
       fromUnit: string | null | undefined,
       toUnit: string | null | undefined,
     ): string | null => {
-      const amount = normalizeNumber(rawUnitPrice, Number.NaN);
+      const amount = parseUserNumber(rawUnitPrice) ?? Number.NaN;
       if (!Number.isFinite(amount) || amount <= 0) return null;
       const fromCode = normalizeUnitCode(fromUnit);
       const toCode = normalizeUnitCode(toUnit);
@@ -1156,7 +1181,7 @@ export function LineItemDialog({
       if (!Number.isFinite(convertedAmount) || convertedAmount <= 0) return null;
       return normalizeUnitPriceInputValue(convertedAmount);
     },
-    [resolveUnitPriceFactor],
+    [parseUserNumber, resolveUnitPriceFactor],
   );
 
   const applyPriceSelection = React.useCallback(
@@ -1342,8 +1367,16 @@ export function LineItemDialog({
         );
       }
 
-      const qtyNumber = Number(values.quantity ?? 0);
-      if (!Number.isFinite(qtyNumber) || qtyNumber <= 0) {
+      const qtyNumber = parseUserNumber(values.quantity);
+      if (qtyNumber === null) {
+        const message = t(
+          "sales.documents.items.errorQuantityInvalid",
+          "Enter the quantity as a number, for example {{example}}.",
+          { example: numberExample },
+        );
+        throw createCrudFormError(message, { quantity: message });
+      }
+      if (qtyNumber <= 0) {
         throw createCrudFormError(
           t(
             "sales.documents.items.errorQuantity",
@@ -1380,8 +1413,16 @@ export function LineItemDialog({
         );
       })();
 
-      const unitPriceNumber = Number(values.unitPrice ?? 0);
-      if (!Number.isFinite(unitPriceNumber) || unitPriceNumber <= 0) {
+      const unitPriceNumber = parseUserNumber(values.unitPrice);
+      if (unitPriceNumber === null) {
+        const message = t(
+          "sales.documents.items.errorUnitPriceInvalid",
+          "Enter the unit price as a number, for example {{example}}.",
+          { example: numberExample },
+        );
+        throw createCrudFormError(message, { unitPrice: message });
+      }
+      if (unitPriceNumber <= 0) {
         throw createCrudFormError(
           t(
             "sales.documents.items.errorUnitPrice",
@@ -1610,6 +1651,8 @@ export function LineItemDialog({
       variantOption,
       onSaved,
       closeDialog,
+      numberExample,
+      parseUserNumber,
       resolvedOrganizationId,
       resolvedTenantId,
     ],
@@ -2541,7 +2584,7 @@ export function LineItemDialog({
         layout: "full",
         component: ({ values }: FieldRenderProps) => {
           if (isCustomLine) return null;
-          const quantity = normalizeNumber(values?.quantity, Number.NaN);
+          const quantity = parseUserNumber(values?.quantity) ?? Number.NaN;
           const enteredUnit = normalizeUnitCode(values?.quantityUnit);
           if (!Number.isFinite(quantity) || quantity <= 0 || !enteredUnit) {
             return (
@@ -2651,6 +2694,7 @@ export function LineItemDialog({
     selectPriceAfterRefresh,
     hasTaxMetadata,
     isShippedOrderLine,
+    parseUserNumber,
   ]);
 
   const groups = React.useMemo<CrudFormGroup[]>(() => {

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

@@ -11,6 +11,7 @@ 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'
+import { formatDisplayDate, formatDisplayDateTime, toUtcDateInputValue } from '@open-mercato/ui/primitives/date-format'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useOrganizationScopeDetail } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { useT, useLocale } from '@open-mercato/shared/lib/i18n/context'
@@ -293,19 +294,18 @@ export function SalesDocumentPaymentsSection({
       {
         accessorKey: 'receivedAt',
         header: t('sales.documents.payments.receivedAt', 'Received'),
-        cell: ({ row }) =>
-          row.original.receivedAt
-            ? new Date(row.original.receivedAt).toLocaleDateString(locale)
-            : '—',
+        // `receivedAt` is written from a date input (`PaymentDialog`), coerced with
+        // `z.coerce.date()` and stored as UTC midnight, so its day must be read in UTC.
+        // Reading it locally names the previous day west of UTC — and disagrees with the
+        // Edit dialog, which seeds from `receivedAt.slice(0, 10)`, i.e. the UTC day.
+        cell: ({ row }) => formatDisplayDate(toUtcDateInputValue(row.original.receivedAt), locale) ?? '—',
       },
       {
         accessorKey: 'createdAt',
         header: t('sales.documents.payments.createdAt', 'Created'),
-        cell: ({ row }) =>
-          row.original.createdAt ? new Date(row.original.createdAt).toLocaleString(locale) : '—',
+        cell: ({ row }) => formatDisplayDateTime(row.original.createdAt, locale) ?? '—',
         meta: {
-          tooltipContent: (row: PaymentRow) =>
-            row.createdAt ? new Date(row.createdAt).toLocaleString(locale) : undefined,
+          tooltipContent: (row: PaymentRow) => formatDisplayDateTime(row.createdAt, locale) ?? undefined,
         },
       },
       {

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

@@ -1,6 +1,7 @@
 "use client"
 
 import * as React from 'react'
+import { toUtcDateInputValue } from '@open-mercato/ui/primitives/date-format'
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@open-mercato/ui/primitives/dialog'
 import { useDialogKeyHandler } from '@open-mercato/ui/hooks/useDialogKeyHandler'
 import { CrudForm, type CrudField } from '@open-mercato/ui/backend/CrudForm'
@@ -36,13 +37,6 @@ type ReturnEditDialogProps = {
   onSaved: () => Promise<void>
 }
 
-function toDateInputValue(value: string | null | undefined): string {
-  if (!value) return ''
-  const date = new Date(value)
-  if (Number.isNaN(date.getTime())) return ''
-  return date.toISOString().slice(0, 10)
-}
-
 export function ReturnEditDialog({
   open,
   returnRecord,
@@ -62,7 +56,7 @@ export function ReturnEditDialog({
       updatedAt: returnRecord?.updatedAt ?? null,
       reason: returnRecord?.reason ?? '',
       notes: returnRecord?.notes ?? '',
-      returnedAt: toDateInputValue(returnRecord?.returnedAt),
+      returnedAt: toUtcDateInputValue(returnRecord?.returnedAt) ?? '',
     }),
     [returnRecord],
   )

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

@@ -1,6 +1,7 @@
 "use client"
 
 import * as React from 'react'
+import { formatDisplayDate, toUtcDateInputValue } from '@open-mercato/ui/primitives/date-format'
 import { Undo2, Plus } from 'lucide-react'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Badge } from '@open-mercato/ui/primitives/badge'
@@ -41,12 +42,8 @@ type SalesReturnsSectionProps = {
   documentUpdatedAt?: string | null
 }
 
-export function formatDisplayDate(value: string | null | undefined, locale?: string): string | null {
-  if (!value) return null
-  const date = new Date(value)
-  if (Number.isNaN(date.getTime())) return null
-  return new Intl.DateTimeFormat(locale, { dateStyle: 'medium' }).format(date)
-}
+// One date formatter for this page rather than three with incompatible semantics.
+export { formatDisplayDate }
 
 export function SalesReturnsSection({ orderId, currencyCode, documentUpdatedAt }: SalesReturnsSectionProps) {
   const t = useT()
@@ -329,7 +326,11 @@ export function SalesReturnsSection({ orderId, currencyCode, documentUpdatedAt }
                 </div>
               </div>
               <div className="whitespace-nowrap text-right text-sm text-muted-foreground">
-                {formatDisplayDate(ret.returnedAt, locale) ?? t('sales.returns.notSet', 'Not set')}
+                {/* `returnedAt` is submitted as a bare `yyyy-MM-dd` by `ReturnEditDialog`, coerced by
+                    `z.coerce.date()` and returned via `.toISOString()`, and that dialog seeds itself
+                    back from the UTC day — unconditionally, however the row was written. Matching the
+                    dialog is the invariant, so the row cannot contradict itself west of UTC. */}
+                {formatDisplayDate(toUtcDateInputValue(ret.returnedAt), locale) ?? t('sales.returns.notSet', 'Not set')}
               </div>
               <div className="whitespace-nowrap text-right text-sm font-medium">
                 {formatMoney(ret.total, currencyCode ?? null, locale)}

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

@@ -1,6 +1,7 @@
 "use client"
 
 import * as React from 'react'
+import { formatDisplayDate, toUtcDateInputValue } from '@open-mercato/ui/primitives/date-format'
 import { Pencil, Plus, Trash2, Truck } from 'lucide-react'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { Badge } from '@open-mercato/ui/primitives/badge'
@@ -41,12 +42,8 @@ type SalesShipmentsSectionProps = {
   onAddComment?: (body: string) => Promise<void>
 }
 
-export function formatDisplayDate(value: string | null | undefined, locale?: string): string | null {
-  if (!value) return null
-  const date = new Date(value)
-  if (Number.isNaN(date.getTime())) return null
-  return new Intl.DateTimeFormat(locale, { dateStyle: 'medium' }).format(date)
-}
+// One date formatter for this page rather than three with incompatible semantics.
+export { formatDisplayDate }
 
 const formatShipmentAddress = (metadata?: Record<string, unknown> | null): string | null => {
   if (!metadata || typeof metadata !== 'object') return null
@@ -487,8 +484,12 @@ export function SalesShipmentsSection({
       ) : (
         <div className="grid gap-3 md:grid-cols-2">
           {shipments.map((shipment) => {
-            const shippedAt = formatDisplayDate(shipment.shippedAt, locale)
-            const deliveredAt = formatDisplayDate(shipment.deliveredAt, locale)
+            // `shippedAt` / `deliveredAt` are written from date inputs (`ShipmentDialog`), coerced
+            // by `z.coerce.date()` and stored as UTC midnight, and the dialog seeds itself back from
+            // `.slice(0, 10)` — the UTC day. Reading them locally names the previous day west of UTC
+            // and disagrees with that dialog on the same row.
+            const shippedAt = formatDisplayDate(toUtcDateInputValue(shipment.shippedAt), locale)
+            const deliveredAt = formatDisplayDate(toUtcDateInputValue(shipment.deliveredAt), locale)
             const addressSummary = formatShipmentAddress(shipment.metadata)
             const statusLabel =
               shipment.statusLabel ??

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

@@ -1016,10 +1016,12 @@
   "sales.documents.items.errorProductRequired": "Wähle ein Produkt aus, um fortzufahren.",
   "sales.documents.items.errorQuantity": "Die Menge muss größer als 0 sein.",
   "sales.documents.items.errorQuantityBelowShipped": "Die Menge kann nicht unter die bereits versandten {{shipped}} gesenkt werden.",
+  "sales.documents.items.errorQuantityInvalid": "Geben Sie die Menge als Zahl ein, zum Beispiel {{example}}.",
   "sales.documents.items.errorQuantityShipmentsUnknown": "Die Menge kann erst gesenkt werden, wenn die Sendungen dieses Auftrags geladen wurden. Öffnen Sie den Auftrag erneut, um es noch einmal zu versuchen.",
   "sales.documents.items.errorSave": "Position konnte nicht gespeichert werden.",
   "sales.documents.items.errorScope": "Organisation und Mandant sind erforderlich.",
   "sales.documents.items.errorUnitPrice": "Der Stückpreis muss größer als 0 sein.",
+  "sales.documents.items.errorUnitPriceInvalid": "Geben Sie den Stückpreis als Zahl ein, zum Beispiel {{example}}.",
   "sales.documents.items.errorVariantRequired": "Wähle eine Variante aus, um fortzufahren.",
   "sales.documents.items.errors.uom.conversionNotFound": "Keine Einheitenumrechnung für dieses Produkt gefunden.",
   "sales.documents.items.errors.uom.defaultUnitMissing": "Dem Produkt fehlt eine Standard-Basiseinheit.",

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

@@ -1016,10 +1016,12 @@
   "sales.documents.items.errorProductRequired": "Select a product to continue.",
   "sales.documents.items.errorQuantity": "Quantity must be greater than 0.",
   "sales.documents.items.errorQuantityBelowShipped": "You cannot lower the quantity below the {{shipped}} already shipped.",
+  "sales.documents.items.errorQuantityInvalid": "Enter the quantity as a number, for example {{example}}.",
   "sales.documents.items.errorQuantityShipmentsUnknown": "The quantity cannot be lowered until this order's shipments have been read. Reopen the order to try again.",
   "sales.documents.items.errorSave": "Failed to save line.",
   "sales.documents.items.errorScope": "Organization and tenant are required.",
   "sales.documents.items.errorUnitPrice": "Unit price must be greater than 0.",
+  "sales.documents.items.errorUnitPriceInvalid": "Enter the unit price as a number, for example {{example}}.",
   "sales.documents.items.errorVariantRequired": "Select a variant to continue.",
   "sales.documents.items.errors.uom.conversionNotFound": "No unit conversion found for this product.",
   "sales.documents.items.errors.uom.defaultUnitMissing": "Product is missing a default base unit.",

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

@@ -1016,10 +1016,12 @@
   "sales.documents.items.errorProductRequired": "Selecciona un producto para continuar.",
   "sales.documents.items.errorQuantity": "La cantidad debe ser mayor que 0.",
   "sales.documents.items.errorQuantityBelowShipped": "No puedes reducir la cantidad por debajo de las {{shipped}} ya enviadas.",
+  "sales.documents.items.errorQuantityInvalid": "Introduce la cantidad como un número, por ejemplo {{example}}.",
   "sales.documents.items.errorQuantityShipmentsUnknown": "La cantidad no se puede reducir hasta que se carguen los envíos de este pedido. Vuelve a abrir el pedido para intentarlo de nuevo.",
   "sales.documents.items.errorSave": "No se pudo guardar la línea.",
   "sales.documents.items.errorScope": "Se requieren organización e inquilino.",
   "sales.documents.items.errorUnitPrice": "El precio unitario debe ser mayor que 0.",
+  "sales.documents.items.errorUnitPriceInvalid": "Introduce el precio unitario como un número, por ejemplo {{example}}.",
   "sales.documents.items.errorVariantRequired": "Selecciona una variante para continuar.",
   "sales.documents.items.errors.uom.conversionNotFound": "No se encontró conversión de unidad para este producto.",
   "sales.documents.items.errors.uom.defaultUnitMissing": "El producto no tiene una unidad base predeterminada.",

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

@@ -1016,10 +1016,12 @@
   "sales.documents.items.errorProductRequired": "계속하려면 상품을 선택하세요.",
   "sales.documents.items.errorQuantity": "수량은 0보다 커야 합니다.",
   "sales.documents.items.errorQuantityBelowShipped": "이미 배송된 {{shipped}} 이하로 수량을 줄일 수 없습니다.",
+  "sales.documents.items.errorQuantityInvalid": "수량을 숫자로 입력하세요. 예: {{example}}.",
   "sales.documents.items.errorQuantityShipmentsUnknown": "이 주문의 배송 정보를 불러올 때까지 수량을 줄일 수 없습니다. 주문을 다시 열어 재시도하세요.",
   "sales.documents.items.errorSave": "품목을 저장하지 못했습니다.",
   "sales.documents.items.errorScope": "조직 및 테넌트 정보가 필요합니다.",
   "sales.documents.items.errorUnitPrice": "단가는 0보다 커야 합니다.",
+  "sales.documents.items.errorUnitPriceInvalid": "단가를 숫자로 입력하세요. 예: {{example}}.",
   "sales.documents.items.errorVariantRequired": "계속하려면 옵션(변형)을 선택하세요.",
   "sales.documents.items.errors.uom.conversionNotFound": "이 상품에 대한 단위 변환 정보를 찾을 수 없습니다.",
   "sales.documents.items.errors.uom.defaultUnitMissing": "상품에 기본 단위가 설정되어 있지 않습니다.",

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

@@ -1016,10 +1016,12 @@
   "sales.documents.items.errorProductRequired": "Wybierz produkt, aby kontynuować.",
   "sales.documents.items.errorQuantity": "Ilość musi być większa niż 0.",
   "sales.documents.items.errorQuantityBelowShipped": "Nie można obniżyć ilości poniżej {{shipped}} już wysłanych.",
+  "sales.documents.items.errorQuantityInvalid": "Podaj ilość jako liczbę, na przykład {{example}}.",
   "sales.documents.items.errorQuantityShipmentsUnknown": "Nie można obniżyć ilości, dopóki wysyłki tego zamówienia nie zostaną wczytane. Otwórz zamówienie ponownie, aby spróbować jeszcze raz.",
   "sales.documents.items.errorSave": "Nie udało się zapisać pozycji.",
   "sales.documents.items.errorScope": "Wymagane są organizacja i najemca.",
   "sales.documents.items.errorUnitPrice": "Cena jednostkowa musi być większa niż 0.",
+  "sales.documents.items.errorUnitPriceInvalid": "Podaj cenę jednostkową jako liczbę, na przykład {{example}}.",
   "sales.documents.items.errorVariantRequired": "Wybierz wariant, aby kontynuować.",
   "sales.documents.items.errors.uom.conversionNotFound": "Nie znaleziono przelicznika jednostek dla tego produktu.",
   "sales.documents.items.errors.uom.defaultUnitMissing": "Produkt nie ma zdefiniowanej domyślnej jednostki bazowej.",