@open-mercato/core 0.8.1-develop.7296.1.2111d779db → 0.8.1-develop.7441.1.b42958b98c

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

@@ -6,6 +6,7 @@ import { withAtomicFlush } from "@open-mercato/shared/lib/commands/flush";
 import {
   buildChanges,
   emitCrudSideEffects,
+  emitCrudUndoSideEffects,
   requireId
 } from "@open-mercato/shared/lib/commands/helpers";
 import { LockMode } from "@mikro-orm/core";
@@ -20,7 +21,10 @@ import { buildFeatureNotificationFromType } from "../../notifications/lib/notifi
 import { emitSalesEvent } from "../events.js";
 import { setRecordCustomFields } from "@open-mercato/core/modules/entities/lib/helpers";
 import { loadCustomFieldValues } from "@open-mercato/shared/lib/crud/custom-fields";
-import { normalizeCustomFieldValues } from "@open-mercato/shared/lib/custom-fields/normalize";
+import {
+  normalizeCustomFieldResponse,
+  normalizeCustomFieldValues
+} from "@open-mercato/shared/lib/custom-fields/normalize";
 import { E } from "../../../generated/entities.ids.generated.js";
 import { findWithDecryption, findOneWithDecryption } from "@open-mercato/shared/lib/encryption/find";
 import {
@@ -45,7 +49,8 @@ import {
   SalesDeliveryWindow,
   SalesPaymentMethod,
   SalesDocumentTag,
-  SalesDocumentTagAssignment
+  SalesDocumentTagAssignment,
+  SalesReturn
 } from "../data/entities.js";
 import {
   CatalogProduct,
@@ -100,7 +105,8 @@ import {
   mapOrderLineEntityToSnapshot,
   mapQuoteLineEntityToSnapshot,
   resolveUpsertDiscountFields,
-  resolveUpsertTotalsOrigin
+  resolveUpsertTotalsOrigin,
+  resolveUpsertCalculatedAmounts
 } from "../lib/lineSnapshots.js";
 import { loadShippedQuantityByLine } from "../lib/shipments/snapshots.js";
 import { resolveDictionaryEntryValue, resolveCachedDictionaryEntryValue } from "../lib/dictionaries.js";
@@ -192,6 +198,9 @@ function cloneJson(value) {
   if (value === null || value === void 0) return value;
   return JSON.parse(JSON.stringify(value));
 }
+function toSnapshotCustomFieldWriteValues(values) {
+  return normalizeCustomFieldValues(normalizeCustomFieldResponse(values) ?? {});
+}
 async function setDocumentCustomFieldsIfSupplied(em, params) {
   const { customFields } = params;
   if (customFields === void 0 || customFields === null) return;
@@ -806,7 +815,7 @@ async function applyDocumentUpdate({
       recordId: entity.id,
       organizationId,
       tenantId,
-      values
+      values: normalizeCustomFieldValues(values)
     });
   }
 }
@@ -2672,7 +2681,46 @@ function applyOrderSnapshot(order, snapshot) {
   order.totalsSnapshot = snapshot.totalsSnapshot ? cloneJson(snapshot.totalsSnapshot) : null;
   order.lineItemCount = snapshot.lineItemCount;
 }
-async function restoreQuoteGraph(em, snapshot) {
+async function assertQuoteGraphUndoCurrent(em, quoteId, expected) {
+  const current = await loadQuoteSnapshot(em, quoteId);
+  const unchanged = !!current && sameIds(current.lines, expected.lines) && sameIds(current.adjustments, expected.adjustments) && sameRecords(current.notes, expected.notes) && sameRecords(current.tags, expected.tags) && sameRecords(current.addresses, expected.addresses);
+  if (!unchanged) return throwDocumentUndoStale("quote");
+}
+async function undoQuoteGraph(ctx, before, after) {
+  ensureQuoteScope(ctx, before.quote.organizationId, before.quote.tenantId);
+  const em = ctx.container.resolve("em").fork();
+  let restored;
+  await em.transactional(async (tx) => {
+    const quote = await findOneWithDecryption(
+      tx,
+      SalesQuote,
+      { id: before.quote.id },
+      { lockMode: LockMode.PESSIMISTIC_WRITE },
+      { tenantId: before.quote.tenantId, organizationId: before.quote.organizationId }
+    );
+    if (after) {
+      if (!quote) return throwDocumentUndoStale("quote");
+      await assertQuoteGraphUndoCurrent(tx, quote.id, after);
+      tx.clear();
+    }
+    restored = await restoreQuoteGraph(tx, before, quote && after ? after : null);
+    await tx.flush();
+  });
+  if (!restored) return;
+  const dataEngine = ctx.container.resolve("dataEngine");
+  await emitCrudUndoSideEffects({
+    dataEngine,
+    action: "updated",
+    entity: restored,
+    identifiers: {
+      id: restored.id,
+      organizationId: restored.organizationId,
+      tenantId: restored.tenantId
+    },
+    indexer: { entityType: E.sales.sales_quote }
+  });
+}
+async function restoreQuoteGraph(em, snapshot, verified = null) {
   let quote = await findOneWithDecryption(
     em,
     SalesQuote,
@@ -2759,17 +2807,21 @@ async function restoreQuoteGraph(em, snapshot) {
   const addressSnapshots = Array.isArray(snapshot.addresses) ? snapshot.addresses : [];
   const noteSnapshots = Array.isArray(snapshot.notes) ? snapshot.notes : [];
   const tagSnapshots = Array.isArray(snapshot.tags) ? snapshot.tags : [];
+  const verifiedIds = (entries) => verified ? { id: { $in: (entries ?? []).map((entry) => entry.id) } } : {};
   await em.nativeDelete(SalesDocumentAddress, {
     documentId: quote.id,
-    documentKind: "quote"
+    documentKind: "quote",
+    ...verifiedIds(verified?.addresses)
   });
   await em.nativeDelete(SalesNote, {
     contextType: "quote",
-    contextId: quote.id
+    contextId: quote.id,
+    ...verifiedIds(verified?.notes)
   });
   await em.nativeDelete(SalesDocumentTagAssignment, {
     documentId: quote.id,
-    documentKind: "quote"
+    documentKind: "quote",
+    ...verifiedIds(verified?.tags)
   });
   await em.nativeDelete(SalesQuoteLine, { quote: quote.id });
   await em.nativeDelete(SalesQuoteAdjustment, { quote: quote.id });
@@ -2909,7 +2961,7 @@ async function restoreQuoteGraph(em, snapshot) {
       recordId: quote.id,
       organizationId: quote.organizationId,
       tenantId: quote.tenantId,
-      values: normalizeCustomFieldValues(snapshot.quote.customFields)
+      values: toSnapshotCustomFieldWriteValues(snapshot.quote.customFields)
     });
   }
   for (const line of snapshot.lines) {
@@ -2919,7 +2971,7 @@ async function restoreQuoteGraph(em, snapshot) {
       recordId: line.id,
       organizationId: quote.organizationId,
       tenantId: quote.tenantId,
-      values: normalizeCustomFieldValues(line.customFields)
+      values: toSnapshotCustomFieldWriteValues(line.customFields)
     });
   }
   for (const adjustment of snapshot.adjustments) {
@@ -2929,12 +2981,149 @@ async function restoreQuoteGraph(em, snapshot) {
       recordId: adjustment.id,
       organizationId: quote.organizationId,
       tenantId: quote.tenantId,
-      values: normalizeCustomFieldValues(adjustment.customFields)
+      values: toSnapshotCustomFieldWriteValues(adjustment.customFields)
     });
   }
   return quote;
 }
