@open-mercato/core 0.7.1-develop.7113.1.9d83dca10c → 0.7.1-develop.7121.1.734c263bda

package/dist/modules/sales/commands/documents.js

@@ -1,4 +1,5 @@
 import { randomUUID } from "crypto";
+import { isDeepStrictEqual } from "node:util";
 import { z } from "zod";
 import { registerCommand } from "@open-mercato/shared/lib/commands";
 import { withAtomicFlush } from "@open-mercato/shared/lib/commands/flush";
@@ -95,6 +96,11 @@ import {
   loadPaymentSnapshot,
   restorePaymentSnapshot
 } from "./payments.js";
+import {
+  mapOrderLineEntityToSnapshot,
+  mapQuoteLineEntityToSnapshot,
+  resolveUpsertDiscountFields
+} from "../lib/lineSnapshots.js";
 import { loadShippedQuantityByLine } from "../lib/shipments/snapshots.js";
 import { resolveDictionaryEntryValue, resolveCachedDictionaryEntryValue } from "../lib/dictionaries.js";
 import { resolveStatusEntryIdByValue } from "../lib/statusHelpers.js";
@@ -1889,66 +1895,6 @@ function buildCalculationContext(params) {
     })
   };
 }
-function mapOrderLineEntityToSnapshot(line) {
-  return {
-    id: line.id,
-    lineNumber: line.lineNumber,
-    kind: line.kind,
-    productId: line.productId ?? null,
-    productVariantId: line.productVariantId ?? null,
-    name: line.name ?? null,
-    description: line.description ?? null,
-    comment: line.comment ?? null,
-    quantity: toNumeric(line.quantity),
-    quantityUnit: line.quantityUnit ?? null,
-    normalizedQuantity: toNumeric(line.normalizedQuantity ?? line.quantity),
-    normalizedUnit: line.normalizedUnit ?? line.quantityUnit ?? null,
-    uomSnapshot: line.uomSnapshot ? cloneJson(line.uomSnapshot) : null,
-    currencyCode: line.currencyCode,
-    unitPriceNet: toNumeric(line.unitPriceNet),
-    unitPriceGross: toNumeric(line.unitPriceGross),
-    discountAmount: toNumeric(line.discountAmount),
-    discountPercent: toNumeric(line.discountPercent),
-    taxRate: toNumeric(line.taxRate),
-    taxAmount: toNumeric(line.taxAmount),
-    totalNetAmount: toNumeric(line.totalNetAmount),
-    totalGrossAmount: toNumeric(line.totalGrossAmount),
-    configuration: line.configuration ? cloneJson(line.configuration) : null,
-    promotionCode: line.promotionCode ?? null,
-    metadata: line.metadata ? cloneJson(line.metadata) : null,
-    customFieldSetId: line.customFieldSetId ?? null
-  };
-}
-function mapQuoteLineEntityToSnapshot(line) {
-  return {
-    id: line.id,
-    lineNumber: line.lineNumber,
-    kind: line.kind,
-    productId: line.productId ?? null,
-    productVariantId: line.productVariantId ?? null,
-    name: line.name ?? null,
-    description: line.description ?? null,
-    comment: line.comment ?? null,
-    quantity: toNumeric(line.quantity),
-    quantityUnit: line.quantityUnit ?? null,
-    normalizedQuantity: toNumeric(line.normalizedQuantity ?? line.quantity),
-    normalizedUnit: line.normalizedUnit ?? line.quantityUnit ?? null,
-    uomSnapshot: line.uomSnapshot ? cloneJson(line.uomSnapshot) : null,
-    currencyCode: line.currencyCode,
-    unitPriceNet: toNumeric(line.unitPriceNet),
-    unitPriceGross: toNumeric(line.unitPriceGross),
-    discountAmount: toNumeric(line.discountAmount),
-    discountPercent: toNumeric(line.discountPercent),
-    taxRate: toNumeric(line.taxRate),
-    taxAmount: toNumeric(line.taxAmount),
-    totalNetAmount: toNumeric(line.totalNetAmount),
-    totalGrossAmount: toNumeric(line.totalGrossAmount),
-    configuration: line.configuration ? cloneJson(line.configuration) : null,
-    promotionCode: line.promotionCode ?? null,
-    metadata: line.metadata ? cloneJson(line.metadata) : null,
-    customFieldSetId: line.customFieldSetId ?? null
-  };
-}
 function mapOrderAdjustmentToDraft(adjustment) {
   return {
     id: adjustment.id,
@@ -1987,6 +1933,9 @@ async function emitTotalsCalculated(eventBus, payload) {
   if (!eventBus) return;
   await eventBus.emitEvent("sales.document.totals.calculated", payload);
 }
+function isStoredRowSourcedLine(line) {
+  return line.discountAmountFromStoredRow === true;
+}
 function createLineSnapshotFromInput(line, lineNumber) {
   const quantity = Number(line.quantity ?? 0);
   const normalizedQuantity = toNumeric(
@@ -2009,6 +1958,14 @@ function createLineSnapshotFromInput(line, lineNumber) {
     unitPriceNet: line.unitPriceNet ?? null,
     unitPriceGross: line.unitPriceGross ?? null,
     discountAmount: line.discountAmount ?? null,
+    // Several callers re-run an already-mapped snapshot through here — the line
+    // upsert and delete paths rebuild every line of the document, not just the
+    // one being edited. Those inputs already carry a line total from a stored
+    // row, so their origin must survive rather than be overwritten with the
+    // caller default, or the untouched lines get re-inflated by quantity on
+    // every write. Exactly one of the two origin fields is ever set, which is
+    // the invariant the calculation engine relies on.
+    ...isStoredRowSourcedLine(line) ? { discountAmountFromStoredRow: true } : { discountAmountBasis: line.discountAmountBasis ?? "unit" },
     discountPercent: line.discountPercent ?? null,
     taxRate: line.taxRate ?? null,
     taxAmount: line.taxAmount ?? null,
@@ -5368,7 +5325,11 @@ const orderLineUpsertCommand = {
       currencyCode: parsed.currencyCode ?? existingSnapshot?.currencyCode ?? order.currencyCode,
       unitPriceNet: unitPriceNet ?? 0,
       unitPriceGross: unitPriceGross ?? unitPriceNet ?? 0,
-      discountAmount: parsed.discountAmount ?? existingSnapshot?.discountAmount ?? 0,
+      ...resolveUpsertDiscountFields(
+        parsed.discountAmount,
+        parsed.discountAmountBasis,
+        existingSnapshot
+      ),
       discountPercent: parsed.discountPercent ?? existingSnapshot?.discountPercent ?? 0,
       taxRate: taxRate ?? 0,
       taxAmount: parsed.taxAmount ?? existingSnapshot?.taxAmount ?? null,
@@ -5789,7 +5750,11 @@ const quoteLineUpsertCommand = {
       currencyCode: parsed.currencyCode ?? existingSnapshot?.currencyCode ?? quote.currencyCode,
       unitPriceNet: unitPriceNet ?? 0,
       unitPriceGross: unitPriceGross ?? unitPriceNet ?? 0,
-      discountAmount: parsed.discountAmount ?? existingSnapshot?.discountAmount ?? 0,
+      ...resolveUpsertDiscountFields(
+        parsed.discountAmount,
+        parsed.discountAmountBasis,
+        existingSnapshot
+      ),
       discountPercent: parsed.discountPercent ?? existingSnapshot?.discountPercent ?? 0,
       taxRate: taxRate ?? 0,
       taxAmount: parsed.taxAmount ?? existingSnapshot?.taxAmount ?? null,
@@ -7064,6 +7029,70 @@ const createInvoiceCommand = {
     await em.flush();
   }
 };
+const invoiceUpdateChangeKeys = [
+  "invoiceNumber",
+  "statusEntryId",
+  "status",
+  "issueDate",
+  "dueDate",
+  "currencyCode",
+  "subtotalNetAmount",
+  "subtotalGrossAmount",
+  "discountTotalAmount",
+  "taxTotalAmount",
+  "grandTotalNetAmount",
+  "grandTotalGrossAmount",
+  "paidTotalAmount",
+  "outstandingAmount",
+  "metadata"
+];
+function toAuditISOString(value) {
+  if (value instanceof Date) {
+    return Number.isNaN(value.getTime()) ? null : value.toISOString();
+  }
+  if (typeof value === "string") {
+    const parsed = new Date(value);
+    return Number.isNaN(parsed.getTime()) ? null : parsed.toISOString();
+  }
+  return null;
+}
+function auditValuesEqual(left, right) {
+  if (Object.is(left, right)) return true;
+  if (left instanceof Date || right instanceof Date) {
+    const leftIso = toAuditISOString(left);
+    const rightIso = toAuditISOString(right);
+    return leftIso !== null && rightIso !== null && leftIso === rightIso;
+  }
+  return isDeepStrictEqual(left, right);
+}
+function buildAuditChanges(before, after, keys) {
+  const changedKeys = keys.filter((key) => !auditValuesEqual(before[key], after[key]));
+  return buildChanges(before, after, changedKeys);
+}
+function selectInvoiceUpdateChangeKeys(input) {
+  return invoiceUpdateChangeKeys.filter(
+    (key) => key === "status" ? input.statusEntryId !== void 0 : input[key] !== void 0
+  );
+}
+function applyInvoiceHeaderUpdate(invoice, input, resolvedStatus) {
+  if (input.invoiceNumber !== void 0) invoice.invoiceNumber = input.invoiceNumber;
+  if (input.statusEntryId !== void 0) {
+    invoice.statusEntryId = input.statusEntryId;
+    invoice.status = resolvedStatus ?? null;
+  }
+  if (input.issueDate !== void 0) invoice.issueDate = input.issueDate;
+  if (input.dueDate !== void 0) invoice.dueDate = input.dueDate;
+  if (input.currencyCode !== void 0) invoice.currencyCode = input.currencyCode;
+  if (input.subtotalNetAmount !== void 0) invoice.subtotalNetAmount = toNumericString(input.subtotalNetAmount);
+  if (input.subtotalGrossAmount !== void 0) invoice.subtotalGrossAmount = toNumericString(input.subtotalGrossAmount);
+  if (input.discountTotalAmount !== void 0) invoice.discountTotalAmount = toNumericString(input.discountTotalAmount);
+  if (input.taxTotalAmount !== void 0) invoice.taxTotalAmount = toNumericString(input.taxTotalAmount);
+  if (input.grandTotalNetAmount !== void 0) invoice.grandTotalNetAmount = toNumericString(input.grandTotalNetAmount);
+  if (input.grandTotalGrossAmount !== void 0) invoice.grandTotalGrossAmount = toNumericString(input.grandTotalGrossAmount);
+  if (input.paidTotalAmount !== void 0) invoice.paidTotalAmount = toNumericString(input.paidTotalAmount);
+  if (input.outstandingAmount !== void 0) invoice.outstandingAmount = toNumericString(input.outstandingAmount);
+  if (input.metadata !== void 0) invoice.metadata = input.metadata;
+}
 const updateInvoiceCommand = {
   id: "sales.invoices.update",
   async prepare(input, ctx) {
@@ -7088,27 +7117,11 @@ const updateInvoiceCommand = {
       tenantId: parsed.tenantId,
       deletedAt: null
     });
-    const changes = buildChanges(invoice, parsed, [
-      "invoiceNumber",
-      "statusEntryId",
-      "status",
-      "issueDate",
-      "dueDate",
-      "currencyCode",
-      "subtotalNetAmount",
-      "subtotalGrossAmount",
-      "discountTotalAmount",
-      "taxTotalAmount",
-      "grandTotalNetAmount",
-      "grandTotalGrossAmount",
-      "paidTotalAmount",
-      "outstandingAmount",
-      "metadata"
-    ]);
+    let resolvedStatus;
     if (parsed.statusEntryId !== void 0) {
-      invoice.status = await resolveDictionaryEntryValue(em, parsed.statusEntryId ?? null, { tenantId: invoice.tenantId });
+      resolvedStatus = await resolveDictionaryEntryValue(em, parsed.statusEntryId ?? null, { tenantId: invoice.tenantId });
     }
-    Object.assign(invoice, changes);
+    applyInvoiceHeaderUpdate(invoice, parsed, resolvedStatus);
     invoice.updatedAt = /* @__PURE__ */ new Date();
     await em.flush();
     const dataEngine = ctx.container.resolve("dataEngine");
@@ -7141,11 +7154,16 @@ const updateInvoiceCommand = {
     const em = ctx.container.resolve("em").fork();
     return loadInvoiceSnapshot(em, result.invoiceId);
   },
-  buildLog: async ({ result, snapshots }) => {
+  buildLog: async ({ input, result, snapshots }) => {
     const before = snapshots.before;
     const after = snapshots.after;
     if (!after) return null;
     const { translate } = await resolveTranslations();
+    const changes = before ? buildAuditChanges(
+      before.invoice,
+      after.invoice,
+      selectInvoiceUpdateChangeKeys(input)
+    ) : {};
     return {
       actionLabel: translate("sales.audit.invoices.update", "Update invoice"),
       resourceKind: "sales.invoice",
@@ -7154,6 +7172,7 @@ const updateInvoiceCommand = {
       organizationId: after.invoice.organizationId,
       snapshotBefore: before,
       snapshotAfter: after,
+      changes: Object.keys(changes).length ? changes : null,
       payload: {
         undo: { before, after }
       }
@@ -7525,6 +7544,41 @@ const createCreditMemoCommand = {
     await em.flush();
   }
 };
+const creditMemoUpdateChangeKeys = [
+  "creditMemoNumber",
+  "statusEntryId",
+  "status",
+  "reason",
+  "issueDate",
+  "currencyCode",
+  "subtotalNetAmount",
+  "subtotalGrossAmount",
+  "taxTotalAmount",
+  "grandTotalNetAmount",
+  "grandTotalGrossAmount",
+  "metadata"
+];
+function selectCreditMemoUpdateChangeKeys(input) {
+  return creditMemoUpdateChangeKeys.filter(
+    (key) => key === "status" ? input.statusEntryId !== void 0 : input[key] !== void 0
+  );
+}
+function applyCreditMemoHeaderUpdate(creditMemo, input, resolvedStatus) {
+  if (input.creditMemoNumber !== void 0) creditMemo.creditMemoNumber = input.creditMemoNumber;
+  if (input.statusEntryId !== void 0) {
+    creditMemo.statusEntryId = input.statusEntryId;
+    creditMemo.status = resolvedStatus ?? null;
+  }
+  if (input.reason !== void 0) creditMemo.reason = input.reason;
+  if (input.issueDate !== void 0) creditMemo.issueDate = input.issueDate;
+  if (input.currencyCode !== void 0) creditMemo.currencyCode = input.currencyCode;
+  if (input.subtotalNetAmount !== void 0) creditMemo.subtotalNetAmount = toNumericString(input.subtotalNetAmount);
+  if (input.subtotalGrossAmount !== void 0) creditMemo.subtotalGrossAmount = toNumericString(input.subtotalGrossAmount);
+  if (input.taxTotalAmount !== void 0) creditMemo.taxTotalAmount = toNumericString(input.taxTotalAmount);
+  if (input.grandTotalNetAmount !== void 0) creditMemo.grandTotalNetAmount = toNumericString(input.grandTotalNetAmount);
+  if (input.grandTotalGrossAmount !== void 0) creditMemo.grandTotalGrossAmount = toNumericString(input.grandTotalGrossAmount);
+  if (input.metadata !== void 0) creditMemo.metadata = input.metadata;
+}
 const updateCreditMemoCommand = {
   id: "sales.credit_memos.update",
   async prepare(input, ctx) {
@@ -7549,24 +7603,11 @@ const updateCreditMemoCommand = {
       tenantId: parsed.tenantId,
       deletedAt: null
     });
-    const changes = buildChanges(creditMemo, parsed, [
-      "creditMemoNumber",
-      "statusEntryId",
-      "status",
-      "reason",
-      "issueDate",
-      "currencyCode",
-      "subtotalNetAmount",
-      "subtotalGrossAmount",
-      "taxTotalAmount",
-      "grandTotalNetAmount",
-      "grandTotalGrossAmount",
-      "metadata"
-    ]);
+    let resolvedStatus;
     if (parsed.statusEntryId !== void 0) {
-      creditMemo.status = await resolveDictionaryEntryValue(em, parsed.statusEntryId ?? null, { tenantId: creditMemo.tenantId });
+      resolvedStatus = await resolveDictionaryEntryValue(em, parsed.statusEntryId ?? null, { tenantId: creditMemo.tenantId });
     }
-    Object.assign(creditMemo, changes);
+    applyCreditMemoHeaderUpdate(creditMemo, parsed, resolvedStatus);
     creditMemo.updatedAt = /* @__PURE__ */ new Date();
     await em.flush();
     const dataEngine = ctx.container.resolve("dataEngine");
@@ -7599,11 +7640,16 @@ const updateCreditMemoCommand = {
     const em = ctx.container.resolve("em").fork();
     return loadCreditMemoSnapshot(em, result.creditMemoId);
   },
-  buildLog: async ({ result, snapshots }) => {
+  buildLog: async ({ input, result, snapshots }) => {
     const before = snapshots.before;
     const after = snapshots.after;
     if (!after) return null;
     const { translate } = await resolveTranslations();
+    const changes = before ? buildAuditChanges(
+      before.creditMemo,
+      after.creditMemo,
+      selectCreditMemoUpdateChangeKeys(input)
+    ) : {};
     return {
       actionLabel: translate("sales.audit.credit_memos.update", "Update credit memo"),
       resourceKind: "sales.credit_memo",
@@ -7612,6 +7658,7 @@ const updateCreditMemoCommand = {
       organizationId: after.creditMemo.organizationId,
       snapshotBefore: before,
       snapshotAfter: after,
+      changes: Object.keys(changes).length ? changes : null,
       payload: {
         undo: { before, after }
       }