diff --git a/src/Components/LoggedIn/Content/Tariffs/DataGridElement/index.tsx b/src/Components/LoggedIn/Content/Tariffs/DataGridElement/index.tsx index 3b3def3..02b76ef 100644 --- a/src/Components/LoggedIn/Content/Tariffs/DataGridElement/index.tsx +++ b/src/Components/LoggedIn/Content/Tariffs/DataGridElement/index.tsx @@ -475,7 +475,7 @@ const DataGridElement: React.FC = ({ openModal }) => { discountsArray.forEach( (discount, i) => { if( i == activeDiscount ) { discount.privileges.forEach( (privilege) => { - if( tariff.service == privilege.good ) { + //if( tariff.service == privilege.good ) { if( privilege.discount != 0 ) { if( fieldAddedValue ) { // внесено @@ -497,16 +497,18 @@ const DataGridElement: React.FC = ({ openModal }) => { if( minI >= 0 ) { discountsArray[ minI ].privileges.forEach( (y) => { - percents = percents + y.discount / 2; // костыль + percents = percents + y.discount / discountsActiveArray.length; // костыль }); } } else { // не внесено - percents = percents + privilege.discount; + if( tariff.service == privilege.good ) { + percents = percents + privilege.discount; + } } } - } + //} }); } }); @@ -538,7 +540,7 @@ const DataGridElement: React.FC = ({ openModal }) => { if( i == activeDiscount ) { discount.privileges.forEach( (privilege) => { - if( item.service == privilege.good ) { + //if( item.service == privilege.good ) { if( privilege.discount != 0 ) { if( fieldAddedValue ) { // внесено @@ -560,22 +562,24 @@ const DataGridElement: React.FC = ({ openModal }) => { if( minI >= 0 ) { discountsArray[ minI ].privileges.forEach( (y) => { - percents = percents + y.discount / 2; // костыль + percents = percents + y.discount / discountsActiveArray.length; // костыль }); } } else { // не внесено - percents = percents + privilege.discount; + if( item.service == privilege.good ) { + percents = percents + privilege.discount; + } } } - } + //} }); } }); }); } - + console.log(percents) price = price - (price * percents); }