-async function restoreOrderGraph(em, snapshot) {
+async function throwDocumentUndoStale(kind) {
+  const { translate } = await resolveTranslations();
+  throw new CrudHttpError(409, {
+    error: kind === "order" ? translate(
+      "sales.documents.errors.undoStaleOrder",
+      "This change can no longer be undone because the order was changed afterwards."
+    ) : translate(
+      "sales.documents.errors.undoStaleQuote",
+      "This change can no longer be undone because the quote was changed afterwards."
+    )
+  });
+}
+function canonicalizeForComparison(value) {
+  if (Array.isArray(value)) {
+    return value.map(canonicalizeForComparison).map((entry) => ({ entry, key: JSON.stringify(entry) })).sort((left, right) => left.key < right.key ? -1 : left.key > right.key ? 1 : 0).map(({ entry }) => entry);
+  }
+  if (value && typeof value === "object") {
+    return Object.fromEntries(
+      Object.keys(value).sort((left, right) => left < right ? -1 : left > right ? 1 : 0).map((key) => [key, canonicalizeForComparison(value[key])])
+    );
+  }
+  return value;
+}
+function toComparableRecords(entries) {
+  const records = /* @__PURE__ */ new Map();
+  for (const entry of entries ?? []) {
+    records.set(entry.id, canonicalizeForComparison(JSON.parse(JSON.stringify(entry))));
+  }
+  return records;
+}
+function withoutAllocationIds(payments) {
+  return (payments ?? []).map((payment) => ({
+    ...payment,
+    allocations: (payment.allocations ?? []).map(
+      (allocation) => Object.fromEntries(Object.entries(allocation).filter(([key]) => key !== "id"))
+    )
+  }));
+}
+function sameRecords(current, expected) {
+  const currentRecords = toComparableRecords(current);
+  const expectedRecords = toComparableRecords(expected);
+  if (currentRecords.size !== expectedRecords.size) return false;
+  for (const [id, record] of expectedRecords) {
+    if (!currentRecords.has(id)) return false;
+    if (!isDeepStrictEqual(currentRecords.get(id), record)) return false;
+  }
+  return true;
+}
+function sameIds(current, expected) {
+  const currentIds = new Set((current ?? []).map((entry) => entry.id));
+  const expectedIds = (expected ?? []).map((entry) => entry.id);
+  return currentIds.size === expectedIds.length && expectedIds.every((id) => currentIds.has(id));
+}
+function sameLineProgress(current, expected) {
+  if (!sameIds(current, expected)) return false;
+  const expectedById = new Map((expected ?? []).map((line) => [line.id, line]));
+  return current.every((line) => {
+    const target = expectedById.get(line.id);
+    return !!target && Number(line.fulfilledQuantity ?? 0) === Number(target.fulfilledQuantity ?? 0) && Number(line.returnedQuantity ?? 0) === Number(target.returnedQuantity ?? 0);
+  });
+}
+async function assertOrderGraphUndoCurrent(em, orderId, expected) {
+  const current = await loadOrderSnapshot(em, orderId);
+  if (!current) return throwDocumentUndoStale("order");
+  const lineIds = current.lines.map((line) => line.id);
+  const [returnCount, invoiceLineCount, creditMemoLineCount] = await Promise.all([
+    em.count(SalesReturn, { order: orderId }),
+    lineIds.length ? em.count(SalesInvoiceLine, { orderLine: { $in: lineIds } }) : Promise.resolve(0),
+    lineIds.length ? em.count(SalesCreditMemoLine, { orderLine: { $in: lineIds } }) : Promise.resolve(0)
+  ]);
+  if (returnCount > 0 || invoiceLineCount > 0 || creditMemoLineCount > 0) {
+    return throwDocumentUndoStale("order");
+  }
+  const unchanged = sameLineProgress(current.lines, expected.lines) && sameIds(current.adjustments, expected.adjustments) && sameRecords(current.shipments, expected.shipments) && sameRecords(withoutAllocationIds(current.payments), withoutAllocationIds(expected.payments)) && sameRecords(current.notes, expected.notes) && sameRecords(current.tags, expected.tags) && sameRecords(current.addresses, expected.addresses);
+  if (!unchanged) return throwDocumentUndoStale("order");
+}
+async function lockOrderForUndo(em, orderId, scope) {
+  const order = await findOneWithDecryption(
+    em,
+    SalesOrder,
+    { id: orderId },
+    { lockMode: LockMode.PESSIMISTIC_WRITE },
+    scope
+  );
+  if (!order) return false;
+  await em.find(
+    SalesOrderLine,
+    { order: orderId },
+    { lockMode: LockMode.PESSIMISTIC_WRITE, orderBy: { id: "asc" } }
+  );
+  return true;
+}
+async function withVerifiedOrderGraph(ctx, expected, scope, work) {
+  const em = ctx.container.resolve("em").fork();
+  await em.transactional(async (tx) => {
+    const exists = await lockOrderForUndo(tx, scope.orderId, {
+      tenantId: scope.tenantId,
+      organizationId: scope.organizationId
+    });
+    if (exists && expected) {
+      await assertOrderGraphUndoCurrent(tx, scope.orderId, expected);
+      tx.clear();
+    }
+    await work(tx, exists);
+  });
+}
+async function undoOrderGraph(ctx, before, after) {
+  ensureOrderScope(ctx, before.order.organizationId, before.order.tenantId);
+  let restored;
+  await withVerifiedOrderGraph(
+    ctx,
+    after,
+    {
+      orderId: before.order.id,
+      tenantId: before.order.tenantId,
+      organizationId: before.order.organizationId
+    },
+    async (tx, exists) => {
+      if (!exists && after) await throwDocumentUndoStale("order");
+      restored = await restoreOrderGraph(tx, before, exists ? after : null);
+      await tx.flush();
+    }
+  );
+  if (!restored) return;
+  const dataEngine = ctx.container.resolve("dataEngine");
+  await emitCrudUndoSideEffects({
+    dataEngine,
+    action: "updated",
+    entity: restored,
+    identifiers: {
+      id: restored.id,
+      organizationId: restored.organizationId,
+      tenantId: restored.tenantId
+    },
+    indexer: { entityType: E.sales.sales_order }
+  });
+}
+async function restoreOrderGraph(em, snapshot, verified = null) {
   let order = await findOneWithDecryption(
     em,
     SalesOrder,
@@ -3060,17 +3249,21 @@ async function restoreOrderGraph(em, snapshot) {
   }
   await em.nativeDelete(SalesPaymentAllocation, { order: order.id });
   await em.nativeDelete(SalesPayment, { order: order.id });
+  const verifiedIds = (entries) => verified ? { id: { $in: (entries ?? []).map((entry) => entry.id) } } : {};
   await em.nativeDelete(SalesDocumentAddress, {
     documentId: order.id,
-    documentKind: "order"
+    documentKind: "order",
+    ...verifiedIds(verified?.addresses)
   });
   await em.nativeDelete(SalesNote, {
     contextType: "order",
-    contextId: order.id
+    contextId: order.id,
+    ...verifiedIds(verified?.notes)
   });
   await em.nativeDelete(SalesDocumentTagAssignment, {
     documentId: order.id,
-    documentKind: "order"
+    documentKind: "order",
+    ...verifiedIds(verified?.tags)
   });
   await em.nativeDelete(SalesOrderAdjustment, { order: order.id });
   await em.nativeDelete(SalesOrderLine, { order: order.id });
@@ -3214,7 +3407,7 @@ async function restoreOrderGraph(em, snapshot) {
       recordId: order.id,
       organizationId: order.organizationId,
       tenantId: order.tenantId,
-      values: normalizeCustomFieldValues(snapshot.order.customFields)
+      values: toSnapshotCustomFieldWriteValues(snapshot.order.customFields)
     });
   }
   for (const line of snapshot.lines) {
@@ -3224,7 +3417,7 @@ async function restoreOrderGraph(em, snapshot) {
       recordId: line.id,
       organizationId: order.organizationId,
       tenantId: order.tenantId,
-      values: normalizeCustomFieldValues(line.customFields)
+      values: toSnapshotCustomFieldWriteValues(line.customFields)
     });
   }
   for (const adjustment of snapshot.adjustments) {
@@ -3234,7 +3427,7 @@ async function restoreOrderGraph(em, snapshot) {
       recordId: adjustment.id,
       organizationId: order.organizationId,
       tenantId: order.tenantId,
-      values: normalizeCustomFieldValues(adjustment.customFields)
+      values: toSnapshotCustomFieldWriteValues(adjustment.customFields)
     });
   }
   for (const shipment of shipmentSnapshots) {
@@ -3545,23 +3738,26 @@ const createQuoteCommand = {
     const payload = extractUndoPayload(logEntry);
     const after = payload?.after;
     if (!after) return;
+    ensureQuoteScope(ctx, after.quote.organizationId, after.quote.tenantId);
     const em = ctx.container.resolve("em").fork();
-    const quote = await findOneWithDecryption(
-      em,
-      SalesQuote,
-      { id: after.quote.id },
-      {},
-      {
-        tenantId: after.quote.tenantId,
-        organizationId: after.quote.organizationId
-      }
-    );
-    if (!quote) return;
-    ensureQuoteScope(ctx, quote.organizationId, quote.tenantId);
-    await em.nativeDelete(SalesQuoteAdjustment, { quote: quote.id });
-    await em.nativeDelete(SalesQuoteLine, { quote: quote.id });
-    em.remove(quote);
-    await em.flush();
+    await em.transactional(async (tx) => {
+      const quote = await findOneWithDecryption(
+        tx,
+        SalesQuote,
+        { id: after.quote.id },
+        { lockMode: LockMode.PESSIMISTIC_WRITE },
+        {
+          tenantId: after.quote.tenantId,
+          organizationId: after.quote.organizationId
+        }
+      );
+      if (!quote) return;
+      await assertQuoteGraphUndoCurrent(tx, quote.id, after);
+      await tx.nativeDelete(SalesQuoteAdjustment, { quote: quote.id });
+      await tx.nativeDelete(SalesQuoteLine, { quote: quote.id });
+      tx.remove(quote);
+      await tx.flush();
+    });
   }
 };
 const deleteQuoteCommand = {
@@ -3679,10 +3875,7 @@ const deleteQuoteCommand = {
     const payload = extractUndoPayload(logEntry);
     const before = payload?.before;
     if (!before) return;
-    const em = ctx.container.resolve("em").fork();
-    ensureQuoteScope(ctx, before.quote.organizationId, before.quote.tenantId);
-    await restoreQuoteGraph(em, before);
-    await em.flush();
+    await undoQuoteGraph(ctx, before, payload?.after);
   }
 };
 const updateQuoteCommand = {
@@ -3835,6 +4028,19 @@ const updateQuoteCommand = {
       ],
       { transaction: true }
     );
