@open-mercato/core 0.6.6-develop.5617.1.62538c48ca → 0.6.6-develop.5637.1.7a68607cc6

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

@@ -7,10 +7,14 @@ import { resolveTranslations } from "@open-mercato/shared/lib/i18n/server";
 import { emitCrudSideEffects } from "@open-mercato/shared/lib/commands/helpers";
 import { findOneWithDecryption, findWithDecryption } from "@open-mercato/shared/lib/encryption/find";
 import { SalesDocumentNumberGenerator } from "../services/salesDocumentNumberGenerator.js";
-import { cloneJson, ensureOrganizationScope, ensureSameScope, ensureTenantScope, extractUndoPayload, toNumericString, enforceSalesDocumentOptimisticLock, SALES_RESOURCE_KIND_ORDER } from "./shared.js";
+import { cloneJson, ensureOrganizationScope, ensureSameScope, ensureTenantScope, extractUndoPayload, toNumericString, enforceSalesDocumentOptimisticLock, SALES_RESOURCE_KIND_ORDER, SALES_RESOURCE_KIND_RETURN } from "./shared.js";
 import { resolveRedoSnapshot } from "@open-mercato/shared/lib/commands/redo";
 import { SalesOrder, SalesOrderAdjustment, SalesOrderLine, SalesReturn, SalesReturnLine } from "../data/entities.js";
-import { returnCreateSchema } from "../data/validators.js";
+import {
+  returnCreateSchema,
+  returnUpdateSchema,
+  returnDeleteSchema
+} from "../data/validators.js";
 import { E } from "../../../generated/entities.ids.generated.js";
 const returnCrudEvents = {
   module: "sales",
@@ -191,6 +195,228 @@ async function loadReturnSnapshot(em, id) {
     adjustmentIds
   };
 }
