b2m-utils 0.0.276 → 0.0.278

package/build/index.esm.js

@@ -588,6 +588,11 @@ var calculateFee = function (ratecardLaneFee, cte, allFees, debug, allFeesForCal
                             }
                             return 0;
                         });
+                        console.log({
+                            filteredFees: filteredFees_1,
+                            filteredFeesResults: filteredFeesResults,
+                            totalFromAllFees: totalFromAllFees,
+                        });
                         if (totalFromAllFees && (totalFromAllFees === null || totalFromAllFees === void 0 ? void 0 : totalFromAllFees.length) > 0) {
                             var totalValueFromAllFees = totalFromAllFees.filter(function (i) { return !isNaN(+i) && +i > 0; }).reduce(function (previous, current) {
                                 if (!isNaN(+previous) && !isNaN(+current)) {
@@ -1274,9 +1279,14 @@ var getLaneFromRatecard = function (cte) {
 var getCtesFeesResult = function (feesToCalc, cte, allFeesForCalc) {
     var _a, _b, _c;
     var results = [];
-    // Separar ICMS das outras fees
+    // 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) === FeeEnum.ICMS; });
-    var nonIcmsFees = feesToCalc.filter(function (f) { var _a; return ((_a = f.fee) === null || _a === void 0 ? void 0 : _a.id) !== FeeEnum.ICMS; });
+    var totalPercentageFees = feesToCalc.filter(function (f) { var _a; return ((_a = f.fee) === null || _a === void 0 ? void 0 : _a.feeCalculationTypeId) === FeeCalculationTypeEnum.TOTAL_PERCENTAGE; });
+    var normalFees = feesToCalc.filter(function (f) {
+        var _a, _b;
+        return ((_a = f.fee) === null || _a === void 0 ? void 0 : _a.id) !== FeeEnum.ICMS &&
+            ((_b = f.fee) === null || _b === void 0 ? void 0 : _b.feeCalculationTypeId) !== FeeCalculationTypeEnum.TOTAL_PERCENTAGE;
+    });
     var _loop_1 = function (item) {
         var feeTotal = calculateFee(item, cte, feesToCalc, false, allFeesForCalc);
         if (feeTotal === null || feeTotal === void 0 ? void 0 : feeTotal.totalFee) {
@@ -1287,8 +1297,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 _e = 0, siblingFees_1 = siblingFees; _e < siblingFees_1.length; _e++) {
+                        var item_1 = siblingFees_1[_e];
                         var result = calculateFee(item_1, cte, feesToCalc, false, allFeesForCalc);
                         siblingFeesResults.push(result);
                     }
@@ -1315,12 +1325,30 @@ 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];
+    // PASSADA 1: Calcular fees normais (não TOTAL_PERCENTAGE, não ICMS)
+    for (var _i = 0, normalFees_1 = normalFees; _i < normalFees_1.length; _i++) {
+        var item = normalFees_1[_i];
         _loop_1(item);
     }
-    // SEGUNDA PASSADA: Calcular ICMS com base nos resultados já filtrados
+    // 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];
+        // Calcular soma das fees normais (excluindo TOTAL_PERCENTAGE e ICMS)
+        var totalWithoutPercentageFees = results
+            .filter(function (r) { return r.total > 0; })
+            .reduce(function (sum, r) { return sum + r.total; }, 0);
+        var percentage = item.value || 0;
+        var calculatedValue = (totalWithoutPercentageFees * percentage) / 100;
+        if (!isNaN(+calculatedValue) && calculatedValue > 0) {
+            results.push({
+                total: +(calculatedValue).toFixed(2),
+                resultFee: "".concat(convertNumberToCurrency(totalWithoutPercentageFees, 'pt-br'), " x ").concat(percentage, "% = ").concat(convertNumberToCurrency(calculatedValue, 'pt-br')),
+                feeValue: percentage,
+                feeId: item.feeId,
+            });
+        }
+    }
+    // PASSADA 3: Calcular ICMS com base em todas as fees anteriores (normais + TOTAL_PERCENTAGE)
     if (icmsFee) {
         // Coletar apenas os valores das fees que realmente contam (total > 0)
         var valuesForIcms = results