From ac96ea502ff0aff1262e3b1c394cca81b7102052 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D1=81=D0=BB=D0=B0=D0=B2=20?=
 =?UTF-8?q?=D0=A7=D0=B8=D0=BA=D0=B0=D0=BB=D0=BA=D0=B8=D0=BD?=
 <vchikalkin@evoleasing.ru>
Date: Wed, 11 Nov 2020 17:55:23 +0300
Subject: [PATCH] refactor

---
 .../Calculation/Sections/sectionsList.ts      |  2 +-
 .../CalculationStore/Effects/reaction.ts      | 66 ++++++-------------
 2 files changed, 20 insertions(+), 48 deletions(-)

diff --git a/src/client/Containers/Calculation/Sections/sectionsList.ts b/src/client/Containers/Calculation/Sections/sectionsList.ts
index 9e452d7..328fbf1 100644
--- a/src/client/Containers/Calculation/Sections/sectionsList.ts
+++ b/src/client/Containers/Calculation/Sections/sectionsList.ts
@@ -1192,7 +1192,7 @@ const sections: ISections[] = [
                 Component: InputNumber,
                 props: {
                   min: '0',
-                  max: '300000',
+                  max: '75000',
                   step: '10000.00',
                   name: 'tbxInsFranchise',
                   valueName: 'insFranchise',
diff --git a/src/client/stores/CalculationStore/Effects/reaction.ts b/src/client/stores/CalculationStore/Effects/reaction.ts
index 5f9dc39..198503a 100644
--- a/src/client/stores/CalculationStore/Effects/reaction.ts
+++ b/src/client/stores/CalculationStore/Effects/reaction.ts
@@ -58,6 +58,7 @@ const reactionEffects: IReactionEffect[] = [
                   name
                   quotenumber
                   evo_recalc_limit
+                  evo_approved_first_payment
                   evo_statuscode: evo_statuscodeidData {
                     evo_id
                   }
@@ -2308,69 +2309,40 @@ const reactionEffects: IReactionEffect[] = [
 
         if (
           model &&
-          model.evo_importer_reward_perc &&
-          model.evo_importer_reward_perc > 0
+          ((model.evo_importer_reward_perc &&
+            model.evo_importer_reward_perc > 0) ||
+            (model.evo_importer_reward_rub &&
+              model.evo_importer_reward_rub > 0))
         ) {
           calculationStore.setValue(
             'importerRewardPerc',
-            model.evo_importer_reward_perc,
+            model.evo_importer_reward_perc || 0,
+          );
+          calculationStore.setValue(
+            'importerRewardRub',
+            model.evo_importer_reward_rub || 0,
           );
           return;
         }
         if (
           brand &&
-          brand.evo_importer_reward_perc &&
-          brand.evo_importer_reward_perc > 0
+          ((brand.evo_importer_reward_perc &&
+            brand.evo_importer_reward_perc > 0) ||
+            (brand.evo_importer_reward_rub &&
+              brand.evo_importer_reward_rub > 0))
         ) {
           calculationStore.setValue(
             'importerRewardPerc',
-            brand.evo_importer_reward_perc,
+            brand.evo_importer_reward_perc || 0,
+          );
+          calculationStore.setValue(
+            'importerRewardRub',
+            brand.evo_importer_reward_rub || 0,
           );
           return;
         }
       }
       calculationStore.setValue('importerRewardPerc', 0);
-    },
-    options: { fireImmediately: true },
-  }),
-
-  calculationStore => ({
-    expression: () => {
-      const { brand, model, leaseObjectUsed } = calculationStore.values;
-      return [brand, model, leaseObjectUsed];
-    },
-    effect: ([brandId, modelId, leaseObjectUsed]) => {
-      if (leaseObjectUsed === false) {
-        const model = calculationStore.options.selectModel?.find(
-          x => x.evo_modelid === modelId,
-        );
-        const brand = calculationStore.options.selectBrand?.find(
-          x => x.evo_brandid === brandId,
-        );
-
-        if (
-          model &&
-          model.evo_importer_reward_rub &&
-          model.evo_importer_reward_rub > 0
-        ) {
-          calculationStore.setValue(
-            'importerRewardRub',
-            model.evo_importer_reward_rub,
-          );
-          return;
-        }
-        if (
-          brand &&
-          brand.evo_importer_reward_rub &&
-          brand.evo_importer_reward_rub > 0
-        ) {
-          calculationStore.setValue(
-            'importerRewardRub',
-            brand.evo_importer_reward_rub,
-          );
-          return;
-        }
-      }
       calculationStore.setValue('importerRewardRub', 0);
     },
     options: { fireImmediately: true },