b2m-utils 0.0.232 → 0.0.235
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/index.esm.js +63 -14
- package/build/index.esm.js.gz +0 -0
- package/build/index.esm.js.map +1 -1
- package/build/index.js +63 -14
- package/build/index.js.gz +0 -0
- package/build/index.js.map +1 -1
- package/package.json +1 -1
package/build/index.js
CHANGED
|
@@ -421,7 +421,7 @@ var filterSiblingFees = function (fees) {
|
|
|
421
421
|
};
|
|
422
422
|
|
|
423
423
|
var calculateFee = function (ratecardLaneFee, cte, allFees, debug, allFeesForCalc) {
|
|
424
|
-
var _a, _b, _c, _d;
|
|
424
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
|
|
425
425
|
if (debug === void 0) { debug = false; }
|
|
426
426
|
if (ratecardLaneFee.fee) {
|
|
427
427
|
var value = ratecardLaneFee.value, fee_1 = ratecardLaneFee.fee;
|
|
@@ -493,7 +493,7 @@ var calculateFee = function (ratecardLaneFee, cte, allFees, debug, allFeesForCal
|
|
|
493
493
|
if (totalValueFromAllFees && !isNaN(+totalValueFromAllFees)) {
|
|
494
494
|
var valueToMultiply = (+value / 100);
|
|
495
495
|
var total_1 = +totalValueFromAllFees * valueToMultiply;
|
|
496
|
-
var
|
|
496
|
+
var _o = applyRedeliveryMultiplier(total_1, cte), adjustedTotal_1 = _o.adjustedTotal, redeliveryInfo_1 = _o.redeliveryInfo;
|
|
497
497
|
total_1 = adjustedTotal_1;
|
|
498
498
|
var totalValueFromAllFeesCurrency = convertNumberToCurrency(+totalValueFromAllFees, 'pt-br');
|
|
499
499
|
var resultCurrency_1 = (+total_1).toLocaleString('pt-BR', {
|
|
@@ -511,7 +511,7 @@ var calculateFee = function (ratecardLaneFee, cte, allFees, debug, allFeesForCal
|
|
|
511
511
|
if ((cte === null || cte === void 0 ? void 0 : cte.taxedWeight) && !isNaN(+(cte === null || cte === void 0 ? void 0 : cte.taxedWeight))) {
|
|
512
512
|
var fractions = Math.ceil(+cte.taxedWeight / 100);
|
|
513
513
|
var total_2 = fractions * value;
|
|
514
|
-
var
|
|
514
|
+
var _p = applyRedeliveryMultiplier(total_2, cte), adjustedTotal_2 = _p.adjustedTotal, redeliveryInfo_2 = _p.redeliveryInfo;
|
|
515
515
|
total_2 = adjustedTotal_2;
|
|
516
516
|
var valueCurrency_1 = (+value).toLocaleString('pt-br', {
|
|
517
517
|
style: 'currency',
|
|
@@ -530,7 +530,7 @@ var calculateFee = function (ratecardLaneFee, cte, allFees, debug, allFeesForCal
|
|
|
530
530
|
if (value && (cte === null || cte === void 0 ? void 0 : cte.freightValue)) {
|
|
531
531
|
if (!isNaN(+value) && !isNaN(+cte.freightValue)) {
|
|
532
532
|
var total_3 = +cte.freightValue * (+value / 100);
|
|
533
|
-
var
|
|
533
|
+
var _q = applyRedeliveryMultiplier(total_3, cte), adjustedTotal_3 = _q.adjustedTotal, redeliveryInfo_3 = _q.redeliveryInfo;
|
|
534
534
|
total_3 = adjustedTotal_3;
|
|
535
535
|
var freightValueCurrency = (+cte.freightValue).toLocaleString('pt-br', {
|
|
536
536
|
style: 'currency',
|
|
@@ -565,7 +565,7 @@ var calculateFee = function (ratecardLaneFee, cte, allFees, debug, allFeesForCal
|
|
|
565
565
|
case exports.FeeCalculationTypeEnum.MIN_VALUE:
|
|
566
566
|
case exports.FeeCalculationTypeEnum.FIXED:
|
|
567
567
|
var total = +value;
|
|
568
|
-
var
|
|
568
|
+
var _r = applyRedeliveryMultiplier(total, cte), adjustedTotal = _r.adjustedTotal, redeliveryInfo = _r.redeliveryInfo;
|
|
569
569
|
total = adjustedTotal;
|
|
570
570
|
var valueCurrency = (+value).toLocaleString('pt-br', {
|
|
571
571
|
style: 'currency',
|
|
@@ -617,7 +617,7 @@ var calculateFee = function (ratecardLaneFee, cte, allFees, debug, allFeesForCal
|
|
|
617
617
|
// Somar ao total
|
|
618
618
|
total_4 += additionalValue;
|
|
619
619
|
// Aplicar multiplicador de redelivery ao valor final
|
|
620
|
-
var
|
|
620
|
+
var _s = applyRedeliveryMultiplier(total_4, cte), adjustedTotal_4 = _s.adjustedTotal, redeliveryInfo_4 = _s.redeliveryInfo;
|
|
621
621
|
total_4 = adjustedTotal_4;
|
|
622
622
|
var valueCurrency_2 = (+highestIntervalFee.value).toLocaleString('pt-br', {
|
|
623
623
|
style: 'currency',
|
|
@@ -634,19 +634,68 @@ var calculateFee = function (ratecardLaneFee, cte, allFees, debug, allFeesForCal
|
|
|
634
634
|
}
|
|
635
635
|
// Lógica de intervalo de KM para FTL
|
|
636
636
|
else if ((cte === null || cte === void 0 ? void 0 : cte.ratecardModalId) === exports.RatecardModalEnum.ROAD_DOMESTIC_FTL && (cte === null || cte === void 0 ? void 0 : cte.distance) && !ratecardLaneFee.maxKm && ratecardLaneFee.minKm && +cte.distance >= +ratecardLaneFee.minKm) {
|
|
637
|
+
console.log('[calculateFee] FTL - Entrando no condicional de intervalo KM', {
|
|
638
|
+
cteId: cte.id,
|
|
639
|
+
cteNumber: cte.number,
|
|
640
|
+
ratecardModalId: cte.ratecardModalId,
|
|
641
|
+
distance: cte.distance,
|
|
642
|
+
ratecardLaneFee: {
|
|
643
|
+
id: ratecardLaneFee.id,
|
|
644
|
+
feeId: (_a = ratecardLaneFee.fee) === null || _a === void 0 ? void 0 : _a.id,
|
|
645
|
+
feeName: (_b = ratecardLaneFee.fee) === null || _b === void 0 ? void 0 : _b.name,
|
|
646
|
+
value: ratecardLaneFee.value,
|
|
647
|
+
minKm: ratecardLaneFee.minKm,
|
|
648
|
+
maxKm: ratecardLaneFee.maxKm,
|
|
649
|
+
laneId: ratecardLaneFee.laneId,
|
|
650
|
+
},
|
|
651
|
+
hasRatecard: !!((_c = cte.carrier) === null || _c === void 0 ? void 0 : _c.Ratecard),
|
|
652
|
+
ratecardCount: (_e = (_d = cte.carrier) === null || _d === void 0 ? void 0 : _d.Ratecard) === null || _e === void 0 ? void 0 : _e.length,
|
|
653
|
+
});
|
|
654
|
+
// Buscar o ratecard correto do CTE usando getRatecardFromCte
|
|
655
|
+
var ratecard = getRatecardFromCte(cte);
|
|
656
|
+
var lane = (_f = ratecard === null || ratecard === void 0 ? void 0 : ratecard.RatecardLane) === null || _f === void 0 ? void 0 : _f.find(function (l) { return l.id === ratecardLaneFee.laneId; });
|
|
657
|
+
console.log('[calculateFee] FTL - Ratecard e Lane encontrados', {
|
|
658
|
+
cteId: cte.id,
|
|
659
|
+
ratecardId: ratecard === null || ratecard === void 0 ? void 0 : ratecard.id,
|
|
660
|
+
ratecardName: ratecard === null || ratecard === void 0 ? void 0 : ratecard.name,
|
|
661
|
+
laneId: lane === null || lane === void 0 ? void 0 : lane.id,
|
|
662
|
+
laneFeeCount: (_g = lane === null || lane === void 0 ? void 0 : lane.RatecardLaneFee) === null || _g === void 0 ? void 0 : _g.length,
|
|
663
|
+
ratecard: ratecard,
|
|
664
|
+
lane: lane,
|
|
665
|
+
});
|
|
637
666
|
// Não tem maxKm - é o último intervalo
|
|
638
|
-
// Encontrar todas as taxas do mesmo tipo que têm maxKm
|
|
639
|
-
var feesWithMaxKm =
|
|
667
|
+
// Encontrar todas as taxas do mesmo tipo que têm maxKm no ratecard
|
|
668
|
+
var feesWithMaxKm = (_h = lane === null || lane === void 0 ? void 0 : lane.RatecardLaneFee) === null || _h === void 0 ? void 0 : _h.filter(function (fee) {
|
|
640
669
|
var _a, _b;
|
|
641
670
|
return ((_a = fee.fee) === null || _a === void 0 ? void 0 : _a.id) === ((_b = ratecardLaneFee.fee) === null || _b === void 0 ? void 0 : _b.id) &&
|
|
642
671
|
fee.maxKm &&
|
|
643
672
|
(cte === null || cte === void 0 ? void 0 : cte.distance) &&
|
|
644
673
|
+fee.maxKm < +cte.distance;
|
|
645
674
|
});
|
|
675
|
+
console.log('[calculateFee] FTL - Fees com maxKm encontradas no ratecard', {
|
|
676
|
+
cteId: cte.id,
|
|
677
|
+
feesWithMaxKmCount: feesWithMaxKm === null || feesWithMaxKm === void 0 ? void 0 : feesWithMaxKm.length,
|
|
678
|
+
feesWithMaxKm: feesWithMaxKm === null || feesWithMaxKm === void 0 ? void 0 : feesWithMaxKm.map(function (f) { return ({
|
|
679
|
+
id: f.id,
|
|
680
|
+
value: f.value,
|
|
681
|
+
minKm: f.minKm,
|
|
682
|
+
maxKm: f.maxKm,
|
|
683
|
+
}); }),
|
|
684
|
+
});
|
|
646
685
|
// Ordenar pelo maxKm do maior para o menor
|
|
647
686
|
feesWithMaxKm === null || feesWithMaxKm === void 0 ? void 0 : feesWithMaxKm.sort(function (a, b) { return b.maxKm - a.maxKm; });
|
|
648
687
|
// Pegar o primeiro (maior maxKm)
|
|
649
688
|
var highestIntervalFee = feesWithMaxKm === null || feesWithMaxKm === void 0 ? void 0 : feesWithMaxKm[0];
|
|
689
|
+
console.log('[calculateFee] FTL - Maior intervalo selecionado', {
|
|
690
|
+
cteId: cte.id,
|
|
691
|
+
hasHighestIntervalFee: !!highestIntervalFee,
|
|
692
|
+
highestIntervalFee: highestIntervalFee ? {
|
|
693
|
+
id: highestIntervalFee.id,
|
|
694
|
+
value: highestIntervalFee.value,
|
|
695
|
+
minKm: highestIntervalFee.minKm,
|
|
696
|
+
maxKm: highestIntervalFee.maxKm,
|
|
697
|
+
} : null,
|
|
698
|
+
});
|
|
650
699
|
if (highestIntervalFee) {
|
|
651
700
|
// Calcula baseado na taxa do intervalo mais alto que tem maxKm
|
|
652
701
|
var total_5 = +highestIntervalFee.value;
|
|
@@ -657,7 +706,7 @@ var calculateFee = function (ratecardLaneFee, cte, allFees, debug, allFeesForCal
|
|
|
657
706
|
// Somar ao total
|
|
658
707
|
total_5 += additionalValue;
|
|
659
708
|
// Aplicar multiplicador de redelivery ao valor final
|
|
660
|
-
var
|
|
709
|
+
var _t = applyRedeliveryMultiplier(total_5, cte), adjustedTotal_5 = _t.adjustedTotal, redeliveryInfo_5 = _t.redeliveryInfo;
|
|
661
710
|
total_5 = adjustedTotal_5;
|
|
662
711
|
var valueCurrency_3 = (+highestIntervalFee.value).toLocaleString('pt-br', {
|
|
663
712
|
style: 'currency',
|
|
@@ -675,9 +724,9 @@ var calculateFee = function (ratecardLaneFee, cte, allFees, debug, allFeesForCal
|
|
|
675
724
|
break;
|
|
676
725
|
case exports.FeeCalculationTypeEnum.COMMODITY_VALUE:
|
|
677
726
|
if (value) {
|
|
678
|
-
var commodityValue = (
|
|
727
|
+
var commodityValue = (_j = cte === null || cte === void 0 ? void 0 : cte.commodityValue) !== null && _j !== void 0 ? _j : 0;
|
|
679
728
|
var total_6 = +commodityValue * (+value / 100);
|
|
680
|
-
var
|
|
729
|
+
var _u = applyRedeliveryMultiplier(total_6, cte), adjustedTotal_6 = _u.adjustedTotal, redeliveryInfo_6 = _u.redeliveryInfo;
|
|
681
730
|
total_6 = adjustedTotal_6;
|
|
682
731
|
var resultCurrency_6 = (+total_6).toLocaleString('pt-br', {
|
|
683
732
|
style: 'currency',
|
|
@@ -690,9 +739,9 @@ var calculateFee = function (ratecardLaneFee, cte, allFees, debug, allFeesForCal
|
|
|
690
739
|
break;
|
|
691
740
|
case exports.FeeCalculationTypeEnum.TAXED_WEIGHT:
|
|
692
741
|
if (value) {
|
|
693
|
-
var taxedWeight = (
|
|
742
|
+
var taxedWeight = (_k = cte === null || cte === void 0 ? void 0 : cte.taxedWeight) !== null && _k !== void 0 ? _k : 0;
|
|
694
743
|
var total_7 = +taxedWeight * +value;
|
|
695
|
-
var
|
|
744
|
+
var _v = applyRedeliveryMultiplier(total_7, cte), adjustedTotal_7 = _v.adjustedTotal, redeliveryInfo_7 = _v.redeliveryInfo;
|
|
696
745
|
total_7 = adjustedTotal_7;
|
|
697
746
|
var resultCurrency_7 = (+total_7).toLocaleString('pt-br', {
|
|
698
747
|
style: 'currency',
|
|
@@ -808,7 +857,7 @@ var calculateFee = function (ratecardLaneFee, cte, allFees, debug, allFeesForCal
|
|
|
808
857
|
return 0;
|
|
809
858
|
});
|
|
810
859
|
if ((siblingFeesResults === null || siblingFeesResults === void 0 ? void 0 : siblingFeesResults.length) > 0) {
|
|
811
|
-
if (((
|
|
860
|
+
if (((_l = siblingFeesResults[0]) === null || _l === void 0 ? void 0 : _l.totalFee) && ((_m = siblingFeesResults[0]) === null || _m === void 0 ? void 0 : _m.totalFee) > totalFee) {
|
|
812
861
|
totalToCalc = 0;
|
|
813
862
|
}
|
|
814
863
|
}
|
package/build/index.js.gz
CHANGED
|
Binary file
|