@open-mercato/core 0.6.8-develop.7088.1.3873d81f42 → 0.6.8-develop.7090.1.4dbca7b350

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

@@ -23,7 +23,7 @@ import type { SectionAction } from '@open-mercato/core/modules/customers/compone
 import type { SalesAdjustmentKind } from '../../data/entities'
 import { PriceWithCurrency } from '../PriceWithCurrency'
 import { AdjustmentDialog, type AdjustmentRowData, type AdjustmentSubmitPayload } from './AdjustmentDialog'
-import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { useT, useLocale } from '@open-mercato/shared/lib/i18n/context'
 import { useOrganizationScopeDetail } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
 import { extractCustomFieldValues } from './customFieldHelpers'
 import { createLogger } from '@open-mercato/shared/lib/logger'
@@ -60,9 +60,9 @@ function normalizeNumber(value: unknown, fallback = 0): number {
   return fallback
 }
 
-function formatPercent(value: number | null | undefined): string {
+export function formatPercent(value: number | null | undefined, locale?: string): string {
   if (value === null || value === undefined) return '—'
-  const formatter = new Intl.NumberFormat(undefined, { style: 'percent', maximumFractionDigits: 2 })
+  const formatter = new Intl.NumberFormat(locale, { style: 'percent', maximumFractionDigits: 2 })
   return formatter.format(value / 100)
 }
 
@@ -77,6 +77,7 @@ export function SalesDocumentAdjustmentsSection({
   onRowsChange,
 }: SalesDocumentAdjustmentsSectionProps) {
   const t = useT()
+  const locale = useLocale()
   const { organizationId, tenantId } = useOrganizationScopeDetail()
   const resolvedOrganizationId = orgFromProps ?? organizationId ?? null
   const resolvedTenantId = tenantFromProps ?? tenantId ?? null
@@ -433,7 +434,7 @@ export function SalesDocumentAdjustmentsSection({
       {
         id: 'rate',
         header: t('sales.documents.adjustments.rate', 'Rate'),
-        cell: ({ row }) => <span className="font-mono text-sm text-muted-foreground">{formatPercent(row.original.rate)}</span>,
+        cell: ({ row }) => <span className="font-mono text-sm text-muted-foreground">{formatPercent(row.original.rate, locale)}</span>,
       },
       {
         id: 'position',
@@ -441,7 +442,7 @@ export function SalesDocumentAdjustmentsSection({
         cell: ({ row }) => <span className="text-sm text-muted-foreground">{row.original.position}</span>,
       },
     ],
-    [currencyCode, resolveKindLabel, t]
+    [currencyCode, locale, resolveKindLabel, t]
   )
 
   const showLoadingState = loading && rows.length === 0

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

@@ -16,7 +16,7 @@ import {
   createDictionaryMap,
   normalizeDictionaryEntries,
 } from "@open-mercato/core/modules/dictionaries/components/dictionaryAppearance";
-import { useT } from "@open-mercato/shared/lib/i18n/context";
+import { useT, useLocale } from "@open-mercato/shared/lib/i18n/context";
 import { useOrganizationScopeDetail } from "@open-mercato/shared/lib/frontend/useOrganizationScope";
 import { useConfirmDialog } from "@open-mercato/ui/backend/confirm-dialog";
 import { emitSalesDocumentTotalsRefresh } from "@open-mercato/core/modules/sales/lib/frontend/documentTotalsEvents";
@@ -158,6 +158,7 @@ export function SalesDocumentItemsSection({
   onItemsChange,
 }: SalesDocumentItemsSectionProps) {
   const t = useT();
+  const locale = useLocale();
   const { organizationId, tenantId } = useOrganizationScopeDetail();
   const { confirm, ConfirmDialogElement } = useConfirmDialog();
   const resolvedOrganizationId = orgFromProps ?? organizationId ?? null;
@@ -827,6 +828,7 @@ export function SalesDocumentItemsSection({
                           {formatMoney(
                             item.unitPriceGross,
                             item.currencyCode ?? currencyCode ?? undefined,
+                            locale,
                           )}{" "}
                           <span className="text-xs text-muted-foreground">
                             {t("sales.documents.items.table.gross", "gross")}
@@ -836,6 +838,7 @@ export function SalesDocumentItemsSection({
                           {formatMoney(
                             item.unitPriceNet,
                             item.currencyCode ?? currencyCode ?? undefined,
+                            locale,
                           )}{" "}
                           {t("sales.documents.items.table.net", "net")}
                         </span>
@@ -850,6 +853,7 @@ export function SalesDocumentItemsSection({
                                   item.currencyCode ??
                                     currencyCode ??
                                     undefined,
+                                  locale,
                                 ),
                                 unit: unitPriceReference.referenceUnitCode,
                               },
@@ -873,6 +877,7 @@ export function SalesDocumentItemsSection({
                                       item.currencyCode ??
                                         currencyCode ??
                                         undefined,
+                                      locale,
                                     ),
                                   },
                                 )}
@@ -903,6 +908,7 @@ export function SalesDocumentItemsSection({
                           {formatMoney(
                             item.totalGross,
                             item.currencyCode ?? currencyCode ?? undefined,
+                            locale,
                           )}{" "}
                           <span className="text-xs font-normal text-muted-foreground">
                             {t("sales.documents.items.table.gross", "gross")}
@@ -912,6 +918,7 @@ export function SalesDocumentItemsSection({
                           {formatMoney(
                             item.totalNet,
                             item.currencyCode ?? currencyCode ?? undefined,
+                            locale,
                           )}{" "}
                           {t("sales.documents.items.table.net", "net")}
                         </span>

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

@@ -46,7 +46,7 @@ import {
   renderDictionaryColor,
 } from "@open-mercato/core/modules/dictionaries/components/dictionaryAppearance";
 import { E } from "#generated/entities.ids.generated";
-import { useT } from "@open-mercato/shared/lib/i18n/context";
+import { useT, useLocale } from "@open-mercato/shared/lib/i18n/context";
 import { useOrganizationScopeDetail } from "@open-mercato/shared/lib/frontend/useOrganizationScope";
 import { formatMoney, normalizeNumber } from "./lineItemUtils";
 import type { SalesLineRecord } from "./lineItemTypes";
@@ -489,6 +489,7 @@ export function LineItemDialog({
   onDraftSaved,
 }: SalesLineDialogProps) {
   const t = useT();
+  const locale = useLocale();
   const scope = useOrganizationScopeDetail();
   const resolvedOrganizationId = organizationId ?? scope.organizationId ?? null;
   const resolvedTenantId = tenantId ?? scope.tenantId ?? null;
@@ -1044,10 +1045,10 @@ export function LineItemDialog({
               displayMode === "including-tax" &&
               amountGross !== null &&
               currency
-                ? formatMoney(amountGross, currency)
+                ? formatMoney(amountGross, currency, locale)
                 : null,
               displayMode === "excluding-tax" && amountNet !== null && currency
-                ? formatMoney(amountNet, currency)
+                ? formatMoney(amountNet, currency, locale)
                 : null,
               displayMode
                 ? displayMode === "including-tax"
@@ -1063,9 +1064,9 @@ export function LineItemDialog({
               labelParts.length > 0
                 ? labelParts.join(" • ")
                 : amountGross !== null && currency
-                  ? formatMoney(amountGross, currency)
+                  ? formatMoney(amountGross, currency, locale)
                   : amountNet !== null && currency
-                    ? formatMoney(amountNet, currency)
+                    ? formatMoney(amountNet, currency, locale)
                     : id;
             return {
               id,
@@ -2059,7 +2060,7 @@ export function LineItemDialog({
                       ? t("sales.documents.items.priceNet", "Net")
                       : t("sales.documents.items.priceGross", "Gross");
                   const lockedAmountLabel = Number.isFinite(lockedAmount)
-                    ? `${formatMoney(lockedAmount, lockedCurrency)} — ${lockedModeLabel}`
+                    ? `${formatMoney(lockedAmount, lockedCurrency, locale)} — ${lockedModeLabel}`
                     : lockedModeLabel;
                   const lockedPriceDetail =
                     selectedPrice?.priceKindTitle ??
@@ -2260,11 +2261,11 @@ export function LineItemDialog({
                       "sales.documents.items.priceBasisTemplate",
                       "Catalog price basis: {{baseAmount}} / {{baseUnit}}. Converted for {{unit}}: {{baseAmount}} × {{factor}} = {{convertedAmount}}.",
                       {
-                        baseAmount: formatMoney(selectedBaseAmount as number, selectedCurrency),
+                        baseAmount: formatMoney(selectedBaseAmount as number, selectedCurrency, locale),
                         baseUnit: baseUnitCode,
                         unit: quantityUnitCode,
                         factor: unitFactor,
-                        convertedAmount: formatMoney(convertedAmount, selectedCurrency),
+                        convertedAmount: formatMoney(convertedAmount, selectedCurrency, locale),
                       },
                     )}
                   </p>

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

@@ -13,7 +13,7 @@ import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import { Button } from '@open-mercato/ui/primitives/button'
 import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { useOrganizationScopeDetail } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
-import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { useT, useLocale } from '@open-mercato/shared/lib/i18n/context'
 import { emitSalesDocumentTotalsRefresh } from '@open-mercato/core/modules/sales/lib/frontend/documentTotalsEvents'
 import { extensionPoints } from '@open-mercato/core/modules/sales/extension-points'
 import { PaymentDialog, type PaymentFormData, type PaymentTotals } from './PaymentDialog'
@@ -60,10 +60,10 @@ function normalizeNumber(value: unknown): number {
   return 0
 }
 
-function formatMoney(value: number, currency: string | null | undefined): string {
+function formatMoney(value: number, currency: string | null | undefined, locale?: string): string {
   if (!currency || currency.trim().length !== 3) return value.toFixed(2)
   try {
-    return new Intl.NumberFormat(undefined, { style: 'currency', currency }).format(value)
+    return new Intl.NumberFormat(locale, { style: 'currency', currency }).format(value)
   } catch {
     return `${currency.toUpperCase()} ${value.toFixed(2)}`
   }
@@ -80,6 +80,7 @@ export function SalesDocumentPaymentsSection({
   onPaymentsChange,
 }: SalesDocumentPaymentsSectionProps) {
   const t = useT()
+  const locale = useLocale()
   const { organizationId, tenantId } = useOrganizationScopeDetail()
   const resolvedOrganizationId = orgFromProps ?? organizationId ?? null
   const resolvedTenantId = tenantFromProps ?? tenantId ?? null
@@ -287,24 +288,24 @@ export function SalesDocumentPaymentsSection({
       {
         accessorKey: 'amount',
         header: t('sales.documents.payments.amount', 'Amount'),
-        cell: ({ row }) => formatMoney(row.original.amount, row.original.currencyCode ?? currencyCode),
+        cell: ({ row }) => formatMoney(row.original.amount, row.original.currencyCode ?? currencyCode, locale),
       },
       {
         accessorKey: 'receivedAt',
         header: t('sales.documents.payments.receivedAt', 'Received'),
         cell: ({ row }) =>
           row.original.receivedAt
-            ? new Date(row.original.receivedAt).toLocaleDateString()
+            ? new Date(row.original.receivedAt).toLocaleDateString(locale)
             : '—',
       },
       {
         accessorKey: 'createdAt',
         header: t('sales.documents.payments.createdAt', 'Created'),
         cell: ({ row }) =>
-          row.original.createdAt ? new Date(row.original.createdAt).toLocaleString() : '—',
+          row.original.createdAt ? new Date(row.original.createdAt).toLocaleString(locale) : '—',
         meta: {
           tooltipContent: (row: PaymentRow) =>
-            row.createdAt ? new Date(row.createdAt).toLocaleString() : undefined,
+            row.createdAt ? new Date(row.createdAt).toLocaleString(locale) : undefined,
         },
       },
       {
@@ -327,7 +328,7 @@ export function SalesDocumentPaymentsSection({
         },
       },
     ],
-    [currencyCode, deleteActionLabel, editActionLabel, handleDelete, openEditPayment, t]
+    [currencyCode, deleteActionLabel, editActionLabel, handleDelete, locale, openEditPayment, t]
   )
 
   if (loading) {

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

@@ -12,7 +12,7 @@ import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { RowActions } from '@open-mercato/ui/backend/RowActions'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import { useOrganizationScopeDetail } from '@open-mercato/shared/lib/frontend/useOrganizationScope'
-import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { useT, useLocale } from '@open-mercato/shared/lib/i18n/context'
 import {
   emitSalesDocumentTotalsRefresh,
   subscribeSalesDocumentTotalsRefresh,
@@ -41,15 +41,16 @@ type SalesReturnsSectionProps = {
   documentUpdatedAt?: string | null
 }
 
-function formatDisplayDate(value: string | null | undefined): 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(undefined, { dateStyle: 'medium' }).format(date)
+  return new Intl.DateTimeFormat(locale, { dateStyle: 'medium' }).format(date)
 }
 
 export function SalesReturnsSection({ orderId, currencyCode, documentUpdatedAt }: SalesReturnsSectionProps) {
   const t = useT()
+  const locale = useLocale()
   const { organizationId, tenantId } = useOrganizationScopeDetail()
   const { confirm, ConfirmDialogElement } = useConfirmDialog()
   const [returns, setReturns] = React.useState<ReturnRow[]>([])
@@ -328,10 +329,10 @@ export function SalesReturnsSection({ orderId, currencyCode, documentUpdatedAt }
                 </div>
               </div>
               <div className="whitespace-nowrap text-right text-sm text-muted-foreground">
-                {formatDisplayDate(ret.returnedAt) ?? t('sales.returns.notSet', 'Not set')}
+                {formatDisplayDate(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)}
+                {formatMoney(ret.total, currencyCode ?? null, locale)}
               </div>
               <div className="flex justify-end">
                 <RowActions

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

@@ -7,7 +7,7 @@ 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 { useLocale, useT } from '@open-mercato/shared/lib/i18n/context'
 import { LineItemDialog } from './LineItemDialog'
 import type { SalesLineRecord } from './lineItemTypes'
 import { formatMoney, normalizeNumber } from './lineItemUtils'
@@ -93,6 +93,7 @@ export function SalesOrderDraftLines({
   onChange,
 }: SalesOrderDraftLinesProps) {
   const t = useT()
+  const locale = useLocale()
   const [dialogOpen, setDialogOpen] = React.useState(false)
   const [editing, setEditing] = React.useState<SalesOrderLineDraft | null>(null)
 
@@ -112,14 +113,14 @@ export function SalesOrderDraftLines({
     {
       id: 'unitPrice',
       header: t('sales.documents.items.table.unit', 'Unit price'),
-      cell: ({ row }) => formatMoney(row.original.record.unitPriceGross, row.original.record.currencyCode ?? currencyCode ?? undefined),
+      cell: ({ row }) => formatMoney(row.original.record.unitPriceGross, row.original.record.currencyCode ?? currencyCode ?? undefined, locale),
     },
     {
       id: 'total',
       header: t('sales.documents.items.table.total', 'Total'),
-      cell: ({ row }) => formatMoney(row.original.record.totalGross, row.original.record.currencyCode ?? currencyCode ?? undefined),
+      cell: ({ row }) => formatMoney(row.original.record.totalGross, row.original.record.currencyCode ?? currencyCode ?? undefined, locale),
     },
-  ], [currencyCode, t])
+  ], [currencyCode, locale, t])
 
   const openCreate = React.useCallback(() => {
     setEditing(null)

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

@@ -20,7 +20,7 @@ import { flash } from '@open-mercato/ui/backend/FlashMessages'
 import { cn } from '@open-mercato/shared/lib/utils'
 import { E } from '#generated/entities.ids.generated'
 import { emitSalesDocumentTotalsRefresh } from '@open-mercato/core/modules/sales/lib/frontend/documentTotalsEvents'
-import { useT } from '@open-mercato/shared/lib/i18n/context'
+import { useT, useLocale } from '@open-mercato/shared/lib/i18n/context'
 import { formatMoney, normalizeNumber } from './lineItemUtils'
 import type { OrderLine, ShipmentRow } from './shipmentTypes'
 import { formatAddressString, type AddressFormatStrategy, type AddressValue } from '@open-mercato/core/modules/customers/utils/addressFormat'
@@ -290,6 +290,7 @@ export function ShipmentDialog({
   onAddComment,
 }: ShipmentDialogProps) {
   const t = useT()
+  const locale = useLocale()
   const [formResetKey, setFormResetKey] = React.useState(0)
   const [shippingMethods, setShippingMethods] = React.useState<ShippingMethodOption[]>([])
   const [shippingMethodLoading, setShippingMethodLoading] = React.useState(false)
@@ -540,21 +541,21 @@ export function ShipmentDialog({
       if (option.avgPrice !== null) {
         parts.push(
           t('sales.documents.shipments.shippingMethodAvg', 'Avg {{price}}', {
-            price: formatMoney(option.avgPrice, currency ?? null),
+            price: formatMoney(option.avgPrice, currency ?? null, locale),
           }),
         )
       }
       if (option.minPrice !== null) {
         parts.push(
           t('sales.documents.shipments.shippingMethodMin', 'Min {{price}}', {
-            price: formatMoney(option.minPrice, currency ?? null),
+            price: formatMoney(option.minPrice, currency ?? null, locale),
           }),
         )
       }
       if (parts.length === 0) return undefined
       return parts.join(' · ')
     },
-    [currencyCode, t],
+    [currencyCode, locale, t],
   )
 
   const mapShippingMethod = React.useCallback(

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

@@ -10,7 +10,7 @@ import { apiCall, withScopedApiRequestHeaders } from '@open-mercato/ui/backend/u
 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'
+import { useT, useLocale } from '@open-mercato/shared/lib/i18n/context'
 import { useConfirmDialog } from '@open-mercato/ui/backend/confirm-dialog'
 import {
   emitSalesDocumentTotalsRefresh,
@@ -41,11 +41,11 @@ type SalesShipmentsSectionProps = {
   onAddComment?: (body: string) => Promise<void>
 }
 
-function formatDisplayDate(value: string | null | undefined): 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(undefined, { dateStyle: 'medium' }).format(date)
+  return new Intl.DateTimeFormat(locale, { dateStyle: 'medium' }).format(date)
 }
 
 const formatShipmentAddress = (metadata?: Record<string, unknown> | null): string | null => {
@@ -123,6 +123,7 @@ export function SalesShipmentsSection({
   onAddComment,
 }: SalesShipmentsSectionProps) {
   const t = useT()
+  const locale = useLocale()
   const { organizationId, tenantId } = useOrganizationScopeDetail()
   const { confirm, ConfirmDialogElement } = useConfirmDialog()
   const resolvedOrganizationId = organizationIdProp ?? organizationId ?? null
@@ -486,8 +487,8 @@ export function SalesShipmentsSection({
       ) : (
         <div className="grid gap-3 md:grid-cols-2">
           {shipments.map((shipment) => {
-            const shippedAt = formatDisplayDate(shipment.shippedAt)
-            const deliveredAt = formatDisplayDate(shipment.deliveredAt)
+            const shippedAt = formatDisplayDate(shipment.shippedAt, locale)
+            const deliveredAt = formatDisplayDate(shipment.deliveredAt, locale)
             const addressSummary = formatShipmentAddress(shipment.metadata)
             const statusLabel =
               shipment.statusLabel ??

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

@@ -9,9 +9,14 @@ export function normalizeNumber(value: unknown, fallback = 0): number {
   return fallback
 }
 
-export function formatMoney(value: number, currency: string | null | undefined): string {
+/**
+ * Pass `locale` to format in the application locale (`useLocale()` in client components).
+ * Omitting it keeps the runtime default, which varies per machine and is therefore not
+ * assertable in tests.
+ */
+export function formatMoney(value: number, currency: string | null | undefined, locale?: string): string {
   if (!currency) return value.toFixed(2)
-  return new Intl.NumberFormat(undefined, { style: 'currency', currency }).format(value)
+  return new Intl.NumberFormat(locale, { style: 'currency', currency }).format(value)
 }
 
 export type LineDiscountDisplay = {