From 3a2c521126ed4891a815488fcb7a8a6ad8ec94f8 Mon Sep 17 00:00:00 2001 From: Chika Date: Mon, 18 Jul 2022 13:15:41 +0300 Subject: [PATCH] merge release/dyn-1186_import-program-sum --- src/client/stores/CalculationStore/Effects/computed.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/client/stores/CalculationStore/Effects/computed.ts b/src/client/stores/CalculationStore/Effects/computed.ts index d17ece5..9afd55f 100644 --- a/src/client/stores/CalculationStore/Effects/computed.ts +++ b/src/client/stores/CalculationStore/Effects/computed.ts @@ -133,7 +133,9 @@ const computedEffects: Record = { } else { const sum = //@ts-ignore - (this.plPriceRub() * (importProgram?.evo_percent_subsidy || 0)) / 100; + ((this.plPriceRub() - (this.values.supplierDiscountRub || 0)) * + (importProgram?.evo_percent_subsidy || 0)) / + 100; return Math.min(sum, importProgram?.evo_max_subsidy_summ || 0); } },