@open-mercato/core 0.10.1-develop.7723.1.3b2ea82ea7 → 0.10.1-develop.7726.1.a447cc5525

package/dist/modules/sales/lib/providers/totals.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../../src/modules/sales/lib/providers/totals.ts"],
-  "sourcesContent": ["import { registerSalesTotalsCalculator, rebuildDocumentResult } from '../calculations'\nimport type { SalesAdjustmentDraft, SalesDocumentCalculationResult } from '../types'\nimport {\n  getPaymentProvider,\n  getShippingProvider,\n  normalizeProviderSettings,\n} from './registry'\nimport type {\n  PaymentMethodContext,\n  ProviderAdjustment,\n  ProviderAdjustmentResult,\n  ShippingMethodContext,\n  ShippingMetrics,\n} from './types'\n\nconst SHIPPING_PREFIX = 'shipping-provider:'\nconst PAYMENT_PREFIX = 'payment-provider:'\n\nlet totalsRegistered = false\n\nfunction toNumber(value: unknown, fallback = 0): number {\n  if (typeof value === 'number' && Number.isFinite(value)) return value\n  if (typeof value === 'string' && value.trim() !== '' && !Number.isNaN(Number(value))) {\n    return Number(value)\n  }\n  return fallback\n}\n\nfunction isProviderAdjustment(adjustment: SalesAdjustmentDraft): boolean {\n  const key = adjustment.calculatorKey ?? ''\n  return typeof key === 'string' && (key.startsWith(SHIPPING_PREFIX) || key.startsWith(PAYMENT_PREFIX))\n}\n\nfunction isManualOverride(adjustment: SalesAdjustmentDraft): boolean {\n  const metadata = adjustment.metadata\n  if (!metadata || typeof metadata !== 'object') return false\n  const manual =\n    (metadata as Record<string, unknown>).manualOverride ??\n    (metadata as Record<string, unknown>).manual_override\n  return manual === true\n}\n\nfunction withoutPrefix(adjustments: SalesAdjustmentDraft[], prefix: string) {\n  return adjustments.filter((adj) => {\n    if (!(adj.calculatorKey ?? '').startsWith(prefix)) return true\n    return isManualOverride(adj)\n  })\n}\n\nfunction extractProviderSettings(\n  method: ShippingMethodContext | PaymentMethodContext | null | undefined\n): Record<string, unknown> | null {\n  if (!method) return null\n  if (method.providerSettings && typeof method.providerSettings === 'object') {\n    return method.providerSettings as Record<string, unknown>\n  }\n  if (method.metadata && typeof method.metadata === 'object') {\n    const meta = method.metadata as Record<string, unknown>\n    if (meta.providerSettings && typeof meta.providerSettings === 'object') {\n      return meta.providerSettings as Record<string, unknown>\n    }\n  }\n  return null\n}\n\nfunction computeMetrics(lines: SalesDocumentCalculationResult['lines']): ShippingMetrics {\n  let itemCount = 0\n  let totalWeight = 0\n  let totalVolume = 0\n  let subtotalNet = 0\n  let subtotalGross = 0\n\n  for (const entry of lines) {\n    const { line } = entry\n    const qty = toNumber(line.quantity, 0)\n    itemCount += qty\n    subtotalNet += toNumber(entry.netAmount, 0)\n    subtotalGross += toNumber(entry.grossAmount, 0)\n\n    const meta = (line.metadata ?? {}) as Record<string, unknown>\n    const configuration = (line.configuration ?? {}) as Record<string, unknown>\n    const weight =\n      toNumber((meta.weight as number | string | undefined) ?? (configuration.weight as number | string | undefined), 0) *\n      qty\n    const volume =\n      toNumber(\n        (meta.volume as number | string | undefined) ??\n          (configuration.volume as number | string | undefined),\n        0\n      ) * qty\n\n    totalWeight += weight\n    totalVolume += volume\n  }\n\n  return {\n    itemCount,\n    totalWeight,\n    totalVolume,\n    subtotalNet,\n    subtotalGross,\n  }\n}\n\nfunction normalizeAdjustments(params: {\n  providerKey: string\n  calculatorKey: string\n  adjustments: ProviderAdjustment[]\n  currencyCode: string\n  defaultKind: SalesAdjustmentDraft['kind']\n}) {\n  return params.adjustments.map<SalesAdjustmentDraft>((adj, index) => ({\n    scope: 'order',\n    kind: adj.kind ?? params.defaultKind,\n    code: adj.code ?? params.providerKey,\n    label: adj.label ?? params.providerKey,\n    calculatorKey: params.calculatorKey,\n    promotionId: null,\n    rate: null,\n    amountNet: toNumber(adj.amountNet, 0),\n    amountGross:\n      adj.amountGross === undefined || adj.amountGross === null\n        ? toNumber(adj.amountNet, 0)\n        : toNumber(adj.amountGross, 0),\n    currencyCode: (adj.currencyCode || params.currencyCode || '').toUpperCase() || params.currencyCode,\n    metadata: adj.metadata ?? null,\n    position: 10_000 + index,\n  }))\n}\n\nfunction mergeMetadata(\n  base: Record<string, unknown> | undefined,\n  key: string,\n  value: unknown\n): Record<string, unknown> {\n  const next = { ...(base ?? {}) }\n  next[key] = value\n  return next\n}\n\nfunction applyProviderResult(\n  current: SalesDocumentCalculationResult,\n  adjustments: SalesAdjustmentDraft[],\n  providerKey: string,\n  calculatorKey: string,\n  result: ProviderAdjustmentResult | null | undefined,\n  defaultKind: SalesAdjustmentDraft['kind']\n): SalesDocumentCalculationResult {\n  if (!result?.adjustments?.length) {\n    return rebuildDocumentResult({\n      documentKind: current.kind,\n      currencyCode: current.currencyCode,\n      lines: current.lines,\n      adjustments,\n      metadata: current.metadata,\n    })\n  }\n  const normalized = normalizeAdjustments({\n    providerKey,\n    calculatorKey,\n    adjustments: result.adjustments,\n    currencyCode: current.currencyCode,\n    defaultKind,\n  })\n  const nextAdjustments = [...adjustments, ...normalized]\n  const next = rebuildDocumentResult({\n    documentKind: current.kind,\n    currencyCode: current.currencyCode,\n    lines: current.lines,\n    adjustments: nextAdjustments,\n    metadata: current.metadata,\n  })\n  if (result.metadata) {\n    next.metadata = mergeMetadata(next.metadata, calculatorKey, result.metadata)\n  }\n  return next\n}\n\nexport function ensureProviderTotalsCalculator() {\n  if (totalsRegistered) return\n  totalsRegistered = true\n\n  registerSalesTotalsCalculator(async ({ documentKind, lines, context, current, eventBus }) => {\n    const metadata = (context.metadata ?? {}) as Record<string, unknown>\n    const shippingMethod = (metadata.shippingMethod ?? null) as ShippingMethodContext | null\n    const paymentMethod = (metadata.paymentMethod ?? null) as PaymentMethodContext | null\n\n    let runningAdjustments = (current.adjustments ?? []).filter(\n      (adj) => !isProviderAdjustment(adj) || isManualOverride(adj)\n    )\n    let working = rebuildDocumentResult({\n      documentKind,\n      currencyCode: current.currencyCode,\n      lines,\n      adjustments: runningAdjustments,\n      metadata: current.metadata,\n    })\n\n    if (shippingMethod?.providerKey) {\n      const provider = getShippingProvider(shippingMethod.providerKey)\n      if (provider?.calculate) {\n        const calculatorKey = `${SHIPPING_PREFIX}${provider.key}`\n        const hasManualOverride = runningAdjustments.some(\n          (adj) => (adj.calculatorKey ?? '').startsWith(calculatorKey) && isManualOverride(adj)\n        )\n        if (hasManualOverride) {\n          // Respect user overrides: keep existing provider-tagged adjustments and skip regeneration.\n          working = rebuildDocumentResult({\n            documentKind,\n            currencyCode: working.currencyCode,\n            lines: working.lines,\n            adjustments: runningAdjustments,\n            metadata: working.metadata,\n          })\n        } else {\n          const rawSettings = extractProviderSettings(shippingMethod)\n          const settings =\n            normalizeProviderSettings('shipping', provider.key, rawSettings) ?? rawSettings ?? {}\n          const metrics = computeMetrics(working.lines)\n          let result = await provider.calculate({\n            method: shippingMethod,\n            settings,\n            document: working,\n            lines: working.lines,\n            context,\n            metrics,\n          })\n          if (eventBus) {\n            await eventBus.emitEvent('sales.shipping.adjustments.apply.before', {\n              documentKind,\n              providerKey: provider.key,\n              calculatorKey,\n              method: shippingMethod,\n              settings,\n              document: working,\n              result,\n              setResult(next: ProviderAdjustmentResult | null | undefined) {\n                result = next ?? null\n              },\n            })\n          }\n          working = applyProviderResult(working, runningAdjustments, provider.key, calculatorKey, result, 'shipping')\n          runningAdjustments = working.adjustments\n          if (eventBus) {\n            let nextDocument = working\n            await eventBus.emitEvent('sales.shipping.adjustments.apply.after', {\n              documentKind,\n              providerKey: provider.key,\n              calculatorKey,\n              method: shippingMethod,\n              settings,\n              document: nextDocument,\n              adjustments: nextDocument.adjustments.filter((adj) =>\n                (adj.calculatorKey ?? '').startsWith(calculatorKey)\n              ),\n              setDocument(next: SalesDocumentCalculationResult | null | undefined) {\n                if (next) {\n                  nextDocument = next\n                }\n              },\n              setAdjustments(next: SalesAdjustmentDraft[] | null | undefined) {\n                if (!next) return\n                const preserved = nextDocument.adjustments.filter(\n                  (adj) => !(adj.calculatorKey ?? '').startsWith(calculatorKey)\n                )\n                nextDocument = rebuildDocumentResult({\n                  documentKind,\n                  currencyCode: nextDocument.currencyCode,\n                  lines: nextDocument.lines,\n                  adjustments: [...preserved, ...next],\n                  metadata: nextDocument.metadata,\n                })\n              },\n            })\n            working = nextDocument\n            runningAdjustments = working.adjustments\n          }\n        }\n      }\n    }\n\n    if (paymentMethod?.providerKey) {\n      const provider = getPaymentProvider(paymentMethod.providerKey)\n      if (provider?.calculate) {\n        const calculatorKey = `${PAYMENT_PREFIX}${provider.key}`\n        const hasManualOverride = runningAdjustments.some(\n          (adj) => (adj.calculatorKey ?? '').startsWith(calculatorKey) && isManualOverride(adj)\n        )\n        if (hasManualOverride) {\n          working = rebuildDocumentResult({\n            documentKind,\n            currencyCode: working.currencyCode,\n            lines: working.lines,\n            adjustments: runningAdjustments,\n            metadata: working.metadata,\n          })\n        } else {\n          runningAdjustments = withoutPrefix(runningAdjustments, PAYMENT_PREFIX)\n          const rawSettings = extractProviderSettings(paymentMethod)\n          const settings =\n            normalizeProviderSettings('payment', provider.key, rawSettings) ?? rawSettings ?? {}\n          let result = await provider.calculate({\n            method: paymentMethod,\n            settings,\n            document: working,\n            lines: working.lines,\n            context,\n          })\n          if (eventBus) {\n            await eventBus.emitEvent('sales.payment.adjustments.apply.before', {\n              documentKind,\n              providerKey: provider.key,\n              calculatorKey,\n              method: paymentMethod,\n              settings,\n              document: working,\n              result,\n              setResult(next: ProviderAdjustmentResult | null | undefined) {\n                result = next ?? null\n              },\n            })\n          }\n          working = applyProviderResult(\n            working,\n            runningAdjustments,\n            provider.key,\n            calculatorKey,\n            result,\n            'surcharge'\n          )\n          runningAdjustments = working.adjustments\n          if (eventBus) {\n            let nextDocument = working\n            await eventBus.emitEvent('sales.payment.adjustments.apply.after', {\n              documentKind,\n              providerKey: provider.key,\n              calculatorKey,\n              method: paymentMethod,\n              settings,\n              document: nextDocument,\n              adjustments: nextDocument.adjustments.filter((adj) =>\n                (adj.calculatorKey ?? '').startsWith(calculatorKey)\n              ),\n              setDocument(next: SalesDocumentCalculationResult | null | undefined) {\n                if (next) {\n                  nextDocument = next\n                }\n              },\n              setAdjustments(next: SalesAdjustmentDraft[] | null | undefined) {\n                if (!next) return\n                const preserved = nextDocument.adjustments.filter(\n                  (adj) => !(adj.calculatorKey ?? '').startsWith(calculatorKey)\n                )\n                nextDocument = rebuildDocumentResult({\n                  documentKind,\n                  currencyCode: nextDocument.currencyCode,\n                  lines: nextDocument.lines,\n                  adjustments: [...preserved, ...next],\n                  metadata: nextDocument.metadata,\n                })\n              },\n            })\n            working = nextDocument\n            runningAdjustments = working.adjustments\n          }\n        }\n      }\n    }\n\n    return working\n  })\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { isExternalAmountsMode, registerSalesTotalsCalculator, rebuildDocumentResult } from '../calculations'\nimport type { SalesAdjustmentDraft, SalesDocumentCalculationResult } from '../types'\nimport {\n  getPaymentProvider,\n  getShippingProvider,\n  normalizeProviderSettings,\n} from './registry'\nimport type {\n  PaymentMethodContext,\n  ProviderAdjustment,\n  ProviderAdjustmentResult,\n  ShippingMethodContext,\n  ShippingMetrics,\n} from './types'\n\nconst SHIPPING_PREFIX = 'shipping-provider:'\nconst PAYMENT_PREFIX = 'payment-provider:'\n\nlet totalsRegistered = false\n\nfunction toNumber(value: unknown, fallback = 0): number {\n  if (typeof value === 'number' && Number.isFinite(value)) return value\n  if (typeof value === 'string' && value.trim() !== '' && !Number.isNaN(Number(value))) {\n    return Number(value)\n  }\n  return fallback\n}\n\nfunction isProviderAdjustment(adjustment: SalesAdjustmentDraft): boolean {\n  const key = adjustment.calculatorKey ?? ''\n  return typeof key === 'string' && (key.startsWith(SHIPPING_PREFIX) || key.startsWith(PAYMENT_PREFIX))\n}\n\nfunction isManualOverride(adjustment: SalesAdjustmentDraft): boolean {\n  const metadata = adjustment.metadata\n  if (!metadata || typeof metadata !== 'object') return false\n  const manual =\n    (metadata as Record<string, unknown>).manualOverride ??\n    (metadata as Record<string, unknown>).manual_override\n  return manual === true\n}\n\nfunction withoutPrefix(adjustments: SalesAdjustmentDraft[], prefix: string) {\n  return adjustments.filter((adj) => {\n    if (!(adj.calculatorKey ?? '').startsWith(prefix)) return true\n    return isManualOverride(adj)\n  })\n}\n\nfunction extractProviderSettings(\n  method: ShippingMethodContext | PaymentMethodContext | null | undefined\n): Record<string, unknown> | null {\n  if (!method) return null\n  if (method.providerSettings && typeof method.providerSettings === 'object') {\n    return method.providerSettings as Record<string, unknown>\n  }\n  if (method.metadata && typeof method.metadata === 'object') {\n    const meta = method.metadata as Record<string, unknown>\n    if (meta.providerSettings && typeof meta.providerSettings === 'object') {\n      return meta.providerSettings as Record<string, unknown>\n    }\n  }\n  return null\n}\n\nfunction computeMetrics(lines: SalesDocumentCalculationResult['lines']): ShippingMetrics {\n  let itemCount = 0\n  let totalWeight = 0\n  let totalVolume = 0\n  let subtotalNet = 0\n  let subtotalGross = 0\n\n  for (const entry of lines) {\n    const { line } = entry\n    const qty = toNumber(line.quantity, 0)\n    itemCount += qty\n    subtotalNet += toNumber(entry.netAmount, 0)\n    subtotalGross += toNumber(entry.grossAmount, 0)\n\n    const meta = (line.metadata ?? {}) as Record<string, unknown>\n    const configuration = (line.configuration ?? {}) as Record<string, unknown>\n    const weight =\n      toNumber((meta.weight as number | string | undefined) ?? (configuration.weight as number | string | undefined), 0) *\n      qty\n    const volume =\n      toNumber(\n        (meta.volume as number | string | undefined) ??\n          (configuration.volume as number | string | undefined),\n        0\n      ) * qty\n\n    totalWeight += weight\n    totalVolume += volume\n  }\n\n  return {\n    itemCount,\n    totalWeight,\n    totalVolume,\n    subtotalNet,\n    subtotalGross,\n  }\n}\n\nfunction normalizeAdjustments(params: {\n  providerKey: string\n  calculatorKey: string\n  adjustments: ProviderAdjustment[]\n  currencyCode: string\n  defaultKind: SalesAdjustmentDraft['kind']\n}) {\n  return params.adjustments.map<SalesAdjustmentDraft>((adj, index) => ({\n    scope: 'order',\n    kind: adj.kind ?? params.defaultKind,\n    code: adj.code ?? params.providerKey,\n    label: adj.label ?? params.providerKey,\n    calculatorKey: params.calculatorKey,\n    promotionId: null,\n    rate: null,\n    amountNet: toNumber(adj.amountNet, 0),\n    amountGross:\n      adj.amountGross === undefined || adj.amountGross === null\n        ? toNumber(adj.amountNet, 0)\n        : toNumber(adj.amountGross, 0),\n    currencyCode: (adj.currencyCode || params.currencyCode || '').toUpperCase() || params.currencyCode,\n    metadata: adj.metadata ?? null,\n    position: 10_000 + index,\n  }))\n}\n\nfunction mergeMetadata(\n  base: Record<string, unknown> | undefined,\n  key: string,\n  value: unknown\n): Record<string, unknown> {\n  const next = { ...(base ?? {}) }\n  next[key] = value\n  return next\n}\n\nfunction applyProviderResult(\n  current: SalesDocumentCalculationResult,\n  adjustments: SalesAdjustmentDraft[],\n  providerKey: string,\n  calculatorKey: string,\n  result: ProviderAdjustmentResult | null | undefined,\n  defaultKind: SalesAdjustmentDraft['kind']\n): SalesDocumentCalculationResult {\n  if (!result?.adjustments?.length) {\n    return rebuildDocumentResult({\n      documentKind: current.kind,\n      currencyCode: current.currencyCode,\n      lines: current.lines,\n      adjustments,\n      metadata: current.metadata,\n    })\n  }\n  const normalized = normalizeAdjustments({\n    providerKey,\n    calculatorKey,\n    adjustments: result.adjustments,\n    currencyCode: current.currencyCode,\n    defaultKind,\n  })\n  const nextAdjustments = [...adjustments, ...normalized]\n  const next = rebuildDocumentResult({\n    documentKind: current.kind,\n    currencyCode: current.currencyCode,\n    lines: current.lines,\n    adjustments: nextAdjustments,\n    metadata: current.metadata,\n  })\n  if (result.metadata) {\n    next.metadata = mergeMetadata(next.metadata, calculatorKey, result.metadata)\n  }\n  return next\n}\n\nexport function ensureProviderTotalsCalculator() {\n  if (totalsRegistered) return\n  totalsRegistered = true\n\n  registerSalesTotalsCalculator(async ({ documentKind, lines, context, current, eventBus, totalsMode }) => {\n    // A provider charge here could not move the caller's header, so it would show\n    // in the breakdown and be absent from the total.\n    if (isExternalAmountsMode(totalsMode)) return current\n    const metadata = (context.metadata ?? {}) as Record<string, unknown>\n    const shippingMethod = (metadata.shippingMethod ?? null) as ShippingMethodContext | null\n    const paymentMethod = (metadata.paymentMethod ?? null) as PaymentMethodContext | null\n\n    let runningAdjustments = (current.adjustments ?? []).filter(\n      (adj) => !isProviderAdjustment(adj) || isManualOverride(adj)\n    )\n    let working = rebuildDocumentResult({\n      documentKind,\n      currencyCode: current.currencyCode,\n      lines,\n      adjustments: runningAdjustments,\n      metadata: current.metadata,\n    })\n\n    if (shippingMethod?.providerKey) {\n      const provider = getShippingProvider(shippingMethod.providerKey)\n      if (provider?.calculate) {\n        const calculatorKey = `${SHIPPING_PREFIX}${provider.key}`\n        const hasManualOverride = runningAdjustments.some(\n          (adj) => (adj.calculatorKey ?? '').startsWith(calculatorKey) && isManualOverride(adj)\n        )\n        if (hasManualOverride) {\n          // Respect user overrides: keep existing provider-tagged adjustments and skip regeneration.\n          working = rebuildDocumentResult({\n            documentKind,\n            currencyCode: working.currencyCode,\n            lines: working.lines,\n            adjustments: runningAdjustments,\n            metadata: working.metadata,\n          })\n        } else {\n          const rawSettings = extractProviderSettings(shippingMethod)\n          const settings =\n            normalizeProviderSettings('shipping', provider.key, rawSettings) ?? rawSettings ?? {}\n          const metrics = computeMetrics(working.lines)\n          let result = await provider.calculate({\n            method: shippingMethod,\n            settings,\n            document: working,\n            lines: working.lines,\n            context,\n            metrics,\n          })\n          if (eventBus) {\n            await eventBus.emitEvent('sales.shipping.adjustments.apply.before', {\n              documentKind,\n              providerKey: provider.key,\n              calculatorKey,\n              method: shippingMethod,\n              settings,\n              document: working,\n              result,\n              setResult(next: ProviderAdjustmentResult | null | undefined) {\n                result = next ?? null\n              },\n            })\n          }\n          working = applyProviderResult(working, runningAdjustments, provider.key, calculatorKey, result, 'shipping')\n          runningAdjustments = working.adjustments\n          if (eventBus) {\n            let nextDocument = working\n            await eventBus.emitEvent('sales.shipping.adjustments.apply.after', {\n              documentKind,\n              providerKey: provider.key,\n              calculatorKey,\n              method: shippingMethod,\n              settings,\n              document: nextDocument,\n              adjustments: nextDocument.adjustments.filter((adj) =>\n                (adj.calculatorKey ?? '').startsWith(calculatorKey)\n              ),\n              setDocument(next: SalesDocumentCalculationResult | null | undefined) {\n                if (next) {\n                  nextDocument = next\n                }\n              },\n              setAdjustments(next: SalesAdjustmentDraft[] | null | undefined) {\n                if (!next) return\n                const preserved = nextDocument.adjustments.filter(\n                  (adj) => !(adj.calculatorKey ?? '').startsWith(calculatorKey)\n                )\n                nextDocument = rebuildDocumentResult({\n                  documentKind,\n                  currencyCode: nextDocument.currencyCode,\n                  lines: nextDocument.lines,\n                  adjustments: [...preserved, ...next],\n                  metadata: nextDocument.metadata,\n                })\n              },\n            })\n            working = nextDocument\n            runningAdjustments = working.adjustments\n          }\n        }\n      }\n    }\n\n    if (paymentMethod?.providerKey) {\n      const provider = getPaymentProvider(paymentMethod.providerKey)\n      if (provider?.calculate) {\n        const calculatorKey = `${PAYMENT_PREFIX}${provider.key}`\n        const hasManualOverride = runningAdjustments.some(\n          (adj) => (adj.calculatorKey ?? '').startsWith(calculatorKey) && isManualOverride(adj)\n        )\n        if (hasManualOverride) {\n          working = rebuildDocumentResult({\n            documentKind,\n            currencyCode: working.currencyCode,\n            lines: working.lines,\n            adjustments: runningAdjustments,\n            metadata: working.metadata,\n          })\n        } else {\n          runningAdjustments = withoutPrefix(runningAdjustments, PAYMENT_PREFIX)\n          const rawSettings = extractProviderSettings(paymentMethod)\n          const settings =\n            normalizeProviderSettings('payment', provider.key, rawSettings) ?? rawSettings ?? {}\n          let result = await provider.calculate({\n            method: paymentMethod,\n            settings,\n            document: working,\n            lines: working.lines,\n            context,\n          })\n          if (eventBus) {\n            await eventBus.emitEvent('sales.payment.adjustments.apply.before', {\n              documentKind,\n              providerKey: provider.key,\n              calculatorKey,\n              method: paymentMethod,\n              settings,\n              document: working,\n              result,\n              setResult(next: ProviderAdjustmentResult | null | undefined) {\n                result = next ?? null\n              },\n            })\n          }\n          working = applyProviderResult(\n            working,\n            runningAdjustments,\n            provider.key,\n            calculatorKey,\n            result,\n            'surcharge'\n          )\n          runningAdjustments = working.adjustments\n          if (eventBus) {\n            let nextDocument = working\n            await eventBus.emitEvent('sales.payment.adjustments.apply.after', {\n              documentKind,\n              providerKey: provider.key,\n              calculatorKey,\n              method: paymentMethod,\n              settings,\n              document: nextDocument,\n              adjustments: nextDocument.adjustments.filter((adj) =>\n                (adj.calculatorKey ?? '').startsWith(calculatorKey)\n              ),\n              setDocument(next: SalesDocumentCalculationResult | null | undefined) {\n                if (next) {\n                  nextDocument = next\n                }\n              },\n              setAdjustments(next: SalesAdjustmentDraft[] | null | undefined) {\n                if (!next) return\n                const preserved = nextDocument.adjustments.filter(\n                  (adj) => !(adj.calculatorKey ?? '').startsWith(calculatorKey)\n                )\n                nextDocument = rebuildDocumentResult({\n                  documentKind,\n                  currencyCode: nextDocument.currencyCode,\n                  lines: nextDocument.lines,\n                  adjustments: [...preserved, ...next],\n                  metadata: nextDocument.metadata,\n                })\n              },\n            })\n            working = nextDocument\n            runningAdjustments = working.adjustments\n          }\n        }\n      }\n    }\n\n    return working\n  })\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/modules/sales/migrations/Migration20260910120000_sales_external_amounts_mode.js

@@ -0,0 +1,19 @@
+import { Migration } from "@mikro-orm/migrations";
+class Migration20260910120000_sales_external_amounts_mode extends Migration {
+  async up() {
+    this.addSql(
+      `alter table "sales_orders" add column if not exists "totals_mode" text not null default 'computed';`
+    );
+    this.addSql(
+      `alter table "sales_order_lines" add column if not exists "amounts_mode" text not null default 'computed';`
+    );
+  }
+  async down() {
+    this.addSql(`alter table "sales_order_lines" drop column if exists "amounts_mode";`);
+    this.addSql(`alter table "sales_orders" drop column if exists "totals_mode";`);
+  }
+}
+export {
+  Migration20260910120000_sales_external_amounts_mode
+};
+//# sourceMappingURL=Migration20260910120000_sales_external_amounts_mode.js.map

package/dist/modules/sales/migrations/Migration20260910120000_sales_external_amounts_mode.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/modules/sales/migrations/Migration20260910120000_sales_external_amounts_mode.ts"],
+  "sourcesContent": ["import { Migration } from '@mikro-orm/migrations';\n\n// Opt-in `external` amounts mode for sales orders: the row-level statement that\n// the stored amounts are a caller's assertion mirrored from an external book of\n// record, not something core derived. Two defaulted columns, no backfill \u2014 every\n// existing row takes 'computed', which is exactly today's behaviour, so the\n// change is observably inert until a caller sets the mode.\n//\n// PostgreSQL has not rewritten a table for a defaulted column add since 11, so\n// both statements are metadata-only regardless of table size.\nexport class Migration20260910120000_sales_external_amounts_mode extends Migration {\n  override async up(): Promise<void> {\n    this.addSql(\n      `alter table \"sales_orders\" add column if not exists \"totals_mode\" text not null default 'computed';`,\n    );\n    this.addSql(\n      `alter table \"sales_order_lines\" add column if not exists \"amounts_mode\" text not null default 'computed';`,\n    );\n  }\n\n  override async down(): Promise<void> {\n    this.addSql(`alter table \"sales_order_lines\" drop column if exists \"amounts_mode\";`);\n    this.addSql(`alter table \"sales_orders\" drop column if exists \"totals_mode\";`);\n  }\n}\n"],
+  "mappings": "AAAA,SAAS,iBAAiB;AAUnB,MAAM,4DAA4D,UAAU;AAAA,EACjF,MAAe,KAAoB;AACjC,SAAK;AAAA,MACH;AAAA,IACF;AACA,SAAK;AAAA,MACH;AAAA,IACF;AAAA,EACF;AAAA,EAEA,MAAe,OAAsB;AACnC,SAAK,OAAO,uEAAuE;AACnF,SAAK,OAAO,iEAAiE;AAAA,EAC/E;AACF;",
+  "names": []
+}

