@zauru-sdk/common 6.5.0 → 6.6.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [6.6.0](https://github.com/intuitiva/zauru-typescript-sdk/compare/@zauru-sdk/common@6.5.0...@zauru-sdk/common@6.6.0) (2026-09-14)
+
+
+### Features
+
+* apply rejection percentage rules inside calculatePurchaseOrderFinancials ([e1852ba](https://github.com/intuitiva/zauru-typescript-sdk/commit/e1852ba86e8263df8a365adda884e6b88802a001))
+
+
+
+
+
 # [6.5.0](https://github.com/intuitiva/zauru-typescript-sdk/compare/@zauru-sdk/common@6.4.1...@zauru-sdk/common@6.5.0) (2026-09-14)
 
 

package/dist/common.d.ts

@@ -12,10 +12,20 @@ export declare const getRejectionPercentage: (source: string | {
     memo?: string | object;
 } | JsonMemoType | undefined) => number;
 export declare const setRejectionPercentage: (memo: string | object | undefined, percentage: number) => string;
+/**
+ * Rejection % of origin stored in the memo, ignoring the adjustment rules
+ * already applied on top of it.
+ */
+export declare const resolveRejectionPercentageBase: (memo?: string | object) => number;
 /**
  * Header money for a purchase order: subtotal = qty × unit_cost,
  * discount = subtotal × rejectionPercentage / 100.
  * Does not change unit cost. purchase_orders.discount is the monetary column.
+ *
+ * If `rules` is given, the rejection % is resolved back to the origin stored in
+ * the memo and the rules are stacked on top of it before calculating the money.
+ * `rejectionPercentage` in the result is the % that was actually charged and
+ * `rejectionCalculations` is the trace to store in the memo.
  */
 export declare const calculatePurchaseOrderFinancials: (input: CalculatePurchaseOrderFinancialsInput) => CalculatePurchaseOrderFinancialsResult;
 /**

package/dist/esm/common.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parsedObject = exports.sortByProperty = exports.labFormPatter = exports.labServicePattern = exports.getRandomNum = exports.CURRENCY_PREFIX = exports.truncateDecimals = exports.ZAURU_REGEX = exports.priceToText = exports.arrayToObject = exports.isNumeric = exports.toFixedIfNeeded = exports.formatTimeToTimePicker = exports.formatDateToDatePicker = exports.getFormattedDate = exports.parsedBaculoFormValue = exports.getPayeeInfoOptions = exports.getPayeeInfoIdOptions = exports.getPayeeFormated = exports.getDateAfterDays = exports.getTimePickerCurrentTime = exports.obtenerFechaActualConZonaHoraria = exports.getDatePickerCurrentDate = exports.stringDateToParsedUTCDate = exports.localDateToUSDate = exports.getStringFullDate = exports.getTodayMinutesDifference = exports.getTodayDaysDifference = exports.getStringDate = exports.getZauruDateByText = exports.getNewDateByFormat = exports.getFechaJuliana = exports.getBasketsSchema = exports.calculatePurchaseOrderFinancials = exports.setRejectionPercentage = exports.getRejectionPercentage = exports.mergeJsonMemo = exports.stringifyJsonMemo = exports.parseJsonMemo = exports.DESTINOS_MUESTRA_OPTIONS = void 0;
+exports.parsedObject = exports.sortByProperty = exports.labFormPatter = exports.labServicePattern = exports.getRandomNum = exports.CURRENCY_PREFIX = exports.truncateDecimals = exports.ZAURU_REGEX = exports.priceToText = exports.arrayToObject = exports.isNumeric = exports.toFixedIfNeeded = exports.formatTimeToTimePicker = exports.formatDateToDatePicker = exports.getFormattedDate = exports.parsedBaculoFormValue = exports.getPayeeInfoOptions = exports.getPayeeInfoIdOptions = exports.getPayeeFormated = exports.getDateAfterDays = exports.getTimePickerCurrentTime = exports.obtenerFechaActualConZonaHoraria = exports.getDatePickerCurrentDate = exports.stringDateToParsedUTCDate = exports.localDateToUSDate = exports.getStringFullDate = exports.getTodayMinutesDifference = exports.getTodayDaysDifference = exports.getStringDate = exports.getZauruDateByText = exports.getNewDateByFormat = exports.getFechaJuliana = exports.getBasketsSchema = exports.calculatePurchaseOrderFinancials = exports.resolveRejectionPercentageBase = exports.setRejectionPercentage = exports.getRejectionPercentage = exports.mergeJsonMemo = exports.stringifyJsonMemo = exports.parseJsonMemo = exports.DESTINOS_MUESTRA_OPTIONS = void 0;
 exports.generateClientUUID = generateClientUUID;
 exports.extractValueBetweenTags = extractValueBetweenTags;
 exports.isJsonArray = isJsonArray;
@@ -24,6 +24,7 @@ exports.parseCode = parseCode;
 const moment_1 = __importDefault(require("moment"));
 require("moment-timezone");
 const types_1 = require("@zauru-sdk/types");
+const rejectionPercentageAdjustment_js_1 = require("./rejectionPercentageAdjustment.js");
 exports.DESTINOS_MUESTRA_OPTIONS = [
     { label: "Microbiología", value: "microbiologa" },
     { label: "Residuos de plaguicidas", value: "residuos_de_plaguicidas" },
@@ -80,6 +81,12 @@ const getRejectionPercentage = (source) => {
 exports.getRejectionPercentage = getRejectionPercentage;
 const setRejectionPercentage = (memo, percentage) => (0, exports.mergeJsonMemo)(memo, { rejectionPercentage: percentage });
 exports.setRejectionPercentage = setRejectionPercentage;
+/**
+ * Rejection % of origin stored in the memo, ignoring the adjustment rules
+ * already applied on top of it.
+ */
+const resolveRejectionPercentageBase = (memo) => (0, rejectionPercentageAdjustment_js_1.resolveRejectionPercentageOrigin)((0, exports.getRejectionPercentage)(memo), (0, exports.parseJsonMemo)(memo).rejectionCalculations);
+exports.resolveRejectionPercentageBase = resolveRejectionPercentageBase;
 const roundMoney = (value) => Math.round((value + Number.EPSILON) * 100) / 100;
 const lineQuantity = (detail) => {
     const delivered = toFiniteNumber(detail.delivered_quantity) ??
@@ -95,6 +102,11 @@ const lineQuantity = (detail) => {
  * Header money for a purchase order: subtotal = qty × unit_cost,
  * discount = subtotal × rejectionPercentage / 100.
  * Does not change unit cost. purchase_orders.discount is the monetary column.
+ *
+ * If `rules` is given, the rejection % is resolved back to the origin stored in
+ * the memo and the rules are stacked on top of it before calculating the money.
+ * `rejectionPercentage` in the result is the % that was actually charged and
+ * `rejectionCalculations` is the trace to store in the memo.
  */
 const calculatePurchaseOrderFinancials = (input) => {
     const details = input.details ?? [];
@@ -102,16 +114,19 @@ const calculatePurchaseOrderFinancials = (input) => {
         const unitCost = toFiniteNumber(detail.unit_cost) ?? 0;
         return sum + lineQuantity(detail) * unitCost;
     }, 0));
-    const rejectionPercentage = toFiniteNumber(input.rejectionPercentage);
-    if (rejectionPercentage == null ||
-        rejectionPercentage <= 0 ||
-        !Number.isFinite(subtotal) ||
-        subtotal <= 0) {
-        return { subtotal: Number.isFinite(subtotal) ? subtotal : 0, discount: 0 };
-    }
+    const safeSubtotal = Number.isFinite(subtotal) ? subtotal : 0;
+    const passedPercentage = toFiniteNumber(input.rejectionPercentage) ?? 0;
+    const rejectionCalculations = input.rules
+        ? (0, rejectionPercentageAdjustment_js_1.applyRejectionPercentageAdjustmentRules)((0, rejectionPercentageAdjustment_js_1.resolveRejectionPercentageOrigin)(passedPercentage, (0, exports.parseJsonMemo)(input.memo).rejectionCalculations), input.rules, input.ctx ?? { itemIds: [] })
+        : undefined;
+    const rejectionPercentage = rejectionCalculations?.finalPercentage ?? passedPercentage;
     return {
-        subtotal,
-        discount: roundMoney(subtotal * (rejectionPercentage / 100)),
+        subtotal: safeSubtotal,
+        discount: rejectionPercentage > 0 && safeSubtotal > 0
+            ? roundMoney(safeSubtotal * (rejectionPercentage / 100))
+            : 0,
+        rejectionPercentage,
+        rejectionCalculations,
     };
 };
 exports.calculatePurchaseOrderFinancials = calculatePurchaseOrderFinancials;

package/dist/esm/rejectionPercentageAdjustment.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyRejectionPercentageRulesToFinancials = exports.applyRejectionPercentageAdjustmentRules = exports.resolveRejectionPercentageBase = exports.resolveRejectionPercentageOrigin = exports.formatRejectionPercentageAdjustmentDescription = exports.rejectionPercentageAdjustmentRuleMatches = exports.filterActiveRejectionPercentageAdjustmentRules = exports.REJECTION_PERCENTAGE_ADJUSTMENT_RULES_TABLE_VAR = void 0;
-const common_js_1 = require("./common.js");
+exports.applyRejectionPercentageAdjustmentRules = exports.resolveRejectionPercentageOrigin = exports.formatRejectionPercentageAdjustmentDescription = exports.rejectionPercentageAdjustmentRuleMatches = exports.filterActiveRejectionPercentageAdjustmentRules = exports.REJECTION_PERCENTAGE_ADJUSTMENT_RULES_TABLE_VAR = void 0;
 exports.REJECTION_PERCENTAGE_ADJUSTMENT_RULES_TABLE_VAR = "rejection_percentage_adjustment_rules_web_app_table_id";
 const defaultFilters = () => ({
     itemMode: "all",
@@ -71,10 +70,13 @@ const formatRejectionPercentageAdjustmentDescription = (result, baseLabel = "ori
     return `${base} ${result.steps.map(formatRuleEffect).join(" ")} = ${formatFinalPercentage(result.finalPercentage)}`;
 };
 exports.formatRejectionPercentageAdjustmentDescription = formatRejectionPercentageAdjustmentDescription;
-const resolveRejectionPercentageOrigin = (passedPercentage, memo) => {
-    const parsed = (0, common_js_1.parseJsonMemo)(memo);
+/**
+ * Callers may pass the origin % or the previously stored final %. With the
+ * previous calculations we go back to the origin so the rules never stack twice.
+ */
+const resolveRejectionPercentageOrigin = (passedPercentage, previousCalculations) => {
     const passed = clampPercentage(Number.isFinite(Number(passedPercentage)) ? Number(passedPercentage) : 0);
-    const calc = parsed.rejectionCalculations;
+    const calc = previousCalculations;
     if (!calc || !Number.isFinite(Number(calc.finalPercentage))) {
         return passed;
     }
@@ -89,8 +91,6 @@ const resolveRejectionPercentageOrigin = (passedPercentage, memo) => {
     return clampPercentage(safePreviousBase + (passed - previousFinal));
 };
 exports.resolveRejectionPercentageOrigin = resolveRejectionPercentageOrigin;
-const resolveRejectionPercentageBase = (memo) => (0, exports.resolveRejectionPercentageOrigin)((0, common_js_1.getRejectionPercentage)(memo), memo);
-exports.resolveRejectionPercentageBase = resolveRejectionPercentageBase;
 const applyRejectionPercentageAdjustmentRules = (basePercentage, rules, ctx) => {
     const start = Number(basePercentage);
     const safeBase = Number.isFinite(start) ? clampPercentage(start) : 0;
@@ -128,25 +128,3 @@ const applyRejectionPercentageAdjustmentRules = (basePercentage, rules, ctx) =>
     return result;
 };
 exports.applyRejectionPercentageAdjustmentRules = applyRejectionPercentageAdjustmentRules;
-const applyRejectionPercentageRulesToFinancials = (input) => {
-    const origin = (0, exports.resolveRejectionPercentageOrigin)(input.originPercentage, input.memo);
-    const result = (0, exports.applyRejectionPercentageAdjustmentRules)(origin, input.rules, input.ctx);
-    const { discount } = (0, common_js_1.calculatePurchaseOrderFinancials)({
-        details: input.details,
-        rejectionPercentage: result.finalPercentage,
-    });
-    return {
-        memo: (0, common_js_1.mergeJsonMemo)(input.memo, {
-            rejectionPercentage: result.finalPercentage,
-            rejectionCalculations: {
-                basePercentage: result.basePercentage,
-                finalPercentage: result.finalPercentage,
-                description: result.description,
-                steps: result.steps,
-            },
-        }),
-        discount,
-        finalPercentage: result.finalPercentage,
-    };
-};
-exports.applyRejectionPercentageRulesToFinancials = applyRejectionPercentageRulesToFinancials;

package/dist/rejectionPercentageAdjustment.d.ts

@@ -1,19 +1,11 @@
-import type { PurchaseOrderFinancialDetail, RejectionPercentageAdjustmentContext, RejectionPercentageAdjustmentResult, RejectionPercentageAdjustmentRule, WebAppRowGraphQL } from "@zauru-sdk/types";
+import type { RejectionCalculationMemo, RejectionPercentageAdjustmentContext, RejectionPercentageAdjustmentResult, RejectionPercentageAdjustmentRule, WebAppRowGraphQL } from "@zauru-sdk/types";
 export declare const REJECTION_PERCENTAGE_ADJUSTMENT_RULES_TABLE_VAR = "rejection_percentage_adjustment_rules_web_app_table_id";
 export declare const filterActiveRejectionPercentageAdjustmentRules: (rules?: WebAppRowGraphQL<RejectionPercentageAdjustmentRule>[]) => WebAppRowGraphQL<RejectionPercentageAdjustmentRule>[];
 export declare const rejectionPercentageAdjustmentRuleMatches: (rule: RejectionPercentageAdjustmentRule, ctx: RejectionPercentageAdjustmentContext) => boolean;
 export declare const formatRejectionPercentageAdjustmentDescription: (result: Pick<RejectionPercentageAdjustmentResult, "basePercentage" | "finalPercentage" | "steps">, baseLabel?: string) => string;
-export declare const resolveRejectionPercentageOrigin: (passedPercentage: number, memo?: string | object) => number;
-export declare const resolveRejectionPercentageBase: (memo?: string | object) => number;
+/**
+ * Callers may pass the origin % or the previously stored final %. With the
+ * previous calculations we go back to the origin so the rules never stack twice.
+ */
+export declare const resolveRejectionPercentageOrigin: (passedPercentage: number, previousCalculations?: RejectionCalculationMemo | null) => number;
 export declare const applyRejectionPercentageAdjustmentRules: (basePercentage: number, rules: Array<RejectionPercentageAdjustmentRule | WebAppRowGraphQL<RejectionPercentageAdjustmentRule>>, ctx: RejectionPercentageAdjustmentContext) => RejectionPercentageAdjustmentResult;
-export declare const applyRejectionPercentageRulesToFinancials: (input: {
-    memo?: string | object;
-    originPercentage: number;
-    details: PurchaseOrderFinancialDetail[];
-    rules: Array<RejectionPercentageAdjustmentRule | WebAppRowGraphQL<RejectionPercentageAdjustmentRule>>;
-    ctx: RejectionPercentageAdjustmentContext;
-}) => {
-    memo: string;
-    discount: number;
-    finalPercentage: number;
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zauru-sdk/common",
-  "version": "6.5.0",
+  "version": "6.6.0",
   "description": "Funciones de uso común en el desarrollo de webapps en Zauru",
   "main": "./dist/esm/index.js",
   "module": "./dist/esm/index.js",
@@ -21,9 +21,9 @@
   },
   "dependencies": {
     "@remix-run/node": "^2.8.1",
-    "@zauru-sdk/types": "^6.15.0",
+    "@zauru-sdk/types": "^6.16.0",
     "moment": "^2.30.1",
     "moment-timezone": "^0.5.45"
   },
-  "gitHead": "2dceb781cae3f4c45ceecb915977c6d142bca6b9"
+  "gitHead": "9e840d01a540f2ab49233dda2cb2b0c916ffba0b"
 }

package/src/common.ts

@@ -12,6 +12,10 @@ import type {
   PurchaseOrderFinancialDetail,
 } from "@zauru-sdk/types";
 import { MONTHS } from "@zauru-sdk/types";
+import {
+  applyRejectionPercentageAdjustmentRules,
+  resolveRejectionPercentageOrigin,
+} from "./rejectionPercentageAdjustment.js";
 
 export const DESTINOS_MUESTRA_OPTIONS: SelectFieldOption[] = [
   { label: "Microbiología", value: "microbiologa" },
@@ -85,6 +89,18 @@ export const setRejectionPercentage = (
   percentage: number,
 ): string => mergeJsonMemo(memo, { rejectionPercentage: percentage });
 
+/**
+ * Rejection % of origin stored in the memo, ignoring the adjustment rules
+ * already applied on top of it.
+ */
+export const resolveRejectionPercentageBase = (
+  memo?: string | object,
+): number =>
+  resolveRejectionPercentageOrigin(
+    getRejectionPercentage(memo),
+    parseJsonMemo(memo).rejectionCalculations,
+  );
+
 const roundMoney = (value: number): number =>
   Math.round((value + Number.EPSILON) * 100) / 100;
 
@@ -106,6 +122,11 @@ const lineQuantity = (detail: PurchaseOrderFinancialDetail): number => {
  * Header money for a purchase order: subtotal = qty × unit_cost,
  * discount = subtotal × rejectionPercentage / 100.
  * Does not change unit cost. purchase_orders.discount is the monetary column.
+ *
+ * If `rules` is given, the rejection % is resolved back to the origin stored in
+ * the memo and the rules are stacked on top of it before calculating the money.
+ * `rejectionPercentage` in the result is the % that was actually charged and
+ * `rejectionCalculations` is the trace to store in the memo.
  */
 export const calculatePurchaseOrderFinancials = (
   input: CalculatePurchaseOrderFinancialsInput,
@@ -117,20 +138,31 @@ export const calculatePurchaseOrderFinancials = (
       return sum + lineQuantity(detail) * unitCost;
     }, 0),
   );
-
-  const rejectionPercentage = toFiniteNumber(input.rejectionPercentage);
-  if (
-    rejectionPercentage == null ||
-    rejectionPercentage <= 0 ||
-    !Number.isFinite(subtotal) ||
-    subtotal <= 0
-  ) {
-    return { subtotal: Number.isFinite(subtotal) ? subtotal : 0, discount: 0 };
-  }
+  const safeSubtotal = Number.isFinite(subtotal) ? subtotal : 0;
+
+  const passedPercentage = toFiniteNumber(input.rejectionPercentage) ?? 0;
+  const rejectionCalculations = input.rules
+    ? applyRejectionPercentageAdjustmentRules(
+        resolveRejectionPercentageOrigin(
+          passedPercentage,
+          parseJsonMemo(input.memo).rejectionCalculations,
+        ),
+        input.rules,
+        input.ctx ?? { itemIds: [] },
+      )
+    : undefined;
+
+  const rejectionPercentage =
+    rejectionCalculations?.finalPercentage ?? passedPercentage;
 
   return {
-    subtotal,
-    discount: roundMoney(subtotal * (rejectionPercentage / 100)),
+    subtotal: safeSubtotal,
+    discount:
+      rejectionPercentage > 0 && safeSubtotal > 0
+        ? roundMoney(safeSubtotal * (rejectionPercentage / 100))
+        : 0,
+    rejectionPercentage,
+    rejectionCalculations,
   };
 };
 

package/src/rejectionPercentageAdjustment.ts

@@ -1,19 +1,13 @@
 import type {
   PriceAdjustmentFilterMode,
   PriceAdjustmentFilters,
-  PurchaseOrderFinancialDetail,
+  RejectionCalculationMemo,
   RejectionPercentageAdjustmentContext,
   RejectionPercentageAdjustmentResult,
   RejectionPercentageAdjustmentRule,
   RejectionPercentageAdjustmentStep,
   WebAppRowGraphQL,
 } from "@zauru-sdk/types";
-import {
-  calculatePurchaseOrderFinancials,
-  getRejectionPercentage,
-  mergeJsonMemo,
-  parseJsonMemo,
-} from "./common.js";
 
 export const REJECTION_PERCENTAGE_ADJUSTMENT_RULES_TABLE_VAR =
   "rejection_percentage_adjustment_rules_web_app_table_id";
@@ -139,15 +133,18 @@ export const formatRejectionPercentageAdjustmentDescription = (
   return `${base} ${result.steps.map(formatRuleEffect).join(" ")} = ${formatFinalPercentage(result.finalPercentage)}`;
 };
 
+/**
+ * Callers may pass the origin % or the previously stored final %. With the
+ * previous calculations we go back to the origin so the rules never stack twice.
+ */
 export const resolveRejectionPercentageOrigin = (
   passedPercentage: number,
-  memo?: string | object,
+  previousCalculations?: RejectionCalculationMemo | null,
 ): number => {
-  const parsed = parseJsonMemo(memo);
   const passed = clampPercentage(
     Number.isFinite(Number(passedPercentage)) ? Number(passedPercentage) : 0,
   );
-  const calc = parsed.rejectionCalculations;
+  const calc = previousCalculations;
   if (!calc || !Number.isFinite(Number(calc.finalPercentage))) {
     return passed;
   }
@@ -165,11 +162,6 @@ export const resolveRejectionPercentageOrigin = (
   return clampPercentage(safePreviousBase + (passed - previousFinal));
 };
 
-export const resolveRejectionPercentageBase = (
-  memo?: string | object,
-): number =>
-  resolveRejectionPercentageOrigin(getRejectionPercentage(memo), memo);
-
 export const applyRejectionPercentageAdjustmentRules = (
   basePercentage: number,
   rules: Array<
@@ -217,42 +209,3 @@ export const applyRejectionPercentageAdjustmentRules = (
   result.description = formatRejectionPercentageAdjustmentDescription(result);
   return result;
 };
-
-export const applyRejectionPercentageRulesToFinancials = (input: {
-  memo?: string | object;
-  originPercentage: number;
-  details: PurchaseOrderFinancialDetail[];
-  rules: Array<
-    | RejectionPercentageAdjustmentRule
-    | WebAppRowGraphQL<RejectionPercentageAdjustmentRule>
-  >;
-  ctx: RejectionPercentageAdjustmentContext;
-}): { memo: string; discount: number; finalPercentage: number } => {
-  const origin = resolveRejectionPercentageOrigin(
-    input.originPercentage,
-    input.memo,
-  );
-  const result = applyRejectionPercentageAdjustmentRules(
-    origin,
-    input.rules,
-    input.ctx,
-  );
-  const { discount } = calculatePurchaseOrderFinancials({
-    details: input.details,
-    rejectionPercentage: result.finalPercentage,
-  });
-
-  return {
-    memo: mergeJsonMemo(input.memo, {
-      rejectionPercentage: result.finalPercentage,
-      rejectionCalculations: {
-        basePercentage: result.basePercentage,
-        finalPercentage: result.finalPercentage,
-        description: result.description,
-        steps: result.steps,
-      },
-    }),
-    discount,
-    finalPercentage: result.finalPercentage,
-  };
-};