evo/EvoCalculator
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Chika 2022-05-31 11:57:24 +03:00
parent cd5a5eb1af
commit f60c2dff8a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/client/stores/CalculationStore/Effects/actions/calculate/prepareData.ts
View File

@ -232,6 +232,7 @@ export default function (this: ICalculationStore): PreparedData {
//@ts-ignore
const importProgramSum = this.importProgramSum();
preparedValues.importProgramSum = importProgramSum;
preparedValues.discount =
convertPrice(
@ -245,7 +246,7 @@ export default function (this: ICalculationStore): PreparedData {
const firstPaymentPercWthtVAT =
values.firstPaymentRub /
(1 + valuesConstants.VAT) /
(preparedValues.plPrice || 0);
((preparedValues.plPrice || 0) - (preparedValues.importProgramSum || 0));
if (firstPaymentPercWthtVAT * 100 < 30) {
const evo_coefficient_season = this.getStaticData('evo_coefficient').filter(
x =>
@ -301,7 +302,8 @@ export default function (this: ICalculationStore): PreparedData {
(preparedValues.plPrice || 0) - (preparedValues.discount || 0);
preparedValues.firstPaymentSum =
(preparedValues.firstPayment || 0) * (preparedValues.plPrice || 0);
(preparedValues.firstPayment || 0) *
((preparedValues.plPrice || 0) - (preparedValues.importProgramSum || 0));
preparedValues.agentsSum =
(values.indAgentRewardSumm / 100) *
@ -635,7 +637,8 @@ export default function (this: ICalculationStore): PreparedData {
//
const nsibBaseValue =
((preparedValues.plPrice || 0) +
((preparedValues.plPrice || 0) -
(preparedValues.importProgramSum || 0) +
(preparedValues.insuranceContract +
(preparedValues.rats || 0) +
(preparedValues.registration || 0) +

1
src/core/services/CoreService/types/Calculation/prepared.ts
View File

@ -1,4 +1,5 @@
export interface PreparedValues {
importProgramSum?: number;
calcDate?: Date;
calcType?: number;
irrExpected?: number;