@open-mercato/core 0.10.1-develop.7833.1.d6cbf0e3ab → 0.10.1-develop.7836.1.0ef0f453c6

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

@@ -4,6 +4,7 @@
   "cart.audit.lines.bulkAdd": "Add cart lines (bulk)",
   "cart.audit.lines.remove": "Remove cart line",
   "cart.audit.merge": "Merge cart",
+  "cart.errors.busy": "Der Warenkorb ist ausgelastet. Bitte versuche es erneut.",
   "cart.errors.store_context_unavailable": "Cart is unavailable for this store right now",
   "cart.errors.unexpected": "Unexpected error",
   "cart.warnings.code_no_longer_valid": "A previously applied code is no longer valid",

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

@@ -4,6 +4,7 @@
   "cart.audit.lines.bulkAdd": "Add cart lines (bulk)",
   "cart.audit.lines.remove": "Remove cart line",
   "cart.audit.merge": "Merge cart",
+  "cart.errors.busy": "Cart is busy. Please try again.",
   "cart.errors.store_context_unavailable": "Cart is unavailable for this store right now",
   "cart.errors.unexpected": "Unexpected error",
   "cart.warnings.code_no_longer_valid": "A previously applied code is no longer valid",

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

@@ -4,6 +4,7 @@
   "cart.audit.lines.bulkAdd": "Add cart lines (bulk)",
   "cart.audit.lines.remove": "Remove cart line",
   "cart.audit.merge": "Merge cart",
+  "cart.errors.busy": "El carrito está ocupado. Inténtalo de nuevo.",
   "cart.errors.store_context_unavailable": "Cart is unavailable for this store right now",
   "cart.errors.unexpected": "Unexpected error",
   "cart.warnings.code_no_longer_valid": "A previously applied code is no longer valid",

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

@@ -4,6 +4,7 @@
   "cart.audit.lines.bulkAdd": "Add cart lines (bulk)",
   "cart.audit.lines.remove": "Remove cart line",
   "cart.audit.merge": "Merge cart",
+  "cart.errors.busy": "장바구니가 사용 중입니다. 다시 시도해 주세요.",
   "cart.errors.store_context_unavailable": "Cart is unavailable for this store right now",
   "cart.errors.unexpected": "Unexpected error",
   "cart.warnings.code_no_longer_valid": "A previously applied code is no longer valid",

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

@@ -4,6 +4,7 @@
   "cart.audit.lines.bulkAdd": "Add cart lines (bulk)",
   "cart.audit.lines.remove": "Remove cart line",
   "cart.audit.merge": "Merge cart",
+  "cart.errors.busy": "Koszyk jest zajęty. Spróbuj ponownie.",
   "cart.errors.store_context_unavailable": "Cart is unavailable for this store right now",
   "cart.errors.unexpected": "Unexpected error",
   "cart.warnings.code_no_longer_valid": "A previously applied code is no longer valid",

package/src/modules/cart/lib/currentCartRoute.ts

@@ -10,6 +10,7 @@ import { getTelemetryRuntime } from '@open-mercato/shared/lib/telemetry/runtime'
 import { getCartCommand } from '../commands/cart'
 import type { CartGetByTokenInput, CartSummary } from '../commands/cart'
 import type { CartPriceChange } from './reprice'
+import { isCartLineMutationLockTimeoutError } from './lineMutationLock'
 import { isCartStoreContextUnavailableError, resolveCartRouteContext } from './routeContext'
 import type { ResolveCartRouteContextOptions, ResolvedCartRouteContext } from './routeContext'
 