+async function loadReturnHeaderSnapshot(em, id) {
+  const header = await findOneWithDecryption(em, SalesReturn, { id, deletedAt: null }, { populate: ["order"] }, {});
+  if (!header || !header.order) return null;
+  const orderId = typeof header.order === "string" ? header.order : header.order.id;
+  return {
+    id: header.id,
+    orderId,
+    organizationId: header.organizationId,
+    tenantId: header.tenantId,
+    reason: header.reason ?? null,
+    notes: header.notes ?? null,
+    returnedAt: header.returnedAt ? header.returnedAt.toISOString() : null
+  };
+}
+async function reverseReturnEffects(em, salesCalculationService, snapshot) {
+  const order = await findOneWithDecryption(
+    em,
+    SalesOrder,
+    { id: snapshot.orderId, deletedAt: null },
+    {},
+    { tenantId: snapshot.tenantId, organizationId: snapshot.organizationId }
+  );
+  if (!order) return;
+  let lines = [];
+  await withAtomicFlush(
+    em,
+    [
+      async () => {
+        lines = await findWithDecryption(
+          em,
+          SalesOrderLine,
+          { order: order.id, deletedAt: null },
+          {},
+          { tenantId: snapshot.tenantId, organizationId: snapshot.organizationId }
+        );
+        const lineMap = new Map(lines.map((line) => [line.id, line]));
+        snapshot.lines.forEach((entry) => {
+          const line = lineMap.get(entry.orderLineId);
+          if (!line) return;
+          const next = Math.max(0, toNumeric(line.returnedQuantity) - entry.quantityReturned);
+          line.returnedQuantity = next.toString();
+          line.updatedAt = /* @__PURE__ */ new Date();
+          em.persist(line);
+        });
+      },
+      async () => {
+        if (snapshot.adjustmentIds.length) {
+          const adjustments = await findWithDecryption(
+            em,
+            SalesOrderAdjustment,
+            { id: { $in: snapshot.adjustmentIds }, deletedAt: null },
+            {},
+            { tenantId: snapshot.tenantId, organizationId: snapshot.organizationId }
+          );
+          adjustments.forEach((adj) => em.remove(adj));
+        }
+        const header = await findOneWithDecryption(
+          em,
+          SalesReturn,
+          { id: snapshot.id, deletedAt: null },
+          {},
+          { tenantId: snapshot.tenantId, organizationId: snapshot.organizationId }
+        );
+        const returnLines = await findWithDecryption(
+          em,
+          SalesReturnLine,
+          { salesReturn: snapshot.id, deletedAt: null },
+          {},
+          { tenantId: snapshot.tenantId, organizationId: snapshot.organizationId }
+        );
+        returnLines.forEach((line) => em.remove(line));
+        if (header) em.remove(header);
+        const existingAdjustments = await findWithDecryption(
+          em,
+          SalesOrderAdjustment,
+          { order: order.id, deletedAt: null },
+          { orderBy: { position: "asc" } },
+          { tenantId: snapshot.tenantId, organizationId: snapshot.organizationId }
+        );
+        const lineSnapshots = lines.map(mapOrderLineEntityToSnapshot);
+        const adjustmentDrafts = existingAdjustments.map(mapOrderAdjustmentToDraft);
+        const calculation = await salesCalculationService.calculateDocumentTotals({
+          documentKind: "order",
+          lines: lineSnapshots,
+          adjustments: adjustmentDrafts,
+          context: buildCalculationContext(order)
+        });
+        applyOrderTotals(order, calculation.totals, calculation.lines.length);
+        order.updatedAt = /* @__PURE__ */ new Date();
+        em.persist(order);
+      }
+    ],
+    { transaction: true }
+  );
+}
+async function restoreReturnEffects(em, salesCalculationService, snapshot) {
+  const returnId = snapshot.id;
+  const createdLines = [];
+  await withAtomicFlush(
+    em,
+    [
+      async () => {
+        const order = await findOneWithDecryption(
+          em,
+          SalesOrder,
+          { id: snapshot.orderId, deletedAt: null },
+          {},
+          { tenantId: snapshot.tenantId, organizationId: snapshot.organizationId }
+        );
+        if (!order) {
+          throw new CrudHttpError(404, { error: "sales.returns.orderMissing" });
+        }
+        ensureSameScope(order, snapshot.organizationId, snapshot.tenantId);
+        const orderLines = await findWithDecryption(
+          em,
+          SalesOrderLine,
+          { order: order.id, deletedAt: null },
+          { lockMode: LockMode.PESSIMISTIC_WRITE },
+          { tenantId: snapshot.tenantId, organizationId: snapshot.organizationId }
+        );
+        const lineMap = new Map(orderLines.map((line) => [line.id, line]));
+        const existingAdjustments = await findWithDecryption(
+          em,
+          SalesOrderAdjustment,
+          { order: order.id, deletedAt: null },
+          { orderBy: { position: "asc" } },
+          { tenantId: snapshot.tenantId, organizationId: snapshot.organizationId }
+        );
+        const positionStart = existingAdjustments.reduce((acc, adj) => Math.max(acc, adj.position ?? 0), 0) + 1;
+        const restoredHeader = await findOneWithDecryption(
+          em,
+          SalesReturn,
+          { id: snapshot.id },
+          {},
+          { tenantId: snapshot.tenantId, organizationId: snapshot.organizationId }
+        ) ?? em.create(SalesReturn, {
+          id: snapshot.id,
+          order,
+          organizationId: snapshot.organizationId,
+          tenantId: snapshot.tenantId,
+          returnNumber: snapshot.returnNumber,
+          reason: snapshot.reason ?? null,
+          notes: snapshot.notes ?? null,
+          returnedAt: snapshot.returnedAt ? new Date(snapshot.returnedAt) : /* @__PURE__ */ new Date(),
+          createdAt: /* @__PURE__ */ new Date(),
+          updatedAt: /* @__PURE__ */ new Date()
+        });
+        restoredHeader.order = order;
+        restoredHeader.deletedAt = null;
+        restoredHeader.organizationId = snapshot.organizationId;
+        restoredHeader.tenantId = snapshot.tenantId;
+        restoredHeader.returnNumber = snapshot.returnNumber;
+        restoredHeader.reason = snapshot.reason ?? null;
+        restoredHeader.notes = snapshot.notes ?? null;
+        restoredHeader.returnedAt = snapshot.returnedAt ? new Date(snapshot.returnedAt) : /* @__PURE__ */ new Date();
+        restoredHeader.updatedAt = /* @__PURE__ */ new Date();
+        em.persist(restoredHeader);
+        const createdAdjustments = [];
+        snapshot.lines.forEach((lineSnapshot, index) => {
+          const line = lineMap.get(lineSnapshot.orderLineId);
+          if (!line) return;
+          const totalNet = lineSnapshot.totalNetAmount;
+          const totalGross = lineSnapshot.totalGrossAmount;
+          const adjustmentId = snapshot.adjustmentIds[index] ?? randomUUID();
+          const returnLine = em.create(SalesReturnLine, {
+            id: lineSnapshot.id,
+            salesReturn: restoredHeader,
+            orderLine: em.getReference(SalesOrderLine, line.id),
+            organizationId: snapshot.organizationId,
+            tenantId: snapshot.tenantId,
+            quantityReturned: lineSnapshot.quantityReturned.toString(),
+            unitPriceNet: lineSnapshot.unitPriceNet.toString(),
+            unitPriceGross: lineSnapshot.unitPriceGross.toString(),
+            totalNetAmount: totalNet.toString(),
+            totalGrossAmount: totalGross.toString(),
+            createdAt: /* @__PURE__ */ new Date(),
+            updatedAt: /* @__PURE__ */ new Date()
+          });
+          createdLines.push(returnLine);
+          em.persist(returnLine);
+          const adjustment = em.create(SalesOrderAdjustment, {
+            id: adjustmentId,
+            order,
+            orderLine: em.getReference(SalesOrderLine, line.id),
+            organizationId: snapshot.organizationId,
+            tenantId: snapshot.tenantId,
+            scope: "line",
+            kind: "return",
+            rate: "0",
+            amountNet: totalNet.toString(),
+            amountGross: totalGross.toString(),
+            currencyCode: order.currencyCode,
+            metadata: { returnId, returnLineId: lineSnapshot.id },
+            position: positionStart + index,
+            createdAt: /* @__PURE__ */ new Date(),
+            updatedAt: /* @__PURE__ */ new Date()
+          });
+          createdAdjustments.push(adjustment);
+          em.persist(adjustment);
+          line.returnedQuantity = (toNumeric(line.returnedQuantity) + lineSnapshot.quantityReturned).toString();
+          line.updatedAt = /* @__PURE__ */ new Date();
+          em.persist(line);
+        });
+        const lineSnapshots = orderLines.map(mapOrderLineEntityToSnapshot);
+        const adjustmentDrafts = [...existingAdjustments, ...createdAdjustments].map(
+          mapOrderAdjustmentToDraft
+        );
+        const calculation = await salesCalculationService.calculateDocumentTotals({
+          documentKind: "order",
+          lines: lineSnapshots,
+          adjustments: adjustmentDrafts,
+          context: buildCalculationContext(order)
+        });
+        applyOrderTotals(order, calculation.totals, calculation.lines.length);
+        order.updatedAt = /* @__PURE__ */ new Date();
+        em.persist(order);
+      }
+    ],
+    { transaction: true }
+  );
+  return createdLines;
+}
 function normalizeLinesInput(lines) {
   const seen = /* @__PURE__ */ new Set();
   const result = [];
@@ -392,224 +618,17 @@ const createReturnCommand = {
     const after = payload?.after;
     if (!after) return;
     const em = ctx.container.resolve("em").fork();
-    const order = await findOneWithDecryption(
-      em,
-      SalesOrder,
-      { id: after.orderId, deletedAt: null },
-      {},
-      { tenantId: after.tenantId, organizationId: after.organizationId }
-    );
-    if (!order) return;
     const salesCalculationService = ctx.container.resolve("salesCalculationService");
-    let lines = [];
-    await withAtomicFlush(
-      em,
-      [
-        async () => {
-          lines = await findWithDecryption(
-            em,
-            SalesOrderLine,
-            { order: order.id, deletedAt: null },
-            {},
-            { tenantId: after.tenantId, organizationId: after.organizationId }
-          );
-          const lineMap = new Map(lines.map((line) => [line.id, line]));
-          after.lines.forEach((entry) => {
-            const line = lineMap.get(entry.orderLineId);
-            if (!line) return;
-            const next = Math.max(0, toNumeric(line.returnedQuantity) - entry.quantityReturned);
-            line.returnedQuantity = next.toString();
-            line.updatedAt = /* @__PURE__ */ new Date();
-            em.persist(line);
-          });
-        },
-        // The line returnedQuantity reversals above are persisted by
-        // withAtomicFlush's per-phase flush boundary before the adjustment /
-        // header / return-line lookups below run any query on this
-        // EntityManager. MikroORM v7 would otherwise silently discard the pending
-        // scalar changes on the managed `lines` when the next read resets the
-        // changeset (see SPEC-018).
-        async () => {
-          if (after.adjustmentIds.length) {
-            const adjustments = await findWithDecryption(
-              em,
-              SalesOrderAdjustment,
-              { id: { $in: after.adjustmentIds }, deletedAt: null },
-              {},
-              { tenantId: after.tenantId, organizationId: after.organizationId }
-            );
-            adjustments.forEach((adj) => em.remove(adj));
-          }
-          const header = await findOneWithDecryption(
-            em,
-            SalesReturn,
-            { id: after.id, deletedAt: null },
-            {},
-            { tenantId: after.tenantId, organizationId: after.organizationId }
-          );
-          const returnLines = await findWithDecryption(
-            em,
-            SalesReturnLine,
-            { salesReturn: after.id, deletedAt: null },
-            {},
-            { tenantId: after.tenantId, organizationId: after.organizationId }
-          );
-          returnLines.forEach((line) => em.remove(line));
-          if (header) em.remove(header);
-          const existingAdjustments = await findWithDecryption(
-            em,
-            SalesOrderAdjustment,
-            { order: order.id, deletedAt: null },
-            { orderBy: { position: "asc" } },
-            { tenantId: after.tenantId, organizationId: after.organizationId }
-          );
-          const lineSnapshots = lines.map(mapOrderLineEntityToSnapshot);
-          const adjustmentDrafts = existingAdjustments.map(mapOrderAdjustmentToDraft);
-          const calculation = await salesCalculationService.calculateDocumentTotals({
-            documentKind: "order",
-            lines: lineSnapshots,
-            adjustments: adjustmentDrafts,
-            context: buildCalculationContext(order)
-          });
-          applyOrderTotals(order, calculation.totals, calculation.lines.length);
-          order.updatedAt = /* @__PURE__ */ new Date();
-          em.persist(order);
-        }
-      ],
-      { transaction: true }
-    );
+    await reverseReturnEffects(em, salesCalculationService, after);
   },
   redo: async ({ ctx, logEntry }) => {
     const after = resolveRedoSnapshot(logEntry);
-    const returnId = after?.id ?? logEntry.resourceId ?? null;
-    if (!after || !returnId) {
+    if (!after || !after.id) {
       throw new CrudHttpError(400, { error: "[internal] redo snapshot unavailable for sales.returns.create" });
     }
     const em = ctx.container.resolve("em").fork();
     const salesCalculationService = ctx.container.resolve("salesCalculationService");
-    const createdLines = [];
-    await withAtomicFlush(
-      em,
-      [
-        async () => {
-          const order = await findOneWithDecryption(
-            em,
-            SalesOrder,
-            { id: after.orderId, deletedAt: null },
-            {},
-            { tenantId: after.tenantId, organizationId: after.organizationId }
-          );
-          if (!order) {
-            throw new CrudHttpError(404, { error: "sales.returns.orderMissing" });
-          }
-          ensureSameScope(order, after.organizationId, after.tenantId);
-          const orderLines = await findWithDecryption(
-            em,
-            SalesOrderLine,
-            { order: order.id, deletedAt: null },
-            { lockMode: LockMode.PESSIMISTIC_WRITE },
-            { tenantId: after.tenantId, organizationId: after.organizationId }
-          );
-          const lineMap = new Map(orderLines.map((line) => [line.id, line]));
-          const existingAdjustments = await findWithDecryption(
-            em,
-            SalesOrderAdjustment,
-            { order: order.id, deletedAt: null },
-            { orderBy: { position: "asc" } },
-            { tenantId: after.tenantId, organizationId: after.organizationId }
-          );
-          const positionStart = existingAdjustments.reduce((acc, adj) => Math.max(acc, adj.position ?? 0), 0) + 1;
-          const restoredHeader = await findOneWithDecryption(
-            em,
-            SalesReturn,
-            { id: after.id },
-            {},
-            { tenantId: after.tenantId, organizationId: after.organizationId }
-          ) ?? em.create(SalesReturn, {
-            id: after.id,
-            order,
-            organizationId: after.organizationId,
-            tenantId: after.tenantId,
-            returnNumber: after.returnNumber,
-            reason: after.reason ?? null,
-            notes: after.notes ?? null,
-            returnedAt: after.returnedAt ? new Date(after.returnedAt) : /* @__PURE__ */ new Date(),
-            createdAt: /* @__PURE__ */ new Date(),
-            updatedAt: /* @__PURE__ */ new Date()
-          });
-          restoredHeader.order = order;
-          restoredHeader.deletedAt = null;
-          restoredHeader.organizationId = after.organizationId;
-          restoredHeader.tenantId = after.tenantId;
-          restoredHeader.returnNumber = after.returnNumber;
-          restoredHeader.reason = after.reason ?? null;
-          restoredHeader.notes = after.notes ?? null;
-          restoredHeader.returnedAt = after.returnedAt ? new Date(after.returnedAt) : /* @__PURE__ */ new Date();
-          restoredHeader.updatedAt = /* @__PURE__ */ new Date();
-          em.persist(restoredHeader);
-          const createdAdjustments = [];
-          after.lines.forEach((lineSnapshot, index) => {
-            const line = lineMap.get(lineSnapshot.orderLineId);
-            if (!line) return;
-            const totalNet = lineSnapshot.totalNetAmount;
-            const totalGross = lineSnapshot.totalGrossAmount;
-            const adjustmentId = after.adjustmentIds[index] ?? randomUUID();
-            const returnLine = em.create(SalesReturnLine, {
-              id: lineSnapshot.id,
-              salesReturn: restoredHeader,
-              orderLine: em.getReference(SalesOrderLine, line.id),
-              organizationId: after.organizationId,
-              tenantId: after.tenantId,
-              quantityReturned: lineSnapshot.quantityReturned.toString(),
-              unitPriceNet: lineSnapshot.unitPriceNet.toString(),
-              unitPriceGross: lineSnapshot.unitPriceGross.toString(),
-              totalNetAmount: totalNet.toString(),
-              totalGrossAmount: totalGross.toString(),
-              createdAt: /* @__PURE__ */ new Date(),
-              updatedAt: /* @__PURE__ */ new Date()
-            });
-            createdLines.push(returnLine);
-            em.persist(returnLine);
-            const adjustment = em.create(SalesOrderAdjustment, {
-              id: adjustmentId,
-              order,
-              orderLine: em.getReference(SalesOrderLine, line.id),
-              organizationId: after.organizationId,
-              tenantId: after.tenantId,
-              scope: "line",
-              kind: "return",
-              rate: "0",
-              amountNet: totalNet.toString(),
-              amountGross: totalGross.toString(),
-              currencyCode: order.currencyCode,
-              metadata: { returnId, returnLineId: lineSnapshot.id },
-              position: positionStart + index,
-              createdAt: /* @__PURE__ */ new Date(),
-              updatedAt: /* @__PURE__ */ new Date()
-            });
-            createdAdjustments.push(adjustment);
-            em.persist(adjustment);
-            line.returnedQuantity = (toNumeric(line.returnedQuantity) + lineSnapshot.quantityReturned).toString();
-            line.updatedAt = /* @__PURE__ */ new Date();
-            em.persist(line);
-          });
-          const lineSnapshots = orderLines.map(mapOrderLineEntityToSnapshot);
-          const adjustmentDrafts = [...existingAdjustments, ...createdAdjustments].map(
-            mapOrderAdjustmentToDraft
-          );
-          const calculation = await salesCalculationService.calculateDocumentTotals({
-            documentKind: "order",
-            lines: lineSnapshots,
-            adjustments: adjustmentDrafts,
-            context: buildCalculationContext(order)
-          });
-          applyOrderTotals(order, calculation.totals, calculation.lines.length);
-          order.updatedAt = /* @__PURE__ */ new Date();
-          em.persist(order);
-        }
-      ],
-      { transaction: true }
-    );
+    const createdLines = await restoreReturnEffects(em, salesCalculationService, after);
     const header = await findOneWithDecryption(
       em,
       SalesReturn,
@@ -645,8 +664,249 @@ const createReturnCommand = {
     return { returnId: header.id };
   }
 };
+const updateReturnCommand = {
+  id: "sales.returns.update",
+  async prepare(rawInput, ctx) {
+    const parsed = returnUpdateSchema.parse(rawInput ?? {});
+    const em = ctx.container.resolve("em");
+    const snapshot = await loadReturnHeaderSnapshot(em, parsed.id);
+    if (snapshot) {
+      ensureTenantScope(ctx, snapshot.tenantId);
+      ensureOrganizationScope(ctx, snapshot.organizationId);
+    }
+    return snapshot ? { before: snapshot } : {};
+  },
+  async execute(rawInput, ctx) {
+    const input = returnUpdateSchema.parse(rawInput ?? {});
+    ensureTenantScope(ctx, input.tenantId);
+    ensureOrganizationScope(ctx, input.organizationId);
+    const { translate } = await resolveTranslations();
+    const em = ctx.container.resolve("em").fork();
+    const header = await em.transactional(async (tx) => {
+      const entity = await findOneWithDecryption(
+        tx,
+        SalesReturn,
+        { id: input.id, deletedAt: null },
+        { populate: ["order"] },
+        { tenantId: input.tenantId, organizationId: input.organizationId }
+      );
+      if (!entity || !entity.order) {
+        throw new CrudHttpError(404, { error: translate("sales.returns.notFound", "Return not found.") });
+      }
+      ensureSameScope(entity, input.organizationId, input.tenantId);
+      const orderId = typeof entity.order === "string" ? entity.order : entity.order.id;
+      if (input.orderId !== orderId) {
+        throw new CrudHttpError(400, { error: translate("sales.returns.orderMismatch", "Return does not belong to this order.") });
+      }
+      enforceSalesDocumentOptimisticLock(ctx, entity, SALES_RESOURCE_KIND_RETURN);
+      if (input.reason !== void 0) entity.reason = input.reason.length ? input.reason : null;
+      if (input.notes !== void 0) entity.notes = input.notes.length ? input.notes : null;
+      if (input.returnedAt !== void 0) entity.returnedAt = input.returnedAt ?? null;
+      entity.updatedAt = /* @__PURE__ */ new Date();
+      tx.persist(entity);
+      await tx.flush();
+      return entity;
+    });
+    const dataEngine = ctx.container.resolve("dataEngine");
+    await emitCrudSideEffects({
+      dataEngine,
+      action: "updated",
+      entity: header,
+      identifiers: { id: header.id, organizationId: header.organizationId, tenantId: header.tenantId },
+      indexer: { entityType: E.sales.sales_return },
+      events: returnCrudEvents
+    });
+    return { returnId: header.id };
+  },
+  captureAfter: async (_input, result, ctx) => {
+    const em = ctx.container.resolve("em").fork();
+    return loadReturnHeaderSnapshot(em, result.returnId);
+  },
+  buildLog: async ({ snapshots, result }) => {
+    const { translate } = await resolveTranslations();
+    const before = snapshots.before;
+    const after = snapshots.after;
+    return {
+      actionLabel: translate("sales.audit.returns.update", "Update return"),
+      resourceKind: "sales.return",
+      resourceId: result.returnId,
+      parentResourceKind: "sales.order",
+      parentResourceId: after?.orderId ?? before?.orderId ?? null,
+      tenantId: after?.tenantId ?? before?.tenantId ?? null,
+      organizationId: after?.organizationId ?? before?.organizationId ?? null,
+      snapshotBefore: before ?? null,
+      snapshotAfter: after ?? null,
+      payload: {
+        undo: { before, after }
+      }
+    };
+  },
+  undo: async ({ logEntry, ctx }) => {
+    const payload = extractUndoPayload(logEntry);
+    const before = payload?.before;
+    if (!before) return;
+    const em = ctx.container.resolve("em").fork();
+    await em.transactional(async (tx) => {
+      const entity = await findOneWithDecryption(
+        tx,
+        SalesReturn,
+        { id: before.id, deletedAt: null },
+        {},
+        { tenantId: before.tenantId, organizationId: before.organizationId }
+      );
+      if (!entity) return;
+      entity.reason = before.reason;
+      entity.notes = before.notes;
+      entity.returnedAt = before.returnedAt ? new Date(before.returnedAt) : null;
+      entity.updatedAt = /* @__PURE__ */ new Date();
+      tx.persist(entity);
+      await tx.flush();
+    });
+    const dataEngine = ctx.container.resolve("dataEngine");
+    const restored = await findOneWithDecryption(
+      em,
+      SalesReturn,
+      { id: before.id, deletedAt: null },
+      {},
+      { tenantId: before.tenantId, organizationId: before.organizationId }
+    );
+    if (restored) {
+      await emitCrudSideEffects({
+        dataEngine,
+        action: "updated",
+        entity: restored,
+        identifiers: { id: restored.id, organizationId: restored.organizationId, tenantId: restored.tenantId },
+        indexer: { entityType: E.sales.sales_return },
+        events: returnCrudEvents
+      });
+    }
+  }
+};
+const deleteReturnCommand = {
+  id: "sales.returns.delete",
+  async prepare(rawInput, ctx) {
+    const parsed = returnDeleteSchema.parse(rawInput ?? {});
+    const em = ctx.container.resolve("em");
+    const snapshot = await loadReturnSnapshot(em, parsed.id);
+    if (snapshot) {
+      ensureTenantScope(ctx, snapshot.tenantId);
+      ensureOrganizationScope(ctx, snapshot.organizationId);
+    }
+    return snapshot ? { before: snapshot } : {};
+  },
+  async execute(rawInput, ctx) {
+    const input = returnDeleteSchema.parse(rawInput ?? {});
+    ensureTenantScope(ctx, input.tenantId);
+    ensureOrganizationScope(ctx, input.organizationId);
+    const { translate } = await resolveTranslations();
+    const em = ctx.container.resolve("em").fork();
+    const salesCalculationService = ctx.container.resolve("salesCalculationService");
+    const snapshot = await loadReturnSnapshot(em, input.id);
+    if (!snapshot) {
+      throw new CrudHttpError(404, { error: translate("sales.returns.notFound", "Return not found.") });
+    }
+    ensureSameScope(snapshot, input.organizationId, input.tenantId);
+    if (input.orderId !== snapshot.orderId) {
+      throw new CrudHttpError(400, { error: translate("sales.returns.orderMismatch", "Return does not belong to this order.") });
+    }
+    const header = await findOneWithDecryption(
+      em,
+      SalesReturn,
+      { id: input.id, deletedAt: null },
+      {},
+      { tenantId: input.tenantId, organizationId: input.organizationId }
+    );
+    if (!header) {
+      throw new CrudHttpError(404, { error: translate("sales.returns.notFound", "Return not found.") });
+    }
+    ensureSameScope(header, input.organizationId, input.tenantId);
+    enforceSalesDocumentOptimisticLock(ctx, header, SALES_RESOURCE_KIND_RETURN);
+    await reverseReturnEffects(em, salesCalculationService, snapshot);
+    const dataEngine = ctx.container.resolve("dataEngine");
+    await emitCrudSideEffects({
+      dataEngine,
+      action: "deleted",
+      entity: header,
+      identifiers: { id: snapshot.id, organizationId: snapshot.organizationId, tenantId: snapshot.tenantId },
+      indexer: { entityType: E.sales.sales_return },
+      events: returnCrudEvents
+    });
+    if (snapshot.lines.length) {
+      await Promise.all(
+        snapshot.lines.map(
+          (line) => emitCrudSideEffects({
+            dataEngine,
+            action: "deleted",
+            entity: { id: line.id, organizationId: snapshot.organizationId, tenantId: snapshot.tenantId },
+            identifiers: { id: line.id, organizationId: snapshot.organizationId, tenantId: snapshot.tenantId },
+            indexer: { entityType: E.sales.sales_return_line }
+          })
+        )
+      );
+    }
+    return { returnId: snapshot.id };
+  },
+  buildLog: async ({ snapshots, result }) => {
+    const before = snapshots.before;
+    if (!before) return null;
+    const { translate } = await resolveTranslations();
+    return {
+      actionLabel: translate("sales.audit.returns.delete", "Delete return"),
+      resourceKind: "sales.return",
+      resourceId: result.returnId,
+      parentResourceKind: "sales.order",
+      parentResourceId: before.orderId ?? null,
+      tenantId: before.tenantId,
+      organizationId: before.organizationId,
+      snapshotBefore: before,
+      payload: {
+        undo: { before }
+      }
+    };
+  },
+  undo: async ({ logEntry, ctx }) => {
+    const payload = extractUndoPayload(logEntry);
+    const before = payload?.before;
+    if (!before) return;
+    const em = ctx.container.resolve("em").fork();
+    const salesCalculationService = ctx.container.resolve("salesCalculationService");
+    const createdLines = await restoreReturnEffects(em, salesCalculationService, before);
+    const header = await findOneWithDecryption(
+      em,
+      SalesReturn,
+      { id: before.id, deletedAt: null },
+      {},
+      { tenantId: before.tenantId, organizationId: before.organizationId }
+    );
+    if (!header) return;
+    const dataEngine = ctx.container.resolve("dataEngine");
+    await emitCrudSideEffects({
+      dataEngine,
+      action: "created",
+      entity: header,
+      identifiers: { id: header.id, organizationId: header.organizationId, tenantId: header.tenantId },
+      indexer: { entityType: E.sales.sales_return },
+      events: returnCrudEvents
+    });
+    if (createdLines.length) {
+      await Promise.all(
+        createdLines.map(
+          (line) => emitCrudSideEffects({
+            dataEngine,
+            action: "created",
+            entity: line,
+            identifiers: { id: line.id, organizationId: line.organizationId, tenantId: line.tenantId },
+            indexer: { entityType: E.sales.sales_return_line }
+          })
+        )
+      );
+    }
+  }
+};
 registerCommand(createReturnCommand);
-const returnCommands = [createReturnCommand];
+registerCommand(updateReturnCommand);
+registerCommand(deleteReturnCommand);
+const returnCommands = [createReturnCommand, updateReturnCommand, deleteReturnCommand];
 export {
   loadReturnSnapshot,
   recalculateOrderTotalsForDisplay,