package/generated/entities/sales_order/index.ts

@@ -43,6 +43,7 @@ export const totals_snapshot = "totals_snapshot";
 export const paid_total_amount = "paid_total_amount";
 export const refunded_total_amount = "refunded_total_amount";
 export const outstanding_amount = "outstanding_amount";
+export const totals_mode = "totals_mode";
 export const line_item_count = "line_item_count";
 export const metadata = "metadata";
 export const custom_field_set_id = "custom_field_set_id";

package/generated/entities/sales_order_line/index.ts

@@ -30,6 +30,7 @@ export const tax_rate = "tax_rate";
 export const tax_amount = "tax_amount";
 export const total_net_amount = "total_net_amount";
 export const total_gross_amount = "total_gross_amount";
+export const amounts_mode = "amounts_mode";
 export const configuration = "configuration";
 export const promotion_code = "promotion_code";
 export const promotion_snapshot = "promotion_snapshot";

package/generated/entity-fields-registry.ts

@@ -3054,6 +3054,7 @@ export const entityFieldsRegistry: Record<string, Record<string, string>> = {
       "paid_total_amount": "paid_total_amount",
       "refunded_total_amount": "refunded_total_amount",
       "outstanding_amount": "outstanding_amount",
+      "totals_mode": "totals_mode",
       "line_item_count": "line_item_count",
       "metadata": "metadata",
       "custom_field_set_id": "custom_field_set_id",
@@ -3136,6 +3137,7 @@ export const entityFieldsRegistry: Record<string, Record<string, string>> = {
       "tax_amount": "tax_amount",
       "total_net_amount": "total_net_amount",
       "total_gross_amount": "total_gross_amount",
+      "amounts_mode": "amounts_mode",
       "configuration": "configuration",
       "promotion_code": "promotion_code",
       "promotion_snapshot": "promotion_snapshot",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/core",
-  "version": "0.10.1-develop.7723.1.3b2ea82ea7",
+  "version": "0.10.1-develop.7726.1.a447cc5525",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -9,6 +9,7 @@
     "watch": "node watch.mjs",
     "test": "jest --config jest.config.cjs",
     "test:pg-integration": "cross-env OM_PG_INTEGRATION=1 jest --config jest.config.cjs --runInBand 'src/modules/(integrations|staff)/.+\\.integration\\.test\\.ts$'",
+    "test:tz": "cross-env TZ=Pacific/Auckland jest --config jest.config.cjs",
     "typecheck": "tsc --noEmit"
   },
   "imports": {
@@ -265,16 +266,16 @@
     "zod": "^4.4.3"
   },
   "peerDependencies": {
-    "@open-mercato/ai-assistant": "0.10.1-develop.7723.1.3b2ea82ea7",
-    "@open-mercato/shared": "0.10.1-develop.7723.1.3b2ea82ea7",
-    "@open-mercato/ui": "0.10.1-develop.7723.1.3b2ea82ea7",
+    "@open-mercato/ai-assistant": "0.10.1-develop.7726.1.a447cc5525",
+    "@open-mercato/shared": "0.10.1-develop.7726.1.a447cc5525",
+    "@open-mercato/ui": "0.10.1-develop.7726.1.a447cc5525",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/ai-assistant": "0.10.1-develop.7723.1.3b2ea82ea7",
-    "@open-mercato/shared": "0.10.1-develop.7723.1.3b2ea82ea7",
-    "@open-mercato/ui": "0.10.1-develop.7723.1.3b2ea82ea7",
+    "@open-mercato/ai-assistant": "0.10.1-develop.7726.1.a447cc5525",
+    "@open-mercato/shared": "0.10.1-develop.7726.1.a447cc5525",
+    "@open-mercato/ui": "0.10.1-develop.7726.1.a447cc5525",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^7.0.1",
     "@testing-library/react": "^16.3.3",

package/src/modules/planner/api/availability-date-specific.ts

@@ -11,6 +11,7 @@ import { CrudHttpError, isCrudHttpError } from '@open-mercato/shared/lib/crud/er
 import { parseScopedCommandInput } from '@open-mercato/shared/lib/api/scoped'
 import { findWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { plannerAvailabilityDateSpecificReplaceSchema } from '../data/validators'
+import { zonedDateKey } from '../lib/availabilityTimezone'
 import { serializeOperationMetadata } from '@open-mercato/shared/lib/commands/operationMetadata'
 import {
   runCrudMutationGuardAfterSuccess,
@@ -26,11 +27,9 @@ const logger = createLogger('planner').child({ component: 'availability' })
 export const metadata = {
   POST: { requireAuth: true },
 }
-
 type RequestContext = {
   ctx: CommandRuntimeContext
 }
-
 async function resolveRequestContext(req: Request): Promise<RequestContext> {
   const container = await createRequestContainer()
   const auth = await getAuthFromRequest(req)
@@ -94,7 +93,10 @@ export async function POST(req: Request) {
         const blocked = rules.some((rule) => {
           const window = parseAvailabilityRuleWindow(rule)
           if (window.repeat !== 'once') return false
-          return dateSet.has(formatDateKey(window.startAt))
+          // Resolved in the rule's own zone so this gate agrees with
+          // `planner.availability.date-specific.replace` and does not depend
+          // on the host clock.
+          return dateSet.has(zonedDateKey(window.startAt, rule.timezone))
         })
         if (blocked) {
           throw new CrudHttpError(403, { error: translate('planner.availability.errors.unauthorized', 'Unauthorized') })
@@ -215,10 +217,3 @@ function resolveDateSet(input: { date?: string; dates?: string[] }): Set<string>
   }
   return dates
 }
-
-function formatDateKey(value: Date): string {
-  const year = value.getFullYear()
-  const month = String(value.getMonth() + 1).padStart(2, '0')
-  const day = String(value.getDate()).padStart(2, '0')
-  return `${year}-${month}-${day}`
-}

package/src/modules/planner/commands/availability-date-specific.ts

@@ -3,6 +3,7 @@ import { registerCommand } from '@open-mercato/shared/lib/commands'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { parseAvailabilityRuleWindow } from '@open-mercato/core/modules/planner/lib/availabilitySchedule'
+import { warnOnUnresolvableTimeZone, zonedDateKey, zonedDayBounds, zonedWallTimeToInstant } from '@open-mercato/core/modules/planner/lib/availabilityTimezone'
 import { PlannerAvailabilityRule } from '../data/entities'
 import {
   plannerAvailabilityDateSpecificReplaceSchema,
@@ -52,22 +53,9 @@ type DateSpecificUndoPayload = {
   after: AvailabilityRuleSnapshot[]
 }
 
-function parseTimeInput(value: string): { hours: number; minutes: number } | null {
-  const [hours, minutes] = value.split(':').map((part) => Number(part))
-  if (!Number.isFinite(hours) || !Number.isFinite(minutes)) return null
-  if (hours < 0 || hours > 23 || minutes < 0 || minutes > 59) return null
-  return { hours, minutes }
-}
-
-function toDateForDay(value: string, time: string): Date | null {
-  if (!value) return null
-  const parsed = parseTimeInput(time)
-  if (!parsed) return null
-  const parts = value.split('-').map((part) => Number(part))
-  if (parts.length !== 3 || parts.some((part) => Number.isNaN(part))) return null
-  const [year, month, day] = parts
-  const date = new Date(year, month - 1, day, parsed.hours, parsed.minutes, 0, 0)
-  return Number.isNaN(date.getTime()) ? null : date
+function toDateForDay(dateKey: string, time: string, timeZone: string): Date | null {
+  if (!dateKey) return null
+  return zonedWallTimeToInstant(dateKey, time, timeZone)
 }
 
 function formatDuration(minutes: number): string {
@@ -86,18 +74,10 @@ function buildAvailabilityRrule(start: Date, end: Date): string {
   return `DTSTART:${dtStart}\nDURATION:${duration}\nRRULE:FREQ=DAILY;COUNT=1`
 }
 
-function buildFullDayRrule(date: string): string | null {
-  const start = toDateForDay(date, '00:00')
-  if (!start) return null
-  const end = new Date(start.getTime() + 24 * 60 * 60 * 1000)
-  return buildAvailabilityRrule(start, end)
-}
-
-function formatDateKey(value: Date): string {
-  const year = value.getFullYear()
-  const month = String(value.getMonth() + 1).padStart(2, '0')
-  const day = String(value.getDate()).padStart(2, '0')
-  return `${year}-${month}-${day}`
+function buildFullDayRrule(date: string, timeZone: string): string | null {
+  const bounds = zonedDayBounds(date, timeZone)
+  if (!bounds) return null
+  return buildAvailabilityRrule(bounds.start, bounds.end)
 }
 
 function toAvailabilityRuleSnapshot(record: PlannerAvailabilityRule): AvailabilityRuleSnapshot {
@@ -140,7 +120,7 @@ async function loadDateSpecificSnapshots(
     .filter((rule) => {
       const window = parseAvailabilityRuleWindow(rule)
       if (window.repeat !== 'once') return false
-      return params.dates.has(formatDateKey(window.startAt))
+      return params.dates.has(zonedDateKey(window.startAt, rule.timezone))
     })
     .map(toAvailabilityRuleSnapshot)
 }
@@ -199,6 +179,7 @@ const replaceDateSpecificAvailabilityCommand: CommandHandler<PlannerAvailability
   },
   async execute(input, ctx) {
     const parsed = plannerAvailabilityDateSpecificReplaceSchema.parse(input)
+    warnOnUnresolvableTimeZone(parsed.timezone, 'planner.availability.date-specific.replace')
     ensureTenantScope(ctx, parsed.tenantId)
     ensureOrganizationScope(ctx, parsed.organizationId)
     const dates = resolveDateSet(parsed)
@@ -223,7 +204,7 @@ const replaceDateSpecificAvailabilityCommand: CommandHandler<PlannerAvailability
         const toDelete = existing.filter((rule) => {
           const window = parseAvailabilityRuleWindow(rule)
           if (window.repeat !== 'once') return false
-          return dates.has(formatDateKey(window.startAt))
+          return dates.has(zonedDateKey(window.startAt, rule.timezone))
         })
         enforceCommandOptimisticLock({
           resourceKind: AVAILABILITY_RULE_RESOURCE_KIND,
@@ -244,7 +225,7 @@ const replaceDateSpecificAvailabilityCommand: CommandHandler<PlannerAvailability
 
       if (!isAvailable) {
         dates.forEach((date) => {
-          const rrule = buildFullDayRrule(date)
+          const rrule = buildFullDayRrule(date, parsed.timezone)
           if (!rrule) return
           const record = trx.create(PlannerAvailabilityRule, {
             tenantId: parsed.tenantId,
@@ -266,8 +247,8 @@ const replaceDateSpecificAvailabilityCommand: CommandHandler<PlannerAvailability
       } else {
         dates.forEach((date) => {
           windows.forEach((window) => {
-            const start = toDateForDay(date, window.start)
-            const end = toDateForDay(date, window.end)
+            const start = toDateForDay(date, window.start, parsed.timezone)
+            const end = toDateForDay(date, window.end, parsed.timezone)
             if (!start || !end || start >= end) return
             const rrule = buildAvailabilityRrule(start, end)
             const record = trx.create(PlannerAvailabilityRule, {

package/src/modules/planner/commands/availability-weekly.ts

@@ -2,6 +2,7 @@ import type { CommandHandler } from '@open-mercato/shared/lib/commands'
 import { registerCommand } from '@open-mercato/shared/lib/commands'
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { parseAvailabilityRuleWindow } from '@open-mercato/core/modules/planner/lib/availabilitySchedule'
+import { warnOnUnresolvableTimeZone, zonedWeeklyAnchor, zonedWeekday } from '@open-mercato/core/modules/planner/lib/availabilityTimezone'
 import { PlannerAvailabilityRule, PlannerAvailabilityRuleSet } from '../data/entities'
 import {
   plannerAvailabilityWeeklyReplaceSchema,
@@ -54,24 +55,6 @@ type WeeklyUndoPayload = {
   after: AvailabilityRuleSnapshot[]
 }
 
-function parseTimeInput(value: string): { hours: number; minutes: number } | null {
-  const [hours, minutes] = value.split(':').map((part) => Number(part))
-  if (!Number.isFinite(hours) || !Number.isFinite(minutes)) return null
-  if (hours < 0 || hours > 23 || minutes < 0 || minutes > 59) return null
-  return { hours, minutes }
-}
-
-function toDateForWeekday(weekday: number, time: string): Date | null {
-  const parsed = parseTimeInput(time)
-  if (!parsed) return null
-  const now = new Date()
-  const base = new Date(now.getFullYear(), now.getMonth(), now.getDate())
-  const diff = (weekday - base.getDay() + 7) % 7
-  const target = new Date(base.getTime() + diff * 24 * 60 * 60 * 1000)
-  target.setHours(parsed.hours, parsed.minutes, 0, 0)
-  return target
-}
-
 function formatDuration(minutes: number): string {
   const clamped = Math.max(1, minutes)
   const hours = Math.floor(clamped / 60)
@@ -81,11 +64,18 @@ function formatDuration(minutes: number): string {
   return `PT${mins}M`
 }
 
-function buildWeeklyRrule(start: Date, end: Date): string {
+function buildWeeklyRrule(start: Date, end: Date, timeZone: string): string {
   const dtStart = start.toISOString().replace(/[-:]/g, '').split('.')[0] + 'Z'
   const durationMinutes = Math.max(1, Math.round((end.getTime() - start.getTime()) / 60000))
   const duration = formatDuration(durationMinutes)
-  const dayCode = DAY_CODES[start.getDay()] ?? 'MO'
+  // `BYDAY` names the weekday the window falls on in its DECLARED zone, which
+  // is the meaningful label for a recurring local-time window. It is therefore
+  // deliberately not consistent with the `Z`-suffixed `DTSTART` beside it: a
+  // Pacific/Auckland Monday 09:00 ships DTSTART:...T210000Z, a Sunday in UTC,
+  // with BYDAY=MO. Nothing in the planner reads BYDAY today (neither the
+  // expander nor `parseAvailabilityRuleWindow`); a future iCal export must
+  // re-derive it from the zone rather than trust it against DTSTART.
+  const dayCode = DAY_CODES[zonedWeekday(start, timeZone)] ?? 'MO'
   return `DTSTART:${dtStart}\nDURATION:${duration}\nRRULE:FREQ=WEEKLY;BYDAY=${dayCode}`
 }
 
@@ -185,6 +175,7 @@ const replaceWeeklyAvailabilityCommand: CommandHandler<PlannerAvailabilityWeekly
   },
   async execute(input, ctx) {
     const parsed = plannerAvailabilityWeeklyReplaceSchema.parse(input)
+    warnOnUnresolvableTimeZone(parsed.timezone, 'planner.availability.weekly.replace')
     ensureTenantScope(ctx, parsed.tenantId)
     ensureOrganizationScope(ctx, parsed.organizationId)
 
@@ -247,10 +238,10 @@ const replaceWeeklyAvailabilityCommand: CommandHandler<PlannerAvailabilityWeekly
       }
 
       parsed.windows.forEach((window) => {
-        const start = toDateForWeekday(window.weekday, window.start)
-        const end = toDateForWeekday(window.weekday, window.end)
-        if (!start || !end || start >= end) return
-        const rrule = buildWeeklyRrule(start, end)
+        const anchor = zonedWeeklyAnchor(window.weekday, window.start, window.end, parsed.timezone, now)
+        if (!anchor || anchor.start >= anchor.end) return
+        const { start, end } = anchor
+        const rrule = buildWeeklyRrule(start, end, parsed.timezone)
         const record = trx.create(PlannerAvailabilityRule, {
           tenantId: parsed.tenantId,
           organizationId: parsed.organizationId,

package/src/modules/planner/lib/availabilityMerge.ts

@@ -1,3 +1,5 @@
+import { resolveTimeZone, zonedWallDateToInstant } from './availabilityTimezone'
+
 type AvailabilityKind = 'availability' | 'unavailability'
 
 export type AvailabilityRuleLike = {
@@ -46,21 +48,8 @@ function zonedParts(instant: Date, timezone: string): { year: number; month: num
   return { year: number('year'), month: number('month'), day: number('day'), hour: number('hour'), minute: number('minute'), second: number('second') }
 }
 
-function zonedWallToInstant(wall: Date, timezone: string): Date | null {
-  const target = wall.getTime()
-  let candidate = target
-  for (let attempt = 0; attempt < 4; attempt += 1) {
-    const parts = zonedParts(new Date(candidate), timezone)
-    const displayed = Date.UTC(parts.year, parts.month - 1, parts.day, parts.hour, parts.minute, parts.second)
-    const next = candidate + target - displayed
-    if (next === candidate) return new Date(candidate)
-    candidate = next
-  }
-  return null
-}
-
 function zonedStartOfDay(dayKey: string, timezone: string): Date | null {
-  return zonedWallToInstant(new Date(`${dayKey}T00:00:00Z`), timezone)
+  return zonedWallDateToInstant(new Date(`${dayKey}T00:00:00Z`), timezone)
 }
 
 function dayKeyForRule(instant: Date, timezone?: string): string {
@@ -146,10 +135,10 @@ function expandZonedRule(rule: AvailabilityRuleLike, parsed: ParsedRule, range:
   let wall = new Date(anchorWall + skipped * step)
   let remaining = (parsed.count ?? Number.POSITIVE_INFINITY) - skipped
   while (wall.getTime() <= range.end.getTime() + DAY_MS && remaining > 0) {
-    const start = zonedWallToInstant(wall, timezone)
-    if (start && !shouldExcludeOccurrence(start, rule.exdates, timezone)) {
-      const end = new Date(start.getTime() + duration)
-      if (end > range.start && start < range.end) windows.push({ start, end, ruleId: rule.id })
+    const start = zonedWallDateToInstant(wall, timezone)
+    if (!shouldExcludeOccurrence(start, rule.exdates, timezone)) {
+      const end = zonedWallDateToInstant(new Date(wall.getTime() + duration), timezone)
+      if (end > start && end > range.start && start < range.end) windows.push({ start, end, ruleId: rule.id })
     }
     wall = new Date(wall.getTime() + step)
     remaining -= 1
@@ -231,7 +220,12 @@ export function getMergedAvailabilityWindows(params: {
   respectTimezone?: boolean
   weeklyScheduleTemplate?: boolean
 }): AvailabilityWindow[] {
-  const rules = params.respectTimezone ? params.rules : params.rules.map((rule) => ({ ...rule, timezone: undefined }))
+  const rules: AvailabilityRuleLike[] = params.respectTimezone
+    ? params.rules.map((rule) => ({
+        ...rule,
+        timezone: rule.timezone ? resolveTimeZone(rule.timezone) : rule.timezone,
+      }))
+    : params.rules.map((rule) => ({ ...rule, timezone: undefined }))
   const parsedRules = rules
     .map((rule) => {
       const parsed = parseRrule(rule.rrule)