@open-mercato/core 0.6.1-develop.3174.1.c3822bcdf0 → 0.6.1-develop.3187.1.4c96d17341

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

@@ -66,6 +66,7 @@ import {
   CustomerPersonProfile,
 } from "../../customers/data/entities";
 import {
+  enforceReturnAdjustmentSign,
   quoteCreateSchema,
   quoteLineCreateSchema,
   quoteAdjustmentCreateSchema,
@@ -6299,18 +6300,22 @@ const quoteLineDeleteSchema = z.object({
   quoteId: z.string().uuid(),
 });
 
-const orderAdjustmentUpsertSchema = orderAdjustmentCreateSchema.extend({
-  id: z.string().uuid().optional(),
-});
+const orderAdjustmentUpsertSchema = orderAdjustmentCreateSchema
+  .extend({
+    id: z.string().uuid().optional(),
+  })
+  .superRefine(enforceReturnAdjustmentSign);
 
 const orderAdjustmentDeleteSchema = z.object({
   id: z.string().uuid(),
   orderId: z.string().uuid(),
 });
 
-const quoteAdjustmentUpsertSchema = quoteAdjustmentCreateSchema.extend({
-  id: z.string().uuid().optional(),
-});
+const quoteAdjustmentUpsertSchema = quoteAdjustmentCreateSchema
+  .extend({
+    id: z.string().uuid().optional(),
+  })
+  .superRefine(enforceReturnAdjustmentSign);
 
 const quoteAdjustmentDeleteSchema = z.object({
   id: z.string().uuid(),

package/src/modules/sales/data/validators.ts

@@ -419,6 +419,41 @@ export const quoteLineUpdateSchema = z
   })
   .merge(quoteLineCreateSchema.partial())
 
+// A `return` adjustment must never increase the grand total. The calculation
+// engine is defensively normalized to negative, but the API edge also rejects
+// positive amounts so bad input is caught before it reaches storage. See #1705.
+export const RETURN_ADJUSTMENT_POSITIVE_NET_MESSAGE =
+  'Return adjustments must use a non-positive amountNet (returns reduce the total).'
+export const RETURN_ADJUSTMENT_POSITIVE_GROSS_MESSAGE =
+  'Return adjustments must use a non-positive amountGross (returns reduce the total).'
+
+type AdjustmentSignInput = {
+  kind?: string
+  amountNet?: number
+  amountGross?: number
+}
+
+export const enforceReturnAdjustmentSign = (
+  value: AdjustmentSignInput,
+  ctx: z.RefinementCtx
+) => {
+  if (value.kind !== 'return') return
+  if (typeof value.amountNet === 'number' && value.amountNet > 0) {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      message: RETURN_ADJUSTMENT_POSITIVE_NET_MESSAGE,
+      path: ['amountNet'],
+    })
+  }
+  if (typeof value.amountGross === 'number' && value.amountGross > 0) {
+    ctx.addIssue({
+      code: z.ZodIssueCode.custom,
+      message: RETURN_ADJUSTMENT_POSITIVE_GROSS_MESSAGE,
+      path: ['amountGross'],
+    })
+  }
+}
+
 export const orderAdjustmentCreateSchema = scoped.extend({
   orderId: uuid(),
   orderLineId: uuid().optional(),

package/src/modules/sales/lib/calculations.ts

@@ -190,13 +190,17 @@ function buildBaseDocumentResult(params: {
     }
   }
 
-  // Line-scoped and any other return (credit) adjustments reduce grand total
+  // Line-scoped and any other return (credit) adjustments reduce grand total.
+  // Sign is normalized to negative regardless of the stored sign so a positive
+  // amountNet / amountGross can never inflate totals (issue #1705).
   for (const adj of resolvedAdjustments) {
     if (adj.kind !== 'return') continue
     const net = toNumber(adj.amountNet, toNumber(adj.amountGross))
     const gross = toNumber(adj.amountGross, net)
-    subtotalNet = Math.max(subtotalNet + net, 0)
-    subtotalGross = Math.max(subtotalGross + gross, 0)
+    const netDelta = -Math.abs(net)
+    const grossDelta = -Math.abs(gross)
+    subtotalNet = Math.max(subtotalNet + netDelta, 0)
+    subtotalGross = Math.max(subtotalGross + grossDelta, 0)
   }
 
   const grandTotalNet = round(subtotalNet)