b2m-utils 0.0.184 → 0.0.186

package/build/index.js

@@ -2,6 +2,36 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var getRatecardFromCte = function (cte) {
+    var _a, _b, _c;
+    var ratecard = null;
+    if (((_a = cte.carrier) === null || _a === void 0 ? void 0 : _a.Ratecard) && ((_c = (_b = cte.carrier) === null || _b === void 0 ? void 0 : _b.Ratecard) === null || _c === void 0 ? void 0 : _c.length) > 0) {
+        var ratecardFromThisYear = cte.carrier.Ratecard.find(function (ratecard) {
+            var today = new Date();
+            return (ratecard === null || ratecard === void 0 ? void 0 : ratecard.startsAt) && (ratecard === null || ratecard === void 0 ? void 0 : ratecard.endsAt) && today >= new Date(ratecard.startsAt) && today <= new Date(ratecard.endsAt);
+        });
+        if (ratecardFromThisYear) {
+            ratecard = ratecardFromThisYear;
+        }
+    }
+    return ratecard;
+};
+
+var applyRedeliveryMultiplier = function (total, cte) {
+    var redeliveryInfo = '';
+    if (cte === null || cte === void 0 ? void 0 : cte.isRedelivery) {
+        var ratecard = getRatecardFromCte(cte);
+        if (ratecard === null || ratecard === void 0 ? void 0 : ratecard.redeliveryPercentageValue) {
+            total = total * (ratecard.redeliveryPercentageValue / 100);
+            redeliveryInfo = " x ".concat(ratecard.redeliveryPercentageValue, "%");
+        }
+    }
+    return {
+        adjustedTotal: total,
+        redeliveryInfo: redeliveryInfo
+    };
+};
+
 exports.ApplicationColumnNameEnum = void 0;
 (function (ApplicationColumnNameEnum) {
     ApplicationColumnNameEnum["DEPARTURE_AT"] = "departureAt";
@@ -204,14 +234,118 @@ exports.TrackProcessProviderTypeEnum = void 0;
     TrackProcessProviderTypeEnum[TrackProcessProviderTypeEnum["OTHERS"] = 5] = "OTHERS";
 })(exports.TrackProcessProviderTypeEnum || (exports.TrackProcessProviderTypeEnum = {}));
 
