@zauru-sdk/utils 6.16.1 → 6.18.0

package/dist/esm/zauru/4pinos-po-discount-history.utils.js

@@ -1,5 +1,14 @@
-import { handlePossibleAxiosErrors } from "@zauru-sdk/common";
+import { formatAutomaticRejectionRuleHistoryDescription, handlePossibleAxiosErrors, REJECTION_PERCENTAGE_RULE_HISTORY_TYPE, } from "@zauru-sdk/common";
 import { create4pinosPoDiscountHistory, getPurchaseOrder, getVariablesByName, update4pinosPoDiscountHistory, } from "@zauru-sdk/services";
+export const mapRejectionRuleStepsToDiscountHistory = (steps, meta) => steps.map((step) => ({
+    agency_id: meta.agency_id,
+    employee_id: meta.employee_id ?? 0,
+    employee_name: "Sistema",
+    created_at: meta.created_at ?? new Date().toISOString(),
+    description: formatAutomaticRejectionRuleHistoryDescription(step),
+    type: REJECTION_PERCENTAGE_RULE_HISTORY_TYPE,
+    discount: step.appliedAmount,
+}));
 export const add4pinosPoDiscountsHistory = async (session, headers, purchaseOrderId, discounts) => {
     return handlePossibleAxiosErrors(async () => {
         const { historial_porcentajes_de_rechazo_webapp_table_id } = await getVariablesByName(headers, session, [

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

@@ -1,4 +1,4 @@
-import { CURRENCY_PREFIX, calculatePurchaseOrderFinancials, getNewDateByFormat, getStringFullDate, getZauruDateByText, handlePossibleAxiosErrors, mergeJsonMemo, } from "@zauru-sdk/common";
+import { CURRENCY_PREFIX, calculatePurchaseOrderFinancials, getNewlyAppliedRejectionRuleSteps, getNewDateByFormat, getStringFullDate, getZauruDateByText, handlePossibleAxiosErrors, mergeJsonMemo, parseJsonMemo, } 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";
 /**
@@ -210,17 +210,19 @@ const extractPurchaseOrderItemIds = (purchase) => {
  * updateOchAndDis
  * Updates rejectionPercentage in purchase_order.memo and the monetary
  * purchase_orders.discount (qty × unit_cost × % / 100). Optionally other_charges.
+ * Prefer `rejectionApplication` (delta + mode) so successive layers are preserved.
  * `data.discount` is a legacy alias for the rejection percentage, not money.
  */
 export const updateOchAndDis = async (headers, data, purchase_id, session) => {
     return handlePossibleAxiosErrors(async () => {
-        const rejectionPercentage = Number(data?.rejectionPercentage ?? data?.discount ?? 0);
         let currentMemo = data.memo;
+        let liveMemo;
         let details = [];
         let loadedPurchase;
         const restPurchaseResponse = await getPurchase(headers, purchase_id);
         if (!restPurchaseResponse.error && restPurchaseResponse.data) {
             loadedPurchase = restPurchaseResponse.data;
+            liveMemo = restPurchaseResponse.data.memo;
             if (currentMemo === undefined) {
                 currentMemo = restPurchaseResponse.data.memo;
             }
@@ -236,6 +238,9 @@ export const updateOchAndDis = async (headers, data, purchase_id, session) => {
                 throw new Error(purchaseOrderResponse.userMsg ||
                     "No se pudo obtener la orden de compra para actualizar el porcentaje de rechazo");
             }
+            if (liveMemo === undefined) {
+                liveMemo = purchaseOrderResponse.data.memo;
+            }
             if (currentMemo === undefined) {
                 currentMemo = purchaseOrderResponse.data.memo;
             }
@@ -258,10 +263,22 @@ export const updateOchAndDis = async (headers, data, purchase_id, session) => {
         const payee = purchaseRecord?.payee;
         const itemIds = extractPurchaseOrderItemIds(loadedPurchase);
         const tipo = purchaseRecord?.reference;
+        const memoForOrigin = liveMemo ?? currentMemo;
+        const previousCalculations = parseJsonMemo(memoForOrigin).rejectionCalculations;
+        const hasExplicitLayers = data.rejectionLayers != null;
+        const hasApplication = data.rejectionApplication != null;
         const financials = calculatePurchaseOrderFinancials({
             details,
-            rejectionPercentage,
-            memo: currentMemo,
+            memo: memoForOrigin,
+            ...(hasExplicitLayers ? { rejectionLayers: data.rejectionLayers } : {}),
+            ...(hasApplication
+                ? { rejectionApplication: data.rejectionApplication }
+                : {}),
+            ...(!hasExplicitLayers && !hasApplication
+                ? {
+                    rejectionPercentage: Number(data?.rejectionPercentage ?? data?.discount ?? 0),
+                }
+                : {}),
             rules,
             ctx: {
                 itemIds,
@@ -271,11 +288,13 @@ export const updateOchAndDis = async (headers, data, purchase_id, session) => {
                         ?.payee_category_id,
             },
         });
+        const newlyAppliedSteps = getNewlyAppliedRejectionRuleSteps(previousCalculations, financials.rejectionCalculations);
         const body = {
             purchase_order: {
-                memo: mergeJsonMemo(currentMemo, {
+                memo: mergeJsonMemo(memoForOrigin, {
                     rejectionPercentage: financials.rejectionPercentage,
                     rejectionCalculations: financials.rejectionCalculations,
+                    rejectionLayers: financials.rejectionLayers,
                 }),
                 discount: financials.discount,
             },
@@ -287,7 +306,12 @@ export const updateOchAndDis = async (headers, data, purchase_id, session) => {
         if (responseUpdate.error || responseUpdate.data === null) {
             throw new Error(responseUpdate.userMsg);
         }
-        return true;
+        return {
+            rejectionPercentage: financials.rejectionPercentage,
+            rejectionLayers: financials.rejectionLayers,
+            rejectionCalculations: financials.rejectionCalculations,
+            newlyAppliedSteps,
+        };
     });
 };
 /**

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

@@ -1,6 +1,6 @@
 import { filterActiveRejectionPercentageAdjustmentRules, handlePossibleAxiosErrors, REJECTION_PERCENTAGE_ADJUSTMENT_RULES_TABLE_VAR, } from "@zauru-sdk/common";
 import { createWebAppTableRegister, getVariables, getVariablesByName, getWebAppTableRegisters, getWebAppTableRegistersRest, updateWebAppTableRegister, } from "@zauru-sdk/services";
-export { applyRejectionPercentageAdjustmentRules, filterActiveRejectionPercentageAdjustmentRules, formatRejectionPercentageAdjustmentDescription, rejectionPercentageAdjustmentRuleMatches, resolveRejectionPercentageBase, resolveRejectionPercentageOrigin, REJECTION_PERCENTAGE_ADJUSTMENT_RULES_TABLE_VAR, } from "@zauru-sdk/common";
+export { applyRejectionPercentageAdjustmentRules, applyRejectionPercentageLayers, computeEffectiveRejectionPercentage, filterActiveRejectionPercentageAdjustmentRules, formatAutomaticRejectionRuleHistoryDescription, formatRejectionPercentageAdjustmentDescription, getNewlyAppliedRejectionRuleSteps, hasSuccessiveRejectionLayers, isAutomaticRejectionRuleHistoryType, normalizeRejectionPercentageLayers, rejectionPercentageAdjustmentRuleMatches, resolveRejectionPercentageBase, resolveRejectionPercentageOrigin, REJECTION_PERCENTAGE_ADJUSTMENT_RULES_TABLE_VAR, REJECTION_PERCENTAGE_RULE_HISTORY_TYPE, } from "@zauru-sdk/common";
 const getTableId = async (headers, session) => {
     const vars = await getVariablesByName(headers, session, [
         REJECTION_PERCENTAGE_ADJUSTMENT_RULES_TABLE_VAR,

package/dist/esm/zauru/remix-handle-request.server.js

@@ -5,6 +5,7 @@ import { RemixServer } from "@remix-run/react";
 import { renderToPipeableStream } from "react-dom/server";
 import { handleError } from "./cloudwatch-remix.server.js";
 const ABORT_DELAY = 5_000;
+const RemixServerComponent = RemixServer;
 function isBotRequest(userAgent) {
     if (!userAgent)
         return false;
@@ -29,7 +30,7 @@ export function handleRequest(request, responseStatusCode, responseHeaders, remi
 function handleBotRequest(request, responseStatusCode, responseHeaders, remixContext) {
     return new Promise((resolve, reject) => {
         let shellRendered = false;
-        const { pipe, abort } = renderToPipeableStream(createElement(RemixServer, {
+        const { pipe, abort } = renderToPipeableStream(createElement(RemixServerComponent, {
             context: remixContext,
             url: request.url,
             abortDelay: ABORT_DELAY,
@@ -61,7 +62,7 @@ function handleBotRequest(request, responseStatusCode, responseHeaders, remixCon
 function handleBrowserRequest(request, responseStatusCode, responseHeaders, remixContext) {
     return new Promise((resolve, reject) => {
         let shellRendered = false;
-        const { pipe, abort } = renderToPipeableStream(createElement(RemixServer, {
+        const { pipe, abort } = renderToPipeableStream(createElement(RemixServerComponent, {
             context: remixContext,
             url: request.url,
             abortDelay: ABORT_DELAY,

package/dist/zauru/4pinos-po-discount-history.utils.d.ts

@@ -1,3 +1,8 @@
 import { Session } from "@remix-run/node";
-import { PoDiscountHistory } from "@zauru-sdk/types";
+import { PoDiscountHistory, PoDiscountHistoryEntry, RejectionPercentageAdjustmentStep } from "@zauru-sdk/types";
+export declare const mapRejectionRuleStepsToDiscountHistory: (steps: RejectionPercentageAdjustmentStep[], meta: {
+    agency_id: number;
+    employee_id?: number;
+    created_at?: string;
+}) => PoDiscountHistoryEntry[];
 export declare const add4pinosPoDiscountsHistory: (session: Session, headers: any, purchaseOrderId: number | string, discounts: PoDiscountHistory["discounts"]) => Promise<import("@zauru-sdk/types").AxiosUtilsResponse<void>>;

package/dist/zauru/purchase-orders.utils.d.ts

@@ -1,5 +1,5 @@
 import type { Session } from "@remix-run/node";
-import { AxiosUtilsResponse, LoteWithPurchaseFormatedSchema, PurchaseOrderGraphQL, PurchasesDataTableListFormatedSchema, PurchasesListResponseSchema } from "@zauru-sdk/types";
+import { AxiosUtilsResponse, LoteWithPurchaseFormatedSchema, PurchaseOrderGraphQL, PurchasesDataTableListFormatedSchema, PurchasesListResponseSchema, RejectionPercentageApplication, RejectionPercentageLayers, UpdateOchAndDisResult } from "@zauru-sdk/types";
 /**
  * Obtiene el listado de ordenes de compra, formateado especialmente para armar la tabla de edición de porcentajes y tolerancia
  * @param headers
@@ -40,14 +40,17 @@ export declare const updatePurchaseItemPrice: (headers: any, data: {
  * updateOchAndDis
  * Updates rejectionPercentage in purchase_order.memo and the monetary
  * purchase_orders.discount (qty × unit_cost × % / 100). Optionally other_charges.
+ * Prefer `rejectionApplication` (delta + mode) so successive layers are preserved.
  * `data.discount` is a legacy alias for the rejection percentage, not money.
  */
 export declare const updateOchAndDis: (headers: any, data: {
+    rejectionApplication?: RejectionPercentageApplication;
+    rejectionLayers?: RejectionPercentageLayers;
     rejectionPercentage?: number | string;
     discount?: number | string;
     other_charges?: number | string;
     memo?: string | object;
-}, purchase_id: number, session?: Session) => Promise<AxiosUtilsResponse<boolean>>;
+}, purchase_id: number, session?: Session) => Promise<AxiosUtilsResponse<UpdateOchAndDisResult>>;
 /**
  * Obtengo los id's de las órdenes de compra en un arreglo numérico
  * @param headers

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

@@ -1,6 +1,6 @@
 import type { Session } from "@remix-run/node";
 import { AxiosUtilsResponse, RejectionPercentageAdjustmentRule, WebAppRowGraphQL, WebAppTableUpdateResponse } from "@zauru-sdk/types";
-export { applyRejectionPercentageAdjustmentRules, filterActiveRejectionPercentageAdjustmentRules, formatRejectionPercentageAdjustmentDescription, rejectionPercentageAdjustmentRuleMatches, resolveRejectionPercentageBase, resolveRejectionPercentageOrigin, REJECTION_PERCENTAGE_ADJUSTMENT_RULES_TABLE_VAR, } from "@zauru-sdk/common";
+export { applyRejectionPercentageAdjustmentRules, applyRejectionPercentageLayers, computeEffectiveRejectionPercentage, filterActiveRejectionPercentageAdjustmentRules, formatAutomaticRejectionRuleHistoryDescription, formatRejectionPercentageAdjustmentDescription, getNewlyAppliedRejectionRuleSteps, hasSuccessiveRejectionLayers, isAutomaticRejectionRuleHistoryType, normalizeRejectionPercentageLayers, rejectionPercentageAdjustmentRuleMatches, resolveRejectionPercentageBase, resolveRejectionPercentageOrigin, REJECTION_PERCENTAGE_ADJUSTMENT_RULES_TABLE_VAR, REJECTION_PERCENTAGE_RULE_HISTORY_TYPE, } from "@zauru-sdk/common";
 export declare const getRejectionPercentageAdjustmentRules: (headers: any, session: Session) => Promise<AxiosUtilsResponse<WebAppRowGraphQL<RejectionPercentageAdjustmentRule>[]>>;
 /**
  * Same listing without a Remix session: resolves the table id over REST, for

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zauru-sdk/utils",
-  "version": "6.16.1",
+  "version": "6.18.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",
@@ -71,12 +71,12 @@
   "dependencies": {
     "@aws-sdk/client-cloudwatch-logs": "^3.1123.0",
     "@remix-run/node": "^2.8.1",
-    "@zauru-sdk/common": "^6.6.0",
+    "@zauru-sdk/common": "^6.8.0",
     "@zauru-sdk/config": "^6.0.0",
     "@zauru-sdk/graphql": "^6.7.0",
-    "@zauru-sdk/services": "^6.11.0",
-    "@zauru-sdk/types": "^6.16.0",
+    "@zauru-sdk/services": "^6.11.2",
+    "@zauru-sdk/types": "^6.18.0",
     "moment": "^2.30.1"
   },
-  "gitHead": "99cc7bef84a3d3c919d336a95eebe82cce2e8c08"
+  "gitHead": "c5b785baa29fdd2ab7f42a9077ba5cbe5c7c9707"
 }