+    const dataEngine = ctx.container.resolve("dataEngine");
+    await emitCrudSideEffects({
+      dataEngine,
+      action: "updated",
+      entity: quote,
+      identifiers: {
+        id: quote.id,
+        organizationId: quote.organizationId,
+        tenantId: quote.tenantId
+      },
+      indexer: { entityType: E.sales.sales_quote },
+      actorUserId: ctx.auth?.sub ?? null
+    });
     const resourceKind = deriveResourceFromCommandId(updateQuoteCommand.id) ?? "sales.quote";
     await invalidateCrudCache(
       ctx.container,
@@ -3889,10 +4095,7 @@ const updateQuoteCommand = {
     const payload = extractUndoPayload(logEntry);
     const before = payload?.before;
     if (!before) return;
-    const em = ctx.container.resolve("em").fork();
-    ensureQuoteScope(ctx, before.quote.organizationId, before.quote.tenantId);
-    await restoreQuoteGraph(em, before);
-    await em.flush();
+    await undoQuoteGraph(ctx, before, payload?.after);
   }
 };
 const orderEntityOutputSchema = z.object({
@@ -4074,8 +4277,20 @@ const updateOrderCommand = {
       { transaction: true }
     );
     emitOrderLifecycleEventsForTransition({ order, previousStatus });
+    const dataEngine = ctx.container.resolve("dataEngine");
+    await emitCrudSideEffects({
+      dataEngine,
+      action: "updated",
+      entity: order,
+      identifiers: {
+        id: order.id,
+        organizationId: order.organizationId,
+        tenantId: order.tenantId
+      },
+      indexer: { entityType: E.sales.sales_order },
+      actorUserId: ctx.auth?.sub ?? null
+    });
     if (statusChangeNote) {
-      const dataEngine = ctx.container.resolve("dataEngine");
       await emitCrudSideEffects({
         dataEngine,
         action: "created",
@@ -4142,10 +4357,7 @@ const updateOrderCommand = {
     const payload = extractUndoPayload(logEntry);
     const before = payload?.before;
     if (!before) return;
-    const em = ctx.container.resolve("em").fork();
-    ensureOrderScope(ctx, before.order.organizationId, before.order.tenantId);
-    await restoreOrderGraph(em, before);
-    await em.flush();
+    await undoOrderGraph(ctx, before, payload?.after);
   }
 };
 const createOrderCommand = {
@@ -4490,23 +4702,34 @@ const createOrderCommand = {
     const payload = extractUndoPayload(logEntry);
     const after = payload?.after;
     if (!after) return;
-    const em = ctx.container.resolve("em").fork();
-    const order = await findOneWithDecryption(
-      em,
-      SalesOrder,
-      { id: after.order.id },
-      {},
+    ensureOrderScope(ctx, after.order.organizationId, after.order.tenantId);
+    await withVerifiedOrderGraph(
+      ctx,
+      after,
       {
+        orderId: after.order.id,
         tenantId: after.order.tenantId,
         organizationId: after.order.organizationId
+      },
+      async (tx, exists) => {
+        if (!exists) return;
+        const order = await findOneWithDecryption(
+          tx,
+          SalesOrder,
+          { id: after.order.id },
+          {},
+          {
+            tenantId: after.order.tenantId,
+            organizationId: after.order.organizationId
+          }
+        );
+        if (!order) return;
+        await tx.nativeDelete(SalesOrderAdjustment, { order: order.id });
+        await tx.nativeDelete(SalesOrderLine, { order: order.id });
+        tx.remove(order);
+        await tx.flush();
       }
     );
-    if (!order) return;
-    ensureOrderScope(ctx, order.organizationId, order.tenantId);
-    await em.nativeDelete(SalesOrderAdjustment, { order: order.id });
-    await em.nativeDelete(SalesOrderLine, { order: order.id });
-    em.remove(order);
-    await em.flush();
   }
 };
 const deleteOrderCommand = {
@@ -4659,10 +4882,7 @@ const deleteOrderCommand = {
     const payload = extractUndoPayload(logEntry);
     const before = payload?.before;
     if (!before) return;
-    const em = ctx.container.resolve("em").fork();
-    ensureOrderScope(ctx, before.order.organizationId, before.order.tenantId);
-    await restoreOrderGraph(em, before);
-    await em.flush();
+    await undoOrderGraph(ctx, before, payload?.after);
   }
 };
 const quoteConvertToOrderSchema = z.object({
@@ -5015,56 +5235,72 @@ const convertQuoteToOrderCommand = {
     const quoteSnapshot = payload?.quote;
     const orderSnapshot = payload?.order;
     if (!quoteSnapshot) return;
-    const em = ctx.container.resolve("em").fork();
     ensureQuoteScope(
       ctx,
       quoteSnapshot.quote.organizationId,
       quoteSnapshot.quote.tenantId
     );
-    if (orderSnapshot) {
-      const orderId = orderSnapshot.order.id;
-      const orderLineIds = orderSnapshot.lines.map((line) => line.id);
-      const existingOrder = await findOneWithDecryption(em, SalesOrder, { id: orderId }, void 0, { tenantId: quoteSnapshot.quote.tenantId, organizationId: quoteSnapshot.quote.organizationId });
-      if (existingOrder) {
-        const shipments = await em.find(SalesShipment, { order: orderId });
-        const shipmentIds = shipments.map((entry) => entry.id);
-        if (shipmentIds.length) {
-          await em.nativeDelete(SalesShipmentItem, {
-            shipment: { $in: shipmentIds }
+    const revertConversion = async (em2, orderExists) => {
+      if (orderSnapshot) {
+        const orderId = orderSnapshot.order.id;
+        const orderLineIds = orderSnapshot.lines.map((line) => line.id);
+        const existingOrder = orderExists ? await findOneWithDecryption(em2, SalesOrder, { id: orderId }, void 0, { tenantId: quoteSnapshot.quote.tenantId, organizationId: quoteSnapshot.quote.organizationId }) : null;
+        if (existingOrder) {
+          const shipments = await em2.find(SalesShipment, { order: orderId });
+          const shipmentIds = shipments.map((entry) => entry.id);
+          if (shipmentIds.length) {
+            await em2.nativeDelete(SalesShipmentItem, {
+              shipment: { $in: shipmentIds }
+            });
+            await em2.nativeDelete(SalesShipment, { id: { $in: shipmentIds } });
+          }
+          await em2.nativeDelete(SalesPaymentAllocation, { order: orderId });
+          await em2.nativeDelete(SalesPayment, { order: orderId });
+          await em2.nativeDelete(SalesDocumentAddress, {
+            documentId: orderId,
+            documentKind: "order"
           });
-          await em.nativeDelete(SalesShipment, { id: { $in: shipmentIds } });
+          await em2.nativeDelete(SalesDocumentTagAssignment, {
+            documentId: orderId,
+            documentKind: "order"
+          });
+          await em2.nativeDelete(SalesOrderAdjustment, { order: orderId });
+          await em2.nativeDelete(SalesOrderLine, { order: orderId });
+          em2.remove(existingOrder);
         }
-        await em.nativeDelete(SalesPaymentAllocation, { order: orderId });
-        await em.nativeDelete(SalesPayment, { order: orderId });
-        await em.nativeDelete(SalesDocumentAddress, {
-          documentId: orderId,
-          documentKind: "order"
-        });
-        await em.nativeDelete(SalesDocumentTagAssignment, {
-          documentId: orderId,
-          documentKind: "order"
+        await em2.nativeDelete(CustomFieldValue, {
+          entityId: E.sales.sales_order,
+          recordId: orderId
         });
-        await em.nativeDelete(SalesOrderAdjustment, { order: orderId });
-        await em.nativeDelete(SalesOrderLine, { order: orderId });
-        em.remove(existingOrder);
+        if (orderLineIds.length) {
+          await em2.nativeDelete(CustomFieldValue, {
+            entityId: E.sales.sales_order_line,
+            recordId: { $in: orderLineIds }
+          });
+        }
       }
-      await em.nativeDelete(CustomFieldValue, {
-        entityId: E.sales.sales_order,
-        recordId: orderId
-      });
-      if (orderLineIds.length) {
-        await em.nativeDelete(CustomFieldValue, {
-          entityId: E.sales.sales_order_line,
-          recordId: { $in: orderLineIds }
-        });
+      const noteIds = quoteSnapshot.notes.map((note) => note.id);
+      if (noteIds.length) {
+        await em2.nativeDelete(SalesNote, { id: { $in: noteIds } });
       }
+      await restoreQuoteGraph(em2, quoteSnapshot);
+      await em2.flush();
+    };
+    if (orderSnapshot) {
+      await withVerifiedOrderGraph(
+        ctx,
+        orderSnapshot,
+        {
+          orderId: orderSnapshot.order.id,
+          tenantId: orderSnapshot.order.tenantId,
+          organizationId: orderSnapshot.order.organizationId
+        },
+        revertConversion
+      );
+      return;
     }
-    const noteIds = quoteSnapshot.notes.map((note) => note.id);
-    if (noteIds.length) {
-      await em.nativeDelete(SalesNote, { id: { $in: noteIds } });
-    }
-    await restoreQuoteGraph(em, quoteSnapshot);
-    await em.flush();
+    const em = ctx.container.resolve("em").fork();
+    await em.transactional((tx) => revertConversion(tx, false));
   }
 };
 const orderLineUpsertSchema = orderLineCreateSchema.extend({
@@ -5371,9 +5607,7 @@ const orderLineUpsertCommand = {
       ),
       discountPercent: parsed.discountPercent ?? existingSnapshot?.discountPercent ?? 0,
       taxRate: taxRate ?? 0,
-      taxAmount: parsed.taxAmount ?? existingSnapshot?.taxAmount ?? null,
       totalNetAmount: parsed.totalNetAmount ?? existingSnapshot?.totalNetAmount ?? null,
-      totalGrossAmount: parsed.totalGrossAmount ?? existingSnapshot?.totalGrossAmount ?? null,
       ...resolveUpsertTotalsOrigin(parsed.totalNetAmount, existingSnapshot),
       configuration: parsed.configuration ?? existingSnapshot?.configuration ?? null,
       promotionCode: parsed.promotionCode ?? existingSnapshot?.promotionCode ?? null,
@@ -5381,6 +5615,10 @@ const orderLineUpsertCommand = {
       customFieldSetId: parsed.customFieldSetId ?? existingSnapshot?.customFieldSetId ?? null,
       customFields: parsed.customFields && typeof parsed.customFields === "object" ? cloneJson(parsed.customFields) : existingSnapshot?.customFields ?? null
     };
+    Object.assign(
+      updatedSnapshot,
+      resolveUpsertCalculatedAmounts(parsed, updatedSnapshot, existingSnapshot)
+    );
     updatedSnapshot.statusEntryId = statusEntryId;
     updatedSnapshot.catalogSnapshot = parsed.catalogSnapshot ?? existingSnapshot?.catalogSnapshot ?? null;
     updatedSnapshot.promotionSnapshot = parsed.promotionSnapshot ?? existingSnapshot?.promotionSnapshot ?? null;
@@ -5483,10 +5721,7 @@ const orderLineUpsertCommand = {
     const payload = extractUndoPayload(logEntry);
     const before = payload?.before;
     if (!before) return;
-    const em = ctx.container.resolve("em").fork();
-    ensureOrderScope(ctx, before.order.organizationId, before.order.tenantId);
-    await restoreOrderGraph(em, before);
-    await em.flush();
+    await undoOrderGraph(ctx, before, payload?.after);
   }
 };
 const orderLineDeleteCommand = {
@@ -5654,10 +5889,7 @@ const orderLineDeleteCommand = {
     const payload = extractUndoPayload(logEntry);
     const before = payload?.before;
     if (!before) return;
-    const em = ctx.container.resolve("em").fork();
-    ensureOrderScope(ctx, before.order.organizationId, before.order.tenantId);
-    await restoreOrderGraph(em, before);
-    await em.flush();
+    await undoOrderGraph(ctx, before, payload?.after);
   }
 };
 const quoteLineUpsertCommand = {
@@ -5797,9 +6029,7 @@ const quoteLineUpsertCommand = {
       ),
       discountPercent: parsed.discountPercent ?? existingSnapshot?.discountPercent ?? 0,
       taxRate: taxRate ?? 0,
-      taxAmount: parsed.taxAmount ?? existingSnapshot?.taxAmount ?? null,
       totalNetAmount: parsed.totalNetAmount ?? existingSnapshot?.totalNetAmount ?? null,
-      totalGrossAmount: parsed.totalGrossAmount ?? existingSnapshot?.totalGrossAmount ?? null,
       ...resolveUpsertTotalsOrigin(parsed.totalNetAmount, existingSnapshot),
       configuration: parsed.configuration ?? existingSnapshot?.configuration ?? null,
       promotionCode: parsed.promotionCode ?? existingSnapshot?.promotionCode ?? null,
@@ -5807,6 +6037,10 @@ const quoteLineUpsertCommand = {
       customFieldSetId: parsed.customFieldSetId ?? existingSnapshot?.customFieldSetId ?? null,
       customFields: parsed.customFields && typeof parsed.customFields === "object" ? cloneJson(parsed.customFields) : existingSnapshot?.customFields ?? null
     };
+    Object.assign(
+      updatedSnapshot,
+      resolveUpsertCalculatedAmounts(parsed, updatedSnapshot, existingSnapshot)
+    );
     updatedSnapshot.statusEntryId = statusEntryId;
     updatedSnapshot.catalogSnapshot = parsed.catalogSnapshot ?? existingSnapshot?.catalogSnapshot ?? null;
     updatedSnapshot.promotionSnapshot = parsed.promotionSnapshot ?? existingSnapshot?.promotionSnapshot ?? null;
@@ -5908,10 +6142,7 @@ const quoteLineUpsertCommand = {
     const payload = extractUndoPayload(logEntry);
     const before = payload?.before;
     if (!before) return;
-    const em = ctx.container.resolve("em").fork();
-    ensureQuoteScope(ctx, before.quote.organizationId, before.quote.tenantId);
-    await restoreQuoteGraph(em, before);
-    await em.flush();
+    await undoQuoteGraph(ctx, before, payload?.after);
   }
 };
 const quoteLineDeleteCommand = {
@@ -6051,10 +6282,7 @@ const quoteLineDeleteCommand = {
     const payload = extractUndoPayload(logEntry);
     const before = payload?.before;
     if (!before) return;
-    const em = ctx.container.resolve("em").fork();
-    ensureQuoteScope(ctx, before.quote.organizationId, before.quote.tenantId);
-    await restoreQuoteGraph(em, before);
-    await em.flush();
+    await undoQuoteGraph(ctx, before, payload?.after);
   }
 };
 const orderAdjustmentUpsertCommand = {
@@ -6304,10 +6532,7 @@ const orderAdjustmentUpsertCommand = {
     const payload = extractUndoPayload(logEntry);
     const before = payload?.before;
     if (!before) return;
-    const em = ctx.container.resolve("em").fork();
-    ensureOrderScope(ctx, before.order.organizationId, before.order.tenantId);
-    await restoreOrderGraph(em, before);
-    await em.flush();
+    await undoOrderGraph(ctx, before, payload?.after);
   }
 };
 const orderAdjustmentDeleteCommand = {
@@ -6461,10 +6686,7 @@ const orderAdjustmentDeleteCommand = {
     const payload = extractUndoPayload(logEntry);
     const before = payload?.before;
     if (!before) return;
-    const em = ctx.container.resolve("em").fork();
-    ensureOrderScope(ctx, before.order.organizationId, before.order.tenantId);
-    await restoreOrderGraph(em, before);
-    await em.flush();
+    await undoOrderGraph(ctx, before, payload?.after);
   }
 };
 const quoteAdjustmentUpsertCommand = {
@@ -6712,10 +6934,7 @@ const quoteAdjustmentUpsertCommand = {
     const payload = extractUndoPayload(logEntry);
     const before = payload?.before;
     if (!before) return;
-    const em = ctx.container.resolve("em").fork();
-    ensureQuoteScope(ctx, before.quote.organizationId, before.quote.tenantId);
-    await restoreQuoteGraph(em, before);
-    await em.flush();
+    await undoQuoteGraph(ctx, before, payload?.after);
   }
 };
 const quoteAdjustmentDeleteCommand = {
@@ -6868,10 +7087,7 @@ const quoteAdjustmentDeleteCommand = {
     const payload = extractUndoPayload(logEntry);
     const before = payload?.before;
     if (!before) return;
-    const em = ctx.container.resolve("em").fork();
-    ensureQuoteScope(ctx, before.quote.organizationId, before.quote.tenantId);
-    await restoreQuoteGraph(em, before);
-    await em.flush();
+    await undoQuoteGraph(ctx, before, payload?.after);
   }
 };
 const invoiceCrudEvents = {