-var calculateFee = function (ratecardLaneFee, cte, allFees, debug) {
+/******************************************************************************
+Copyright (c) Microsoft Corporation.
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+PERFORMANCE OF THIS SOFTWARE.
+***************************************************************************** */
+
+var __assign = function() {
+  __assign = Object.assign || function __assign(t) {
+      for (var s, i = 1, n = arguments.length; i < n; i++) {
+          s = arguments[i];
+          for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+      return t;
+  };
+  return __assign.apply(this, arguments);
+};
+
+function __awaiter(thisArg, _arguments, P, generator) {
+  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+  return new (P || (P = Promise))(function (resolve, reject) {
+      function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+      function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+      function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+      step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+}
+
+function __generator(thisArg, body) {
+  var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+  return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+  function verb(n) { return function (v) { return step([n, v]); }; }
+  function step(op) {
+      if (f) throw new TypeError("Generator is already executing.");
+      while (g && (g = 0, op[0] && (_ = 0)), _) try {
+          if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+          if (y = 0, t) op = [op[0] & 2, t.value];
+          switch (op[0]) {
+              case 0: case 1: t = op; break;
+              case 4: _.label++; return { value: op[1], done: false };
+              case 5: _.label++; y = op[1]; op = [0]; continue;
+              case 7: op = _.ops.pop(); _.trys.pop(); continue;
+              default:
+                  if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                  if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                  if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                  if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                  if (t[2]) _.ops.pop();
+                  _.trys.pop(); continue;
+          }
+          op = body.call(thisArg, _);
+      } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+      if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+  }
+}
+
+typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
+  var e = new Error(message);
+  return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+};
+
+var convertNumberToCurrency = function (value, locale, options) {
+    if (locale === void 0) { locale = 'en-US'; }
+    var configObject = {
+        locale: 'en-US',
+        currency: 'USD',
+    };
+    switch (locale) {
+        case 'pt-br':
+            configObject.locale = 'pt-br';
+            configObject.currency = 'BRL';
+            break;
+    }
+    return (+value).toLocaleString(configObject.locale, __assign({ style: 'currency', currency: configObject.currency }, options));
+};
+
+var filterSiblingFees = function (fees) {
+    return fees.filter(function (fee) {
+        var _a, _b, _c;
+        if ((_a = fee.fee) === null || _a === void 0 ? void 0 : _a.parentId) {
+            var siblingFees = fees === null || fees === void 0 ? void 0 : fees.filter(function (i) { var _a, _b, _c, _d; return ((_a = i.fee) === null || _a === void 0 ? void 0 : _a.parentId) === ((_b = fee.fee) === null || _b === void 0 ? void 0 : _b.parentId) && ((_c = i.fee) === null || _c === void 0 ? void 0 : _c.id) !== ((_d = fee.fee) === null || _d === void 0 ? void 0 : _d.id); });
+            if (siblingFees && (siblingFees === null || siblingFees === void 0 ? void 0 : siblingFees.length) > 0) {
+                siblingFees.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 ((siblingFees === null || siblingFees === void 0 ? void 0 : siblingFees.length) > 0) {
+                    if (((_b = siblingFees[0]) === null || _b === void 0 ? void 0 : _b.totalFee) && fee.totalFee && ((_c = siblingFees[0]) === null || _c === void 0 ? void 0 : _c.totalFee) > fee.totalFee) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    });
+};
+
+var calculateFee = function (ratecardLaneFee, cte, allFees, debug, allFeesForCalc) {
     var _a, _b, _c, _d;
+    if (debug === void 0) { debug = false; }
     if (ratecardLaneFee.fee) {
         var value = ratecardLaneFee.value, fee_1 = ratecardLaneFee.fee;
-        var valueCurrency = (+ratecardLaneFee.value).toLocaleString('pt-br', {
-            style: 'currency',
-            currency: 'BRL',
-        });
         var totalFee = 0;
         var resultFee = '';
         var totalToCalc = 0;
@@ -222,25 +356,20 @@ var calculateFee = function (ratecardLaneFee, cte, allFees, debug) {
             switch (fee_1.id) {
                 case exports.FeeEnum.ICMS:
                     if (allFees && Array.isArray(allFees) && (allFees === null || allFees === void 0 ? void 0 : allFees.length) > 0) {
-                        var totalFromAllFees = allFees.filter(function (i) { var _a; return ((_a = i.fee) === null || _a === void 0 ? void 0 : _a.feeCalculationTypeId) !== exports.FeeCalculationTypeEnum.TOTAL_PERCENTAGE; }).map(function (it) {
-                            var result = calculateFee(it, cte, allFees);
+                        var totalFromAllFees = filterSiblingFees(allFees).filter(function (i) { var _a; return ((_a = i.fee) === null || _a === void 0 ? void 0 : _a.feeCalculationTypeId) !== exports.FeeCalculationTypeEnum.TOTAL_PERCENTAGE; }).map(function (it) {
+                            var result = calculateFee(it, cte, allFees, debug, allFeesForCalc);
                             if (result === null || result === void 0 ? void 0 : result.totalToCalc) {
                                 return result.totalToCalc;
                             }
                             return 0;
-                        });
+                        }, 0);
                         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 (previous && current && !isNaN(+previous) && !isNaN(+current)) {
-                                    return +previous + +current;
-                                }
-                                else {
-                                    return 0;
-                                }
-                            });
+                                return +previous + +current;
+                            }, 0);
                             if (totalValueFromAllFees && !isNaN(+totalValueFromAllFees)) {
-                                var valueToDivide = (1 - value);
-                                var firstTotal = +totalValueFromAllFees / valueToDivide;
+                                var valueToDivide = (1 - value).toFixed(2);
+                                var firstTotal = +totalValueFromAllFees / +valueToDivide;
                                 var total = +firstTotal * +value;
                                 var totalValueFromAllFeesCurrency = convertNumberToCurrency(+totalValueFromAllFees, 'pt-br');
                                 var resultCurrency = (+total).toLocaleString('pt-BR', {
@@ -249,6 +378,7 @@ var calculateFee = function (ratecardLaneFee, cte, allFees, debug) {
                                 });
                                 var result = "(".concat(totalValueFromAllFeesCurrency, " / ").concat(valueToDivide, ") x ").concat(value, " = ").concat(resultCurrency);
                                 totalFee = total;
+                                totalToCalc = Number(total.toFixed(2));
                                 resultFee = result;
                             }
                         }
@@ -260,8 +390,11 @@ var calculateFee = function (ratecardLaneFee, cte, allFees, debug) {
             switch (fee_1.feeCalculationTypeId) {
                 case exports.FeeCalculationTypeEnum.TOTAL_PERCENTAGE:
                     if (allFees && Array.isArray(allFees) && (allFees === null || allFees === void 0 ? void 0 : allFees.length) > 0) {
-                        var totalFromAllFees = allFees.filter(function (i) { var _a; return ((_a = i.fee) === null || _a === void 0 ? void 0 : _a.feeCalculationTypeId) !== exports.FeeCalculationTypeEnum.TOTAL_PERCENTAGE; }).map(function (it) {
-                            var result = calculateFee(it, cte, allFees);
+                        var totalFromAllFees = allFees.filter(function (i) { var _a; return ((_a = i.fee) === null || _a === void 0 ? void 0 : _a.feeCalculationTypeId) !== exports.FeeCalculationTypeEnum.TOTAL_PERCENTAGE; }).map(function () {
+                            // const result = calculateFee(it, cte, allFees, debug, allFeesForCalc);
+                            var result = {
+                                totalToCalc: 0,
+                            };
                             if (result === null || result === void 0 ? void 0 : result.totalToCalc) {
                                 return result.totalToCalc;
                             }
@@ -278,110 +411,242 @@ var calculateFee = function (ratecardLaneFee, cte, allFees, debug) {
                             });
                             if (totalValueFromAllFees && !isNaN(+totalValueFromAllFees)) {
                                 var valueToMultiply = (1 - value);
-                                var total = +totalValueFromAllFees * (valueToMultiply / 100);
+                                var total_1 = +totalValueFromAllFees * (valueToMultiply / 100);
+                                var _e = applyRedeliveryMultiplier(total_1, cte), adjustedTotal_1 = _e.adjustedTotal, redeliveryInfo_1 = _e.redeliveryInfo;
+                                total_1 = adjustedTotal_1;
                                 var totalValueFromAllFeesCurrency = convertNumberToCurrency(+totalValueFromAllFees, 'pt-br');
-                                var resultCurrency = (+total).toLocaleString('pt-BR', {
+                                var resultCurrency_1 = (+total_1).toLocaleString('pt-BR', {
                                     style: 'currency',
                                     currency: 'BRL',
                                 });
-                                var result = "".concat(totalValueFromAllFeesCurrency, " x ").concat(valueToMultiply, "% = ").concat(resultCurrency);
-                                totalFee = total;
-                                resultFee = result;
+                                var result_1 = "".concat(totalValueFromAllFeesCurrency, " x ").concat(valueToMultiply, "%").concat(redeliveryInfo_1, " = ").concat(resultCurrency_1);
+                                totalFee = total_1;
+                                resultFee = result_1;
                             }
                         }
                     }
                     break;
                 case exports.FeeCalculationTypeEnum.FRACTIONED:
-                    if (cte.taxedWeight && !isNaN(+cte.taxedWeight)) {
+                    if ((cte === null || cte === void 0 ? void 0 : cte.taxedWeight) && !isNaN(+(cte === null || cte === void 0 ? void 0 : cte.taxedWeight))) {
                         var fractions = Math.ceil(+cte.taxedWeight / 100);
-                        var total = fractions * value;
-                        var resultCurrency = (+total).toLocaleString('pt-BR', {
+                        var total_2 = fractions * value;
+                        var _f = applyRedeliveryMultiplier(total_2, cte), adjustedTotal_2 = _f.adjustedTotal, redeliveryInfo_2 = _f.redeliveryInfo;
+                        total_2 = adjustedTotal_2;
+                        var valueCurrency_1 = (+value).toLocaleString('pt-br', {
                             style: 'currency',
                             currency: 'BRL',
                         });
-                        var result = "".concat(fractions, " fra\u00E7\u00F5es x ").concat(valueCurrency, " = ").concat(resultCurrency);
-                        totalFee = total;
-                        resultFee = result;
+                        var resultCurrency_2 = (+total_2).toLocaleString('pt-BR', {
+                            style: 'currency',
+                            currency: 'BRL',
+                        });
+                        var result_2 = "".concat(fractions, " fra\u00E7\u00F5es x ").concat(valueCurrency_1).concat(redeliveryInfo_2, " = ").concat(resultCurrency_2);
+                        totalFee = total_2;
+                        resultFee = result_2;
                     }
                     break;
                 case exports.FeeCalculationTypeEnum.FREIGHT:
-                    if (value && cte.freightValue) {
+                    if (value && (cte === null || cte === void 0 ? void 0 : cte.freightValue)) {
                         if (!isNaN(+value) && !isNaN(+cte.freightValue)) {
-                            var total = +cte.freightValue * (+value / 100);
+                            var total_3 = +cte.freightValue * (+value / 100);
+                            var _g = applyRedeliveryMultiplier(total_3, cte), adjustedTotal_3 = _g.adjustedTotal, redeliveryInfo_3 = _g.redeliveryInfo;
+                            total_3 = adjustedTotal_3;
                             var freightValueCurrency = (+cte.freightValue).toLocaleString('pt-br', {
                                 style: 'currency',
                                 currency: 'BRL',
                             });
-                            var resultCurrency = (+total).toLocaleString('pt-br', {
+                            var resultCurrency_3 = (+total_3).toLocaleString('pt-br', {
                                 style: 'currency',
                                 currency: 'BRL',
                             });
-                            var result = "".concat(freightValueCurrency, " x ").concat(value, "% = ").concat(resultCurrency);
-                            totalFee = total;
-                            resultFee = result;
+                            var result_3 = "".concat(freightValueCurrency, " x ").concat(value, "%").concat(redeliveryInfo_3, " = ").concat(resultCurrency_3);
+                            totalFee = total_3;
+                            resultFee = result_3;
                         }
+                        /*const commodityValue = cte.commodityValue ?? 0;
+
+                        let total = +commodityValue * (+value / 100);
+
+                        const { adjustedTotal, redeliveryInfo } = applyRedeliveryMultiplier(total, cte);
+                        total = adjustedTotal;
+
+                        const resultCurrency = (+total).toLocaleString('pt-br', {
+                            style: 'currency',
+                            currency: 'BRL',
+                        });
+
+                        const result = `${convertNumberToCurrency(+commodityValue, 'pt-br')} x ${value}%${redeliveryInfo} = ${resultCurrency}`;
+
+                        totalFee = total;
+                        resultFee = result;*/
                     }
                     break;
                 case exports.FeeCalculationTypeEnum.MIN_VALUE:
                 case exports.FeeCalculationTypeEnum.FIXED:
-                    totalFee = +value;
-                    resultFee = valueCurrency;
+                    var total = +value;
+                    var _h = applyRedeliveryMultiplier(total, cte), adjustedTotal = _h.adjustedTotal, redeliveryInfo = _h.redeliveryInfo;
+                    total = adjustedTotal;
+                    var valueCurrency = (+value).toLocaleString('pt-br', {
+                        style: 'currency',
+                        currency: 'BRL',
+                    });
+                    var resultCurrency = (+total).toLocaleString('pt-br', {
+                        style: 'currency',
+                        currency: 'BRL',
+                    });
+                    var result = "".concat(redeliveryInfo ? "".concat(valueCurrency).concat(redeliveryInfo, " = ").concat(resultCurrency) : valueCurrency);
+                    totalFee = total;
+                    resultFee = result;
+                    if ((cte === null || cte === void 0 ? void 0 : cte.taxedWeight) && !ratecardLaneFee.maxWeight && ratecardLaneFee.minWeight && Math.ceil(+cte.taxedWeight) >= +ratecardLaneFee.minWeight) {
+                        // Não tem maxWeight - é o último intervalo
+                        // Encontrar todas as taxas do mesmo tipo que têm maxWeight
+                        var feesWithMaxWeight = allFeesForCalc === null || allFeesForCalc === void 0 ? void 0 : allFeesForCalc.filter(function (fee) {
+                            var _a, _b;
+                            return ((_a = fee.fee) === null || _a === void 0 ? void 0 : _a.id) === ((_b = ratecardLaneFee.fee) === null || _b === void 0 ? void 0 : _b.id) &&
+                                fee.maxWeight &&
+                                (cte === null || cte === void 0 ? void 0 : cte.taxedWeight) &&
+                                fee.maxWeight < cte.taxedWeight;
+                        });
+                        // Ordenar pelo maxWeight do maior para o menor
+                        feesWithMaxWeight === null || feesWithMaxWeight === void 0 ? void 0 : feesWithMaxWeight.sort(function (a, b) { return b.maxWeight - a.maxWeight; });
+                        // Pegar o primeiro (maior maxWeight)
+                        var highestIntervalFee = feesWithMaxWeight === null || feesWithMaxWeight === void 0 ? void 0 : feesWithMaxWeight[0];
+                        if (highestIntervalFee) {
+                            // Calcula baseado na taxa do intervalo mais alto que tem maxWeight
+                            var total_4 = +highestIntervalFee.value;
+                            // Calcular diferença de peso
+                            var weightDifference = Math.ceil(((cte === null || cte === void 0 ? void 0 : cte.taxedWeight) || 0) - (highestIntervalFee.maxWeight || 0));
+                            // Calcular valor adicional pela diferença de peso
+                            var additionalValue = weightDifference * +ratecardLaneFee.value;
+                            // Somar ao total
+                            total_4 += additionalValue;
+                            // Aplicar multiplicador de redelivery ao valor final
+                            var _j = applyRedeliveryMultiplier(total_4, cte), adjustedTotal_4 = _j.adjustedTotal, redeliveryInfo_4 = _j.redeliveryInfo;
+                            total_4 = adjustedTotal_4;
+                            var valueCurrency_2 = (+highestIntervalFee.value).toLocaleString('pt-br', {
+                                style: 'currency',
+                                currency: 'BRL',
+                            });
+                            var resultCurrency_4 = (+total_4).toLocaleString('pt-br', {
+                                style: 'currency',
+                                currency: 'BRL',
+                            });
+                            var result_4 = "".concat(valueCurrency_2, " + ").concat(weightDifference, " kg x ").concat(convertNumberToCurrency(+ratecardLaneFee.value, 'pt-br')).concat(redeliveryInfo_4, " = ").concat(resultCurrency_4);
+                            totalFee = total_4;
+                            resultFee = result_4;
+                        }
+                    }
                     break;
                 case exports.FeeCalculationTypeEnum.COMMODITY_VALUE:
                     if (value) {
-                        var commodityValue = (_a = cte.commodityValue) !== null && _a !== void 0 ? _a : 0;
-                        var total = +commodityValue * (+value / 100);
-                        var resultCurrency = (+total).toLocaleString('pt-br', {
+                        var commodityValue = (_a = cte === null || cte === void 0 ? void 0 : cte.commodityValue) !== null && _a !== void 0 ? _a : 0;
+                        var total_5 = +commodityValue * (+value / 100);
+                        var _k = applyRedeliveryMultiplier(total_5, cte), adjustedTotal_5 = _k.adjustedTotal, redeliveryInfo_5 = _k.redeliveryInfo;
+                        total_5 = adjustedTotal_5;
+                        var resultCurrency_5 = (+total_5).toLocaleString('pt-br', {
                             style: 'currency',
                             currency: 'BRL',
                         });
-                        var result = "".concat(convertNumberToCurrency(+commodityValue, 'pt-br'), " x ").concat(value, "% = ").concat(resultCurrency);
-                        totalFee = total;
-                        resultFee = result;
+                        var result_5 = "".concat(convertNumberToCurrency(+commodityValue, 'pt-br'), " x ").concat(value, "%").concat(redeliveryInfo_5, " = ").concat(resultCurrency_5);
+                        totalFee = total_5;
+                        resultFee = result_5;
                     }
                     break;
                 case exports.FeeCalculationTypeEnum.TAXED_WEIGHT:
                     if (value) {
-                        var taxedWeight = (_b = cte.taxedWeight) !== null && _b !== void 0 ? _b : 0;
-                        var total = +taxedWeight * +value;
-                        var resultCurrency = (+total).toLocaleString('pt-br', {
+                        var taxedWeight = (_b = cte === null || cte === void 0 ? void 0 : cte.taxedWeight) !== null && _b !== void 0 ? _b : 0;
+                        var total_6 = +taxedWeight * +value;
+                        var _l = applyRedeliveryMultiplier(total_6, cte), adjustedTotal_6 = _l.adjustedTotal, redeliveryInfo_6 = _l.redeliveryInfo;
+                        total_6 = adjustedTotal_6;
+                        var resultCurrency_6 = (+total_6).toLocaleString('pt-br', {
                             style: 'currency',
                             currency: 'BRL',
                         });
-                        var result = "".concat(taxedWeight, " kg x ").concat(convertNumberToCurrency(+value, 'pt-br', {
+                        var result_6 = "".concat(taxedWeight, " kg x ").concat(convertNumberToCurrency(+value, 'pt-br', {
                             minimumFractionDigits: 4,
-                        }), " = ").concat(resultCurrency);
-                        totalFee = total;
-                        resultFee = result;
+                        })).concat(redeliveryInfo_6, " = ").concat(resultCurrency_6);
+                        totalFee = total_6;
+                        resultFee = result_6;
                     }
                     break;
-                default:
-                    if (ratecardLaneFee.minWeight && cte.taxedWeight) {
-                        if (+ratecardLaneFee.minWeight <= +cte.taxedWeight) {
-                            // if (+ratecardLaneFee.maxWeight > +cte.taxedWeight) {
-                            var total = +value;
-                            var valueCurrency_1 = (+value).toLocaleString('pt-br', {
+                /*if (ratecardLaneFee.minWeight && cte?.taxedWeight) {
+
+                    if (+ratecardLaneFee.minWeight <= +cte.taxedWeight) {
+
+                        if (ratecardLaneFee.maxWeight && +ratecardLaneFee.maxWeight > +cte.taxedWeight) {
+
+                            let total = +value;
+
+                            const { adjustedTotal, redeliveryInfo } = applyRedeliveryMultiplier(total, cte);
+                            total = adjustedTotal;
+
+                            const valueCurrency = (+value).toLocaleString('pt-br', {
                                 style: 'currency',
                                 currency: 'BRL',
                             });
-                            var resultCurrency = (+total).toLocaleString('pt-br', {
+
+                            const resultCurrency = (+total).toLocaleString('pt-br', {
                                 style: 'currency',
                                 currency: 'BRL',
                             });
-                            var result = "".concat(valueCurrency_1, " = ").concat(resultCurrency);
-                            /*return {
-                                total,
-                                result,
-                            }*/
+
+                            const result = `${valueCurrency}${redeliveryInfo} = ${resultCurrency}`;
+
                             totalFee = total;
                             resultFee = result;
-                            // }
+
+                        } else {
+                            // Não tem maxWeight - é o último intervalo
+                            // Encontrar todas as taxas do mesmo tipo que têm maxWeight
+                            const feesWithMaxWeight = allFees?.filter(fee =>
+                                fee.fee?.id === ratecardLaneFee.fee?.id &&
+                                fee.maxWeight &&
+                                cte?.taxedWeight &&
+                                fee.maxWeight < cte.taxedWeight
+                            );
+
+                            // Ordenar pelo maxWeight do maior para o menor
+                            feesWithMaxWeight?.sort((a, b) => (b.maxWeight! as number) - (a.maxWeight! as number));
+
+                            // Pegar o primeiro (maior maxWeight)
+                            const highestIntervalFee = feesWithMaxWeight?.[0];
+
+                            if (highestIntervalFee) {
+                                // Calcula baseado na taxa do intervalo mais alto que tem maxWeight
+                                let total = +highestIntervalFee.value;
+
+                                // Calcular diferença de peso
+                                const weightDifference = (cte?.taxedWeight || 0) - (highestIntervalFee.maxWeight || 0);
+
+                                // Calcular valor adicional pela diferença de peso
+                                const additionalValue = weightDifference * +ratecardLaneFee.value;
+
+                                // Somar ao total
+                                total += additionalValue;
+
+                                // Aplicar multiplicador de redelivery ao valor final
+                                const { adjustedTotal, redeliveryInfo } = applyRedeliveryMultiplier(total, cte);
+                                total = adjustedTotal;
+
+                                const valueCurrency = (+highestIntervalFee.value).toLocaleString('pt-br', {
+                                    style: 'currency',
+                                    currency: 'BRL',
+                                });
+
+                                const resultCurrency = (+total).toLocaleString('pt-br', {
+                                    style: 'currency',
+                                    currency: 'BRL',
+                                });
+
+                                const result = `${valueCurrency} + ${weightDifference}kg x ${convertNumberToCurrency(+ratecardLaneFee.value, 'pt-br')}${redeliveryInfo} = ${resultCurrency}`;
+
+                                totalFee = total;
+                                resultFee = result;
+                            }
                         }
-                        /*return {
-                            total: 0,
-                            result: 0,
-                        };*/
+
                     }
+                }*/
             }
         }
         totalToCalc = totalFee;
@@ -390,8 +655,12 @@ var calculateFee = function (ratecardLaneFee, cte, allFees, debug) {
             if (siblingFees && (siblingFees === null || siblingFees === void 0 ? void 0 : siblingFees.length) > 0) {
                 var siblingFeesResults = [];
                 for (var _i = 0, siblingFees_1 = siblingFees; _i < siblingFees_1.length; _i++) {
-                    var item = siblingFees_1[_i];
-                    var result = calculateFee(item, cte);
+                    siblingFees_1[_i];
+                    // const result = calculateFee(item, cte, allFees, debug, allFeesForCalc);
+                    var result = {
+                        totalToCalc: 0,
+                        totalFee: 0,
+                    };
                     siblingFeesResults.push(result);
                 }
                 siblingFeesResults.sort(function (a, b) {
@@ -400,6 +669,9 @@ var calculateFee = function (ratecardLaneFee, cte, allFees, debug) {
                     }
                     return 0;
                 });
+                /*console.log({
+                    siblingFeesResults,
+                });*/
                 if ((siblingFeesResults === null || siblingFeesResults === void 0 ? void 0 : siblingFeesResults.length) > 0) {
                     if (((_c = siblingFeesResults[0]) === null || _c === void 0 ? void 0 : _c.totalFee) && ((_d = siblingFeesResults[0]) === null || _d === void 0 ? void 0 : _d.totalFee) > totalFee) {
                         totalToCalc = 0;
@@ -409,114 +681,14 @@ var calculateFee = function (ratecardLaneFee, cte, allFees, debug) {
         }
         return {
             totalFee: +totalFee.toFixed(2),
-            // totalFee: Math.ceil(+totalFee * 100) / 100,
-            // totalFee,
             resultFee: resultFee,
             totalToCalc: totalToCalc,
             feeValue: ratecardLaneFee.value,
+            fee: fee_1,
         };
     }
 };
 
-/******************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-
-var __assign = function() {
-  __assign = Object.assign || function __assign(t) {
-      for (var s, i = 1, n = arguments.length; i < n; i++) {
-          s = arguments[i];
-          for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-      }
-      return t;
-  };
-  return __assign.apply(this, arguments);
-};
-
-function __awaiter(thisArg, _arguments, P, generator) {
-  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-  return new (P || (P = Promise))(function (resolve, reject) {
-      function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-      function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-      function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-      step((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-}
-
-function __generator(thisArg, body) {
-  var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-  return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-  function verb(n) { return function (v) { return step([n, v]); }; }
-  function step(op) {
-      if (f) throw new TypeError("Generator is already executing.");
-      while (g && (g = 0, op[0] && (_ = 0)), _) try {
-          if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-          if (y = 0, t) op = [op[0] & 2, t.value];
-          switch (op[0]) {
-              case 0: case 1: t = op; break;
-              case 4: _.label++; return { value: op[1], done: false };
-              case 5: _.label++; y = op[1]; op = [0]; continue;
-              case 7: op = _.ops.pop(); _.trys.pop(); continue;
-              default:
-                  if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                  if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                  if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                  if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                  if (t[2]) _.ops.pop();
-                  _.trys.pop(); continue;
-          }
-          op = body.call(thisArg, _);
-      } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-      if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-  }
-}
-
-typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-  var e = new Error(message);
-  return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
-};
-
-var convertNumberToCurrency = function (value, locale, options) {
-    if (locale === void 0) { locale = 'en-US'; }
-    var configObject = {
-        locale: 'en-US',
-        currency: 'USD',
-    };
-    switch (locale) {
-        case 'pt-br':
-            configObject.locale = 'pt-br';
-            configObject.currency = 'BRL';
-            break;
-    }
-    return (+value).toLocaleString(configObject.locale, __assign({ style: 'currency', currency: configObject.currency }, options));
-};
-
-var getRatecardFromCte = function (cte) {
-    var _a, _b, _c;
-    var ratecard = null;
-    if (((_a = cte.carrier) === null || _a === void 0 ? void 0 : _a.Ratecard) && ((_c = (_b = cte.carrier) === null || _b === void 0 ? void 0 : _b.Ratecard) === null || _c === void 0 ? void 0 : _c.length) > 0) {
-        var ratecardFromThisYear = cte.carrier.Ratecard.find(function (ratecard) {
-            var today = new Date();
-            return (ratecard === null || ratecard === void 0 ? void 0 : ratecard.startsAt) && (ratecard === null || ratecard === void 0 ? void 0 : ratecard.endsAt) && today >= new Date(ratecard.startsAt) && today <= new Date(ratecard.endsAt);
-        });
-        if (ratecardFromThisYear) {
-            ratecard = ratecardFromThisYear;
-        }
-    }
-    return ratecard;
-};
-
 var getCteLane = function (cte) {
     var _a, _b, _c, _d, _e;
     if (cte === null || cte === void 0 ? void 0 : cte.carrier) {
@@ -6971,6 +7143,9 @@ var getLaneFromRatecard = function (cte) {
         if (directLane) {
             return directLane;
         }
+        console.log({
+            directLane: directLane,
+        });
         // Se não encontrar rota direta, buscar rota inversa (Destino -> Origem)
         // Para isso, precisamos encontrar a UF da origem
         var originUf_1 = (_d = (_c = cte.cityOrigin) === null || _c === void 0 ? void 0 : _c.state) === null || _d === void 0 ? void 0 : _d.uf;
@@ -6978,6 +7153,9 @@ var getLaneFromRatecard = function (cte) {
             var reverseLane = ratecard.RatecardLane.find(function (i) {
                 return i.cityOriginId === (cityDestination === null || cityDestination === void 0 ? void 0 : cityDestination.id) && i.ufDestination === originUf_1;
             });
+            console.log({
+                reverseLane: reverseLane,
+            });
             if (reverseLane) {
                 return reverseLane;
             }
@@ -7181,8 +7359,10 @@ var setFormattedDatesInObjects = function (objectFormat) { return __awaiter(void
     });
 }); };
 
+exports.applyRedeliveryMultiplier = applyRedeliveryMultiplier;
 exports.calculateFee = calculateFee;
 exports.convertNumberToCurrency = convertNumberToCurrency;
+exports.filterSiblingFees = filterSiblingFees;
 exports.formatDateString = formatDateString;
 exports.getAuditTotalFromCte = getAuditTotalFromCte;
 exports.getConfigurationFromDomain = getConfigurationFromDomain;