b2m-utils 0.0.280 → 0.0.282

package/build/index.js

@@ -1281,28 +1281,42 @@ var getLaneFromRatecard = function (cte) {
 };
 
 var getCtesFeesResult = function (feesToCalc, cte, allFeesForCalc) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     var results = [];
     // Separar fees por tipo: normais, TOTAL_PERCENTAGE e ICMS
-    var icmsFee = feesToCalc.find(function (f) { var _a; return ((_a = f.fee) === null || _a === void 0 ? void 0 : _a.id) === exports.FeeEnum.ICMS; });
+    var icmsFee = feesToCalc.find(function (f) { var _a; return ((_a = f.fee) === null || _a === void 0 ? void 0 : _a.id) === exports.FeeEnum.ICMS || f.feeId === 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 normalFees = feesToCalc.filter(function (f) {
         var _a, _b;
         return ((_a = f.fee) === null || _a === void 0 ? void 0 : _a.id) !== exports.FeeEnum.ICMS &&
+            f.feeId !== exports.FeeEnum.ICMS &&
             ((_b = f.fee) === null || _b === void 0 ? void 0 : _b.feeCalculationTypeId) !== exports.FeeCalculationTypeEnum.TOTAL_PERCENTAGE;
     });
+    console.log('DEBUG getCtesFeesResult - Separação de fees:', {
+        totalFees: feesToCalc.length,
+        icmsFee: icmsFee ? { feeId: icmsFee.feeId, 'fee.id': (_a = icmsFee.fee) === null || _a === void 0 ? void 0 : _a.id } : null,
+        totalPercentageCount: totalPercentageFees.length,
+        normalFeesCount: normalFees.length,
+        normalFeeIds: normalFees.map(function (f) { var _a; return ({ feeId: f.feeId, 'fee.id': (_a = f.fee) === null || _a === void 0 ? void 0 : _a.id }); })
+    });
     var _loop_1 = function (item) {
         var feeTotal = calculateFee(item, cte, feesToCalc, 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 ((_a = item.fee) === null || _a === void 0 ? void 0 : _a.parentId) {
+            if ((_b = item.fee) === null || _b === void 0 ? void 0 : _b.parentId) {
                 var fee_1 = item.fee;
-                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; });
+                var siblingFees = feesToCalc === null || feesToCalc === void 0 ? void 0 : feesToCalc.filter(function (i) {
+                    var _a, _b, _c;
+                    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 &&
+                        ((_c = i.fee) === null || _c === void 0 ? void 0 : _c.id) !== exports.FeeEnum.ICMS &&
+                        i.feeId !== exports.FeeEnum.ICMS;
+                });
                 if (siblingFees && (siblingFees === null || siblingFees === void 0 ? void 0 : siblingFees.length) > 0) {
                     var siblingFeesResults = [];
-                    for (var _e = 0, siblingFees_1 = siblingFees; _e < siblingFees_1.length; _e++) {
-                        var item_1 = siblingFees_1[_e];
+                    for (var _f = 0, siblingFees_1 = siblingFees; _f < siblingFees_1.length; _f++) {
+                        var item_1 = siblingFees_1[_f];
                         var result = calculateFee(item_1, cte, feesToCalc, false, allFeesForCalc);
                         siblingFeesResults.push(result);
                     }
@@ -1313,7 +1327,7 @@ var getCtesFeesResult = function (feesToCalc, cte, allFeesForCalc) {
                         return 0;
                     });
                     if ((siblingFeesResults === null || siblingFeesResults === void 0 ? void 0 : siblingFeesResults.length) > 0) {
-                        if (((_b = siblingFeesResults[0]) === null || _b === void 0 ? void 0 : _b.totalFee) && ((_c = siblingFeesResults[0]) === null || _c === void 0 ? void 0 : _c.totalFee) > totalFee) {
+                        if (((_c = siblingFeesResults[0]) === null || _c === void 0 ? void 0 : _c.totalFee) && ((_d = siblingFeesResults[0]) === null || _d === void 0 ? void 0 : _d.totalFee) > totalFee) {
                             totalToPush = 0;
                         }
                     }
@@ -1335,8 +1349,8 @@ var getCtesFeesResult = function (feesToCalc, cte, allFeesForCalc) {
         _loop_1(item);
     }
     // PASSADA 2: Calcular fees TOTAL_PERCENTAGE usando a soma das fees normais já calculadas
-    for (var _d = 0, totalPercentageFees_1 = totalPercentageFees; _d < totalPercentageFees_1.length; _d++) {
-        var item = totalPercentageFees_1[_d];
+    for (var _e = 0, totalPercentageFees_1 = totalPercentageFees; _e < totalPercentageFees_1.length; _e++) {
+        var item = totalPercentageFees_1[_e];
         // Calcular soma das fees normais (excluindo TOTAL_PERCENTAGE e ICMS)
         var totalWithoutPercentageFees = results
             .filter(function (r) { return r.total > 0; })