Merge branch 'development'

2022-07-18 13:16:00 +03:00 · 2022-07-18 13:16:00 +03:00 · 443ed45762
commit 443ed45762
parent 287c94d92f 3a2c521126
1 changed files with 3 additions and 1 deletions
--- a/src/client/stores/CalculationStore/Effects/computed.ts
+++ b/src/client/stores/CalculationStore/Effects/computed.ts
@ -133,7 +133,9 @@ const computedEffects: Record<ComputedValuesNames, ComputedEffect> = {
    } 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);
    }
  },