hl-core 0.0.8-beta.1 → 0.0.8-beta.10

package/store/data.store.js

@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia';
-import { t } from './messages';
 import { rules } from './rules';
+import { i18n } from '@/configs/i18n';
 import { Toast, Types, Positions, ToastOptions } from './toast';
 import { isValidGUID, yearEnding, jwtDecode, ErrorHandler, getKeyWithPattern, getNumber, getAgeByBirthDate } from '../composables';
 import { DataStoreClass, Contragent } from '../composables/classes';
@@ -10,7 +10,7 @@ import { useFormStore } from './form.store';
 export const useDataStore = defineStore('data', {
   state: () => ({
     ...new DataStoreClass(),
-    t: t,
+    t: i18n.t,
     rules: rules,
     toast: Toast,
     toastTypes: Types,
@@ -31,6 +31,7 @@ export const useDataStore = defineStore('data', {
   }),
   getters: {
     isEFO: state => state.product === 'efo',
+    isAML: state => state.product === 'aml',
     isBaiterek: state => state.product === 'baiterek',
     isBolashak: state => state.product === 'bolashak',
     isMycar: state => state.product === 'mycar',
@@ -38,6 +39,8 @@ export const useDataStore = defineStore('data', {
     isLiferenta: state => state.product === 'liferenta',
     isPension: state => state.product === 'pension',
     isGons: state => state.product === 'gons',
+    isKazyna: state => state.product === 'halykkazyna',
+    isComplianceWindow: state => state.product === 'compliance',
     isEveryFormDisabled: state => Object.values(state.formStore.isDisabled).every(i => i === true),
   },
   actions: {
@@ -62,7 +65,7 @@ export const useDataStore = defineStore('data', {
     },
     copyToClipboard(text) {
       if (typeof text === 'string' || typeof text === 'number') {
-        if (this.isEFO) {
+        if (this.isEFO || this.isAML) {
           navigator.clipboard.writeText(text);
         } else {
           this.sendToParent(constants.postActions.clipboard, text);
@@ -115,7 +118,7 @@ export const useDataStore = defineStore('data', {
             this.isCompliance() ||
             this.isAnalyst() ||
             this.isUpk() ||
-            this.isFinanceCenter() ||
+            this.isFinCenter() ||
             this.isSupervisor() ||
             this.isSupport();
           if (hasPermission) {
@@ -190,11 +193,14 @@ export const useDataStore = defineStore('data', {
     isUpk() {
       return this.isRole(constants.roles.upk);
     },
+    isDrn() {
+      return this.isRole(constants.roles.drn);
+    },
     isSupport() {
       return this.isRole(constants.roles.support);
     },
-    isFinanceCenter() {
-      return this.isRole(constants.roles.financeCenter);
+    isFinCenter() {
+      return this.isRole(constants.roles.finCenter);
     },
     isSupervisor() {
       return this.isRole(constants.roles.supervisor);
@@ -221,6 +227,7 @@ export const useDataStore = defineStore('data', {
         const token = localStorage.getItem('accessToken') || null;
         if (token) {
           this.$reset();
+          this.formStore.$reset();
           localStorage.clear();
 
           if (whichProduct === 'efo') {
@@ -299,7 +306,7 @@ export const useDataStore = defineStore('data', {
         }
       }
     },
-    async getContragent(member, whichForm, whichIndex, load = true) {
+    async getContragent(member, load = true) {
       if (load) {
         this.isLoading = true;
       }
@@ -314,10 +321,10 @@ export const useDataStore = defineStore('data', {
         response = await this.api.getContragent(queryData);
         if (response.totalItems > 0) {
           if (response.totalItems.length === 1) {
-            await this.serializeContragentData(whichForm, response.items[0], whichIndex);
+            await this.serializeContragentData(member, response.items[0]);
           } else {
             const sortedByRegistrationDate = response.items.sort((left, right) => new Date(right.registrationDate) - new Date(left.registrationDate));
-            await this.serializeContragentData(whichForm, sortedByRegistrationDate[0], whichIndex);
+            await this.serializeContragentData(member, sortedByRegistrationDate[0]);
           }
           member.gotFromInsis = true;
         } else {
@@ -335,14 +342,15 @@ export const useDataStore = defineStore('data', {
         this.isLoading = true;
       }
       try {
+        const member = whichIndex === null ? this.formStore[whichForm] : this.formStore[whichForm][whichIndex];
         if (this.isMycar && this.isAgentMycar() && whichForm === this.formStore.beneficiaryFormKey) {
-          await this.serializeContragentData(whichForm, this.formStore.applicationData.beneficiaryApp[0], whichIndex);
+          await this.serializeContragentData(member, this.formStore.applicationData.beneficiaryApp[0]);
           this.isLoading = false;
           return;
         }
         const response = await this.api.getContragentById(id);
         if (response.totalItems > 0) {
-          await this.serializeContragentData(whichForm, response.items[0], whichIndex);
+          await this.serializeContragentData(member, response.items[0]);
         } else {
           this.isLoading = false;
           return false;
@@ -354,58 +362,35 @@ export const useDataStore = defineStore('data', {
         this.isLoading = false;
       }
     },
-    async serializeContragentData(whichForm, contragent, whichIndex = null) {
+    async serializeContragentData(member, contragent) {
       const [{ value: data }, { value: contacts }, { value: documents }, { value: address }] = await Promise.allSettled([
         this.api.getContrAgentData(contragent.id),
         this.api.getContrAgentContacts(contragent.id),
         this.api.getContrAgentDocuments(contragent.id),
         this.api.getContrAgentAddress(contragent.id),
       ]);
-      if (whichIndex === null) {
-        this.formStore[whichForm].response = {
-          contragent: contragent,
-        };
-        if (data && data.length) {
-          this.formStore[whichForm].response.questionnaires = data;
-        }
-        if (contacts && contacts.length) {
-          this.formStore[whichForm].response.contacts = contacts;
-        }
-        if (documents && documents.length) {
-          this.formStore[whichForm].response.documents = documents;
-        }
-        if (address && address.length) {
-          this.formStore[whichForm].response.addresses = address;
-        }
+      member.response = {
+        contragent: contragent,
+      };
+      if (data && data.length) {
+        member.response.questionnaires = data;
       }
-      if (whichIndex !== null) {
-        this.formStore[whichForm][whichIndex].response = {
-          contragent: contragent,
-        };
-        if (data && data.length) {
-          this.formStore[whichForm][whichIndex].response.questionnaires = data;
-        }
-        if (contacts && contacts.length) {
-          this.formStore[whichForm][whichIndex].response.contacts = contacts;
-        }
-        if (documents && documents.length) {
-          this.formStore[whichForm][whichIndex].response.documents = documents;
-        }
-        if (address && address.length) {
-          this.formStore[whichForm][whichIndex].response.addresses = address;
-        }
-      }
-      this.parseContragent(
-        whichForm,
-        {
-          personalData: contragent,
-          documents: documents,
-          contacts: contacts,
-          data: data,
-          address: address,
-        },
-        whichIndex,
-      );
+      if (contacts && contacts.length) {
+        member.response.contacts = contacts;
+      }
+      if (documents && documents.length) {
+        member.response.documents = documents;
+      }
+      if (address && address.length) {
+        member.response.addresses = address;
+      }
+      this.parseContragent(member, {
+        personalData: contragent,
+        documents: documents,
+        contacts: contacts,
+        data: data,
+        address: address,
+      });
     },
     async searchContragent(iin) {
       this.isLoading = true;
@@ -428,142 +413,72 @@ export const useDataStore = defineStore('data', {
       }
       this.isLoading = false;
     },
-    parseContragent(whichForm, user, whichIndex = null) {
-      if (whichIndex === null) {
-        // Save User Personal Data
-        this.formStore[whichForm].verifyType = user.personalData.verifyType;
-        this.formStore[whichForm].verifyDate = user.personalData.verifyDate;
-        this.formStore[whichForm].iin = reformatIin(user.personalData.iin);
-        this.formStore[whichForm].age = user.personalData.age;
-        const country = this.countries.find(i => i.nameRu?.match(new RegExp(user.personalData.birthPlace, 'i')));
-        this.formStore[whichForm].birthPlace = country && Object.keys(country).length ? country : new Value();
-        this.formStore[whichForm].gender = this.gender.find(i => i.nameRu === user.personalData.genderName);
-        this.formStore[whichForm].gender.id = user.personalData.gender;
-        this.formStore[whichForm].birthDate = reformatDate(user.personalData.birthDate);
-        this.formStore[whichForm].genderName = user.personalData.genderName;
-        this.formStore[whichForm].lastName = user.personalData.lastName;
-        this.formStore[whichForm].longName = user.personalData.longName;
-        this.formStore[whichForm].middleName = user.personalData.middleName ? user.personalData.middleName : '';
-        this.formStore[whichForm].firstName = user.personalData.firstName;
-        this.formStore[whichForm].id = user.personalData.id;
-        this.formStore[whichForm].type = user.personalData.type;
-        this.formStore[whichForm].registrationDate = user.personalData.registrationDate;
-        //  Save User Documents Data
-        if ('documents' in user && user.documents.length) {
-          const documentType = this.documentTypes.find(i => i.ids === user.documents[0].type);
-          const documentIssuer = this.documentIssuers.find(i => i.nameRu === user.documents[0].issuerNameRu);
-          this.formStore[whichForm].documentType = documentType ? documentType : new Value();
-          this.formStore[whichForm].documentNumber = user.documents[0].number;
-          this.formStore[whichForm].documentIssuers = documentIssuer ? documentIssuer : new Value();
-          this.formStore[whichForm].documentDate = reformatDate(user.documents[0].issueDate);
-          this.formStore[whichForm].documentExpire = reformatDate(user.documents[0].expireDate);
-        }
-        // Document detail (residency, economy code, etc..)
-        if ('data' in user && user.data.length) {
-          user.data.forEach(dataObject => {
-            this.searchFromList(whichForm, dataObject);
-          });
-        }
-        if ('address' in user && user.address.length) {
-          const country = this.countries.find(i => i.nameRu?.match(new RegExp(user.address.countryName, 'i')));
-          const province = this.states.find(i => i.ids === user.address[0].stateCode);
-          const localityType = this.localityTypes.find(i => i.nameRu === user.address[0].cityTypeName);
-          const city = this.cities.find(i => !!user.address[0].cityName && i.nameRu === user.address[0].cityName.replace('г.', ''));
-          const region = this.regions.find(i => !!user.address[0].regionCode && i.ids == user.address[0].regionCode);
-          this.formStore[whichForm].registrationCountry = country ? country : new Value();
-          this.formStore[whichForm].registrationStreet = user.address[0].streetName;
-          this.formStore[whichForm].registrationCity = city ? city : new Value();
-          this.formStore[whichForm].registrationNumberApartment = user.address[0].apartmentNumber;
-          this.formStore[whichForm].registrationNumberHouse = user.address[0].blockNumber;
-          this.formStore[whichForm].registrationProvince = province ? province : new Value();
-          this.formStore[whichForm].registrationRegionType = localityType ? localityType : new Value();
-          this.formStore[whichForm].registrationRegion = region ? region : new Value();
-          this.formStore[whichForm].registrationQuarter = user.address[0].kvartal;
-          this.formStore[whichForm].registrationMicroDistrict = user.address[0].microRaion;
-        }
-        if ('contacts' in user && user.contacts.length) {
-          user.contacts.forEach(contact => {
-            if (contact.type === 'EMAIL' && contact.value) {
-              this.formStore[whichForm].email = contact.value;
-            }
-            if (contact.type === 'MOBILE' && contact.value) {
-              let phoneNumber = contact.value.substring(1);
-              this.formStore[whichForm].phoneNumber = `+7 (${phoneNumber.slice(0, 3)}) ${phoneNumber.slice(3, 6)} ${phoneNumber.slice(6, 8)} ${phoneNumber.slice(8)}`;
-            }
-            if (contact.type === 'HOME' && contact.value) {
-              let homePhone = contact.value.substring(1);
-              this.formStore[whichForm].homePhone = `+7 (${homePhone.slice(0, 3)}) ${homePhone.slice(3, 6)} ${homePhone.slice(6, 8)} ${homePhone.slice(8)}`;
-            }
-          });
-        }
+    parseContragent(member, user) {
+      // Save User Personal Data
+      member.verifyType = user.personalData.verifyType;
+      member.verifyDate = user.personalData.verifyDate;
+      member.iin = reformatIin(user.personalData.iin);
+      member.age = user.personalData.age;
+      const country = this.countries.find(i => i.nameRu?.match(new RegExp(user.personalData.birthPlace, 'i')));
+      member.birthPlace = country && Object.keys(country).length ? country : new Value();
+      member.gender = this.gender.find(i => i.nameRu === user.personalData.genderName);
+      member.gender.id = user.personalData.gender;
+      member.birthDate = reformatDate(user.personalData.birthDate);
+      member.genderName = user.personalData.genderName;
+      member.lastName = user.personalData.lastName;
+      member.longName = user.personalData.longName;
+      member.middleName = user.personalData.middleName ? user.personalData.middleName : '';
+      member.firstName = user.personalData.firstName;
+      member.id = user.personalData.id;
+      member.type = user.personalData.type;
+      member.registrationDate = user.personalData.registrationDate;
+      //  Save User Documents Data
+      if ('documents' in user && user.documents.length) {
+        const documentType = this.documentTypes.find(i => i.ids === user.documents[0].type);
+        const documentIssuer = this.documentIssuers.find(i => i.nameRu === user.documents[0].issuerNameRu);
+        member.documentType = documentType ? documentType : new Value();
+        member.documentNumber = user.documents[0].number;
+        member.documentIssuers = documentIssuer ? documentIssuer : new Value();
+        member.documentDate = reformatDate(user.documents[0].issueDate);
+        member.documentExpire = reformatDate(user.documents[0].expireDate);
+      }
+      // Document detail (residency, economy code, etc..)
+      if ('data' in user && user.data.length) {
+        user.data.forEach(dataObject => {
+          this.searchFromList(member, dataObject);
+        });
       }
-      if (whichIndex !== null) {
-        // Save User Personal Data
-        this.formStore[whichForm][whichIndex].iin = reformatIin(user.personalData.iin);
-        this.formStore[whichForm][whichIndex].verifyType = user.personalData.verifyType;
-        this.formStore[whichForm][whichIndex].verifyDate = user.personalData.verifyDate;
-        this.formStore[whichForm][whichIndex].age = user.personalData.age;
-        const country = this.countries.find(i => i.nameRu?.match(new RegExp(user.personalData.birthPlace, 'i')));
-        this.formStore[whichForm][whichIndex].birthPlace = country && Object.keys(country).length ? country : new Value();
-        this.formStore[whichForm][whichIndex].gender = this.gender.find(i => i.nameRu === user.personalData.genderName);
-        this.formStore[whichForm][whichIndex].gender.id = user.personalData.gender;
-        this.formStore[whichForm][whichIndex].birthDate = reformatDate(user.personalData.birthDate);
-        this.formStore[whichForm][whichIndex].genderName = user.personalData.genderName;
-        this.formStore[whichForm][whichIndex].lastName = user.personalData.lastName;
-        this.formStore[whichForm][whichIndex].longName = user.personalData.longName;
-        this.formStore[whichForm][whichIndex].middleName = user.personalData.middleName ? user.personalData.middleName : '';
-        this.formStore[whichForm][whichIndex].firstName = user.personalData.firstName;
-        this.formStore[whichForm][whichIndex].id = user.personalData.id;
-        this.formStore[whichForm][whichIndex].type = user.personalData.type;
-        this.formStore[whichForm][whichIndex].registrationDate = user.personalData.registrationDate;
-        //  Save User Documents Data
-        if ('documents' in user && user.documents.length) {
-          const documentType = this.documentTypes.find(i => i.ids === user.documents[0].type);
-          const documentIssuer = this.documentIssuers.find(i => i.nameRu === user.documents[0].issuerNameRu);
-          this.formStore[whichForm][whichIndex].documentType = documentType ? documentType : new Value();
-          this.formStore[whichForm][whichIndex].documentNumber = user.documents[0].number;
-          this.formStore[whichForm][whichIndex].documentIssuers = documentIssuer ? documentIssuer : new Value();
-          this.formStore[whichForm][whichIndex].documentDate = reformatDate(user.documents[0].issueDate);
-          this.formStore[whichForm][whichIndex].documentExpire = reformatDate(user.documents[0].expireDate);
-        }
-        // Document detail (residency, economy code, etc..)
-        if ('data' in user && user.data.length) {
-          user.data.forEach(dataObject => {
-            this.searchFromList(whichForm, dataObject, whichIndex);
-          });
-        }
-        if ('address' in user && user.address.length) {
-          const country = this.countries.find(i => i.nameRu?.match(new RegExp(user.address.countryName, 'i')));
-          const province = this.states.find(i => i.ids === user.address[0].stateCode);
-          const localityType = this.localityTypes.find(i => i.nameRu === user.address[0].cityTypeName);
-          const city = this.cities.find(i => !!user.address[0].cityName && i.nameRu === user.address[0].cityName.replace('г.', ''));
-          const region = this.regions.find(i => !!user.address[0].regionCode && i.ids == user.address[0].regionCode);
-          this.formStore[whichForm][whichIndex].registrationCountry = country ? country : new Value();
-          this.formStore[whichForm][whichIndex].registrationStreet = user.address[0].streetName;
-          this.formStore[whichForm][whichIndex].registrationCity = city ? city : new Value();
-          this.formStore[whichForm][whichIndex].registrationNumberApartment = user.address[0].apartmentNumber;
-          this.formStore[whichForm][whichIndex].registrationNumberHouse = user.address[0].blockNumber;
-          this.formStore[whichForm][whichIndex].registrationProvince = province ? province : new Value();
-          this.formStore[whichForm][whichIndex].registrationRegionType = localityType ? localityType : new Value();
-          this.formStore[whichForm][whichIndex].registrationRegion = region ? region : new Value();
-          this.formStore[whichForm][whichIndex].registrationQuarter = user.address[0].kvartal;
-          this.formStore[whichForm][whichIndex].registrationMicroDistrict = user.address[0].microRaion;
-        }
-        if ('contacts' in user && user.contacts.length) {
-          user.contacts.forEach(contact => {
-            if (contact.type === 'EMAIL' && contact.value) {
-              this.formStore[whichForm][whichIndex].email = contact.value;
-            }
-            if (contact.type === 'MOBILE' && contact.value) {
-              let phoneNumber = contact.value.substring(1);
-              this.formStore[whichForm][whichIndex].phoneNumber = `+7 (${phoneNumber.slice(0, 3)}) ${phoneNumber.slice(3, 6)} ${phoneNumber.slice(6, 8)} ${phoneNumber.slice(8)}`;
-            }
-            if (contact.type === 'HOME' && contact.value) {
-              let homePhone = contact.value.substring(1);
-              this.formStore[whichForm][whichIndex].homePhone = `+7 (${homePhone.slice(0, 3)}) ${homePhone.slice(3, 6)} ${homePhone.slice(6, 8)} ${homePhone.slice(8)}`;
-            }
-          });
-        }
+      if ('address' in user && user.address.length) {
+        const country = this.countries.find(i => i.nameRu?.match(new RegExp(user.address[0].countryName, 'i')));
+        const province = this.states.find(i => i.ids === user.address[0].stateCode);
+        const localityType = this.localityTypes.find(i => i.nameRu === user.address[0].cityTypeName);
+        const city = this.cities.find(i => !!user.address[0].cityName && i.nameRu === user.address[0].cityName.replace('г.', ''));
+        const region = this.regions.find(i => !!user.address[0].regionCode && i.ids == user.address[0].regionCode);
+        member.registrationCountry = country ? country : new Value();
+        member.registrationStreet = user.address[0].streetName;
+        member.registrationCity = city ? city : new Value();
+        member.registrationNumberApartment = user.address[0].apartmentNumber;
+        member.registrationNumberHouse = user.address[0].blockNumber;
+        member.registrationProvince = province ? province : new Value();
+        member.registrationRegionType = localityType ? localityType : new Value();
+        member.registrationRegion = region ? region : new Value();
+        member.registrationQuarter = user.address[0].kvartal;
+        member.registrationMicroDistrict = user.address[0].microRaion;
+      }
+      if ('contacts' in user && user.contacts.length) {
+        user.contacts.forEach(contact => {
+          if (contact.type === 'EMAIL' && contact.value) {
+            member.email = contact.value;
+          }
+          if (contact.type === 'MOBILE' && contact.value) {
+            let phoneNumber = contact.value.substring(1);
+            member.phoneNumber = `+7 (${phoneNumber.slice(0, 3)}) ${phoneNumber.slice(3, 6)} ${phoneNumber.slice(6, 8)} ${phoneNumber.slice(8)}`;
+          }
+          if (contact.type === 'HOME' && contact.value) {
+            let homePhone = contact.value.substring(1);
+            member.homePhone = `+7 (${homePhone.slice(0, 3)}) ${homePhone.slice(3, 6)} ${homePhone.slice(6, 8)} ${homePhone.slice(8)}`;
+          }
+        });
       }
     },
     async alreadyInInsis(iin, firstName, lastName, middleName) {
@@ -757,6 +672,8 @@ export const useDataStore = defineStore('data', {
           verifyDate: user.verifyDate,
         });
 
+        const checkForNull = value => (value ? value : '');
+
         // ! SaveContragent -> Addresses
         let addressData = [];
         addressData.push({
@@ -773,11 +690,14 @@ export const useDataStore = defineStore('data', {
           streetName: user.registrationStreet,
           kvartal: user.registrationQuarter,
           microRaion: user.registrationMicroDistrict,
-          cityTypeId: Number(user.registrationRegionType.ids),
+          cityTypeId: Number(user.registrationRegionType.ids) > 0 ? Number(user.registrationRegionType.ids) : null,
           cityTypeName: user.registrationRegionType.nameRu,
           blockNumber: user.registrationNumberHouse,
           apartmentNumber: user.registrationNumberApartment,
-          address: `${user.birthPlace.nameRu}, ${user.registrationRegionType.nameRu} ${user.registrationCity.nameRu}, ул. ${user.registrationStreet}, д. ${user.registrationNumberHouse} кв. ${user.registrationNumberApartment}`,
+          address: `${checkForNull(user.birthPlace.nameRu)}, ${checkForNull(user.registrationRegionType.nameRu)} ${checkForNull(user.registrationCity.nameRu)}, ул. ${checkForNull(
+            user.registrationStreet,
+          )}, д. ${checkForNull(user.registrationNumberHouse)} кв. ${checkForNull(user.registrationNumberApartment)}`,
+
           type: 'H',
         });
 
@@ -870,6 +790,8 @@ export const useDataStore = defineStore('data', {
           data.position = member.jobPosition;
           data.jobName = member.jobPlace;
           data.familyStatusId = member.familyStatus.id;
+          data.relationId = member.relationDegree.ids;
+          data.relationName = member.relationDegree.nameRu;
         }
         if (whichMember === 'Beneficiary') {
           if (
@@ -909,7 +831,7 @@ export const useDataStore = defineStore('data', {
         return ErrorHandler(err, err.response?.data?.errors && Object.values(err.response?.data?.errors).join(' -> '));
       }
     },
-    searchFromList(whichForm, searchIt, whichIndex = null) {
+    searchFromList(member, searchIt) {
       const getQuestionariesData = () => {
         switch (searchIt.questId) {
           case '500003':
@@ -932,11 +854,7 @@ export const useDataStore = defineStore('data', {
       const [searchFrom, whichField] = getQuestionariesData();
       if (searchFrom && searchFrom.length) {
         const result = searchFrom.find(i => i.ids === searchIt.questAnswer);
-        if (whichIndex === null) {
-          this.formStore[whichForm][whichField] = result ? result : new Value();
-        } else {
-          this.formStore[whichForm][whichIndex][whichField] = result ? result : new Value();
-        }
+        member[whichField] = result ? result : new Value();
       }
     },
     async setSurvey(data) {
@@ -954,14 +872,20 @@ export const useDataStore = defineStore('data', {
     async getFromApi(whichField, whichRequest, parameter, reset = false) {
       const storageValue = JSON.parse(localStorage.getItem(whichField) || 'null');
       const currentHour = new Date().getHours();
+      const currentMinutePart = Math.ceil((new Date().getMinutes() + 1) / 15);
 
       const getDataCondition = () => {
         if (!storageValue) return true;
         const hasHourKey = 'hour' in storageValue;
+        const hasMiniteKey = 'minute' in storageValue;
         const hasModeKey = 'mode' in storageValue;
         const hasValueKey = 'value' in storageValue;
-        if (storageValue && (hasHourKey === false || hasModeKey === false || hasValueKey === false)) return true;
-        if (storageValue && (storageValue.hour !== currentHour || storageValue.mode !== import.meta.env.MODE || storageValue.value.length === 0)) return true;
+        if (storageValue && (hasHourKey === false || hasMiniteKey === false || hasModeKey === false || hasValueKey === false)) return true;
+        if (
+          storageValue &&
+          (storageValue.hour !== currentHour || storageValue.minute !== currentMinutePart || storageValue.mode !== import.meta.env.MODE || storageValue.value.length === 0)
+        )
+          return true;
       };
       if (!!getDataCondition() || reset === true) {
         this[whichField] = [];
@@ -973,6 +897,7 @@ export const useDataStore = defineStore('data', {
               JSON.stringify({
                 value: response,
                 hour: currentHour,
+                minute: currentMinutePart,
                 mode: import.meta.env.MODE,
               }),
             );
@@ -1043,16 +968,7 @@ export const useDataStore = defineStore('data', {
       });
     },
     async getDicFileTypeList() {
-      try {
-        if (this.dicFileTypeList.length) {
-          return this.dicFileTypeList;
-        } else {
-          this.dicFileTypeList = await this.api.getDicFileTypeList();
-          return this.dicFileTypeList;
-        }
-      } catch (err) {
-        console.log(err.response.data);
-      }
+      return await this.getFromApi('dicFileTypeList', 'getDicFileTypeList');
     },
     async getDocumentIssuers() {
       return await this.getFromApi('documentIssuers', 'getDocumentIssuers');
@@ -1090,6 +1006,15 @@ export const useDataStore = defineStore('data', {
     async getProcessTariff() {
       return await this.getFromApi('processTariff', 'getProcessTariff');
     },
+    async getCurrencies() {
+      try {
+        const currencies = await this.api.getCurrencies();
+        this.currencies = currencies;
+        return currencies;
+      } catch (err) {
+        console.log(err);
+      }
+    },
     async getAdditionalInsuranceTermsAnswers(questionId) {
       try {
         const answers = await this.api.getAdditionalInsuranceTermsAnswers(this.processCode, questionId);
@@ -1203,6 +1128,9 @@ export const useDataStore = defineStore('data', {
         this.getProcessIndexRate(),
         this.getProcessTariff(),
         this.getProcessPaymentPeriod(),
+        this.getDicFileTypeList(),
+        this.getDictionaryItems('RegionPolicy'),
+        this.getDictionaryItems('SaleChanellPolicy'),
       ]);
     },
     async getUserGroups() {
@@ -1250,15 +1178,12 @@ export const useDataStore = defineStore('data', {
     },
     async searchAgentByName(name) {
       try {
-        this.isLoading = true;
-        this.AgentDataList = await this.api.searchAgentByName(name);
-        if (!this.AgentDataList.length) {
+        this.AgentData = await this.api.searchAgentByName(name);
+        if (!this.AgentData.length) {
           this.showToaster('error', this.t('toaster.notFound'), 1500);
         }
       } catch (err) {
         console.log(err);
-      } finally {
-        this.isLoading = false;
       }
     },
     async setINSISWorkData() {
@@ -1287,14 +1212,14 @@ export const useDataStore = defineStore('data', {
         this.isLoading = false;
       }
     },
-    async filterManagerByRegion(dictName, filterName) {
+    async getDictionaryItems(dictName) {
+      return await this.getFromApi(dictName, 'getDictionaryItems', dictName);
+    },
+    async filterManagerByRegion(filterName) {
       try {
-        this.isLoading = true;
-        this[`${dictName}List`] = await this.api.filterManagerByRegion(dictName, filterName);
+        this.ManagerPolicy = await this.api.filterManagerByRegion('ManagerPolicy', filterName);
       } catch (err) {
         console.log(err);
-      } finally {
-        this.isLoading = false;
       }
     },
     async getUnderwritingCouncilData(id) {
@@ -1390,11 +1315,18 @@ export const useDataStore = defineStore('data', {
           paymentPeriodId: this.formStore.productConditionsForm.paymentPeriod.id,
           addCovers: this.formStore.additionalInsuranceTermsWithout,
         };
-        console.log(calculationData);
+        if (this.isKazyna) {
+          calculationData.premiumInCurrency = getNumber(this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar);
+          calculationData.amountInCurrency = getNumber(this.formStore.productConditionsForm.requestedSumInsuredInDollar);
+        }
         const calculationResponse = await this.api.calculateWithoutApplication(calculationData);
         this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(calculationResponse.amount);
         this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(calculationResponse.premium);
         this.formStore.additionalInsuranceTermsWithout = calculationResponse.addCovers;
+        if (this.isKazyna) {
+          this.formStore.productConditionsForm.requestedSumInsuredInDollar = this.getNumberWithSpaces(calculationResponse.amountInCurrency);
+          this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar = this.getNumberWithSpaces(calculationResponse.premiumInCurrency);
+        }
         this.showToaster('success', this.t('toaster.calculated'), 1000);
       } catch (err) {
         ErrorHandler(err);
@@ -1437,7 +1369,10 @@ export const useDataStore = defineStore('data', {
           },
           addCoversDto: this.formStore.additionalInsuranceTerms,
         };
-
+        if (this.isKazyna) {
+          form1.policyAppDto.premiumInCurrency = getNumber(this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar);
+          form1.policyAppDto.amountInCurrency = getNumber(this.formStore.productConditionsForm.requestedSumInsuredInDollar);
+        }
         try {
           let id = this.formStore.applicationData.processInstanceId;
 
@@ -1446,12 +1381,15 @@ export const useDataStore = defineStore('data', {
           try {
             result = await this.api.getCalculation(id);
           } catch (err) {
-            this.showToaster('error', err?.response?.data, 5000);
+            ErrorHandler(err);
           }
 
           const applicationData = await this.api.getApplicationData(taskId);
           this.formStore.applicationData = applicationData;
           this.formStore.additionalInsuranceTerms = this.formStore.applicationData.addCoverDto;
+          if (this.isKazyna) {
+            this.formStore.productConditionsForm.requestedSumInsuredInDollar = this.getNumberWithSpaces(result / this.currencies.usd);
+          }
           if (this.formStore.productConditionsForm.insurancePremiumPerMonth != null) {
             this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(result);
           } else {
@@ -1459,11 +1397,10 @@ export const useDataStore = defineStore('data', {
           }
           this.showToaster('success', this.t('toaster.calculated'), 1000);
         } catch (err) {
-          console.log(err);
+          ErrorHandler(err);
         }
       } catch (err) {
         ErrorHandler(err);
-        console.log(err, 'error');
       }
       this.isLoading = false;
     },
@@ -1590,6 +1527,8 @@ export const useDataStore = defineStore('data', {
           this.setMembersField(this.formStore.policyholderFormKey, 'clientApp');
           if (insuredData && insuredData.length) {
             insuredData.forEach((each, index) => {
+              const relationDegree = this.relations.find(i => i.ids == each.relationId);
+              this.formStore.insuredForm[index].relationDegree = relationDegree ? relationDegree : new Value();
               this.setMembersFieldIndex(this.formStore.insuredFormKey, 'insuredApp', index);
             });
           }
@@ -1652,7 +1591,10 @@ export const useDataStore = defineStore('data', {
           this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(
             applicationData.policyAppDto.premium === null ? null : applicationData.policyAppDto.premium,
           );
-
+          if (this.isKazyna) {
+            this.formStore.productConditionsForm.requestedSumInsuredInDollar = this.getNumberWithSpaces(applicationData.policyAppDto.amountInCurrency);
+            this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar = this.getNumberWithSpaces(applicationData.policyAppDto.premiumInCurrency);
+          }
           let riskGroup = this.riskGroup.find(item => {
             if (applicationData.policyAppDto.riskGroup == 0) {
               return true;
@@ -1714,6 +1656,7 @@ export const useDataStore = defineStore('data', {
     },
     async handleTask(action, taskId, comment) {
       if (action && Object.keys(constants.actions).includes(action)) {
+        this.isButtonsLoading = true;
         switch (action) {
           case constants.actions.claim: {
             try {
@@ -1724,6 +1667,7 @@ export const useDataStore = defineStore('data', {
             } catch (err) {
               ErrorHandler(err);
             }
+            break;
           }
           case constants.actions.reject:
           case constants.actions.return:
@@ -1733,7 +1677,7 @@ export const useDataStore = defineStore('data', {
               const sended = await this.sendTask(taskId, action, comment);
               if (!sended) return;
               this.formStore.$reset();
-              if (this.isEFO) {
+              if (this.isEFO || this.isAML) {
                 await this.router.push({ name: 'Insurance-Product' });
               } else {
                 this.sendToParent(constants.postActions.toHomePage, this.t('toaster.successOperation') + 'SUCCESS');
@@ -1741,8 +1685,10 @@ export const useDataStore = defineStore('data', {
             } catch (err) {
               ErrorHandler(err);
             }
+            break;
           }
         }
+        this.isButtonsLoading = false;
       } else {
         console.error('No handleTask action');
       }
@@ -1909,7 +1855,7 @@ export const useDataStore = defineStore('data', {
           const localMembers = [...this.formStore[localKey]].sort((a, b) => a.id - b.id);
           const applicationMembers = [...this.formStore.applicationData[applicationKey]].sort((a, b) => a.insisId - b.insisId);
           if (localMembers.every((each, index) => applicationMembers[index].insisId === each.id && applicationMembers[index].iin === each.iin.replace(/-/g, '')) === false) {
-            this.showToaster('error', this.t('toaster.notSavedMember').replace('{text}', text), 3000);
+            this.showToaster('error', this.t('toaster.notSavedMember', { text: text }), 3000);
             return false;
           }
           if (localKey === this.formStore.beneficiaryFormKey) {
@@ -1924,15 +1870,15 @@ export const useDataStore = defineStore('data', {
         }
       } else {
         if (this.formStore[localKey].some(i => i.iin !== null)) {
-          this.showToaster('error', this.t('toaster.notSavedMember').replace('{text}', text), 3000);
+          this.showToaster('error', this.t('toaster.notSavedMember', { text: text }), 3000);
           return false;
         }
         if (this.formStore.applicationData[applicationKey].length !== 0) {
-          this.showToaster('error', this.t('toaster.notSavedMember').replace('{text}', text), 3000);
+          this.showToaster('error', this.t('toaster.notSavedMember', { text: text }), 3000);
           return false;
         } else {
           if (this.formStore[localKey][0].iin !== null) {
-            this.showToaster('error', this.t('toaster.notSavedMember').replace('{text}', text), 3000);
+            this.showToaster('error', this.t('toaster.notSavedMember', { text: text }), 3000);
             return false;
           }
         }
@@ -1945,7 +1891,7 @@ export const useDataStore = defineStore('data', {
         return false;
       }
       if (this.formStore.policyholderForm.id !== this.formStore.applicationData.clientApp.insisId) {
-        this.showToaster('error', this.t('toaster.notSavedMember').replace('{text}', 'страхователя'), 3000);
+        this.showToaster('error', this.t('toaster.notSavedMember', { text: 'страхователя' }), 3000);
         return false;
       }
       if (!this.isGons) {
@@ -1977,7 +1923,7 @@ export const useDataStore = defineStore('data', {
           }
         }
       }
-      if (!this.isGons) {
+      if (this.controls.hasAttachment) {
         const areValid = this.formStore.SaleChanellPolicy.nameRu && this.formStore.RegionPolicy.nameRu && this.formStore.ManagerPolicy.nameRu && this.formStore.AgentData.fullName;
         if (areValid) {
           await this.setINSISWorkData();
@@ -2142,12 +2088,12 @@ export const useDataStore = defineStore('data', {
         this.isLoading = false;
       }
     },
-    async getContragentFromGBDFL(iin, phoneNumber, whichForm, whichIndex) {
+    async getContragentFromGBDFL(member) {
       this.isLoading = true;
       try {
         const data = {
-          iin: iin.replace(/-/g, ''),
-          phoneNumber: formatPhone(phoneNumber),
+          iin: member.iin.replace(/-/g, ''),
+          phoneNumber: formatPhone(member.phoneNumber),
         };
         const gbdResponse = await this.api.getContragentFromGBDFL(data);
         if (gbdResponse.status === 'soap:Server') {
@@ -2171,284 +2117,145 @@ export const useDataStore = defineStore('data', {
         }
         const { person } = parseXML(gbdResponse.content, true, 'person');
         const { responseInfo } = parseXML(gbdResponse.content, true, 'responseInfo');
-        if (typeof whichIndex !== 'number') {
-          if (this.formStore[whichForm].gosPersonData !== null && this.formStore[whichForm].gosPersonData.iin !== iin.replace(/-/g, '')) {
-            this.formStore[whichForm].resetMember(false);
-          }
-          this.formStore[whichForm].gosPersonData = person;
-        } else {
-          if (this.formStore[whichForm][whichIndex].gosPersonData !== null && this.formStore[whichForm][whichIndex].gosPersonData.iin !== iin.replace(/-/g, '')) {
-            this.formStore[whichForm][whichIndex].resetMember(false);
-          }
-          this.formStore[whichForm][whichIndex].gosPersonData = person;
-        }
-
-        await this.getContragent(typeof whichIndex === 'number' ? this.formStore[whichForm][whichIndex] : this.formStore[whichForm], whichForm, whichIndex, false);
-        if (typeof whichIndex !== 'number') {
-          this.formStore[whichForm].verifyDate = responseInfo.responseDate;
-          this.formStore[whichForm].verifyType = 'GBDFL';
-        } else {
-          this.formStore[whichForm][whichIndex].verifyDate = responseInfo.responseDate;
-          this.formStore[whichForm][whichIndex].verifyType = 'GBDFL';
-        }
-        await this.saveInStoreUserGBDFL(person, whichForm, whichIndex);
+        if (member.gosPersonData !== null && member.gosPersonData.iin !== iin.replace(/-/g, '')) {
+          member.resetMember(false);
+        }
+        member.gosPersonData = person;
+        await this.getContragent(member, false);
+        member.verifyDate = responseInfo.responseDate;
+        member.verifyType = 'GBDFL';
+        await this.saveInStoreUserGBDFL(person, member);
       } catch (err) {
         ErrorHandler(err);
       }
       this.isLoading = false;
     },
-    async saveInStoreUserGBDFL(person, whichForm, whichIndex = null) {
-      if (whichIndex === null) {
-        this.formStore[whichForm].firstName = person.name;
-        this.formStore[whichForm].lastName = person.surname;
-        this.formStore[whichForm].middleName = person.patronymic ? person.patronymic : '';
-        this.formStore[whichForm].longName = `${person.surname} ${person.name} ${person.patronymic ? person.patronymic : ''}`;
-        this.formStore[whichForm].birthDate = reformatDate(person.birthDate);
-        this.formStore[whichForm].genderName = person.gender.nameRu;
-
-        const gender = this.gender.find(i => i.id == person.gender.code);
-        if (gender) this.formStore[whichForm].gender = gender;
-
-        const birthPlace = this.countries.find(i => i.nameRu.match(new RegExp(person.birthPlace.country.nameRu, 'i')));
-        if (birthPlace) this.formStore[whichForm].birthPlace = birthPlace;
-
-        const countryOfCitizenship = this.citizenshipCountries.find(i => i.nameRu.match(new RegExp(person.citizenship.nameRu, 'i')));
-        if (countryOfCitizenship) this.formStore[whichForm].countryOfCitizenship = countryOfCitizenship;
-
-        const regCountry = this.countries.find(i => i.nameRu.match(new RegExp(person.regAddress.country.nameRu, 'i')));
-        if (regCountry) this.formStore[whichForm].registrationCountry = regCountry;
-
-        const regProvince = this.states.find(i => i.nameRu.match(new RegExp(person.regAddress.district.nameRu, 'i')));
-        if (regProvince) this.formStore[whichForm].registrationProvince = regProvince;
-
-        if ('city' in person.regAddress && !!person.regAddress.city) {
-          if (person.regAddress.city.includes(', ')) {
-            const personCities = person.regAddress.city.split(', ');
+    async saveInStoreUserGBDFL(person, member) {
+      member.firstName = person.name;
+      member.lastName = person.surname;
+      member.middleName = person.patronymic ? person.patronymic : '';
+      member.longName = `${person.surname} ${person.name} ${person.patronymic ? person.patronymic : ''}`;
+      member.birthDate = reformatDate(person.birthDate);
+      member.genderName = person.gender.nameRu;
+
+      const gender = this.gender.find(i => i.id == person.gender.code);
+      if (gender) member.gender = gender;
+
+      const birthPlace = this.countries.find(i => i.nameRu.match(new RegExp(person.birthPlace.country.nameRu, 'i')));
+      if (birthPlace) member.birthPlace = birthPlace;
+
+      const countryOfCitizenship = this.citizenshipCountries.find(i => i.nameRu.match(new RegExp(person.citizenship.nameRu, 'i')));
+      if (countryOfCitizenship) member.countryOfCitizenship = countryOfCitizenship;
+
+      const regCountry = this.countries.find(i => i.nameRu.match(new RegExp(person.regAddress.country.nameRu, 'i')));
+      if (regCountry) member.registrationCountry = regCountry;
+
+      const regProvince = this.states.find(i => i.nameRu.match(new RegExp(person.regAddress.district.nameRu, 'i')));
+      if (regProvince) member.registrationProvince = regProvince;
+
+      if ('city' in person.regAddress && !!person.regAddress.city) {
+        if (person.regAddress.city.includes(', ')) {
+          const personCities = person.regAddress.city.split(', ');
+          for (let i = 0; i < personCities.length; ++i) {
+            const possibleCity = this.cities.find(i => i.nameRu.includes(personCities[i]));
+            if (possibleCity) {
+              member.registrationCity = possibleCity;
+              break;
+            }
+          }
+          if (member.registrationCity.nameRu === null) {
             for (let i = 0; i < personCities.length; ++i) {
-              const possibleCity = this.cities.find(i => i.nameRu.includes(personCities[i]));
-              if (possibleCity) {
-                this.formStore[whichForm].registrationCity = possibleCity;
+              const possibleRegion = this.regions.find(i => i.nameRu.includes(personCities[i]));
+              if (possibleRegion) {
+                member.registrationRegion = possibleRegion;
                 break;
               }
             }
-            if (this.formStore[whichForm].registrationCity.nameRu === null) {
-              for (let i = 0; i < personCities.length; ++i) {
-                const possibleRegion = this.regions.find(i => i.nameRu.includes(personCities[i]));
-                if (possibleRegion) {
-                  this.formStore[whichForm].registrationRegion = possibleRegion;
-                  break;
-                }
-              }
-            }
-          } else {
-            const regCity = this.cities.find(i => i.nameRu.match(new RegExp(person.regAddress.city, 'i')));
-            if (regCity) this.formStore[whichForm].registrationCity = regCity;
-
-            if (this.formStore[whichForm].registrationCity.nameRu === null) {
-              const regRegion = this.regions.find(i => i.nameRu.match(new RegExp(person.regAddress.city), 'i'));
-              if (regRegion) this.formStore[whichForm].registrationRegion = regRegion;
-            }
           }
-        }
+        } else {
+          const regCity = this.cities.find(i => i.nameRu.match(new RegExp(person.regAddress.city, 'i')));
+          if (regCity) member.registrationCity = regCity;
 
-        if (this.formStore[whichForm].registrationCity.nameRu === null && this.formStore[whichForm].registrationRegion.nameRu === null) {
-          const regCity = this.cities.find(
-            i => i.nameRu.match(new RegExp(person.regAddress.region.nameRu, 'i')) || i.nameRu.match(new RegExp(person.regAddress.district.nameRu, 'i')),
-          );
-          if (regCity) {
-            this.formStore[whichForm].registrationCity = regCity;
-            const regType = this.localityTypes.find(i => i.nameRu === 'город');
-            if (regType) this.formStore[whichForm].registrationRegionType = regType;
-          } else {
-            const regRegion = this.regions.find(
-              i => i.nameRu.match(new RegExp(person.regAddress.region.nameRu), 'i') || i.nameRu.match(new RegExp(person.regAddress.district.nameRu, 'i')),
-            );
-            if (regRegion) {
-              this.formStore[whichForm].registrationRegion = regRegion;
-              const regType = this.localityTypes.find(i => (i.nameRu === i.nameRu) === 'село' || i.nameRu === 'поселок');
-              if (regType) this.formStore[whichForm].registrationRegionType = regType;
-            }
+          if (member.registrationCity.nameRu === null) {
+            const regRegion = this.regions.find(i => i.nameRu.match(new RegExp(person.regAddress.city), 'i'));
+            if (regRegion) member.registrationRegion = regRegion;
           }
         }
+      }
 
-        if (person.regAddress.street.includes(', ')) {
-          const personAddress = person.regAddress.street.split(', ');
-          const microDistrict = personAddress.find(i => i.match(new RegExp('микрорайон', 'i')));
-          const quarter = personAddress.find(i => i.match(new RegExp('квартал', 'i')));
-          const street = personAddress.find(i => i.match(new RegExp('улица', 'i')));
-          if (microDistrict) this.formStore[whichForm].registrationMicroDistrict = microDistrict;
-          if (quarter) this.formStore[whichForm].registrationQuarter = quarter;
-          if (street) this.formStore[whichForm].registrationStreet = street;
+      if (member.registrationCity.nameRu === null && member.registrationRegion.nameRu === null) {
+        const regCity = this.cities.find(
+          i => i.nameRu.match(new RegExp(person.regAddress.region.nameRu, 'i')) || i.nameRu.match(new RegExp(person.regAddress.district.nameRu, 'i')),
+        );
+        if (regCity) {
+          member.registrationCity = regCity;
+          const regType = this.localityTypes.find(i => i.nameRu === 'город');
+          if (regType) member.registrationRegionType = regType;
         } else {
-          if (person.regAddress.street) this.formStore[whichForm].registrationStreet = person.regAddress.street;
-        }
-        if (person.regAddress.building) this.formStore[whichForm].registrationNumberHouse = person.regAddress.building;
-        if (person.regAddress.flat) this.formStore[whichForm].registrationNumberApartment = person.regAddress.flat;
-
-        // TODO Доработать логику и для остальных
-        if ('length' in person.documents.document) {
-          const validDocument = person.documents.document.find(i => new Date(i.endDate) > new Date(Date.now()) && i.status.code === '00' && i.type.code === '002');
-          if (validDocument) {
-            const documentType = this.documentTypes.find(i => i.ids === '1UDL');
-            if (documentType) this.formStore[whichForm].documentType = documentType;
-
-            this.formStore[whichForm].documentNumber = validDocument.number;
-            this.formStore[whichForm].documentExpire = reformatDate(validDocument.endDate);
-            this.formStore[whichForm].documentDate = reformatDate(validDocument.beginDate);
-            this.formStore[whichForm].documentNumber = validDocument.number;
-
-            const documentIssuer = this.documentIssuers.find(i => i.nameRu.match(new RegExp('МВД РК', 'i')));
-            if (documentIssuer) this.formStore[whichForm].documentIssuers = documentIssuer;
+          const regRegion = this.regions.find(
+            i => i.nameRu.match(new RegExp(person.regAddress.region.nameRu), 'i') || i.nameRu.match(new RegExp(person.regAddress.district.nameRu, 'i')),
+          );
+          if (regRegion) {
+            member.registrationRegion = regRegion;
+            const regType = this.localityTypes.find(i => (i.nameRu === i.nameRu) === 'село' || i.nameRu === 'поселок');
+            if (regType) member.registrationRegionType = regType;
           }
-        } else {
-          const documentType =
-            person.documents.document.type.nameRu === 'УДОСТОВЕРЕНИЕ РК'
-              ? this.documentTypes.find(i => i.ids === '1UDL')
-              : this.documentTypes.find(i => i.nameRu.match(new RegExp(person.documents.document.type.nameRu, 'i')))
-              ? this.documentTypes.find(i => i.nameRu.match(new RegExp(person.documents.document.type.nameRu, 'i')))
-              : new Value();
-          if (documentType) this.formStore[whichForm].documentType = documentType;
+        }
+      }
 
-          const documentNumber = person.documents.document.number;
-          if (documentNumber) this.formStore[whichForm].documentNumber = documentNumber;
+      if (person.regAddress.street.includes(', ')) {
+        const personAddress = person.regAddress.street.split(', ');
+        const microDistrict = personAddress.find(i => i.match(new RegExp('микрорайон', 'i')));
+        const quarter = personAddress.find(i => i.match(new RegExp('квартал', 'i')));
+        const street = personAddress.find(i => i.match(new RegExp('улица', 'i')));
+        if (microDistrict) member.registrationMicroDistrict = microDistrict;
+        if (quarter) member.registrationQuarter = quarter;
+        if (street) member.registrationStreet = street;
+      } else {
+        if (person.regAddress.street) member.registrationStreet = person.regAddress.street;
+      }
+      if (person.regAddress.building) member.registrationNumberHouse = person.regAddress.building;
+      if (person.regAddress.flat) member.registrationNumberApartment = person.regAddress.flat;
 
-          const documentDate = person.documents.document.beginDate;
-          if (documentDate) this.formStore[whichForm].documentDate = reformatDate(documentDate);
+      // TODO Доработать логику и для остальных
+      if ('length' in person.documents.document) {
+        const validDocument = person.documents.document.find(i => new Date(i.endDate) > new Date(Date.now()) && i.status.code === '00' && i.type.code === '002');
+        if (validDocument) {
+          const documentType = this.documentTypes.find(i => i.ids === '1UDL');
+          if (documentType) member.documentType = documentType;
 
-          const documentExpire = person.documents.document.endDate;
-          if (documentExpire) this.formStore[whichForm].documentExpire = reformatDate(documentExpire);
+          member.documentNumber = validDocument.number;
+          member.documentExpire = reformatDate(validDocument.endDate);
+          member.documentDate = reformatDate(validDocument.beginDate);
+          member.documentNumber = validDocument.number;
 
-          // TODO уточнить
           const documentIssuer = this.documentIssuers.find(i => i.nameRu.match(new RegExp('МВД РК', 'i')));
-          if (documentIssuer) this.formStore[whichForm].documentIssuers = documentIssuer;
+          if (documentIssuer) member.documentIssuers = documentIssuer;
         }
-        const economySectorCode = this.economySectorCode.find(i => i.ids === '500003.9');
-        if (economySectorCode) this.formStore[whichForm].economySectorCode = economySectorCode;
       } else {
-        this.formStore[whichForm][whichIndex].firstName = person.name;
-        this.formStore[whichForm][whichIndex].lastName = person.surname;
-        this.formStore[whichForm][whichIndex].middleName = person.patronymic ? person.patronymic : '';
-        this.formStore[whichForm][whichIndex].longName = `${person.surname} ${person.name} ${person.patronymic ? person.patronymic : ''}`;
-        this.formStore[whichForm][whichIndex].birthDate = reformatDate(person.birthDate);
-        this.formStore[whichForm][whichIndex].genderName = person.gender.nameRu;
-
-        const gender = this.gender.find(i => i.id == person.gender.code);
-        if (gender) this.formStore[whichForm][whichIndex].gender = gender;
+        const documentType =
+          person.documents.document.type.nameRu === 'УДОСТОВЕРЕНИЕ РК'
+            ? this.documentTypes.find(i => i.ids === '1UDL')
+            : this.documentTypes.find(i => i.nameRu.match(new RegExp(person.documents.document.type.nameRu, 'i')))
+            ? this.documentTypes.find(i => i.nameRu.match(new RegExp(person.documents.document.type.nameRu, 'i')))
+            : new Value();
+        if (documentType) member.documentType = documentType;
 
-        const birthPlace = this.countries.find(i => i.nameRu.match(new RegExp(person.birthPlace.country.nameRu, 'i')));
-        if (birthPlace) this.formStore[whichForm][whichIndex].birthPlace = birthPlace;
+        const documentNumber = person.documents.document.number;
+        if (documentNumber) member.documentNumber = documentNumber;
 
-        const countryOfCitizenship = this.citizenshipCountries.find(i => i.nameRu.match(new RegExp(person.citizenship.nameRu, 'i')));
-        if (countryOfCitizenship) this.formStore[whichForm][whichIndex].countryOfCitizenship = countryOfCitizenship;
+        const documentDate = person.documents.document.beginDate;
+        if (documentDate) member.documentDate = reformatDate(documentDate);
 
-        const regCountry = this.countries.find(i => i.nameRu.match(new RegExp(person.regAddress.country.nameRu, 'i')));
-        if (regCountry) this.formStore[whichForm][whichIndex].registrationCountry = regCountry;
+        const documentExpire = person.documents.document.endDate;
+        if (documentExpire) member.documentExpire = reformatDate(documentExpire);
 
-        const regProvince = this.states.find(i => i.nameRu.match(new RegExp(person.regAddress.district.nameRu, 'i')));
-        if (regProvince) this.formStore[whichForm][whichIndex].registrationProvince = regProvince;
-
-        if ('city' in person.regAddress && !!person.regAddress.city) {
-          if (person.regAddress.city.includes(', ')) {
-            const personCities = person.regAddress.city.split(', ');
-            for (let i = 0; i < personCities.length; ++i) {
-              const possibleCity = this.cities.find(i => i.nameRu.includes(personCities[i]));
-              if (possibleCity) {
-                this.formStore[whichForm][whichIndex].registrationCity = possibleCity;
-                break;
-              }
-            }
-            if (this.formStore[whichForm][whichIndex].registrationCity.nameRu === null) {
-              for (let i = 0; i < personCities.length; ++i) {
-                const possibleRegion = this.regions.find(i => i.nameRu.includes(personCities[i]));
-                if (possibleRegion) {
-                  this.formStore[whichForm][whichIndex].registrationRegion = possibleRegion;
-                  break;
-                }
-              }
-            }
-          } else {
-            const regCity = this.cities.find(i => i.nameRu.match(new RegExp(person.regAddress.city, 'i')));
-            if (regCity) this.formStore[whichForm][whichIndex].registrationCity = regCity;
-            if (this.formStore[whichForm][whichIndex].registrationCity.nameRu === null) {
-              const regRegion = this.regions.find(i => i.nameRu.match(new RegExp(person.regAddress.city), 'i'));
-              if (regRegion) this.formStore[whichForm][whichIndex].registrationRegion = regRegion;
-            }
-          }
-        }
-
-        if (this.formStore[whichForm][whichIndex].registrationCity.nameRu === null && this.formStore[whichForm][whichIndex].registrationRegion.nameRu === null) {
-          const regCity = this.cities.find(
-            i => i.nameRu.match(new RegExp(person.regAddress.region.nameRu, 'i')) || i.nameRu.match(new RegExp(person.regAddress.district.nameRu, 'i')),
-          );
-          if (regCity) {
-            this.formStore[whichForm][whichIndex].registrationCity = regCity;
-            const regType = this.localityTypes.find(i => i.nameRu === 'город');
-            if (regType) this.formStore[whichForm][whichIndex].registrationRegionType = regType;
-          } else {
-            const regRegion = this.regions.find(
-              i => i.nameRu.match(new RegExp(person.regAddress.region.nameRu), 'i') || i.nameRu.match(new RegExp(person.regAddress.district.nameRu, 'i')),
-            );
-            if (regRegion) {
-              this.formStore[whichForm][whichIndex].registrationRegion = regRegion;
-              const regType = this.localityTypes.find(i => (i.nameRu === i.nameRu) === 'село' || i.nameRu === 'поселок');
-              if (regType) this.formStore[whichForm][whichIndex].registrationRegionType = regType;
-            }
-          }
-        }
-
-        if (person.regAddress.street.includes(', ')) {
-          const personAddress = person.regAddress.street.split(', ');
-          const microDistrict = personAddress.find(i => i.match(new RegExp('микрорайон', 'i')));
-          const quarter = personAddress.find(i => i.match(new RegExp('квартал', 'i')));
-          const street = personAddress.find(i => i.match(new RegExp('улица', 'i')));
-          if (microDistrict) this.formStore[whichForm][whichIndex].registrationMicroDistrict = microDistrict;
-          if (quarter) this.formStore[whichForm][whichIndex].registrationQuarter = quarter;
-          if (street) this.formStore[whichForm][whichIndex].registrationStreet = street;
-        } else {
-          if (person.regAddress.street) this.formStore[whichForm][whichIndex].registrationStreet = person.regAddress.street;
-        }
-        if (person.regAddress.building) this.formStore[whichForm][whichIndex].registrationNumberHouse = person.regAddress.building;
-        if (person.regAddress.flat) this.formStore[whichForm][whichIndex].registrationNumberApartment = person.regAddress.flat;
-
-        // TODO Доработать логику и для остальных
-        if ('length' in person.documents.document) {
-          const validDocument = person.documents.document.find(i => new Date(i.endDate) > new Date(Date.now()) && i.status.code === '00' && i.type.code === '002');
-          if (validDocument) {
-            const documentType = this.documentTypes.find(i => i.ids === '1UDL');
-            if (documentType) this.formStore[whichForm][whichIndex].documentType = documentType;
-            this.formStore[whichForm][whichIndex].documentNumber = validDocument.number;
-            this.formStore[whichForm][whichIndex].documentExpire = reformatDate(validDocument.endDate);
-            this.formStore[whichForm][whichIndex].documentDate = reformatDate(validDocument.beginDate);
-            this.formStore[whichForm][whichIndex].documentNumber = validDocument.number;
-
-            const documentIssuer = this.documentIssuers.find(i => i.nameRu.match(new RegExp('МВД РК', 'i')));
-            if (documentIssuer) this.formStore[whichForm][whichIndex].documentIssuers = documentIssuer;
-          }
-        } else {
-          const documentType =
-            person.documents.document.type.nameRu === 'УДОСТОВЕРЕНИЕ РК'
-              ? this.documentTypes.find(i => i.ids === '1UDL')
-              : this.documentTypes.find(i => i.nameRu.match(new RegExp(person.documents.document.type.nameRu, 'i')))
-              ? this.documentTypes.find(i => i.nameRu.match(new RegExp(person.documents.document.type.nameRu, 'i')))
-              : new Value();
-          if (documentType) this.formStore[whichForm][whichIndex].documentType = documentType;
-
-          const documentNumber = person.documents.document.number;
-          if (documentNumber) this.formStore[whichForm][whichIndex].documentNumber = documentNumber;
-
-          const documentDate = person.documents.document.beginDate;
-          if (documentDate) this.formStore[whichForm][whichIndex].documentDate = reformatDate(documentDate);
-
-          const documentExpire = person.documents.document.endDate;
-          if (documentExpire) this.formStore[whichForm][whichIndex].documentExpire = reformatDate(documentExpire);
-
-          // TODO уточнить
-          const documentIssuer = this.documentIssuers.find(i => i.nameRu.match(new RegExp('МВД РК', 'i')));
-          if (documentIssuer) this.formStore[whichForm][whichIndex].documentIssuers = documentIssuer;
-        }
-        const economySectorCode = this.economySectorCode.find(i => i.ids === '500003.9');
-        if (economySectorCode) this.formStore[whichForm][whichIndex].economySectorCode = economySectorCode;
+        // TODO уточнить
+        const documentIssuer = this.documentIssuers.find(i => i.nameRu.match(new RegExp('МВД РК', 'i')));
+        if (documentIssuer) member.documentIssuers = documentIssuer;
       }
+      const economySectorCode = this.economySectorCode.find(i => i.ids === '500003.9');
+      if (economySectorCode) member.economySectorCode = economySectorCode;
     },
     hasJobSection(whichForm) {
       switch (whichForm) {