@zauru-sdk/utils 6.10.0 → 6.11.0

package/dist/esm/zauru/purchase-orders.utils.js

@@ -1,5 +1,6 @@
-import { CURRENCY_PREFIX, calculatePurchaseOrderFinancials, getNewDateByFormat, getStringFullDate, getZauruDateByText, handlePossibleAxiosErrors, setRejectionPercentage, } from "@zauru-sdk/common";
+import { CURRENCY_PREFIX, applyRejectionPercentageRulesToFinancials, calculatePurchaseOrderFinancials, getNewDateByFormat, getStringFullDate, getZauruDateByText, handlePossibleAxiosErrors, setRejectionPercentage, } from "@zauru-sdk/common";
 import { commitSession, createNewPurchaseOrder, deleteDelivery, deletePurchaseOrder, deleteReception, getLotesWithPurchaseFormated, getPurchase, getPurchaseOrder, getPurchasesListDataTables, getVariablesByName, inactivarLote, updateReceivedPurchaseOrder, } from "@zauru-sdk/services";
+import { getActiveRejectionPercentageAdjustmentRules } from "./rejectionPercentageAdjustmentRules.utils.js";
 /**
  * Obtiene el listado de ordenes de compra, formateado especialmente para armar la tabla de edición de porcentajes y tolerancia
  * @param headers
@@ -188,6 +189,23 @@ const extractPurchaseOrderFinancialDetails = (purchase) => {
     }
     return [];
 };
+const extractPurchaseOrderItemIds = (purchase) => {
+    if (purchase == null || typeof purchase !== "object")
+        return [];
+    const record = purchase;
+    const raw = record.purchase_order_details ??
+        record.purchase_order_details_attributes ??
+        record.details ??
+        [];
+    const list = Array.isArray(raw)
+        ? raw
+        : raw && typeof raw === "object"
+            ? Object.values(raw)
+            : [];
+    return list
+        .map((detail) => Number(detail.item_id))
+        .filter((itemId) => Number.isFinite(itemId));
+};
 /**
  * updateOchAndDis
  * Updates rejectionPercentage in purchase_order.memo and the monetary
@@ -199,8 +217,10 @@ export const updateOchAndDis = async (headers, data, purchase_id, session) => {
         const rejectionPercentage = Number(data?.rejectionPercentage ?? data?.discount ?? 0);
         let currentMemo = data.memo;
         let details = [];
+        let loadedPurchase;
         const restPurchaseResponse = await getPurchase(headers, purchase_id);
         if (!restPurchaseResponse.error && restPurchaseResponse.data) {
+            loadedPurchase = restPurchaseResponse.data;
             if (currentMemo === undefined) {
                 currentMemo = restPurchaseResponse.data.memo;
             }
@@ -209,7 +229,7 @@ export const updateOchAndDis = async (headers, data, purchase_id, session) => {
         if ((currentMemo === undefined || details.length === 0) && session) {
             const purchaseOrderResponse = await getPurchaseOrder(session, purchase_id, {
                 withLotStocksToMyAgency: false,
-                withPayee: false,
+                withPayee: true,
                 withReceptions: false,
             });
             if (purchaseOrderResponse.error || !purchaseOrderResponse.data) {
@@ -222,6 +242,9 @@ export const updateOchAndDis = async (headers, data, purchase_id, session) => {
             if (details.length === 0) {
                 details = extractPurchaseOrderFinancialDetails(purchaseOrderResponse.data);
             }
+            if (loadedPurchase == null) {
+                loadedPurchase = purchaseOrderResponse.data;
+            }
         }
         if (currentMemo === undefined) {
             throw new Error("memo or session is required to update rejectionPercentage");
@@ -230,14 +253,37 @@ export const updateOchAndDis = async (headers, data, purchase_id, session) => {
             throw new Error(restPurchaseResponse.userMsg ||
                 "No se pudieron obtener los detalles de la orden de compra para calcular el descuento");
         }
-        const { discount } = calculatePurchaseOrderFinancials({
-            details,
-            rejectionPercentage,
-        });
+        const rules = await getActiveRejectionPercentageAdjustmentRules(headers, session);
+        const purchaseRecord = loadedPurchase;
+        const payee = purchaseRecord?.payee;
+        const itemIds = extractPurchaseOrderItemIds(loadedPurchase);
+        const tipo = purchaseRecord?.reference;
+        const adjusted = rules.length > 0
+            ? applyRejectionPercentageRulesToFinancials({
+                memo: currentMemo,
+                originPercentage: rejectionPercentage,
+                details,
+                rules,
+                ctx: {
+                    itemIds,
+                    tipo,
+                    providerCategoryId: payee?.payee_category_id ??
+                        purchaseRecord
+                            ?.payee_category_id,
+                },
+            })
+            : {
+                memo: setRejectionPercentage(currentMemo, rejectionPercentage),
+                discount: calculatePurchaseOrderFinancials({
+                    details,
+                    rejectionPercentage,
+                }).discount,
+                finalPercentage: rejectionPercentage,
+            };
         const body = {
             purchase_order: {
-                memo: setRejectionPercentage(currentMemo, rejectionPercentage),
-                discount,
+                memo: adjusted.memo,
+                discount: adjusted.discount,
             },
         };
         if (data.other_charges !== undefined && data.other_charges !== null) {

package/dist/esm/zauru/rejectionPercentageAdjustmentRules.utils.js

@@ -1,17 +1,12 @@
-import { getRejectionPercentage, handlePossibleAxiosErrors, parseJsonMemo, } from "@zauru-sdk/common";
-import { createWebAppTableRegister, getVariablesByName, getWebAppTableRegisters, updateWebAppTableRegister, } from "@zauru-sdk/services";
-import { defaultPriceAdjustmentFilters, priceAdjustmentRuleMatches, } from "./priceAdjustmentRules.utils.js";
-const TABLE_VAR = "rejection_percentage_adjustment_rules_web_app_table_id";
-const asPriceAdjustmentRule = (rule) => ({
-    ...rule,
-    tipoValor: "percentage",
-});
-export const filterActiveRejectionPercentageAdjustmentRules = (rules) => (rules ?? [])
-    .filter((rule) => !rule.data?.fechaEliminacion && rule.data?.activa !== false)
-    .sort((a, b) => (a.data?.prioridad ?? 0) - (b.data?.prioridad ?? 0) || a.id - b.id);
+import { handlePossibleAxiosErrors } from "@zauru-sdk/common";
+import { createWebAppTableRegister, getRejectionPercentageAdjustmentRulesByHeaders, getVariablesByName, getWebAppTableRegisters, updateWebAppTableRegister, } from "@zauru-sdk/services";
+export { applyRejectionPercentageAdjustmentRules, applyRejectionPercentageRulesToFinancials, filterActiveRejectionPercentageAdjustmentRules, formatRejectionPercentageAdjustmentDescription, rejectionPercentageAdjustmentRuleMatches, resolveRejectionPercentageBase, resolveRejectionPercentageOrigin, REJECTION_PERCENTAGE_ADJUSTMENT_RULES_TABLE_VAR, } from "@zauru-sdk/common";
+import { filterActiveRejectionPercentageAdjustmentRules, REJECTION_PERCENTAGE_ADJUSTMENT_RULES_TABLE_VAR, } from "@zauru-sdk/common";
 const getTableId = async (headers, session) => {
-    const vars = await getVariablesByName(headers, session, [TABLE_VAR]);
-    return vars[TABLE_VAR];
+    const vars = await getVariablesByName(headers, session, [
+        REJECTION_PERCENTAGE_ADJUSTMENT_RULES_TABLE_VAR,
+    ]);
+    return vars[REJECTION_PERCENTAGE_ADJUSTMENT_RULES_TABLE_VAR];
 };
 export const getRejectionPercentageAdjustmentRules = (headers, session) => {
     return handlePossibleAxiosErrors(async () => {
@@ -23,6 +18,25 @@ export const getRejectionPercentageAdjustmentRules = (headers, session) => {
         return response.data ?? [];
     });
 };
+export const getActiveRejectionPercentageAdjustmentRules = async (headers, session) => {
+    try {
+        if (session) {
+            const response = await getRejectionPercentageAdjustmentRules(headers, session);
+            if (response.error) {
+                return [];
+            }
+            return filterActiveRejectionPercentageAdjustmentRules(response.data);
+        }
+        const response = await getRejectionPercentageAdjustmentRulesByHeaders(headers);
+        if (response.error) {
+            return [];
+        }
+        return filterActiveRejectionPercentageAdjustmentRules(response.data);
+    }
+    catch {
+        return [];
+    }
+};
 export const createRejectionPercentageAdjustmentRule = (headers, session, body) => {
     return handlePossibleAxiosErrors(async () => {
         const tableId = await getTableId(headers, session);
@@ -35,90 +49,3 @@ export const updateRejectionPercentageAdjustmentRule = (headers, session, id, bo
         return updateWebAppTableRegister(headers, tableId, Number(id), body);
     });
 };
-export const rejectionPercentageAdjustmentRuleMatches = (rule, ctx) => {
-    const filtros = rule.filtros ?? defaultPriceAdjustmentFilters();
-    const priceRule = asPriceAdjustmentRule(rule);
-    const itemIds = ctx.itemIds ?? [];
-    if (filtros.itemMode === "all") {
-        return priceAdjustmentRuleMatches(priceRule, {
-            itemId: 0,
-            tipo: ctx.tipo,
-            providerCategoryId: ctx.providerCategoryId,
-        });
-    }
-    if (itemIds.length === 0) {
-        return false;
-    }
-    return itemIds.some((itemId) => priceAdjustmentRuleMatches(priceRule, {
-        itemId,
-        tipo: ctx.tipo,
-        providerCategoryId: ctx.providerCategoryId,
-    }));
-};
-const roundPercentage = (value, digits = 4) => {
-    const factor = 10 ** digits;
-    return Math.round((value + Number.EPSILON) * factor) / factor;
-};
-const clampPercentage = (value) => Math.min(100, Math.max(0, value));
-const formatPercentage = (value) => Number.isInteger(value) ? String(value) : String(roundPercentage(value));
-const formatFinalPercentage = (value) => roundPercentage(value, 2).toFixed(2);
-const formatRuleEffect = (step) => {
-    const sign = step.operation === "subtract" ? "-" : "+";
-    return `${sign} ${formatPercentage(step.value)}% (${step.ruleName})`;
-};
-export const formatRejectionPercentageAdjustmentDescription = (result, baseLabel = "origen") => {
-    const base = `${formatPercentage(result.basePercentage)} (${baseLabel})`;
-    if (result.steps.length === 0) {
-        return base;
-    }
-    return `${base} ${result.steps.map(formatRuleEffect).join(" ")} = ${formatFinalPercentage(result.finalPercentage)}`;
-};
-export const resolveRejectionPercentageBase = (memo) => {
-    const parsed = parseJsonMemo(memo);
-    const current = clampPercentage(getRejectionPercentage(parsed));
-    const calc = parsed.rejectionCalculations;
-    if (calc &&
-        Number.isFinite(Number(calc.finalPercentage)) &&
-        roundPercentage(current, 2) ===
-            roundPercentage(Number(calc.finalPercentage), 2)) {
-        const base = Number(calc.basePercentage);
-        return Number.isFinite(base) ? clampPercentage(base) : current;
-    }
-    return current;
-};
-export const applyRejectionPercentageAdjustmentRules = (basePercentage, rules, ctx) => {
-    const start = Number(basePercentage);
-    const safeBase = Number.isFinite(start) ? clampPercentage(start) : 0;
-    let runningTotal = safeBase;
-    const steps = [];
-    const normalized = rules
-        .map((rule) => ("data" in rule ? rule.data : rule))
-        .filter((rule) => Boolean(rule))
-        .filter((rule) => !rule.fechaEliminacion && rule.activa !== false)
-        .sort((a, b) => (a.prioridad ?? 0) - (b.prioridad ?? 0));
-    for (const rule of normalized) {
-        if (!rejectionPercentageAdjustmentRuleMatches(rule, ctx)) {
-            continue;
-        }
-        const value = Number(rule.valor) || 0;
-        const previous = runningTotal;
-        runningTotal =
-            rule.operacion === "subtract" ? previous - value : previous + value;
-        runningTotal = clampPercentage(roundPercentage(runningTotal));
-        steps.push({
-            ruleName: rule.nombre,
-            operation: rule.operacion,
-            value,
-            appliedAmount: roundPercentage(runningTotal - previous),
-            runningTotal,
-        });
-    }
-    const result = {
-        basePercentage: roundPercentage(safeBase),
-        finalPercentage: roundPercentage(runningTotal, 2),
-        description: "",
-        steps,
-    };
-    result.description = formatRejectionPercentageAdjustmentDescription(result);
-    return result;
-};

package/dist/zauru/rejectionPercentageAdjustmentRules.utils.d.ts

@@ -1,10 +1,7 @@
 import type { Session } from "@remix-run/node";
-import { AxiosUtilsResponse, RejectionPercentageAdjustmentContext, RejectionPercentageAdjustmentResult, RejectionPercentageAdjustmentRule, WebAppRowGraphQL, WebAppTableUpdateResponse } from "@zauru-sdk/types";
-export declare const filterActiveRejectionPercentageAdjustmentRules: (rules?: WebAppRowGraphQL<RejectionPercentageAdjustmentRule>[]) => WebAppRowGraphQL<RejectionPercentageAdjustmentRule>[];
+import { AxiosUtilsResponse, RejectionPercentageAdjustmentRule, WebAppRowGraphQL, WebAppTableUpdateResponse } from "@zauru-sdk/types";
+export { applyRejectionPercentageAdjustmentRules, applyRejectionPercentageRulesToFinancials, filterActiveRejectionPercentageAdjustmentRules, formatRejectionPercentageAdjustmentDescription, rejectionPercentageAdjustmentRuleMatches, resolveRejectionPercentageBase, resolveRejectionPercentageOrigin, REJECTION_PERCENTAGE_ADJUSTMENT_RULES_TABLE_VAR, } from "@zauru-sdk/common";
 export declare const getRejectionPercentageAdjustmentRules: (headers: any, session: Session) => Promise<AxiosUtilsResponse<WebAppRowGraphQL<RejectionPercentageAdjustmentRule>[]>>;
+export declare const getActiveRejectionPercentageAdjustmentRules: (headers: any, session?: Session) => Promise<WebAppRowGraphQL<RejectionPercentageAdjustmentRule>[]>;
 export declare const createRejectionPercentageAdjustmentRule: (headers: any, session: Session, body: RejectionPercentageAdjustmentRule) => Promise<AxiosUtilsResponse<WebAppTableUpdateResponse>>;
 export declare const updateRejectionPercentageAdjustmentRule: (headers: any, session: Session, id: string, body: Partial<RejectionPercentageAdjustmentRule>) => Promise<AxiosUtilsResponse<WebAppTableUpdateResponse>>;
-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 resolveRejectionPercentageBase: (memo?: string | object) => number;
-export declare const applyRejectionPercentageAdjustmentRules: (basePercentage: number, rules: Array<RejectionPercentageAdjustmentRule | WebAppRowGraphQL<RejectionPercentageAdjustmentRule>>, ctx: RejectionPercentageAdjustmentContext) => RejectionPercentageAdjustmentResult;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zauru-sdk/utils",
-  "version": "6.10.0",
+  "version": "6.11.0",
   "description": "Utilidades, parseo de request y demás para desarrollo de webapps de Zauru",
   "main": "./dist/esm/index.js",
   "module": "./dist/esm/index.js",
@@ -25,12 +25,12 @@
   },
   "dependencies": {
     "@remix-run/node": "^2.8.1",
-    "@zauru-sdk/common": "^6.4.1",
+    "@zauru-sdk/common": "^6.5.0",
     "@zauru-sdk/config": "^6.0.0",
     "@zauru-sdk/graphql": "^6.7.0",
-    "@zauru-sdk/services": "^6.9.1",
+    "@zauru-sdk/services": "^6.10.0",
     "@zauru-sdk/types": "^6.15.0",
     "moment": "^2.30.1"
   },
-  "gitHead": "ab1ff7197a4688c0e887942b4e7a1f6b729a510e"
+  "gitHead": "2dceb781cae3f4c45ceecb915977c6d142bca6b9"
 }