b2m-utils 0.0.270 → 0.0.271

package/build/index.js

@@ -1276,13 +1276,18 @@ var getLaneFromRatecard = function (cte) {
 };
 
 var getCtesFeesResult = function (feesToCalc, cte, allFeesForCalc) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f;
     var results = [];
-    // Separar ICMS das outras fees
+    // Separar ICMS e TOTAL_PERCENTAGE das outras fees
     var icmsFee = feesToCalc.find(function (f) { var _a; return ((_a = f.fee) === null || _a === void 0 ? void 0 : _a.id) === exports.FeeEnum.ICMS; });
-    var nonIcmsFees = feesToCalc.filter(function (f) { var _a; return ((_a = f.fee) === null || _a === void 0 ? void 0 : _a.id) !== exports.FeeEnum.ICMS; });
+    var totalPercentageFees = feesToCalc.filter(function (f) { var _a; return ((_a = f.fee) === null || _a === void 0 ? void 0 : _a.feeCalculationTypeId) === exports.FeeCalculationTypeEnum.TOTAL_PERCENTAGE; });
+    var regularFees = feesToCalc.filter(function (f) {
+        var _a, _b;
+        return ((_a = f.fee) === null || _a === void 0 ? void 0 : _a.id) !== exports.FeeEnum.ICMS &&
+            ((_b = f.fee) === null || _b === void 0 ? void 0 : _b.feeCalculationTypeId) !== exports.FeeCalculationTypeEnum.TOTAL_PERCENTAGE;
+    });
     var _loop_1 = function (item) {
-        var feeTotal = calculateFee(item, cte, feesToCalc, false, allFeesForCalc);
+        var feeTotal = calculateFee(item, cte, regularFees, false, allFeesForCalc);
         if (feeTotal === null || feeTotal === void 0 ? void 0 : feeTotal.totalFee) {
             var totalFee = feeTotal.totalFee, resultFee = feeTotal.resultFee, feeValue = feeTotal.feeValue;
             var totalToPush = totalFee;
@@ -1291,8 +1296,8 @@ var getCtesFeesResult = function (feesToCalc, cte, allFeesForCalc) {
                 var siblingFees = feesToCalc === null || feesToCalc === void 0 ? void 0 : feesToCalc.filter(function (i) { var _a, _b; return ((_a = i.fee) === null || _a === void 0 ? void 0 : _a.parentId) === fee_1.parentId && ((_b = i.fee) === null || _b === void 0 ? void 0 : _b.id) !== fee_1.id; });
                 if (siblingFees && (siblingFees === null || siblingFees === void 0 ? void 0 : siblingFees.length) > 0) {
                     var siblingFeesResults = [];
-                    for (var _d = 0, siblingFees_1 = siblingFees; _d < siblingFees_1.length; _d++) {
-                        var item_1 = siblingFees_1[_d];
+                    for (var _h = 0, siblingFees_1 = siblingFees; _h < siblingFees_1.length; _h++) {
+                        var item_1 = siblingFees_1[_h];
                         var result = calculateFee(item_1, cte, feesToCalc, false, allFeesForCalc);
                         siblingFeesResults.push(result);
                     }
@@ -1319,12 +1324,55 @@ var getCtesFeesResult = function (feesToCalc, cte, allFeesForCalc) {
             }
         }
     };
-    // PRIMEIRA PASSADA: Calcular todas as fees exceto ICMS
-    for (var _i = 0, nonIcmsFees_1 = nonIcmsFees; _i < nonIcmsFees_1.length; _i++) {
-        var item = nonIcmsFees_1[_i];
+    // PRIMEIRA PASSADA: Calcular fees regulares (exceto ICMS e TOTAL_PERCENTAGE)
+    for (var _i = 0, regularFees_1 = regularFees; _i < regularFees_1.length; _i++) {
+        var item = regularFees_1[_i];
         _loop_1(item);
     }
-    // SEGUNDA PASSADA: Calcular ICMS com base nos resultados já filtrados
+    var _loop_2 = function (item) {
+        var feeTotal = calculateFee(item, cte, regularFees, false, allFeesForCalc);
+        if (feeTotal === null || feeTotal === void 0 ? void 0 : feeTotal.totalFee) {
+            var totalFee = feeTotal.totalFee, resultFee = feeTotal.resultFee, feeValue = feeTotal.feeValue;
+            var totalToPush = totalFee;
+            if ((_d = item.fee) === null || _d === void 0 ? void 0 : _d.parentId) {
+                var fee_2 = item.fee;
+                var siblingFees = totalPercentageFees === null || totalPercentageFees === void 0 ? void 0 : totalPercentageFees.filter(function (i) { var _a, _b; return ((_a = i.fee) === null || _a === void 0 ? void 0 : _a.parentId) === fee_2.parentId && ((_b = i.fee) === null || _b === void 0 ? void 0 : _b.id) !== fee_2.id; });
+                if (siblingFees && (siblingFees === null || siblingFees === void 0 ? void 0 : siblingFees.length) > 0) {
+                    var siblingFeesResults = [];
+                    for (var _j = 0, siblingFees_2 = siblingFees; _j < siblingFees_2.length; _j++) {
+                        var siblingItem = siblingFees_2[_j];
+                        var result = calculateFee(siblingItem, cte, regularFees, false, allFeesForCalc);
+                        siblingFeesResults.push(result);
+                    }
+                    siblingFeesResults.sort(function (a, b) {
+                        if ((b === null || b === void 0 ? void 0 : b.totalFee) && (a === null || a === void 0 ? void 0 : a.totalFee)) {
+                            return +(b === null || b === void 0 ? void 0 : b.totalFee) - +(a === null || a === void 0 ? void 0 : a.totalFee);
+                        }
+                        return 0;
+                    });
+                    if ((siblingFeesResults === null || siblingFeesResults === void 0 ? void 0 : siblingFeesResults.length) > 0) {
+                        if (((_e = siblingFeesResults[0]) === null || _e === void 0 ? void 0 : _e.totalFee) && ((_f = siblingFeesResults[0]) === null || _f === void 0 ? void 0 : _f.totalFee) > totalFee) {
+                            totalToPush = 0;
+                        }
+                    }
+                }
+            }
+            if (!isNaN(+totalToPush)) {
+                results.push({
+                    total: +(totalToPush).toFixed(2),
+                    resultFee: resultFee,
+                    feeValue: feeValue,
+                    feeId: item.feeId,
+                });
+            }
+        }
+    };
+    // SEGUNDA PASSADA: Calcular fees TOTAL_PERCENTAGE com base nas fees regulares já calculadas
+    for (var _g = 0, totalPercentageFees_1 = totalPercentageFees; _g < totalPercentageFees_1.length; _g++) {
+        var item = totalPercentageFees_1[_g];
+        _loop_2(item);
+    }
+    // TERCEIRA PASSADA: Calcular ICMS com base nos resultados já filtrados
     if (icmsFee) {
         // Coletar apenas os valores das fees que realmente contam (total > 0)
         var valuesForIcms = results