@open-mercato/core 0.6.8-develop.7100.1.fbf66fca35 → 0.7.0

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

@@ -46,11 +46,10 @@ import {
   renderDictionaryColor,
 } from "@open-mercato/core/modules/dictionaries/components/dictionaryAppearance";
 import { E } from "#generated/entities.ids.generated";
-import { useT, useLocale } from "@open-mercato/shared/lib/i18n/context";
+import { useT } 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";
-import { prepareShippedLineUpdatePayload } from "./lineItemShipmentLock";
 import {
   normalizeCustomFieldSubmitValue,
   extractCustomFieldValues,
@@ -280,13 +279,6 @@ type SalesLineDialogProps = {
   tenantId: string | null;
   initialLine?: SalesLineRecord | null;
   shippedQuantity?: number;
-  /**
-   * Whether `shippedQuantity` reflects a fully resolved shipment state. Defaults
-   * to `true` so callers that genuinely know the value keep working; pass `false`
-   * while the host is still loading shipments or after the load failed, and the
-   * dialog locks pricing instead of assuming the line is unshipped.
-   */
-  shippedQuantityResolved?: boolean;
   onOpenChange: (open: boolean) => void;
   onSaved?: () => Promise<void> | void;
   onDraftSaved?: (payload: Record<string, unknown>, lineId: string | null) => Promise<void> | void;
@@ -483,13 +475,11 @@ export function LineItemDialog({
   tenantId,
   initialLine,
   shippedQuantity = 0,
-  shippedQuantityResolved = true,
   onOpenChange,
   onSaved,
   onDraftSaved,
 }: SalesLineDialogProps) {
   const t = useT();
-  const locale = useLocale();
   const scope = useOrganizationScopeDetail();
   const resolvedOrganizationId = organizationId ?? scope.organizationId ?? null;
   const resolvedTenantId = tenantId ?? scope.tenantId ?? null;
@@ -523,23 +513,6 @@ export function LineItemDialog({
     () => (kind === "order" ? "sales/order-lines" : "sales/quote-lines"),
     [kind],
   );
-  // A line the caller has not resolved shipment state for is treated as shipped:
-  // the server rejects pricing changes on shipped lines, so guessing "unshipped"
-  // from a pending or failed shipments load hands the user an edit that cannot
-  // be saved. A brand-new line has no shipments by construction.
-  const hasExistingLine = Boolean(initialLine);
-  const shipmentStateUnknown = kind === "order" && hasExistingLine && !shippedQuantityResolved;
-  const isShippedOrderLine =
-    kind === "order" &&
-    hasExistingLine &&
-    (shipmentStateUnknown || shippedQuantity > 0);
-  // While the shipments read is unresolved the shipped quantity is unknown, so the
-  // only safe floor for a quantity edit is the quantity already stored on the line:
-  // whatever turns out to be shipped can never exceed it. Raising stays allowed,
-  // exactly as it is once the state resolves.
-  const storedQuantity = Number(initialLine?.quantity ?? 0);
-  const safeStoredQuantity = Number.isFinite(storedQuantity) ? storedQuantity : 0;
-  const quantityFloor = shipmentStateUnknown ? safeStoredQuantity : shippedQuantity;
   const documentKey = kind === "order" ? "orderId" : "quoteId";
   const customFieldEntityId =
     kind === "order" ? E.sales.sales_order_line : E.sales.sales_quote_line;
@@ -1045,10 +1018,10 @@ export function LineItemDialog({
               displayMode === "including-tax" &&
               amountGross !== null &&
               currency
-                ? formatMoney(amountGross, currency, locale)
+                ? formatMoney(amountGross, currency)
                 : null,
               displayMode === "excluding-tax" && amountNet !== null && currency
-                ? formatMoney(amountNet, currency, locale)
+                ? formatMoney(amountNet, currency)
                 : null,
               displayMode
                 ? displayMode === "including-tax"
@@ -1064,9 +1037,9 @@ export function LineItemDialog({
               labelParts.length > 0
                 ? labelParts.join(" • ")
                 : amountGross !== null && currency
-                  ? formatMoney(amountGross, currency, locale)
+                  ? formatMoney(amountGross, currency)
                   : amountNet !== null && currency
-                    ? formatMoney(amountNet, currency, locale)
+                    ? formatMoney(amountNet, currency)
                     : id;
             return {
               id,
@@ -1357,17 +1330,12 @@ export function LineItemDialog({
           },
         );
       }
-      if (quantityFloor > 0 && qtyNumber < quantityFloor) {
-        const message = shipmentStateUnknown
-          ? t(
-              "sales.documents.items.errorQuantityShipmentsUnknown",
-              "The quantity cannot be lowered until this order's shipments have been read. Reopen the order to try again.",
-            )
-          : t(
-              "sales.documents.items.errorQuantityBelowShipped",
-              "You cannot lower the quantity below the {{shipped}} already shipped.",
-              { shipped: shippedQuantity },
-            );
+      if (shippedQuantity > 0 && qtyNumber < shippedQuantity) {
+        const message = t(
+          "sales.documents.items.errorQuantityBelowShipped",
+          "You cannot lower the quantity below the {{shipped}} already shipped.",
+          { shipped: shippedQuantity },
+        );
         throw createCrudFormError(message, { quantity: message });
       }
       const resolvedQuantityUnit = (() => {
@@ -1541,20 +1509,9 @@ export function LineItemDialog({
       }
       if (resolvedName) payload.name = resolvedName;
 
-      const submittedPayload = prepareShippedLineUpdatePayload(
-        payload,
-        isShippedOrderLine && initialLine
-          ? {
-              quantity: initialLine.quantity,
-              totalNetAmount: initialLine.totalNet,
-              totalGrossAmount: initialLine.totalGross,
-            }
-          : null,
-      );
-
       try {
         if (onDraftSaved) {
-          await onDraftSaved(submittedPayload, editingId);
+          await onDraftSaved(payload, editingId);
           closeDialog();
           return;
         }
@@ -1564,9 +1521,7 @@ export function LineItemDialog({
           () =>
             action(
               resourcePath,
-              editingId
-                ? { id: editingId, ...submittedPayload }
-                : submittedPayload,
+              editingId ? { id: editingId, ...payload } : payload,
               {
                 errorMessage: t(
                   "sales.documents.items.errorSave",
@@ -1597,15 +1552,10 @@ export function LineItemDialog({
       documentKey,
       documentUpdatedAt,
       editingId,
-      initialLine,
-      isShippedOrderLine,
       onDraftSaved,
       priceOptions,
       productOption,
-      quantityFloor,
       resourcePath,
-      shipmentStateUnknown,
-      shippedQuantity,
       t,
       variantOption,
       onSaved,
@@ -1663,7 +1613,6 @@ export function LineItemDialog({
                   type="button"
                   size="sm"
                   variant={mode === "catalog" ? "default" : "ghost"}
-                  disabled={isShippedOrderLine}
                   onClick={() => switchMode("catalog")}
                 >
                   {t("sales.documents.items.lineMode.catalog", "Catalog item")}
@@ -1672,7 +1621,6 @@ export function LineItemDialog({
                   type="button"
                   size="sm"
                   variant={mode === "custom" ? "default" : "ghost"}
-                  disabled={isShippedOrderLine}
                   onClick={() => switchMode("custom")}
                 >
                   {t("sales.documents.items.lineMode.custom", "Custom line")}
@@ -1853,7 +1801,6 @@ export function LineItemDialog({
                       },
                     )
                   }
-                  disabled={isShippedOrderLine}
                 />
               ),
             } satisfies CrudField,
@@ -2013,7 +1960,7 @@ export function LineItemDialog({
                         },
                       )
                     }
-                    disabled={isShippedOrderLine || !productId}
+                    disabled={!productId}
                   />
                 );
               },
@@ -2037,51 +1984,6 @@ export function LineItemDialog({
                   typeof values?.variantId === "string"
                     ? values.variantId
                     : null;
-                const selectedPriceId =
-                  typeof value === "string" ? value : null;
-                const selectedPrice = selectedPriceId
-                  ? (priceOptions.find(
-                      (entry) => entry.id === selectedPriceId,
-                    ) ?? null)
-                  : null;
-                if (isShippedOrderLine) {
-                  const lockedAmount = normalizeNumber(
-                    values?.unitPrice,
-                    Number.NaN,
-                  );
-                  const lockedCurrency =
-                    selectedPrice?.currencyCode ??
-                    (typeof values?.currencyCode === "string"
-                      ? values.currencyCode
-                      : currencyCode) ??
-                    undefined;
-                  const lockedModeLabel =
-                    values?.priceMode === "net"
-                      ? t("sales.documents.items.priceNet", "Net")
-                      : t("sales.documents.items.priceGross", "Gross");
-                  const lockedAmountLabel = Number.isFinite(lockedAmount)
-                    ? `${formatMoney(lockedAmount, lockedCurrency, locale)} — ${lockedModeLabel}`
-                    : lockedModeLabel;
-                  const lockedPriceDetail =
-                    selectedPrice?.priceKindTitle ??
-                    selectedPrice?.priceKindCode ??
-                    null;
-                  return (
-                    <div className="space-y-2">
-                      <Input
-                        readOnly
-                        disabled
-                        value={lockedAmountLabel}
-                        aria-label={t("sales.documents.items.price", "Price")}
-                      />
-                      {lockedPriceDetail ? (
-                        <p className="text-xs text-muted-foreground">
-                          {lockedPriceDetail}
-                        </p>
-                      ) : null}
-                    </div>
-                  );
-                }
                 return (
                   <LookupSelect
                     key={
@@ -2089,7 +1991,7 @@ export function LineItemDialog({
                         ? `${productId}-${variantId ?? "no-variant"}`
                         : "price"
                     }
-                    value={selectedPriceId}
+                    value={typeof value === "string" ? value : null}
                     onChange={(next) => {
                       setValue(next ?? null);
                       const selected = next
@@ -2231,11 +2133,9 @@ export function LineItemDialog({
                   }
                   onChange={(event) => setValue(event.target.value)}
                   placeholder="0.00"
-                  disabled={isShippedOrderLine}
                 />
                 <Select
                   value={mode}
-                  disabled={isShippedOrderLine}
                   onValueChange={(value) => {
                     const nextMode = value === "net" ? "net" : "gross";
                     setFormValue?.("priceMode", nextMode);
@@ -2261,11 +2161,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, locale),
+                        baseAmount: formatMoney(selectedBaseAmount as number, selectedCurrency),
                         baseUnit: baseUnitCode,
                         unit: quantityUnitCode,
                         factor: unitFactor,
-                        convertedAmount: formatMoney(convertedAmount, selectedCurrency, locale),
+                        convertedAmount: formatMoney(convertedAmount, selectedCurrency),
                       },
                     )}
                   </p>
@@ -2322,7 +2222,7 @@ export function LineItemDialog({
               <Select
                 value={resolvedValue || undefined}
                 onValueChange={(value) => handleChange({ target: { value } } as React.ChangeEvent<HTMLSelectElement>)}
-                disabled={isShippedOrderLine || !taxRates.length}
+                disabled={!taxRates.length}
               >
                 <SelectTrigger>
                   <SelectValue
@@ -2392,7 +2292,6 @@ export function LineItemDialog({
               <Input
                 value={typeof value === "string" ? value : ""}
                 onChange={(event) => setValue(event.target.value || null)}
-                disabled={isShippedOrderLine}
                 placeholder={t(
                   "sales.documents.items.quantityUnitPlaceholder",
                   "e.g. pc",
@@ -2450,7 +2349,7 @@ export function LineItemDialog({
                   });
                 }
               }}
-              disabled={isShippedOrderLine || !productId}
+              disabled={!productId}
             >
               <SelectTrigger>
                 <SelectValue
@@ -2495,7 +2394,7 @@ export function LineItemDialog({
                 typeof values?.quantityUnit === "string"
                   ? values.quantityUnit
                   : null;
-              if (productId && !isShippedOrderLine) {
+              if (productId) {
                 const selectedPriceId =
                   typeof values?.priceId === "string" ? values.priceId : null;
                 const selectedPriceKindId =
@@ -2611,7 +2510,7 @@ export function LineItemDialog({
               "ui.lookupSelect.startTyping",
               "Start typing to search.",
             )}
-            minQuery={0}
+            minQuery={1}
           />
         ),
       } satisfies CrudField,
@@ -2650,7 +2549,6 @@ export function LineItemDialog({
     resolveTaxSelection,
     selectPriceAfterRefresh,
     hasTaxMetadata,
-    isShippedOrderLine,
   ]);
 
   const groups = React.useMemo<CrudFormGroup[]>(() => {
@@ -3016,21 +2914,6 @@ export function LineItemDialog({
               : t("sales.documents.items.addTitle", "Add line")}
           </DialogTitle>
         </DialogHeader>
-        {isShippedOrderLine ? (
-          <Alert status="information" style="lighter">
-            <AlertDescription>
-              {shipmentStateUnknown
-                ? t(
-                    "sales.documents.items.shippedLineLockPending",
-                    "Pricing is locked until this order's shipments have been read. Reopen the order to try again — you can still edit the name and raise the quantity.",
-                  )
-                : t(
-                    "sales.documents.items.shippedLineLocked",
-                    "Pricing is locked on this line because it already has shipped items. You can still edit the name and quantity.",
-                  )}
-            </AlertDescription>
-          </Alert>
-        ) : null}
         <CrudForm<LineFormState>
           key={formResetKey}
           embedded

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

@@ -13,9 +13,8 @@ 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, useLocale } from '@open-mercato/shared/lib/i18n/context'
+import { useT } 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'
 import { extractCustomFieldValues } from './customFieldHelpers'
 import { Plus } from 'lucide-react'
@@ -60,10 +59,10 @@ function normalizeNumber(value: unknown): number {
   return 0
 }
 
-function formatMoney(value: number, currency: string | null | undefined, locale?: string): string {
+function formatMoney(value: number, currency: string | null | undefined): string {
   if (!currency || currency.trim().length !== 3) return value.toFixed(2)
   try {
-    return new Intl.NumberFormat(locale, { style: 'currency', currency }).format(value)
+    return new Intl.NumberFormat(undefined, { style: 'currency', currency }).format(value)
   } catch {
     return `${currency.toUpperCase()} ${value.toFixed(2)}`
   }
@@ -80,7 +79,6 @@ 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
@@ -277,10 +275,6 @@ export function SalesDocumentPaymentsSection({
         cell: ({ row }) => row.original.paymentMethodName ?? '—',
       },
       {
-        // Injected columns are placed against `ColumnDef.id` before the table is
-        // built, so an accessor-derived id is not yet available: the gateway
-        // status widget anchors on this explicit id.
-        id: 'status',
         accessorKey: 'status',
         header: t('sales.documents.payments.status', 'Status'),
         cell: ({ row }) => row.original.statusLabel ?? row.original.status ?? '—',
@@ -288,24 +282,24 @@ export function SalesDocumentPaymentsSection({
       {
         accessorKey: 'amount',
         header: t('sales.documents.payments.amount', 'Amount'),
-        cell: ({ row }) => formatMoney(row.original.amount, row.original.currencyCode ?? currencyCode, locale),
+        cell: ({ row }) => formatMoney(row.original.amount, row.original.currencyCode ?? currencyCode),
       },
       {
         accessorKey: 'receivedAt',
         header: t('sales.documents.payments.receivedAt', 'Received'),
         cell: ({ row }) =>
           row.original.receivedAt
-            ? new Date(row.original.receivedAt).toLocaleDateString(locale)
+            ? new Date(row.original.receivedAt).toLocaleDateString()
             : '—',
       },
       {
         accessorKey: 'createdAt',
         header: t('sales.documents.payments.createdAt', 'Created'),
         cell: ({ row }) =>
-          row.original.createdAt ? new Date(row.original.createdAt).toLocaleString(locale) : '—',
+          row.original.createdAt ? new Date(row.original.createdAt).toLocaleString() : '—',
         meta: {
           tooltipContent: (row: PaymentRow) =>
-            row.createdAt ? new Date(row.createdAt).toLocaleString(locale) : undefined,
+            row.createdAt ? new Date(row.createdAt).toLocaleString() : undefined,
         },
       },
       {
@@ -328,7 +322,7 @@ export function SalesDocumentPaymentsSection({
         },
       },
     ],
-    [currencyCode, deleteActionLabel, editActionLabel, handleDelete, locale, openEditPayment, t]
+    [currencyCode, deleteActionLabel, editActionLabel, handleDelete, openEditPayment, t]
   )
 
   if (loading) {
@@ -356,12 +350,7 @@ export function SalesDocumentPaymentsSection({
   return (
     <div className="space-y-4">
       {payments.length ? (
-        <DataTable<PaymentRow>
-          columns={columns}
-          data={payments}
-          onRowClick={openEditPayment}
-          extensionTableId={extensionPoints.hosts.paymentsTable.tableId}
-        />
+        <DataTable<PaymentRow> columns={columns} data={payments} onRowClick={openEditPayment} />
       ) : (
         <TabEmptyState
           title={t('sales.documents.payments.emptyTitle', 'No payments yet.')}

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, useLocale } from '@open-mercato/shared/lib/i18n/context'
+import { useT } from '@open-mercato/shared/lib/i18n/context'
 import {
   emitSalesDocumentTotalsRefresh,
   subscribeSalesDocumentTotalsRefresh,
@@ -41,16 +41,15 @@ type SalesReturnsSectionProps = {
   documentUpdatedAt?: string | null
 }
 
-export function formatDisplayDate(value: string | null | undefined, locale?: string): string | null {
+function formatDisplayDate(value: string | null | undefined): 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)
+  return new Intl.DateTimeFormat(undefined, { 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[]>([])
@@ -329,10 +328,10 @@ 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')}
+                {formatDisplayDate(ret.returnedAt) ?? t('sales.returns.notSet', 'Not set')}
               </div>
               <div className="whitespace-nowrap text-right text-sm font-medium">
-                {formatMoney(ret.total, currencyCode ?? null, locale)}
+                {formatMoney(ret.total, currencyCode ?? null)}
               </div>
               <div className="flex justify-end">
                 <RowActions