@@ -173,6 +174,13 @@ const logger = createLogger('cart').child({ component: 'api' })
  * unexpected 500, logged and reported.
  */
 export async function mapRouteErrorToResponse(error: unknown): Promise<NextResponse> {
+  if (isCartLineMutationLockTimeoutError(error)) {
+    const { translate } = await resolveTranslations()
+    return NextResponse.json(
+      { error: translate('cart.errors.busy', 'Cart is busy. Please try again.'), code: 'cart_busy' },
+      { status: 503, headers: { 'Retry-After': '1', 'Cache-Control': 'no-store' } },
+    )
+  }
   if (isCrudHttpError(error)) return NextResponse.json(error.body, { status: error.status })
   const interceptorRejection = getCommandInterceptorHttpRejection(error)
   if (interceptorRejection) return NextResponse.json(interceptorRejection.body, { status: interceptorRejection.status })

package/src/modules/cart/lib/lineMutationLock.ts

@@ -0,0 +1,59 @@
+import type { EntityManager } from '@mikro-orm/postgresql'
+import { withAtomicFlush } from '@open-mercato/shared/lib/commands/flush'
+import { calculateBackoffDelayMs } from '@open-mercato/shared/lib/delivery/retry'
+
+const CART_LINE_LOCK_TIMEOUT = Symbol.for('@open-mercato/cart:LineMutationLockTimeout')
+
+export class CartLineMutationLockTimeoutError extends Error {
+  readonly [CART_LINE_LOCK_TIMEOUT] = true
+
+  constructor() {
+    super('[internal] Cart line mutation lock wait deadline exceeded')
+    this.name = 'CartLineMutationLockTimeoutError'
+  }
+}
+
+export function isCartLineMutationLockTimeoutError(error: unknown): error is CartLineMutationLockTimeoutError {
+  return typeof error === 'object' && error !== null && Reflect.get(error, CART_LINE_LOCK_TIMEOUT) === true
+}
+
+export async function withCartLineMutationLock(
+  em: EntityManager,
+  cartId: string,
+  phases: Array<() => void | Promise<void>>,
+  label: string,
+  waitDeadlineMs = 15_000,
+): Promise<void> {
+  const key = `cart:lines:${cartId}`
+  const deadline = Date.now() + waitDeadlineMs
+  const busy = new Error('[internal] Cart line mutation lock is busy')
+  const joinsTransaction = em.isInTransaction()
+
+  for (let attempt = 1; ; attempt += 1) {
+    try {
+      await withAtomicFlush(em, [
+        async () => {
+          if (joinsTransaction) {
+            await em.execute('select pg_advisory_xact_lock(hashtextextended(?::text, 0))', [key])
+            return
+          }
+          const rows = await em.execute<Array<{ locked: boolean }>>(
+            'select pg_try_advisory_xact_lock(hashtextextended(?::text, 0)) as locked',
+            [key],
+          )
+          if (!rows[0]?.locked) throw busy
+        },
+        ...phases,
+      ], { transaction: true, label })
+      return
+    } catch (error) {
+      if (error !== busy || em.isInTransaction()) throw error
+    }
+
+    const remainingMs = deadline - Date.now()
+    if (remainingMs <= 0) throw new CartLineMutationLockTimeoutError()
+    const delayMs = calculateBackoffDelayMs(Math.min(attempt, 5), { baseDelayMs: 50, maxJitterMs: 25 })
+    await new Promise((resolve) => setTimeout(resolve, Math.min(delayMs, remainingMs)))
+    if (Date.now() >= deadline) throw new CartLineMutationLockTimeoutError()
+  }
+}

package/src/modules/sales/commands/documents.ts

@@ -646,8 +646,9 @@ const documentUpdateFieldsSchema = z
     currencyCode: currencyCodeSchema.optional(),
     // Order-only columns — SalesQuote declares none of them. Declared here
     // because the create schema declares them and a caller reusing its create
-    // payload on an update otherwise lost them silently; `applyDocumentUpdate`
-    // rejects each with a 400 on a quote rather than dropping it.
+    // payload on an update otherwise lost them silently. `applyDocumentUpdate`
+    // rejects them on a quote, except `totalsMode`, which is ignored to preserve
+    // quote-create compatibility without enabling external quote amounts.
     exchangeRate: z.union([z.null(), exchangeRateSchema]).optional(),
     paymentStatusEntryId: z.string().uuid().nullable().optional(),
     fulfillmentStatusEntryId: z.string().uuid().nullable().optional(),
@@ -5894,7 +5895,6 @@ const updateQuoteCommand: CommandHandler<
   },
   async execute(rawInput, ctx) {
     const parsed = documentUpdateSchema.parse(rawInput ?? {});
-    await assertAmountsModeUnsupportedOnQuote([parsed]);
     documentEditSchema.parse(rawInput ?? {});
     const em = (ctx.container.resolve("em") as EntityManager).fork();
     let quote!: SalesQuote;

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

@@ -7,7 +7,8 @@ import { buildOptimisticLockHeader } from "@open-mercato/ui/backend/utils/optimi
 import { deleteCrud } from "@open-mercato/ui/backend/utils/crud";
 import { normalizeCrudServerError } from "@open-mercato/ui/backend/utils/serverErrors";
 import { ErrorMessage, LoadingMessage, TabEmptyState } from "@open-mercato/ui/backend/detail";
-import { Button } from "@open-mercato/ui/primitives/button";
+import { IconButton } from "@open-mercato/ui/primitives/icon-button";
+import { SimpleTooltip } from "@open-mercato/ui/primitives/tooltip";
 import { flash } from "@open-mercato/ui/backend/FlashMessages";
 import { Pencil, Trash2 } from "lucide-react";
 import {
@@ -41,6 +42,53 @@ import { createLogger } from '@open-mercato/shared/lib/logger'
 
 const logger = createLogger('sales')
 
+function DisabledActionHint({
+  label,
+  reason,
+  children,
+}: {
+  label: string
+  reason?: string
+  children: React.ReactNode
+}) {
+  const [open, setOpen] = React.useState(false)
+  const touchOpenRef = React.useRef(false)
+  if (!reason) return <>{children}</>
+  return (
+    <SimpleTooltip
+      content={reason}
+      open={open}
+      onOpenChange={(nextOpen) => {
+        if (nextOpen || !touchOpenRef.current) setOpen(nextOpen)
+      }}
+    >
+      <span
+        className="inline-flex rounded-md focus-visible:outline-none focus-visible:shadow-focus"
+        tabIndex={0}
+        aria-label={`${label}: ${reason}`}
+        onClick={(event) => event.stopPropagation()}
+        onPointerDown={(event) => {
+          if (event.pointerType !== 'touch') return
+          touchOpenRef.current = true
+          setOpen(true)
+          event.currentTarget.focus()
+        }}
+        onBlur={() => {
+          touchOpenRef.current = false
+          setOpen(false)
+        }}
+        onKeyDown={(event) => {
+          if (event.key !== 'Escape') return
+          touchOpenRef.current = false
+          setOpen(false)
+        }}
+      >
+        {children}
+      </span>
+    </SimpleTooltip>
+  )
+}
+
 type ResolvedUnitPriceReference = {
   grossPerReference: number;
   referenceUnitCode: string;
@@ -932,11 +980,13 @@ export function SalesDocumentItemsSection({
                             {discount.amount !== null ? (
                               <span className="font-mono text-sm">
                                 {t(
-                                  "sales.documents.items.table.discountAmount",
-                                  "−{{value}}",
+                                  discount.amount < 0
+                                    ? "sales.documents.items.table.markupAmount"
+                                    : "sales.documents.items.table.discountAmount",
+                                  discount.amount < 0 ? "+{{value}}" : "−{{value}}",
                                   {
                                     value: formatMoney(
-                                      discount.amount,
+                                      Math.abs(discount.amount),
                                       item.currencyCode ??
                                         currencyCode ??
                                         undefined,
@@ -1005,30 +1055,39 @@ export function SalesDocumentItemsSection({
                     })}
                     <td className="px-3 py-3">
                       <div className="flex items-center gap-2 justify-end">
-                        <Button
-                          size="icon"
-                          variant="ghost"
-                          className="h-8 w-8"
-                          aria-label={t('ui.actions.edit', 'Edit')}
-                          disabled={amountsReadOnly}
-                          onClick={(event) => {
-                            event.stopPropagation();
-                            handleEdit(item);
-                          }}
+                        <DisabledActionHint
+                          label={t('ui.actions.edit', 'Edit')}
+                          reason={amountsReadOnly
+                            ? t('sales.documents.amountsExternalHint', 'Totals on this document come from an external system and are stored as supplied.')
+                            : undefined}
                         >
-                          <Pencil className="h-4 w-4" />
-                        </Button>
-                        <span
-                          title={amountsReadOnly
+                          <IconButton
+                            type="button"
+                            size="default"
+                            variant="ghost"
+                            aria-label={t('ui.actions.edit', 'Edit')}
+                            disabled={amountsReadOnly}
+                            onClick={(event) => {
+                              event.stopPropagation();
+                              handleEdit(item);
+                            }}
+                          >
+                            <Pencil className="h-4 w-4" />
+                          </IconButton>
+                        </DisabledActionHint>
+                        <DisabledActionHint
+                          label={t('ui.actions.delete', 'Delete')}
+                          reason={amountsReadOnly
                             ? t('sales.documents.amountsExternalHint', 'Totals on this document come from an external system and are stored as supplied.')
                             : kind === 'order' && items.length === 1
                               ? t('sales.documents.items.errorDeleteLast', 'An order must contain at least one line item.')
                               : undefined}
                         >
-                          <Button
-                            size="icon"
+                          <IconButton
+                            type="button"
+                            size="default"
                             variant="ghost"
-                            className="h-8 w-8 text-destructive"
+                            className="text-destructive"
                             aria-label={t('ui.actions.delete', 'Delete')}
                             disabled={amountsReadOnly || (kind === 'order' && items.length === 1)}
                             onClick={(event) => {
@@ -1037,8 +1096,8 @@ export function SalesDocumentItemsSection({
                             }}
                           >
                             <Trash2 className="h-4 w-4" />
-                          </Button>
-                        </span>
+                          </IconButton>
+                        </DisabledActionHint>
                       </div>
                     </td>
                   </tr>

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

@@ -73,10 +73,10 @@ export function resolveLineDiscountDisplay(
 ): LineDiscountDisplay | null {
   const amount = normalizeNumber(line.discountAmount, 0)
   const percent = normalizeNumber(line.discountPercent, 0)
-  if (amount > 0) {
+  if (amount !== 0) {
     return {
       amount,
-      percent: percentAccountsForAmount(line, percent, amount) ? percent : null,
+      percent: amount > 0 && percentAccountsForAmount(line, percent, amount) ? percent : null,
     }
   }
   if (percent > 0) return { amount: null, percent }

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

@@ -1091,6 +1091,7 @@
   "sales.documents.items.table.discountAmount": "−{{value}}",
   "sales.documents.items.table.discountPercent": "{{value}} %",
   "sales.documents.items.table.gross": "brutto",
+  "sales.documents.items.table.markupAmount": "+{{value}}",
   "sales.documents.items.table.net": "netto",
   "sales.documents.items.table.product": "Produkt",
   "sales.documents.items.table.quantity": "Menge",

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

@@ -1091,6 +1091,7 @@
   "sales.documents.items.table.discountAmount": "−{{value}}",
   "sales.documents.items.table.discountPercent": "{{value}}%",
   "sales.documents.items.table.gross": "gross",
+  "sales.documents.items.table.markupAmount": "+{{value}}",
   "sales.documents.items.table.net": "net",
   "sales.documents.items.table.product": "Product",
   "sales.documents.items.table.quantity": "Qty",

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

@@ -1091,6 +1091,7 @@
   "sales.documents.items.table.discountAmount": "−{{value}}",
   "sales.documents.items.table.discountPercent": "{{value}} %",
   "sales.documents.items.table.gross": "bruto",
+  "sales.documents.items.table.markupAmount": "+{{value}}",
   "sales.documents.items.table.net": "neto",
   "sales.documents.items.table.product": "Producto",
   "sales.documents.items.table.quantity": "Cant.",

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

@@ -1091,6 +1091,7 @@
   "sales.documents.items.table.discountAmount": "−{{value}}",
   "sales.documents.items.table.discountPercent": "{{value}}%",
   "sales.documents.items.table.gross": "세금 포함",
+  "sales.documents.items.table.markupAmount": "+{{value}}",
   "sales.documents.items.table.net": "세금 제외",
   "sales.documents.items.table.product": "상품",
   "sales.documents.items.table.quantity": "수량",

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

@@ -1091,6 +1091,7 @@
   "sales.documents.items.table.discountAmount": "−{{value}}",
   "sales.documents.items.table.discountPercent": "{{value}}%",
   "sales.documents.items.table.gross": "brutto",
+  "sales.documents.items.table.markupAmount": "+{{value}}",
   "sales.documents.items.table.net": "netto",
   "sales.documents.items.table.product": "Produkt",
   "sales.documents.items.table.quantity": "Ilość",