From c61d5ded7fc68e59771ae9abb76e689cef510e18 Mon Sep 17 00:00:00 2001
From: Chika <djchikalkin@gmail.com>
Date: Tue, 8 Jun 2021 14:22:16 +0300
Subject: [PATCH] load regionRegistration from kp too

---
 .../stores/CalculationStore/Effects/lib/queries.js  |  1 +
 .../Effects/reactions/gibddReactions.ts             | 13 +++++++------
 .../Effects/reactions/loadKpReaction/index.ts       |  9 +++------
 .../reactions/loadKpReaction/mapKpToValues.ts       |  1 +
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/client/stores/CalculationStore/Effects/lib/queries.js b/src/client/stores/CalculationStore/Effects/lib/queries.js
index 82cc90f..5b8c6c0 100644
--- a/src/client/stores/CalculationStore/Effects/lib/queries.js
+++ b/src/client/stores/CalculationStore/Effects/lib/queries.js
@@ -14,4 +14,5 @@ evo_max_mass
 evo_seats
 evo_year
 offerprintformapi
+evo_regionid
 `;
diff --git a/src/client/stores/CalculationStore/Effects/reactions/gibddReactions.ts b/src/client/stores/CalculationStore/Effects/reactions/gibddReactions.ts
index cad5a18..ef1cf7a 100644
--- a/src/client/stores/CalculationStore/Effects/reactions/gibddReactions.ts
+++ b/src/client/stores/CalculationStore/Effects/reactions/gibddReactions.ts
@@ -405,6 +405,9 @@ const gibddReactions: IReactionEffect[] = [
         ElementStatus.Default,
       );
 
+      let evo_regionid = calculationStore.getOption('selectQuote')
+        ?.evo_regionid;
+
       if (objectRegistration === 100000001) {
         calculationStore.setFilter('selectRegionRegistration', options =>
           options.filter(x => x.evo_businessunit_evolution === true),
@@ -420,20 +423,18 @@ const gibddReactions: IReactionEffect[] = [
             'selectRegionRegistration',
             ElementStatus.Disabled,
           );
-          const targetObjectRegistration = calculationStore.getOption(
+          const targetRegionRegistration = calculationStore.getOption(
             'selectRegionRegistration',
             {
               evo_fias_id: evo_region_fias_id,
             },
           );
-          if (targetObjectRegistration) {
-            calculationStore.setValue(
-              'regionRegistration',
-              targetObjectRegistration.evo_regionid,
-            );
+          if (targetRegionRegistration) {
+            evo_regionid = targetRegionRegistration.evo_regionid;
           }
         }
       }
+      calculationStore.setValue('regionRegistration', evo_regionid);
     },
   }),
 ];
diff --git a/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/index.ts b/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/index.ts
index ee199c3..edebfe4 100644
--- a/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/index.ts
+++ b/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/index.ts
@@ -59,6 +59,7 @@ const loadKpReaction: IReactionEffect = calculationStore => ({
       calcType,
       indAgent,
       INNForCalc,
+      regionRegistration,
     } = calculationStore.values;
 
     calculationStore.setStatus('selectQuote', ElementStatus.Disabled);
@@ -89,9 +90,6 @@ const loadKpReaction: IReactionEffect = calculationStore => ({
             ),
           );
 
-          let regionRegistration = quote.evo_regionid,
-            townRegistration = quote.evo_townid;
-
           const {
             entities: options,
           }: IGetCRMEntitiesResponse & {
@@ -113,7 +111,7 @@ const loadKpReaction: IReactionEffect = calculationStore => ({
               findepartment_accountid:
                 quote.evo_fin_department_accountid || NIL,
               evo_gps_brandid: quote.evo_gps_brandid || NIL,
-              evo_regionid: regionRegistration || NIL,
+              evo_regionid: quote.evo_regionid || NIL,
             },
             toOptions: [
               'selectModel',
@@ -294,14 +292,13 @@ const loadKpReaction: IReactionEffect = calculationStore => ({
             recalcWithRevision,
             leaseObjectCount,
             clientRisk,
-            regionRegistration,
-            townRegistration,
             calcType,
             totalPayments: evo_sumpay_withnds,
             indAgent,
             requirementTelematic,
             vehicleTaxInYear,
             INNForCalc,
+            regionRegistration,
           });
 
           message.success({
diff --git a/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/mapKpToValues.ts b/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/mapKpToValues.ts
index 63261a5..9169519 100644
--- a/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/mapKpToValues.ts
+++ b/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/mapKpToValues.ts
@@ -92,6 +92,7 @@ const mapKPtoValues: TValues<string> = {
   objectCategoryTax: 'evo_category_tr',
   objectTypeTax: 'evo_vehicle_type_tax',
   typePTS: 'evo_pts_type',
+  townRegistration: 'evo_townid',
 };
 
 export function getKpPropName(valueName: ValuesNames) {