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

package/dist/modules/sales/components/documents/LineItemDialog.js

@@ -50,6 +50,7 @@ import {
   extractCustomFieldValues
 } from "./customFieldHelpers.js";
 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");
 function mapTaxRateOption(item) {
@@ -213,6 +214,26 @@ function LineItemDialog({
 }) {
   const t = useT();
   const locale = useLocale();
+  const parseUserNumber = React.useCallback(
+    (value) => {
+      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;
@@ -537,7 +558,7 @@ 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));
         }
@@ -607,7 +628,7 @@ function LineItemDialog({
         setPriceLoading(false);
       }
     },
-    [t]
+    [parseUserNumber, t]
   );
   const selectPriceAfterRefresh = React.useCallback(
     (prices, currentPriceId, currentPriceKindId) => {
@@ -639,7 +660,7 @@ function LineItemDialog({
   );
   const convertUnitPriceForUnitChange = React.useCallback(
     (rawUnitPrice, fromUnit, toUnit) => {
-      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);
@@ -654,7 +675,7 @@ function LineItemDialog({
       if (!Number.isFinite(convertedAmount) || convertedAmount <= 0) return null;
       return normalizeUnitPriceInputValue(convertedAmount);
     },
-    [resolveUnitPriceFactor]
+    [parseUserNumber, resolveUnitPriceFactor]
   );
   const applyPriceSelection = React.useCallback(
     (selected, setFormValue, options) => {
@@ -782,8 +803,16 @@ 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",
@@ -813,8 +842,16 @@ function LineItemDialog({
         if (isCustomLine) return entered;
         return entered ?? normalizeUnitCode(productOption?.defaultSalesUnit) ?? normalizeUnitCode(productOption?.defaultUnit);
       })();
-      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",
@@ -976,6 +1013,8 @@ function LineItemDialog({
       variantOption,
       onSaved,
       closeDialog,
+      numberExample,
+      parseUserNumber,
       resolvedOrganizationId,
       resolvedTenantId
     ]
@@ -1715,7 +1754,7 @@ function LineItemDialog({
         layout: "full",
         component: ({ values }) => {
           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 /* @__PURE__ */ jsx("p", { className: "text-xs text-muted-foreground", children: t(
@@ -1811,7 +1850,8 @@ function LineItemDialog({
     resolveTaxSelection,
     selectPriceAfterRefresh,
     hasTaxMetadata,
-    isShippedOrderLine
+    isShippedOrderLine,
+    parseUserNumber
   ]);
   const groups = React.useMemo(() => {
     return [