hl-core 0.0.8-beta.3 → 0.0.8-beta.31

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,9 @@ export const useDataStore = defineStore('data', {
   }),
   getters: {
     isEFO: state => state.product === 'efo',
+    isAML: state => state.product === 'aml',
+    isLKA: state => state.product === 'lka',
+    isBridge: state => state.product === 'efo' || state.product === 'aml' || state.product === 'lka',
     isBaiterek: state => state.product === 'baiterek',
     isBolashak: state => state.product === 'bolashak',
     isMycar: state => state.product === 'mycar',
@@ -38,7 +41,14 @@ 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',
+    isCalculator: state => state.product === 'calculator',
+    isComplianceWindow: state => state.product === 'compliance',
     isEveryFormDisabled: state => Object.values(state.formStore.isDisabled).every(i => i === true),
+    hasClientAnketa: state => state.formStore.additionalInsuranceTerms.find(i => i.coverTypeCode === 10),
+    isClientAnketaCondition: state =>
+      !state.formStore.insuredForm.find(member => member.iin === state.formStore.policyholderForm.iin) &&
+      !!state.formStore.additionalInsuranceTerms.find(i => i.coverTypeCode === 10 && i.coverSumCode === 'included'),
   },
   actions: {
     isIframe() {
@@ -62,7 +72,7 @@ export const useDataStore = defineStore('data', {
     },
     copyToClipboard(text) {
       if (typeof text === 'string' || typeof text === 'number') {
-        if (this.isEFO) {
+        if (this.isBridge) {
           navigator.clipboard.writeText(text);
         } else {
           this.sendToParent(constants.postActions.clipboard, text);
@@ -107,17 +117,30 @@ export const useDataStore = defineStore('data', {
           this.refreshToken = response.refreshToken;
           this.getUserRoles();
         }
+        const checkPermission = () => {
+          if (this.isAML) {
+            return this.isCompliance() || this.isAdmin() || this.isSupport() || this.isAnalyst();
+          }
+          if (this.isLKA) {
+            return this.isAgent() || this.isAdmin() || this.isSupport() || this.isAnalyst() || this.isDrn();
+          }
+          if (this.isEFO) {
+            return (
+              this.isInitiator() ||
+              this.isUnderwriter() ||
+              this.isAdmin() ||
+              this.isCompliance() ||
+              this.isAnalyst() ||
+              this.isUpk() ||
+              this.isFinCenter() ||
+              this.isSupervisor() ||
+              this.isSupport()
+            );
+          }
+          return false;
+        };
         if (this.controls.onAuth) {
-          const hasPermission =
-            this.isInitiator() ||
-            this.isUnderwriter() ||
-            this.isAdmin() ||
-            this.isCompliance() ||
-            this.isAnalyst() ||
-            this.isUpk() ||
-            this.isFinanceCenter() ||
-            this.isSupervisor() ||
-            this.isSupport();
+          const hasPermission = checkPermission();
           if (hasPermission) {
             localStorage.setItem('accessToken', this.accessToken);
             localStorage.setItem('refreshToken', this.refreshToken);
@@ -150,6 +173,9 @@ export const useDataStore = defineStore('data', {
         }
       }
     },
+    getUserData() {
+      return this.accessToken ? jwtDecode(this.accessToken) : null;
+    },
     isRole(whichRole) {
       if (this.user.roles.length === 0) {
         this.getUserRoles();
@@ -196,8 +222,8 @@ export const useDataStore = defineStore('data', {
     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);
@@ -205,6 +231,20 @@ export const useDataStore = defineStore('data', {
     isProcessEditable(statusCode) {
       return !!constants.editableStatuses.find(status => status === statusCode);
     },
+    isProcessReturnable(statusCode) {
+      const getReturnableStatuses = () => {
+        const defaultStatuses = constants.returnStatementStatuses;
+        return defaultStatuses;
+      };
+      return !!getReturnableStatuses().find(status => status === statusCode);
+    },
+    isProcessCancel(statusCode) {
+      const getCanceleStatuses = () => {
+        const defaultStatuses = constants.cancelApplicationStatuses;
+        return defaultStatuses;
+      };
+      return !!getCanceleStatuses().find(status => status === statusCode);
+    },
     isTask() {
       return this.formStore.applicationData.processInstanceId !== 0 && this.formStore.applicationData.isTask;
     },
@@ -303,7 +343,7 @@ export const useDataStore = defineStore('data', {
         }
       }
     },
-    async getContragent(member, whichForm, whichIndex, load = true) {
+    async getContragent(member, load = true) {
       if (load) {
         this.isLoading = true;
       }
@@ -318,10 +358,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 {
@@ -339,14 +379,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;
@@ -358,58 +399,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;
-        }
+      if (contacts && contacts.length) {
+        member.response.contacts = contacts;
       }
-      this.parseContragent(
-        whichForm,
-        {
-          personalData: contragent,
-          documents: documents,
-          contacts: contacts,
-          data: data,
-          address: address,
-        },
-        whichIndex,
-      );
+      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;
@@ -432,142 +450,80 @@ 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) {
+        member.documentsList = user.documents;
+        const documentByPriority = (() => {
+          if (this.isLifetrip) {
+            return user.documents.find(i => i.type === 'PS');
+          }
+          return user.documents.find(i => i.type === '1UDL');
+        })();
+        const userDocument = documentByPriority ? documentByPriority : user.documents[0];
+        const documentType = this.documentTypes.find(i => i.ids === userDocument.type);
+        const documentIssuer = this.documentIssuers.find(i => i.nameRu === userDocument.issuerNameRu);
+        member.documentType = documentType ? documentType : new Value();
+        member.documentNumber = userDocument.number;
+        member.documentIssuers = documentIssuer ? documentIssuer : new Value();
+        member.documentDate = reformatDate(userDocument.issueDate);
+        member.documentExpire = reformatDate(userDocument.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 && !member.phoneNumber) {
+            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) {
@@ -633,7 +589,7 @@ export const useDataStore = defineStore('data', {
           gender: user.gender.id,
           genderName: user.genderName ? user.genderName : user.gender.nameRu,
           birthPlace: user.birthPlace.nameRu,
-          age: user.age,
+          age: Number(user.age),
           registrationDate: user.registrationDate,
           verifyType: user.verifyType,
           verifyDate: user.verifyDate,
@@ -658,7 +614,7 @@ export const useDataStore = defineStore('data', {
             questName = 'Страна налогового резиденства';
           }
           return {
-            id: 'response' in user && 'questionnaires' in user.response ? user.response.questionnaires?.find(i => i.questId == questionId).id : question.id,
+            id: 'response' in user && user.response && 'questionnaires' in user.response ? user.response.questionnaires?.find(i => i.questId == questionId).id : question.id,
             contragentId: user.id,
             questAnswer: question.ids,
             questId: questionId,
@@ -669,7 +625,7 @@ export const useDataStore = defineStore('data', {
         if (user.countryOfTaxResidency.ids !== '500014.3') {
           user.addTaxResidency = new Value();
         }
-        const addTaxResidency = 'response' in user && 'questionnaires' in user.response && user.response.questionnaires.find(i => i.questId === '507777');
+        const addTaxResidency = 'response' in user && user.response && 'questionnaires' in user.response && user.response.questionnaires.find(i => i.questId === '507777');
         if (user.addTaxResidency.nameRu !== null) {
           questionariesData.push({
             id: addTaxResidency ? addTaxResidency.id : 0,
@@ -697,17 +653,21 @@ export const useDataStore = defineStore('data', {
         if (user.phoneNumber !== '' && user.phoneNumber !== null) {
           contactsData.push({
             contragentId: user.id,
-            id: 'response' in user && 'contacts' in user.response ? user.response.contacts.find(i => i.type === 'MOBILE').id : 0,
+            id: 'response' in user && user.response && 'contacts' in user.response ? user.response.contacts.find(i => i.type === 'MOBILE').id : 0,
             newValue: '',
             note: '',
             primaryFlag: 'Y',
             type: 'MOBILE',
             typeName: 'Сотовый телефон',
             value: formatPhone(user.phoneNumber),
-            verifyType: user.otpTokenId ? 'BMG' : 'response' in user && 'contacts' in user.response ? user.response.contacts.find(i => i.type === 'MOBILE').verifyType : null,
+            verifyType: user.otpTokenId
+              ? 'BMG'
+              : 'response' in user && user.response && 'contacts' in user.response
+              ? user.response.contacts.find(i => i.type === 'MOBILE').verifyType
+              : null,
             verifyDate: user.otpTokenId
               ? this.currentDate()
-              : 'response' in user && 'contacts' in user.response
+              : 'response' in user && user.response && 'contacts' in user.response
               ? user.response.contacts.find(i => i.type === 'MOBILE').verifyDate
               : null,
           });
@@ -715,19 +675,19 @@ export const useDataStore = defineStore('data', {
         if (user.email !== '' && user.email !== null) {
           contactsData.push({
             contragentId: user.id,
-            id: 'response' in user && 'contacts' in user.response ? user.response.contacts.find(i => i.type === 'EMAIL').id : 0,
+            id: 'response' in user && user.response && 'contacts' in user.response ? user.response.contacts.find(i => i.type === 'EMAIL').id : 0,
             newValue: '',
             note: '',
             primaryFlag: 'N',
             type: 'EMAIL',
             typeName: 'E-Mail',
-            value: user.email ? user.email : 'response' in user && 'contacts' in user.response ? user.response.contacts.find(i => i.type === 'EMAIL').value : '',
+            value: user.email ? user.email : 'response' in user && user.response && 'contacts' in user.response ? user.response.contacts.find(i => i.type === 'EMAIL').value : '',
           });
         }
         if (user.homePhone !== '' && user.homePhone !== null) {
           contactsData.push({
             contragentId: user.id,
-            id: 'response' in user && 'contacts' in user.response ? user.response.contacts.find(i => i.type === 'HOME').id : 0,
+            id: 'response' in user && user.response && 'contacts' in user.response ? user.response.contacts.find(i => i.type === 'HOME').id : 0,
             newValue: '',
             note: '',
             primaryFlag: 'N',
@@ -735,17 +695,18 @@ export const useDataStore = defineStore('data', {
             typeName: 'Домашний телефон',
             value: user.homePhone
               ? formatPhone(user.homePhone)
-              : 'response' in user && 'contacts' in user.response
+              : 'response' in user && user.response && 'contacts' in user.response
               ? user.response.contacts.find(i => i.type === 'HOME').value
               : '',
           });
         }
 
         // ! SaveContragent -> Documents
-        let documentsData = [];
-        documentsData.push({
+        let documentsData = user.documentsList;
+        const hasAlreadyDocument = documentsData.findIndex(i => i.type === user.documentType.ids && i.number === user.documentNumber);
+        const userDocument = {
           contragentId: user.id,
-          id: 'response' in user && 'documents' in user.response ? user.response.documents[0].id : 0,
+          id: hasAlreadyDocument !== -1 ? documentsData[hasAlreadyDocument].id : 0,
           description: null,
           expireDate: user.getDateByKey('documentExpire'),
           issueDate: user.getDateByKey('documentDate'),
@@ -759,15 +720,21 @@ export const useDataStore = defineStore('data', {
           serial: null,
           verifyType: user.verifyType,
           verifyDate: user.verifyDate,
-        });
+        };
+        if (hasAlreadyDocument !== -1) {
+          documentsData[hasAlreadyDocument] = userDocument;
+        } else {
+          documentsData.push(userDocument);
+        }
 
         // ! SaveContragent -> Addresses
+        const checkForNull = value => (value ? value : '');
         let addressData = [];
         addressData.push({
-          id: 'response' in user && 'addresses' in user.response ? user.response.addresses[0].id : 0,
+          id: 'response' in user && user.response && 'addresses' in user.response ? user.response.addresses[0].id : 0,
           contragentId: user.id,
-          countryCode: user.birthPlace.ids,
-          countryName: user.birthPlace.nameRu,
+          countryCode: user.registrationCountry.ids,
+          countryName: user.registrationCountry.nameRu,
           stateCode: user.registrationProvince.ids,
           stateName: user.registrationProvince.nameRu,
           cityCode: user.registrationCity.code,
@@ -777,11 +744,13 @@ 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.registrationCountry.nameRu)}, ${checkForNull(user.registrationRegionType.nameRu)} ${checkForNull(
+            user.registrationCity.nameRu,
+          )}, ул. ${checkForNull(user.registrationStreet)}, д. ${checkForNull(user.registrationNumberHouse)} кв. ${checkForNull(user.registrationNumberApartment)}`,
           type: 'H',
         });
 
@@ -794,9 +763,11 @@ export const useDataStore = defineStore('data', {
         };
 
         const personId = await this.api.saveContragent(data);
-        if (personId) {
+        if (personId > 0) {
           await this.getContragentById(personId, whichForm, false, whichIndex);
           user.otpTokenId = null;
+        } else {
+          return false;
         }
       } catch (err) {
         this.isLoading = false;
@@ -858,15 +829,12 @@ export const useDataStore = defineStore('data', {
           data.isNotary = member.isNotary;
         }
         if (whichMember === 'Insured') {
-          if (
-            this.formStore.applicationData &&
-            this.formStore.applicationData.insuredApp &&
-            this.formStore.applicationData.insuredApp.length &&
-            this.formStore.applicationData.insuredApp.every(i => i.iin !== data.iin) &&
-            data.id !== null
-          ) {
-            await this.api.deleteMember('Insured', data.id);
-            delete data.id;
+          if (this.formStore.applicationData && this.formStore.applicationData.insuredApp && this.formStore.applicationData.insuredApp.length) {
+            await this.deleteInsuredLogic();
+            if (this.formStore.applicationData.insuredApp.every(i => i.iin !== data.iin) && data.id !== null) {
+              await this.api.deleteMember('Insured', data.id);
+              delete data.id;
+            }
           }
           data.isDisability = this.formStore.isPolicyholderInsured ? false : member.isDisability.nameRu == 'Да';
           data.disabilityGroupId = data.isDisability ? member.disabilityGroupId.id : null;
@@ -874,6 +842,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 (
@@ -890,6 +860,9 @@ export const useDataStore = defineStore('data', {
           data.percentage = Number(member.percentageOfPayoutAmount);
           data.relationId = member.relationDegree.ids;
           data.relationName = member.relationDegree.nameRu;
+          if (this.isLiferenta || this.isBolashak) {
+            data.beneficiaryInsurancePayId = member.insurancePay.id;
+          }
         }
         if (whichMember === 'BeneficialOwner') {
           if (data.id === 0) {
@@ -913,7 +886,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':
@@ -936,11 +909,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) {
@@ -958,14 +927,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] = [];
@@ -977,6 +952,7 @@ export const useDataStore = defineStore('data', {
               JSON.stringify({
                 value: response,
                 hour: currentHour,
+                minute: currentMinutePart,
                 mode: import.meta.env.MODE,
               }),
             );
@@ -1047,16 +1023,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');
@@ -1094,6 +1061,24 @@ export const useDataStore = defineStore('data', {
     async getProcessTariff() {
       return await this.getFromApi('processTariff', 'getProcessTariff');
     },
+    async getDicAnnuityTypeList() {
+      return await this.getFromApi('dicAnnuityTypeList', 'getDicAnnuityTypeList');
+    },
+    async getProcessAnnuityPaymentPeriod() {
+      return await this.getFromApi('processAnnuityPaymentPeriod', 'getProcessAnnuityPaymentPeriod', this.processCode);
+    },
+    async getInsurancePay() {
+      return await this.getFromApi('insurancePay', 'getInsurancePay');
+    },
+    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);
@@ -1102,15 +1087,25 @@ export const useDataStore = defineStore('data', {
         console.log(err);
       }
     },
-    async getQuestionList(surveyType, processInstanceId, insuredId, baseField, secondaryField) {
+    async getQuestionList(surveyType, processInstanceId, insuredId, baseField, secondaryField, whichMember = 'insured') {
       if (!this.formStore[baseField] || (this.formStore[baseField] && !this.formStore[baseField].length)) {
         try {
-          const [{ value: baseQuestions }, { value: secondaryQuestions }] = await Promise.allSettled([
-            this.api.getQuestionList(surveyType, processInstanceId, insuredId),
-            this.api.getQuestionListSecond(`${surveyType}second`, processInstanceId, insuredId),
-          ]);
-          this.formStore[baseField] = baseQuestions;
-          this.formStore[secondaryField] = secondaryQuestions;
+          if (whichMember === 'insured') {
+            const [{ value: baseQuestions }, { value: secondaryQuestions }] = await Promise.allSettled([
+              this.api.getQuestionList(surveyType, processInstanceId, insuredId),
+              this.api.getQuestionListSecond(`${surveyType}second`, processInstanceId, insuredId),
+            ]);
+            this.formStore[baseField] = baseQuestions;
+            this.formStore[secondaryField] = secondaryQuestions;
+          }
+          if (whichMember === 'policyholder') {
+            const [{ value: baseQuestions }, { value: secondaryQuestions }] = await Promise.allSettled([
+              this.api.getClientQuestionList(surveyType, processInstanceId, insuredId),
+              this.api.getClientQuestionListSecond(`${surveyType}second`, processInstanceId, insuredId),
+            ]);
+            this.formStore[baseField] = baseQuestions;
+            this.formStore[secondaryField] = secondaryQuestions;
+          }
         } catch (err) {
           console.log(err);
         }
@@ -1120,6 +1115,9 @@ export const useDataStore = defineStore('data', {
     getNumberWithSpaces(n) {
       return n === null ? null : Number((typeof n === 'string' ? n : n.toFixed().toString()).replace(/[^0-9]+/g, '')).toLocaleString('ru');
     },
+    getNumberWithDot(n) {
+      return n === null ? null : n.toLocaleString('ru', { maximumFractionDigits: 2, minimumFractionDigits: 2 }).replace(/,/g, '.');
+    },
     async getTaskList(search = '', groupCode = 'Work', onlyGet = false, needToReturn = false, key = 'dateCreated', processInstanceId = null, byOneProcess = null) {
       if (onlyGet === false) {
         this.isLoading = true;
@@ -1207,6 +1205,12 @@ export const useDataStore = defineStore('data', {
         this.getProcessIndexRate(),
         this.getProcessTariff(),
         this.getProcessPaymentPeriod(),
+        this.getDicFileTypeList(),
+        this.getDicAnnuityTypeList(),
+        this.getProcessAnnuityPaymentPeriod(),
+        this.getInsurancePay(),
+        this.getDictionaryItems('RegionPolicy'),
+        this.getDictionaryItems('SaleChanellPolicy'),
       ]);
     },
     async getUserGroups() {
@@ -1254,15 +1258,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() {
@@ -1291,14 +1292,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) {
@@ -1324,24 +1325,18 @@ export const useDataStore = defineStore('data', {
         this.showToaster('success', this.t('toaster.successSaved'));
         return true;
       } catch (err) {
-        this.showToaster('error', this.t('toaster.error'));
-        return false;
+        return ErrorHandler(err);
       } finally {
         this.isLoading = false;
       }
     },
     async sendUnderwritingCouncilTask(data) {
       try {
-        this.isLoading = true;
         await this.api.sendUnderwritingCouncilTask(data);
         this.showToaster('success', this.t('toaster.successOperation'), 5000);
         return true;
       } catch (err) {
-        console.log(err);
-        this.showToaster('error', this.t('toaster.error'), 5000);
-        return false;
-      } finally {
-        this.isLoading = false;
+        return ErrorHandler(err);
       }
     },
     async definedAnswers(filter, whichSurvey, value = null, index = null) {
@@ -1349,11 +1344,89 @@ export const useDataStore = defineStore('data', {
         this.formStore.definedAnswersId[whichSurvey][filter] = await this.api.definedAnswers(filter);
       }
       if (value !== null && this.formStore.definedAnswersId[whichSurvey][filter].length) {
-        const answer = this.formStore.definedAnswersId[whichSurvey][filter].find(answer => answer.nameRu === value);
+        const answer = this.formStore.definedAnswersId[whichSurvey][filter].find(answer => answer.nameRu.match(new RegExp(value, 'i')));
         this.formStore[whichSurvey].body[index].first.answerId = answer.ids;
       }
       return this.formStore.definedAnswersId[whichSurvey];
     },
+    getConditionsData() {
+      const conditionsData = {
+        policyAppDto: {
+          id: this.formStore.applicationData.policyAppDto.id,
+          processInstanceId: this.formStore.applicationData.policyAppDto.processInstanceId,
+          policyId: null,
+          policyNumber: null,
+          contractDate: this.currentDate(),
+          amount: this.formStore.productConditionsForm.requestedSumInsured != null ? Number(this.formStore.productConditionsForm.requestedSumInsured.replace(/\s/g, '')) : null,
+          premium:
+            this.formStore.productConditionsForm.insurancePremiumPerMonth != null ? Number(this.formStore.productConditionsForm.insurancePremiumPerMonth.replace(/\s/g, '')) : null,
+          isSpokesman: this.formStore.hasRepresentative,
+          coverPeriod: this.formStore.productConditionsForm.coverPeriod,
+          payPeriod: this.formStore.productConditionsForm.coverPeriod,
+          annualIncome: this.formStore.productConditionsForm.annualIncome ? Number(this.formStore.productConditionsForm.annualIncome.replace(/\s/g, '')) : null,
+          indexRateId: this.formStore.productConditionsForm.processIndexRate?.id
+            ? this.formStore.productConditionsForm.processIndexRate.id
+            : this.processIndexRate.find(i => i.code === '0')?.id,
+          paymentPeriodId: this.formStore.productConditionsForm.paymentPeriod.id,
+          lifeMultiply: formatProcents(this.formStore.productConditionsForm.lifeMultiply),
+          lifeAdditive: formatProcents(this.formStore.productConditionsForm.lifeAdditive),
+          adbMultiply: formatProcents(this.formStore.productConditionsForm.adbMultiply),
+          adbAdditive: formatProcents(this.formStore.productConditionsForm.adbAdditive),
+          disabilityMultiply: formatProcents(this.formStore.productConditionsForm.disabilityMultiply),
+          disabilityAdditive: formatProcents(this.formStore.productConditionsForm.adbAdditive),
+          riskGroup: this.formStore.productConditionsForm.riskGroup?.id ? this.formStore.productConditionsForm.riskGroup.id : 1,
+        },
+        addCoversDto: this.formStore.additionalInsuranceTerms,
+      };
+      if (this.isKazyna) {
+        conditionsData.policyAppDto.premiumInCurrency = getNumber(this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar);
+        conditionsData.policyAppDto.amountInCurrency = getNumber(this.formStore.productConditionsForm.requestedSumInsuredInDollar);
+        conditionsData.policyAppDto.currencyExchangeRate = this.currencies.usd;
+      }
+      if (this.isLiferenta) {
+        conditionsData.policyAppDto.guaranteedPaymentPeriod = this.formStore.productConditionsForm.guaranteedPeriod || 0;
+        conditionsData.policyAppDto.annuityTypeId = this.formStore.productConditionsForm.typeAnnuityInsurance.id;
+        conditionsData.policyAppDto.paymentPeriod = this.formStore.productConditionsForm.termAnnuityPayments;
+        conditionsData.policyAppDto.annuityPaymentPeriodId = this.formStore.productConditionsForm.periodAnnuityPayment.id;
+      }
+      return conditionsData;
+    },
+    async clearAddCovers(coverCode, coverValue) {
+      if (!coverCode || !coverValue) return;
+      const applicationData = this.getConditionsData();
+      const termCoverIndex = applicationData.addCoversDto.findIndex(i => i.coverTypeCode === coverCode);
+      if (termCoverIndex !== -1) {
+        const answers = await this.getAdditionalInsuranceTermsAnswers(applicationData.addCoversDto[termCoverIndex].coverTypeId);
+        if (answers.length) {
+          const newCover = answers.find(i => i.code === coverValue);
+          if (newCover) {
+            applicationData.addCoversDto[termCoverIndex].coverSumId = newCover.id;
+            applicationData.addCoversDto[termCoverIndex].coverSumName = newCover.nameRu;
+          }
+        }
+      }
+    },
+    async deleteInsuredLogic() {
+      const applicationData = this.getConditionsData();
+      const clearCovers = [{ code: 10, value: 'excluded' }];
+      await Promise.allSettled(
+        clearCovers.map(async cover => {
+          await this.clearAddCovers(cover.code, cover.value);
+        }),
+      );
+      if (!!this.formStore.productConditionsForm.insurancePremiumPerMonth) {
+        applicationData.policyAppDto.premium = null;
+      }
+      if (!!this.formStore.productConditionsForm.requestedSumInsured) {
+        applicationData.policyAppDto.amount = null;
+      }
+      try {
+        await this.api.setApplication(applicationData);
+        this.showToaster('info', this.t('toaster.needToRecalculate'));
+      } catch (err) {
+        ErrorHandler(err);
+      }
+    },
     async getPaymentTable(id) {
       try {
         const paymentResultTable = await this.api.calculatePremuim(id);
@@ -1366,10 +1439,10 @@ export const useDataStore = defineStore('data', {
         console.log(err);
       }
     },
-    async getDefaultCalculationData(showLoader = false) {
+    async getDefaultCalculationData(showLoader = false, product = null) {
       this.isLoading = showLoader;
       try {
-        const calculationData = await this.api.getDefaultCalculationData();
+        const calculationData = await this.api.getDefaultCalculationData(this.isCalculator ? product : undefined);
         return calculationData;
       } catch (err) {
         ErrorHandler(err);
@@ -1377,7 +1450,7 @@ export const useDataStore = defineStore('data', {
         this.isLoading = false;
       }
     },
-    async calculateWithoutApplication(showLoader = false) {
+    async calculateWithoutApplication(showLoader = false, product = null) {
       this.isLoading = showLoader;
       try {
         const calculationData = {
@@ -1394,10 +1467,31 @@ export const useDataStore = defineStore('data', {
           paymentPeriodId: this.formStore.productConditionsForm.paymentPeriod.id,
           addCovers: this.formStore.additionalInsuranceTermsWithout,
         };
-        const calculationResponse = await this.api.calculateWithoutApplication(calculationData);
+        if (this.isKazyna || product === 'halykkazyna') {
+          calculationData.premiumInCurrency = getNumber(this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar);
+          calculationData.amountInCurrency = getNumber(this.formStore.productConditionsForm.requestedSumInsuredInDollar);
+          calculationData.currencyExchangeRate = this.currencies.usd;
+        }
+        if (this.isLiferenta) {
+          calculationData.guaranteedPaymentPeriod = this.formStore.productConditionsForm.guaranteedPeriod || 0;
+          calculationData.annuityTypeId = this.formStore.productConditionsForm.typeAnnuityInsurance.id;
+          calculationData.paymentPeriod = this.formStore.productConditionsForm.termAnnuityPayments;
+          calculationData.annuityPaymentPeriodId = this.formStore.productConditionsForm.periodAnnuityPayment.id;
+        }
+        const calculationResponse = await this.api.calculateWithoutApplication(calculationData, this.isCalculator ? product : undefined);
         this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(calculationResponse.amount);
         this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(calculationResponse.premium);
         this.formStore.additionalInsuranceTermsWithout = calculationResponse.addCovers;
+        if (this.isKazyna || product === 'halykkazyna') {
+          if (this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar != null) {
+            this.formStore.productConditionsForm.requestedSumInsuredInDollar = this.getNumberWithSpaces(calculationResponse.amountInCurrency);
+          } else {
+            this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar = this.getNumberWithSpaces(calculationResponse.premiumInCurrency);
+          }
+        }
+        if (this.isLiferenta) {
+          this.formStore.productConditionsForm.amountAnnuityPayments = this.getNumberWithSpaces(calculationResponse.annuityMonthPay);
+        }
         this.showToaster('success', this.t('toaster.calculated'), 1000);
       } catch (err) {
         ErrorHandler(err);
@@ -1409,61 +1503,29 @@ export const useDataStore = defineStore('data', {
     async calculate(taskId) {
       this.isLoading = true;
       try {
-        let form1 = {
-          baiterekApp: null,
-          policyAppDto: {
-            id: this.formStore.applicationData.policyAppDto.id,
-            processInstanceId: this.formStore.applicationData.policyAppDto.processInstanceId,
-            policyId: null,
-            policyNumber: null,
-            contractDate: this.currentDate(),
-            amount: this.formStore.productConditionsForm.requestedSumInsured != null ? Number(this.formStore.productConditionsForm.requestedSumInsured.replace(/\s/g, '')) : null,
-            premium:
-              this.formStore.productConditionsForm.insurancePremiumPerMonth != null
-                ? Number(this.formStore.productConditionsForm.insurancePremiumPerMonth.replace(/\s/g, ''))
-                : null,
-            isSpokesman: this.formStore.hasRepresentative,
-            coverPeriod: this.formStore.productConditionsForm.coverPeriod,
-            payPeriod: this.formStore.productConditionsForm.coverPeriod,
-            annualIncome: this.formStore.productConditionsForm.annualIncome ? Number(this.formStore.productConditionsForm.annualIncome.replace(/\s/g, '')) : null,
-            indexRateId: this.formStore.productConditionsForm.processIndexRate?.id
-              ? this.formStore.productConditionsForm.processIndexRate.id
-              : this.processIndexRate.find(i => i.code === '0')?.id,
-            paymentPeriodId: this.formStore.productConditionsForm.paymentPeriod.id,
-            lifeMultiply: formatProcents(this.formStore.productConditionsForm.lifeMultiply),
-            lifeAdditive: formatProcents(this.formStore.productConditionsForm.lifeAdditive),
-            adbMultiply: formatProcents(this.formStore.productConditionsForm.adbMultiply),
-            adbAdditive: formatProcents(this.formStore.productConditionsForm.adbAdditive),
-            disabilityMultiply: formatProcents(this.formStore.productConditionsForm.disabilityMultiply),
-            disabilityAdditive: formatProcents(this.formStore.productConditionsForm.adbAdditive),
-            riskGroup: this.formStore.productConditionsForm.riskGroup?.id ? this.formStore.productConditionsForm.riskGroup.id : 1,
-          },
-          addCoversDto: this.formStore.additionalInsuranceTerms,
-        };
-
-        try {
-          let id = this.formStore.applicationData.processInstanceId;
-
-          await this.api.setApplication(form1);
-          let result;
-          try {
-            result = await this.api.getCalculation(id);
-          } catch (err) {
-            ErrorHandler(err);
-          }
-
-          const applicationData = await this.api.getApplicationData(taskId);
-          this.formStore.applicationData = applicationData;
-          this.formStore.additionalInsuranceTerms = this.formStore.applicationData.addCoverDto;
-          if (this.formStore.productConditionsForm.insurancePremiumPerMonth != null) {
-            this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(result);
+        const id = this.formStore.applicationData.processInstanceId;
+        await this.api.setApplication(this.getConditionsData());
+        const result = ref();
+        result.value = await this.api.getCalculation(id);
+        const applicationData = await this.api.getApplicationData(taskId);
+        this.formStore.applicationData = applicationData;
+        this.formStore.additionalInsuranceTerms = this.formStore.applicationData.addCoverDto;
+        if (this.isKazyna) {
+          if (this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar != null) {
+            this.formStore.productConditionsForm.requestedSumInsuredInDollar = this.getNumberWithSpaces(result.value / this.currencies.usd);
           } else {
-            this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(result);
+            this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar = this.getNumberWithSpaces(result.value / this.currencies.usd);
           }
-          this.showToaster('success', this.t('toaster.calculated'), 1000);
-        } catch (err) {
-          ErrorHandler(err);
         }
+        if (this.formStore.productConditionsForm.insurancePremiumPerMonth != null) {
+          this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(result.value);
+        } else {
+          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(result.value);
+        }
+        if (this.isLiferenta) {
+          this.formStore.productConditionsForm.amountAnnuityPayments = this.getNumberWithSpaces(applicationData.policyAppDto.annuityMonthPay);
+        }
+        this.showToaster('success', this.t('toaster.calculated'), 1000);
       } catch (err) {
         ErrorHandler(err);
       }
@@ -1524,6 +1586,12 @@ export const useDataStore = defineStore('data', {
         const beneficiaryPolicyholderIndex = beneficiaryData.findIndex(i => i.insisId === clientData.insisId);
         this.formStore.isPolicyholderBeneficiary = beneficiaryPolicyholderIndex !== -1;
 
+        if ('finCenterData' in applicationData && !!applicationData.finCenterData) {
+          this.formStore.finCenterData = applicationData.finCenterData;
+          this.formStore.finCenterData.regNumber = applicationData.finCenterData.regNumber;
+          this.formStore.finCenterData.date = reformatDate(applicationData.finCenterData.date);
+        }
+
         if (fetchMembers) {
           let allMembers = [
             {
@@ -1593,6 +1661,8 @@ export const useDataStore = defineStore('data', {
           if (insuredData && insuredData.length) {
             insuredData.forEach((each, index) => {
               this.setMembersFieldIndex(this.formStore.insuredFormKey, 'insuredApp', index);
+              const relationDegree = this.relations.find(i => i.ids == each.relationId);
+              this.formStore.insuredForm[index].relationDegree = relationDegree ? relationDegree : new Value();
             });
           }
 
@@ -1602,6 +1672,10 @@ export const useDataStore = defineStore('data', {
               const relationDegree = this.relations.find(i => i.ids == each.relationId);
               this.formStore.beneficiaryForm[index].relationDegree = relationDegree ? relationDegree : new Value();
               this.formStore.beneficiaryForm[index].percentageOfPayoutAmount = each.percentage;
+              if (this.isLiferenta || this.isBolashak) {
+                const insurancePay = this.insurancePay.find(i => i.id == each.beneficiaryInsurancePayId);
+                this.formStore.beneficiaryForm[index].insurancePay = insurancePay ? insurancePay : new Value();
+              }
             });
           }
 
@@ -1637,11 +1711,30 @@ export const useDataStore = defineStore('data', {
           // this.formStore.productConditionsForm.annualIncome = applicationData.policyAppDto.annualIncome?.toString();
           this.formStore.productConditionsForm.lifeMultiply = parseProcents(applicationData.policyAppDto.lifeMultiply);
           this.formStore.productConditionsForm.lifeAdditive = parseProcents(applicationData.policyAppDto.lifeAdditive);
+          this.formStore.productConditionsForm.lifeMultiplyClient = parseProcents(applicationData.policyAppDto.lifeMultiplyClient);
+          this.formStore.productConditionsForm.lifeAdditiveClient = parseProcents(applicationData.policyAppDto.lifeAdditiveClient);
           this.formStore.productConditionsForm.adbMultiply = parseProcents(applicationData.policyAppDto.adbMultiply);
           this.formStore.productConditionsForm.adbAdditive = parseProcents(applicationData.policyAppDto.adbAdditive);
           this.formStore.productConditionsForm.disabilityMultiply = parseProcents(applicationData.policyAppDto.disabilityMultiply);
           this.formStore.productConditionsForm.disabilityAdditive = parseProcents(applicationData.policyAppDto.disabilityAdditive);
 
+          if (this.isLiferenta) {
+            this.formStore.productConditionsForm.additionalConditionAnnuityPayments =
+              applicationData.policyAppDto.guaranteedPaymentPeriod === null || applicationData.policyAppDto.guaranteedPaymentPeriod === 0 ? false : true;
+            this.formStore.productConditionsForm.guaranteedPeriod =
+              applicationData.policyAppDto.guaranteedPaymentPeriod === 0 ? null : applicationData.policyAppDto.guaranteedPaymentPeriod;
+            this.formStore.productConditionsForm.termAnnuityPayments = applicationData.policyAppDto.paymentPeriod;
+            this.formStore.productConditionsForm.amountAnnuityPayments = this.getNumberWithSpaces(
+              applicationData.policyAppDto.annuityMonthPay === 0 ? null : applicationData.policyAppDto.annuityMonthPay,
+            );
+
+            let annuityType = this.dicAnnuityTypeList.find(item => item.id == applicationData.policyAppDto.annuityTypeId);
+            this.formStore.productConditionsForm.typeAnnuityInsurance = annuityType ? annuityType : new Value();
+
+            let annuityPaymentPeriod = this.processAnnuityPaymentPeriod.find(item => item.id == applicationData.policyAppDto.annuityPaymentPeriodId);
+            this.formStore.productConditionsForm.periodAnnuityPayment = annuityPaymentPeriod ? annuityPaymentPeriod : new Value();
+          }
+
           let processIndexRate = this.processIndexRate.find(item => item.id == applicationData.policyAppDto.indexRateId);
           this.formStore.productConditionsForm.processIndexRate = processIndexRate ? processIndexRate : this.processIndexRate.find(item => item.code === '0');
 
@@ -1654,7 +1747,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;
@@ -1675,11 +1771,11 @@ export const useDataStore = defineStore('data', {
         this.isLoading = false;
       }
     },
-    async setApplication() {
+    async getProcessHistoryLog(taskId) {
       try {
-        await this.api.setApplication(this.formStore.applicationData);
+        return await this.api.getProcessHistoryLog(taskId);
       } catch (err) {
-        console.log(err);
+        ErrorHandler(err);
       }
     },
     async deleteTask(taskId) {
@@ -1722,11 +1818,12 @@ export const useDataStore = defineStore('data', {
             try {
               this.isLoading = true;
               await this.api.claimTask(this.formStore.applicationTaskId);
-              await this.getApplicationData(taskId, false, false, false);
+              await this.getApplicationData(taskId, false, false, false, false);
               this.showToaster('success', this.t('toaster.successOperation'), 3000);
             } catch (err) {
               ErrorHandler(err);
             }
+            break;
           }
           case constants.actions.reject:
           case constants.actions.return:
@@ -1736,7 +1833,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');
@@ -1744,6 +1841,22 @@ export const useDataStore = defineStore('data', {
             } catch (err) {
               ErrorHandler(err);
             }
+            break;
+          }
+          case constants.actions.affiliate: {
+            try {
+              const sended = await this.sendUnderwritingCouncilTask({ taskId: taskId, decision: constants.actions.accept });
+              if (!sended) return;
+              this.formStore.$reset();
+              if (this.isEFO || this.isAML) {
+                await this.router.push({ name: 'Insurance-Product' });
+              } else {
+                this.sendToParent(constants.postActions.toHomePage, this.t('toaster.successOperation') + 'SUCCESS');
+              }
+            } catch (err) {
+              ErrorHandler(err);
+            }
+            break;
           }
         }
         this.isButtonsLoading = false;
@@ -1755,6 +1868,7 @@ export const useDataStore = defineStore('data', {
       try {
         const response = await this.api.getInvoiceData(processInstanceId);
         if (response) {
+          this.formStore.invoiceData = response;
           return response;
         } else {
           return false;
@@ -1813,19 +1927,23 @@ export const useDataStore = defineStore('data', {
         this.formStore[whichForm][index].jobPlace = this.formStore.applicationData[whichMember][index].jobName;
       }
     },
-    findObject(from, key, searchKey) {
-      const found = this[from].find(i => i[key] == searchKey);
-      return found || new Value();
-    },
     async signDocument() {
       try {
         if (this.formStore.signUrls.length) {
           return this.formStore.signUrls;
         }
-        const data = [
-          { processInstanceId: this.formStore.applicationData.processInstanceId, name: 'Agreement', format: 'pdf' },
-          { processInstanceId: this.formStore.applicationData.processInstanceId, name: 'Statement', format: 'pdf' },
-        ];
+        const prepareSignDocuments = () => {
+          switch (this.formStore.applicationData.statusCode) {
+            case 'ContractSignedFrom':
+              return [{ processInstanceId: this.formStore.applicationData.processInstanceId, name: 'Contract', format: 'pdf' }];
+            default:
+              return [
+                { processInstanceId: this.formStore.applicationData.processInstanceId, name: 'Agreement', format: 'pdf' },
+                { processInstanceId: this.formStore.applicationData.processInstanceId, name: 'Statement', format: 'pdf' },
+              ];
+          }
+        };
+        const data = prepareSignDocuments();
         const result = await this.api.signDocument(data);
         this.formStore.signUrls = result;
         return this.formStore.signUrls;
@@ -1833,6 +1951,22 @@ export const useDataStore = defineStore('data', {
         ErrorHandler(err);
       }
     },
+    async registerNumber() {
+      try {
+        this.isLoading = true;
+        const data = {
+          processInstanceId: this.formStore.applicationData.processInstanceId,
+          regNumber: this.formStore.finCenterData.regNumber,
+          date: formatDate(this.formStore.finCenterData.date),
+        };
+        const result = await this.api.registerNumber(data);
+        return result;
+      } catch (err) {
+        return ErrorHandler(err);
+      } finally {
+        this.isLoading = false;
+      }
+    },
     async sendSMS(type, phoneNumber, text) {
       if (!type || !phoneNumber || !text) return;
       const smsData = {
@@ -1885,7 +2019,7 @@ export const useDataStore = defineStore('data', {
         };
         const recalculatedValue = await this.api.reCalculate(data);
         if (!!recalculatedValue) {
-          await this.getApplicationData(taskId, false, false, false);
+          await this.getApplicationData(taskId, false, false, false, true);
           this.showToaster(
             'success',
             `${this.t('toaster.successRecalculation')}. ${whichSum == 'insurancePremiumPerMonth' ? 'Страховая премия' : 'Страховая сумма'}: ${this.getNumberWithSpaces(
@@ -1913,7 +2047,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) {
@@ -1928,15 +2062,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;
           }
         }
@@ -1949,25 +2083,48 @@ 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) {
+      if (this.members.insuredApp.has) {
         if (this.validateMultipleMembers(this.formStore.insuredFormKey, 'insuredApp', 'застрахованных') === false) {
           return false;
         }
+        if (this.members.insuredApp.required) {
+          const inStatement = this.formStore.insuredForm.every(i => i.id > 0);
+          if (inStatement === false) {
+            this.showToaster('error', this.t('toaster.requiredMember', { text: this.t('toaster.insured') }));
+            return false;
+          }
+        }
       }
-      if (this.validateMultipleMembers(this.formStore.beneficiaryFormKey, 'beneficiaryApp', 'выгодоприобретателей') === false) {
-        return false;
+      if (this.members.beneficiaryApp.has) {
+        if (this.validateMultipleMembers(this.formStore.beneficiaryFormKey, 'beneficiaryApp', 'выгодоприобретателей') === false) {
+          return false;
+        }
+        if (this.members.beneficiaryApp.required) {
+          const inStatement = this.formStore.beneficiaryForm.every(i => i.id > 0);
+          if (inStatement === false) {
+            this.showToaster('error', this.t('toaster.requiredMember', { text: this.t('toaster.beneficiary') }));
+            return false;
+          }
+        }
       }
-      if (!this.isGons) {
+      if (this.members.beneficialOwnerApp.has) {
         if (this.formStore.isActOwnBehalf === false) {
           if (this.validateMultipleMembers(this.formStore.beneficialOwnerFormKey, 'beneficialOwnerApp', 'бенефициарных собственников') === false) {
             return false;
           }
         }
+        if (this.members.beneficialOwnerApp.required) {
+          const inStatement = this.formStore.beneficialOwnerForm.every(i => i.id > 0);
+          if (inStatement === false) {
+            this.showToaster('error', this.t('toaster.requiredMember', { text: this.t('toaster.beneficialOwner') }));
+            return false;
+          }
+        }
       }
-      if (!this.isGons) {
+      if (this.members.spokesmanApp.has) {
         if (this.formStore.hasRepresentative) {
           if (this.formStore.applicationData.spokesmanApp && this.formStore.policyholdersRepresentativeForm.id !== this.formStore.applicationData.spokesmanApp.insisId) {
             this.showToaster(
@@ -1980,8 +2137,15 @@ export const useDataStore = defineStore('data', {
             return false;
           }
         }
+        if (this.members.spokesmanApp.required) {
+          const inStatement = this.formStore.policyholdersRepresentativeForm.id > 0;
+          if (inStatement === false) {
+            this.showToaster('error', this.t('toaster.requiredMember', { text: this.t('toaster.spokesman') }));
+            return false;
+          }
+        }
       }
-      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();
@@ -2029,7 +2193,7 @@ export const useDataStore = defineStore('data', {
       if (areMembersValid) {
         if (!!this.formStore.productConditionsForm.insurancePremiumPerMonth && !!this.formStore.productConditionsForm.requestedSumInsured) {
           const hasCritical = this.formStore.additionalInsuranceTerms?.find(cover => cover.coverTypeName === 'Критическое заболевание Застрахованного');
-          if (hasCritical && hasCritical.coverSumName !== 'не включено') {
+          if (hasCritical && hasCritical.coverSumName.match(new RegExp('не включено', 'i'))) {
             await Promise.allSettled([
               this.getQuestionList(
                 'health',
@@ -2045,15 +2209,36 @@ export const useDataStore = defineStore('data', {
                 'surveyByCriticalBase',
                 'surveyByCriticalSecond',
               ),
+              this.isClientAnketaCondition &&
+                this.getQuestionList(
+                  'health',
+                  this.formStore.applicationData.processInstanceId,
+                  this.formStore.applicationData.clientApp.id,
+                  'surveyByHealthBasePolicyholder',
+                  'surveyByHealthSecond',
+                  'policyholder',
+                ),
             ]);
-            await Promise.allSettled([
-              ...this.formStore.surveyByHealthBase.body.map(async question => {
-                await this.definedAnswers(question.first.id, 'surveyByHealthBase');
-              }),
-              ...this.formStore.surveyByCriticalBase.body.map(async question => {
-                await this.definedAnswers(question.first.id, 'surveyByCriticalBase');
-              }),
-            ]);
+            this.isClientAnketaCondition
+              ? await Promise.allSettled([
+                  ...this.formStore.surveyByHealthBase.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByHealthBase');
+                  }),
+                  ...this.formStore.surveyByCriticalBase.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByCriticalBase');
+                  }),
+                  ...this.formStore.surveyByHealthBasePolicyholder.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByHealthBasePolicyholder');
+                  }),
+                ])
+              : await Promise.allSettled([
+                  ...this.formStore.surveyByHealthBase.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByHealthBase');
+                  }),
+                  ...this.formStore.surveyByCriticalBase.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByCriticalBase');
+                  }),
+                ]);
           } else {
             await Promise.allSettled([
               this.getQuestionList(
@@ -2063,14 +2248,32 @@ export const useDataStore = defineStore('data', {
                 'surveyByHealthBase',
                 'surveyByHealthSecond',
               ),
+              this.isClientAnketaCondition &&
+                this.getQuestionList(
+                  'health',
+                  this.formStore.applicationData.processInstanceId,
+                  this.formStore.applicationData.clientApp.id,
+                  'surveyByHealthBasePolicyholder',
+                  'surveyByHealthSecond',
+                  'policyholder',
+                ),
+              ,
             ]);
-            await Promise.allSettled(
-              this.formStore.surveyByHealthBase.body.map(async question => {
-                await this.definedAnswers(question.first.id, 'surveyByHealthBase');
-              }),
-            );
+            this.isClientAnketaCondition
+              ? await Promise.allSettled([
+                  ...this.formStore.surveyByHealthBase.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByHealthBase');
+                  }),
+                  ...this.formStore.surveyByHealthBasePolicyholder.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByHealthBasePolicyholder');
+                  }),
+                ])
+              : await Promise.allSettled(
+                  this.formStore.surveyByHealthBase.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByHealthBase');
+                  }),
+                );
           }
-
           if (this.validateAnketa('surveyByHealthBase')) {
             let hasCriticalAndItsValid = null;
             if (hasCritical && hasCritical.coverSumName !== 'не включено') {
@@ -2084,6 +2287,11 @@ export const useDataStore = defineStore('data', {
               hasCriticalAndItsValid = null;
             }
             if (hasCriticalAndItsValid === true || hasCriticalAndItsValid === null) {
+              if (this.isClientAnketaCondition && this.validateAnketa('surveyByHealthBasePolicyholder') === false) {
+                this.showToaster('error', this.t('toaster.emptyHealthAnketaPolicyholder'), 3000);
+                this.isLoading = false;
+                return false;
+              }
               this.isLoading = false;
               return true;
             }
@@ -2146,313 +2354,180 @@ export const useDataStore = defineStore('data', {
         this.isLoading = false;
       }
     },
-    async getContragentFromGBDFL(iin, phoneNumber, whichForm, whichIndex) {
+    async getContragentFromGBDFL(member) {
+      // null - ожидание
+      // false - ошибка или неправильно
+      // true - успешно и данные получены
       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') {
           this.showToaster('error', `${gbdResponse.statusName}. Отправьте запрос через некоторое время`, 5000);
           this.isLoading = false;
-          return;
+          return false;
         }
         if (gbdResponse.status === 'PENDING') {
-          this.showToaster('success', this.t('toaster.waitForClient'), 5000);
+          this.showToaster('info', this.t('toaster.waitForClient'), 5000);
           this.isLoading = false;
-          return;
+          return null;
         }
         if (constants.gbdErrors.find(i => i === gbdResponse.status)) {
           if (gbdResponse.status === 'TIMEOUT') {
-            this.showToaster('success', `${gbdResponse.statusName}. Отправьте запрос еще раз`, 5000);
+            this.showToaster('error', `${gbdResponse.statusName}. Отправьте запрос еще раз`, 5000);
+            return null;
           } else {
-            this.showToaster('success', gbdResponse.statusName, 5000);
+            this.showToaster('error', gbdResponse.statusName, 5000);
           }
           this.isLoading = false;
-          return;
+          return false;
         }
         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);
+        return true;
       } catch (err) {
-        ErrorHandler(err);
+        return ErrorHandler(err);
+      } finally {
+        this.isLoading = false;
       }
-      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;
+    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) this.formStore[whichForm].gender = gender;
+      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) this.formStore[whichForm].birthPlace = birthPlace;
+      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) this.formStore[whichForm].countryOfCitizenship = countryOfCitizenship;
+      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) this.formStore[whichForm].registrationCountry = regCountry;
+      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) this.formStore[whichForm].registrationProvince = regProvince;
+      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(', ');
+      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 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 gender = this.gender.find(i => i.id == person.gender.code);
-        if (gender) this.formStore[whichForm][whichIndex].gender = gender;
+        const documentNumber = person.documents.document.number;
+        if (documentNumber) member.documentNumber = documentNumber;
 
-        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 documentDate = person.documents.document.beginDate;
+        if (documentDate) member.documentDate = reformatDate(documentDate);
 
-        const countryOfCitizenship = this.citizenshipCountries.find(i => i.nameRu.match(new RegExp(person.citizenship.nameRu, 'i')));
-        if (countryOfCitizenship) this.formStore[whichForm][whichIndex].countryOfCitizenship = countryOfCitizenship;
+        const documentExpire = person.documents.document.endDate;
+        if (documentExpire) member.documentExpire = reformatDate(documentExpire);
 
-        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 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) {
@@ -2492,6 +2567,12 @@ export const useDataStore = defineStore('data', {
           return true;
       }
     },
+    hasPercentageOfPayoutAmount() {
+      return true;
+    },
+    canViewInvoiceInfo() {
+      return this.isAdmin();
+    },
   },
 });