hl-core 0.0.8-beta.9 → 0.0.9-beta.1

package/store/{data.store.js → data.store.ts}

@@ -1,11 +1,13 @@
 import { defineStore } from 'pinia';
 import { rules } from './rules';
-import { i18n } from '@/configs/i18n';
+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';
-import { ApiClass } from '@/api';
+import { DataStoreClass, Contragent, DocumentItem, Member, Value } from '../composables/classes';
+import { ApiClass } from '../api';
 import { useFormStore } from './form.store';
+import { AxiosError } from 'axios';
+import { PostActions, StoreMembers, Roles, Statuses, MemberCodes, MemberAppCodes } from '../types/enum';
 
 export const useDataStore = defineStore('data', {
   state: () => ({
@@ -18,30 +20,36 @@ export const useDataStore = defineStore('data', {
     isValidGUID: isValidGUID,
     router: useRouter(),
     formStore: useFormStore(),
-    contragent: useContragentStore(),
+    // contragent: useContragentStore(),
     api: new ApiClass(),
-    yearEnding: year => yearEnding(year, constants.yearTitles, constants.yearCases),
+    yearEnding: (year: number) => yearEnding(year, constants.yearTitles, constants.yearCases),
     currentDate: () => new Date(Date.now() - new Date().getTimezoneOffset() * 60 * 1000).toISOString().slice(0, -1),
-    showToaster: (type, msg, timeout) =>
+    showToaster: (type: 'success' | 'error' | 'warning' | 'info', msg: string, timeout?: number) =>
       Toast.useToast()(msg, {
         ...ToastOptions,
-        type: Types[type.toUpperCase()],
+        type: Types[type.toUpperCase() as keyof typeof Types],
         timeout: type === 'error' ? 6000 : typeof timeout === 'number' ? timeout : ToastOptions.timeout,
       }),
   }),
   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',
     isLifetrip: state => state.product === 'lifetrip',
     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() {
@@ -51,88 +59,45 @@ export const useDataStore = defineStore('data', {
         return true;
       }
     },
-    sendToParent(action, value) {
-      window.parent.postMessage({ action: action, value: value }, '*');
-    },
     getChildIframe() {
       return document.getElementById('product-iframe');
     },
-    sendToChild(action, value) {
-      const childFrame = this.getChildIframe();
+    sendToParent(action: keyof typeof PostActions, value: any) {
+      window.parent.postMessage({ action: action, value: value }, '*');
+    },
+    sendToChild(action: keyof typeof PostActions, value: any) {
+      const childFrame = this.getChildIframe() as HTMLIFrameElement;
       if (childFrame && childFrame.contentWindow && childFrame.contentWindow.postMessage) {
         childFrame.contentWindow.postMessage({ action: action, value: value }, '*');
       }
     },
-    copyToClipboard(text) {
+    copyToClipboard(text: any) {
       if (typeof text === 'string' || typeof text === 'number') {
-        if (this.isEFO || this.isAML) {
-          navigator.clipboard.writeText(text);
+        if (this.isBridge) {
+          navigator.clipboard.writeText(String(text));
         } else {
-          this.sendToParent(constants.postActions.clipboard, text);
+          this.sendToParent(constants.postActions.clipboard, String(text));
         }
         this.showToaster('success', this.t('toaster.copied'));
       } else {
         this.showToaster('error', this.t('toaster.noUrl'));
       }
     },
-    getFilesByIIN(iin) {
+    getFilesByIIN(iin: string) {
       return iin ? this.formStore.signedDocumentList.filter(file => file.iin === iin && file.fileTypeName === 'Удостоверение личности') : null;
     },
     async getNewAccessToken() {
       try {
-        const data = {
-          accessToken: localStorage.getItem('accessToken'),
-          refreshToken: localStorage.getItem('refreshToken'),
-        };
-        const response = await this.api.getNewAccessToken(data);
+        const accessToken = localStorage.getItem('accessToken') || null;
+        const refreshToken = localStorage.getItem('refreshToken') || null;
+        if (!accessToken || !refreshToken) {
+          return;
+        }
+        const response = await this.api.getNewAccessToken({ accessToken: accessToken, refreshToken: refreshToken });
         this.accessToken = response.accessToken;
         this.refreshToken = response.refreshToken;
         localStorage.setItem('accessToken', this.accessToken);
         localStorage.setItem('refreshToken', this.refreshToken);
-      } catch (err) {
-        console.error(err);
-      }
-    },
-    async loginUser(login, password, numAttempt) {
-      try {
-        const token = localStorage.getItem('accessToken') || null;
-        if (token && isValidToken(token)) {
-          this.accessToken = token;
-          this.getUserRoles();
-        } else {
-          const response = await this.api.loginUser({
-            login: login,
-            password: password,
-            numAttempt: numAttempt,
-          });
-
-          this.accessToken = response.accessToken;
-          this.refreshToken = response.refreshToken;
-          this.getUserRoles();
-        }
-        if (this.controls.onAuth) {
-          const hasPermission =
-            this.isInitiator() ||
-            this.isUnderwriter() ||
-            this.isAdmin() ||
-            this.isCompliance() ||
-            this.isAnalyst() ||
-            this.isUpk() ||
-            this.isFinCenter() ||
-            this.isSupervisor() ||
-            this.isSupport();
-          if (hasPermission) {
-            localStorage.setItem('accessToken', this.accessToken);
-            localStorage.setItem('refreshToken', this.refreshToken);
-          } else {
-            this.showToaster('error', this.t('toaster.noProductPermission'), 5000);
-            this.accessToken = null;
-            this.refreshToken = null;
-          }
-        } else {
-          localStorage.setItem('accessToken', this.accessToken);
-          localStorage.setItem('refreshToken', this.refreshToken);
-        }
       } catch (err) {
         ErrorHandler(err);
       }
@@ -145,15 +110,28 @@ export const useDataStore = defineStore('data', {
         const key = getKeyWithPattern(decoded, 'role');
         if (key) {
           const roles = decoded[key];
-          if (typeof roles === constants.types.string) {
+          if (typeof roles === 'string') {
             this.user.roles.push(roles);
-          } else if (typeof roles === constants.types.array) {
+          } else if (typeof roles === 'object') {
             this.user.roles = roles;
           }
         }
       }
     },
-    isRole(whichRole) {
+    getUserData() {
+      return this.accessToken ? jwtDecode(this.accessToken) : null;
+    },
+    async getUserGroups() {
+      try {
+        this.isLoading = true;
+        this.userGroups = await this.api.getUserGroups();
+      } catch (err) {
+        console.log(err);
+      } finally {
+        this.isLoading = false;
+      }
+    },
+    isRole(whichRole: keyof typeof Roles) {
       if (this.user.roles.length === 0) {
         this.getUserRoles();
       }
@@ -164,60 +142,126 @@ export const useDataStore = defineStore('data', {
       return this.isManager() || this.isAgent() || this.isAgentMycar() || this.isManagerHalykBank() || this.isServiceManager();
     },
     isManager() {
-      return this.isRole(constants.roles.manager);
+      return this.isRole(constants.roles.Manager);
     },
     isCompliance() {
-      return this.isRole(constants.roles.compliance);
+      return this.isRole(constants.roles.Compliance);
     },
     isAdmin() {
-      return this.isRole(constants.roles.admin);
+      return this.isRole(constants.roles.Admin);
     },
     isAgent() {
-      return this.isRole(constants.roles.agent);
+      return this.isRole(constants.roles.Agent);
     },
     isManagerHalykBank() {
-      return this.isRole(constants.roles.managerHalykBank);
+      return this.isRole(constants.roles.ManagerHalykBank);
     },
     isServiceManager() {
-      return this.isRole(constants.roles.serviceManager);
+      return this.isRole(constants.roles.ServiceManager);
     },
     isUnderwriter() {
-      return this.isRole(constants.roles.underwriter);
+      return this.isRole(constants.roles.Underwriter);
     },
     isAgentMycar() {
-      return this.isRole(constants.roles.agentMycar);
+      return this.isRole(constants.roles.AgentMycar);
     },
     isAnalyst() {
-      return this.isRole(constants.roles.analyst);
+      return this.isRole(constants.roles.Analyst);
     },
     isUpk() {
-      return this.isRole(constants.roles.upk);
+      return this.isRole(constants.roles.UPK);
     },
     isDrn() {
-      return this.isRole(constants.roles.drn);
+      return this.isRole(constants.roles.DRNSJ);
     },
     isSupport() {
-      return this.isRole(constants.roles.support);
+      return this.isRole(constants.roles.Support);
     },
     isFinCenter() {
-      return this.isRole(constants.roles.finCenter);
+      return this.isRole(constants.roles.FinCenter);
     },
     isSupervisor() {
-      return this.isRole(constants.roles.supervisor);
+      return this.isRole(constants.roles.Supervisor);
     },
-    isProcessEditable(statusCode) {
-      return !!constants.editableStatuses.find(status => status === statusCode);
+    isProcessEditable(statusCode?: keyof typeof Statuses) {
+      const getEditibleStatuses = () => {
+        const defaultStatuses = constants.editableStatuses;
+        return defaultStatuses;
+      };
+      return !!getEditibleStatuses().find(status => status === statusCode);
+    },
+    isProcessReturnable(statusCode?: keyof typeof Statuses) {
+      const getReturnableStatuses = () => {
+        const defaultStatuses = constants.returnStatementStatuses;
+        return defaultStatuses;
+      };
+      return !!getReturnableStatuses().find(status => status === statusCode);
+    },
+    isProcessCancel(statusCode?: keyof typeof Statuses) {
+      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;
     },
-    async resetSelected(route) {
-      this.settings.open = false;
-      this.panel.open = false;
-      this.panelAction = null;
-      this.menu.selectedItem = new MenuItem();
-      if (route && route.name) {
-        await this.router.replace({ name: route.name });
+    async loginUser(login: string, password: string, numAttempt: number) {
+      try {
+        const token = localStorage.getItem('accessToken') || null;
+        if (token && isValidToken(token)) {
+          this.accessToken = token;
+          this.getUserRoles();
+        } else {
+          const loginResponse = await this.api.loginUser({
+            login: login,
+            password: password,
+            numAttempt: numAttempt,
+          });
+
+          this.accessToken = loginResponse.accessToken;
+          this.refreshToken = loginResponse.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 = checkPermission();
+          if (hasPermission) {
+            localStorage.setItem('accessToken', this.accessToken);
+            localStorage.setItem('refreshToken', String(this.refreshToken));
+          } else {
+            this.showToaster('error', this.t('toaster.noProductPermission'), 5000);
+            this.accessToken = null;
+            this.refreshToken = null;
+          }
+        } else {
+          localStorage.setItem('accessToken', this.accessToken);
+          localStorage.setItem('refreshToken', String(this.refreshToken));
+        }
+      } catch (err) {
+        ErrorHandler(err);
       }
     },
     async logoutUser() {
@@ -229,22 +273,31 @@ export const useDataStore = defineStore('data', {
           this.$reset();
           this.formStore.$reset();
           localStorage.clear();
-
-          if (whichProduct === 'efo') {
+          if (whichProduct === 'efo' || whichProduct === 'aml' || whichProduct === 'lka') {
             await this.router.push({ name: 'Auth' });
           } else {
             this.sendToParent(constants.postActions.toAuth, null);
           }
         }
       } catch (err) {
-        console.log(err);
+        ErrorHandler(err);
       }
       this.isLoading = false;
     },
-    async getFile(file, mode = 'view', fileType = 'pdf') {
+    async resetSelected(route: RouteType) {
+      this.settings.open = false;
+      this.panel.open = false;
+      this.panelAction = null;
+      this.menu.selectedItem = new MenuItem();
+      if (route && route.name) {
+        await this.router.replace({ name: route.name });
+      }
+    },
+    async getFile(file: DocumentItem, mode: string = 'view', fileType: string = 'pdf') {
+      if (!file.id) return;
       try {
         this.isLoading = true;
-        await this.api.getFile(file.id).then(response => {
+        await this.api.getFile(file.id).then((response: any) => {
           if (!['pdf', 'docx'].includes(fileType)) {
             const blob = new Blob([response], { type: `image/${fileType}` });
             const url = window.URL.createObjectURL(blob);
@@ -255,7 +308,7 @@ export const useDataStore = defineStore('data', {
                 window.open(url, '_blank', `width=${screen.width},height=${screen.height},top=70`);
               });
             } else {
-              link.setAttribute('download', file.fileName);
+              link.setAttribute('download', file.fileName!);
               document.body.appendChild(link);
               link.click();
             }
@@ -271,7 +324,7 @@ export const useDataStore = defineStore('data', {
                 window.open(url, '_blank', `right=100`);
               });
             } else {
-              link.setAttribute('download', file.fileName);
+              link.setAttribute('download', file.fileName!);
               document.body.appendChild(link);
               link.click();
             }
@@ -283,87 +336,72 @@ export const useDataStore = defineStore('data', {
         this.isLoading = false;
       }
     },
-    async deleteFile(data) {
+    async deleteFile(data: DocumentItem) {
       try {
         await this.api.deleteFile(data);
         this.showToaster('success', this.t('toaster.fileWasDeleted'), 3000);
       } catch (err) {
-        this.showToaster('error', err.response.data, 2000);
+        ErrorHandler(err);
       }
     },
-    async uploadFiles(data, load = false) {
+    async uploadFiles(data: FormData, load: boolean = false) {
+      this.isLoading = load;
       try {
-        if (load) {
-          this.isLoading = true;
-        }
         await this.api.uploadFiles(data);
         return true;
       } catch (err) {
         return ErrorHandler(err);
       } finally {
-        if (load) {
-          this.isLoading = false;
-        }
+        this.isLoading = false;
       }
     },
-    async getContragent(member, load = true) {
-      if (load) {
-        this.isLoading = true;
-      }
+    async getContragent(member: Member, load: boolean = true) {
+      this.isLoading = load;
+      if (!member.iin) return;
       try {
-        let response;
-        let queryData = {
+        const queryData = {
           firstName: '',
           lastName: '',
           middleName: '',
+          iin: member.iin.replace(/-/g, ''),
         };
-        queryData.iin = member.iin.replace(/-/g, '');
-        response = await this.api.getContragent(queryData);
-        if (response.totalItems > 0) {
-          if (response.totalItems.length === 1) {
-            await this.serializeContragentData(member, response.items[0]);
+        const contragentResponse = await this.api.getContragent(queryData);
+        if (contragentResponse.totalItems > 0) {
+          if (contragentResponse.items.length === 1) {
+            await this.serializeContragentData(member, contragentResponse.items[0]);
           } else {
-            const sortedByRegistrationDate = response.items.sort((left, right) => new Date(right.registrationDate) - new Date(left.registrationDate));
+            const sortedByRegistrationDate = contragentResponse.items.sort(
+              (left, right) => new Date(right.registrationDate).getMilliseconds() - new Date(left.registrationDate).getMilliseconds(),
+            );
             await this.serializeContragentData(member, sortedByRegistrationDate[0]);
           }
           member.gotFromInsis = true;
         } else {
-          this.userNotFound = true;
+          this.showToaster('error', this.t('toaster.notFoundUser'));
         }
       } catch (err) {
-        console.log(err);
-      }
-      if (load) {
-        this.isLoading = false;
+        ErrorHandler(err);
       }
+      this.isLoading = false;
     },
-    async getContragentById(id, whichForm, onlyGet = true, whichIndex = null) {
-      if (onlyGet) {
-        this.isLoading = true;
-      }
+    async getContragentById(id: number, whichForm: keyof typeof StoreMembers, load: boolean = true, whichIndex: number | null = null) {
+      this.isLoading = load;
       try {
-        const member = whichIndex === null ? this.formStore[whichForm] : this.formStore[whichForm][whichIndex];
-        if (this.isMycar && this.isAgentMycar() && whichForm === this.formStore.beneficiaryFormKey) {
-          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(member, response.items[0]);
+        const member = whichIndex === null ? this.formStore[whichForm as SingleMember] : this.formStore[whichForm as MultipleMember][whichIndex];
+        const contragentResponse = await this.api.getContragentById(id);
+        if (contragentResponse.totalItems > 0) {
+          await this.serializeContragentData(member, contragentResponse.items[0]);
         } else {
-          this.isLoading = false;
-          return false;
+          this.showToaster('error', this.t('toaster.notFoundUser'));
         }
       } catch (err) {
-        console.log(err);
-      }
-      if (onlyGet) {
+        ErrorHandler(err);
+      } finally {
         this.isLoading = false;
       }
     },
-    async serializeContragentData(member, contragent) {
-      const [{ value: data }, { value: contacts }, { value: documents }, { value: address }] = await Promise.allSettled([
+    async serializeContragentData(member: Member, contragent: ContragentType) {
+      const [questionairesResponse, contactsResponse, documentsResponse, addressResponse] = await Promise.allSettled([
         this.api.getContrAgentData(contragent.id),
         this.api.getContrAgentContacts(contragent.id),
         this.api.getContrAgentDocuments(contragent.id),
@@ -372,56 +410,38 @@ export const useDataStore = defineStore('data', {
       member.response = {
         contragent: contragent,
       };
-      if (data && data.length) {
-        member.response.questionnaires = data;
+      if (questionairesResponse.status === 'fulfilled' && questionairesResponse.value && questionairesResponse.value.length) {
+        member.response.questionnaires = questionairesResponse.value;
       }
-      if (contacts && contacts.length) {
-        member.response.contacts = contacts;
+      if (contactsResponse.status === 'fulfilled' && contactsResponse.value && contactsResponse.value.length) {
+        member.response.contacts = contactsResponse.value;
       }
-      if (documents && documents.length) {
-        member.response.documents = documents;
+      if (documentsResponse.status === 'fulfilled' && documentsResponse.value && documentsResponse.value.length) {
+        member.response.documents = documentsResponse.value;
       }
-      if (address && address.length) {
-        member.response.addresses = address;
+      if (addressResponse.status === 'fulfilled' && addressResponse.value && addressResponse.value.length) {
+        member.response.addresses = addressResponse.value;
       }
       this.parseContragent(member, {
         personalData: contragent,
-        documents: documents,
-        contacts: contacts,
-        data: data,
-        address: address,
+        data: questionairesResponse.status === 'fulfilled' ? questionairesResponse.value : undefined,
+        contacts: contactsResponse.status === 'fulfilled' ? contactsResponse.value : undefined,
+        documents: documentsResponse.status === 'fulfilled' ? documentsResponse.value : undefined,
+        address: addressResponse.status === 'fulfilled' ? addressResponse.value : undefined,
       });
     },
-    async searchContragent(iin) {
-      this.isLoading = true;
-      try {
-        let queryData = {
-          iin: iin.replace(/-/g, ''),
-          firstName: '',
-          lastName: '',
-          middleName: '',
-        };
-        const response = await this.api.getContragent(queryData);
-        if (response.totalItems > 0) {
-          this.contragentList = response.items;
-        } else {
-          this.contragentList = [];
-        }
-      } catch (err) {
-        console.log(err);
-        this.contragentList = [];
-      }
-      this.isLoading = false;
-    },
-    parseContragent(member, user) {
-      // Save User Personal Data
+    parseContragent(
+      member: Member,
+      user: { personalData: ContragentType; data?: ContragentQuestionaries[]; contacts?: ContragentContacts[]; documents?: ContragentDocuments[]; address?: ContragentAddress[] },
+    ) {
       member.verifyType = user.personalData.verifyType;
       member.verifyDate = user.personalData.verifyDate;
       member.iin = reformatIin(user.personalData.iin);
-      member.age = user.personalData.age;
+      member.age = String(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);
+      const gender = this.gender.find(i => i.nameRu === user.personalData.genderName);
+      member.gender = gender ? gender : new Value();
       member.gender.id = user.personalData.gender;
       member.birthDate = reformatDate(user.personalData.birthDate);
       member.genderName = user.personalData.genderName;
@@ -432,45 +452,54 @@ export const useDataStore = defineStore('data', {
       member.id = user.personalData.id;
       member.type = user.personalData.type;
       member.registrationDate = user.personalData.registrationDate;
-      //  Save User Documents Data
-      if ('documents' in user && user.documents.length) {
-        const documentType = this.documentTypes.find(i => i.ids === user.documents[0].type);
-        const documentIssuer = this.documentIssuers.find(i => i.nameRu === user.documents[0].issuerNameRu);
+
+      if ('documents' in user && user.documents && 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 = user.documents[0].number;
+        member.documentNumber = userDocument.number;
         member.documentIssuers = documentIssuer ? documentIssuer : new Value();
-        member.documentDate = reformatDate(user.documents[0].issueDate);
-        member.documentExpire = reformatDate(user.documents[0].expireDate);
+        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 ('data' in user && user.data && user.data.length) {
+        user.data.forEach(questData => {
+          this.searchFromList(member, questData);
         });
       }
-      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);
+      if ('address' in user && user.address && user.address.length) {
+        const userAddress = user.address[0];
+        const country = this.countries.find(i => i.nameRu?.match(new RegExp(userAddress.countryName, 'i')));
+        const province = this.states.find(i => i.ids === userAddress.stateCode);
+        const localityType = this.localityTypes.find(i => i.nameRu === userAddress.cityTypeName);
+        const city = this.cities.find(i => !!userAddress.cityName && i.nameRu === userAddress.cityName.replace('г.', ''));
+        const region = this.regions.find(i => !!userAddress.regionCode && i.ids == userAddress.regionCode);
         member.registrationCountry = country ? country : new Value();
-        member.registrationStreet = user.address[0].streetName;
+        member.registrationStreet = userAddress.streetName;
         member.registrationCity = city ? city : new Value();
-        member.registrationNumberApartment = user.address[0].apartmentNumber;
-        member.registrationNumberHouse = user.address[0].blockNumber;
+        member.registrationNumberApartment = userAddress.apartmentNumber;
+        member.registrationNumberHouse = userAddress.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;
+        member.registrationQuarter = userAddress.kvartal;
+        member.registrationMicroDistrict = userAddress.microRaion;
       }
-      if ('contacts' in user && user.contacts.length) {
+      if ('contacts' in user && user.contacts && user.contacts.length) {
         user.contacts.forEach(contact => {
           if (contact.type === 'EMAIL' && contact.value) {
             member.email = contact.value;
           }
-          if (contact.type === 'MOBILE' && 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)}`;
           }
@@ -481,84 +510,133 @@ export const useDataStore = defineStore('data', {
         });
       }
     },
-    async alreadyInInsis(iin, firstName, lastName, middleName) {
+    searchFromList(member: Member, searchIt: ContragentQuestionaries) {
+      const getQuestionariesData = () => {
+        switch (searchIt.questId) {
+          case '500003':
+            return { from: this.economySectorCode, field: 'economySectorCode' };
+          case '500011':
+            return { from: this.residents, field: 'signOfResidency' };
+          case '500012':
+            return { from: this.citizenshipCountries, field: 'countryOfCitizenship' };
+          case '500014':
+            return { from: this.taxCountries, field: 'countryOfTaxResidency' };
+          case '507777':
+            return { from: this.addTaxCountries, field: 'addTaxResidency' };
+          case '500147':
+            return { from: [] };
+          case '500148':
+            return { from: [] };
+        }
+      };
+      const qData = getQuestionariesData();
+      if (qData && qData.from && qData.from.length && qData.field) {
+        const qResult = qData.from.find(i => i.ids === searchIt.questAnswer);
+        //@ts-ignore
+        member[qData.field] = qResult ? qResult : new Value();
+      }
+    },
+    async alreadyInInsis(member: Member) {
+      if (!member.iin) return null;
       try {
         const queryData = {
-          iin: iin.replaceAll('-', ''),
-          firstName: !!firstName ? firstName : '',
-          lastName: !!lastName ? lastName : '',
-          middleName: !!middleName ? middleName : '',
+          iin: member.iin.replaceAll('-', ''),
+          firstName: !!member.firstName ? member.firstName : '',
+          lastName: !!member.lastName ? member.lastName : '',
+          middleName: !!member.middleName ? member.middleName : '',
         };
         const contragent = await this.api.getContragent(queryData);
         if (contragent.totalItems > 0) {
-          if (contragent.totalItems.length === 1) {
+          if (contragent.items.length === 1) {
             return contragent.items[0].id;
           } else {
-            const sortedByRegistrationDate = contragent.items.sort((left, right) => new Date(right.registrationDate) - new Date(left.registrationDate));
+            const sortedByRegistrationDate = contragent.items.sort(
+              (left, right) => new Date(right.registrationDate).getMilliseconds() - new Date(left.registrationDate).getMilliseconds(),
+            );
             return sortedByRegistrationDate[0].id;
           }
         } else {
-          return false;
+          return null;
         }
       } catch (err) {
-        console.log(err);
-        return false;
+        ErrorHandler(err);
+        return null;
       }
     },
-    async saveContragent(user, whichForm, whichIndex, onlySaveAction = true) {
+    async searchContragent(iin: string) {
+      try {
+        const queryData = {
+          iin: iin.replace(/-/g, ''),
+          firstName: '',
+          lastName: '',
+          middleName: '',
+        };
+        const contragentResponse = await this.api.getContragent(queryData);
+        if (contragentResponse.totalItems > 0) {
+          this.contragentList = contragentResponse.items;
+        } else {
+          this.contragentList = [];
+        }
+      } catch (err) {
+        ErrorHandler(err);
+        this.contragentList = [];
+      }
+    },
+    async saveContragent(user: Member, whichForm: keyof typeof StoreMembers, whichIndex: number | null, onlySaveAction: boolean = true) {
       this.isLoading = !onlySaveAction;
-      const hasInsisId = await this.alreadyInInsis(user.iin, user.firstName, user.lastName, user.middleName);
-      if (hasInsisId !== false) {
+      const hasInsisId = await this.alreadyInInsis(user);
+      if (typeof hasInsisId === 'number') {
         user.id = hasInsisId;
-        const [{ value: data }, { value: contacts }, { value: documents }, { value: address }] = await Promise.allSettled([
+        const [questionairesResponse, contactsResponse, documentsResponse, addressResponse] = await Promise.allSettled([
           this.api.getContrAgentData(user.id),
           this.api.getContrAgentContacts(user.id),
           this.api.getContrAgentDocuments(user.id),
           this.api.getContrAgentAddress(user.id),
         ]);
         user.response = {};
-        if (data && data.length) {
-          user.response.questionnaires = data;
+        if (questionairesResponse.status === 'fulfilled' && questionairesResponse.value && questionairesResponse.value.length) {
+          user.response.questionnaires = questionairesResponse.value;
         }
-        if (contacts && contacts.length) {
-          user.response.contacts = contacts;
+        if (contactsResponse.status === 'fulfilled' && contactsResponse.value && contactsResponse.value.length) {
+          user.response.contacts = contactsResponse.value;
         }
-        if (documents && documents.length) {
-          user.response.documents = documents;
+        if (documentsResponse.status === 'fulfilled' && documentsResponse.value && documentsResponse.value.length) {
+          user.response.documents = documentsResponse.value;
         }
-        if (address && address.length) {
-          user.response.addresses = address;
+        if (addressResponse.status === 'fulfilled' && addressResponse.value && addressResponse.value.length) {
+          user.response.addresses = addressResponse.value;
         }
       }
       try {
-        // ! SaveContragent -> Contragent
-        let contragentData = {
-          id: user.id,
-          type: user.type,
-          iin: user.iin.replace(/-/g, ''),
-          longName: user.longName !== null ? user.longName : user.lastName + user.firstName + user.middleName ? user.middleName : '',
-          lastName: user.lastName,
-          firstName: user.firstName,
-          middleName: user.middleName ? user.middleName : '',
-          birthDate: user.getDateByKey('birthDate'),
-          gender: user.gender.id,
-          genderName: user.genderName ? user.genderName : user.gender.nameRu,
-          birthPlace: user.birthPlace.nameRu,
-          age: user.age,
+        const contragentData: ContragentType = {
+          id: Number(user.id),
+          type: Number(user.type),
+          iin: user.iin!.replace(/-/g, ''),
+          longName: user.longName !== null ? user.longName : (user.lastName ?? '') + (user.firstName ?? '') + (user.middleName ?? ''),
+          lastName: user.lastName ?? '',
+          firstName: user.firstName ?? '',
+          middleName: user.middleName ?? '',
+          birthDate: user.getDateByKey('birthDate')!,
+          gender: Number(user.gender.id),
+          genderName: user.genderName ? user.genderName : user.gender.nameRu ?? '',
+          birthPlace: user.birthPlace.nameRu ?? '',
+          age: Number(user.age),
           registrationDate: user.registrationDate,
           verifyType: user.verifyType,
           verifyDate: user.verifyDate,
         };
-        // ! SaveContragent -> Questionnaires
-        let questionnaires = (({ economySectorCode, countryOfCitizenship, countryOfTaxResidency, signOfResidency }) => ({
+
+        const userResponseQuestionnaires =
+          'response' in user && user.response && 'questionnaires' in user.response && user.response.questionnaires ? user.response.questionnaires : null;
+        const userQuestionnaires = (({ economySectorCode, countryOfCitizenship, countryOfTaxResidency, signOfResidency }) => ({
           economySectorCode,
           countryOfCitizenship,
           countryOfTaxResidency,
           signOfResidency,
         }))(user);
-        let questionariesData = Object.values(questionnaires).map(question => {
+        const questionariesData: ContragentQuestionaries[] = Object.values(userQuestionnaires).map(question => {
           let questName = '';
-          let questionId = parseInt(question.ids).toString();
+          let questionId = parseInt(String(question.ids)).toString();
           if (questionId === '500003') {
             questName = 'Код сектора экономики';
           } else if (questionId === '500011') {
@@ -569,23 +647,23 @@ 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,
-            contragentId: user.id,
-            questAnswer: question.ids,
+            id: userResponseQuestionnaires !== null ? Number(userResponseQuestionnaires.find(i => i.questId == questionId)?.id) : Number(question.id),
+            contragentId: Number(user.id),
+            questAnswer: String(question.ids ?? ''),
             questId: questionId,
-            questAnswerName: question.nameRu,
+            questAnswerName: question.nameRu ?? '',
             questName: questName,
           };
         });
         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 = userResponseQuestionnaires !== null ? userResponseQuestionnaires.find(i => i.questId === '507777') : undefined;
         if (user.addTaxResidency.nameRu !== null) {
           questionariesData.push({
             id: addTaxResidency ? addTaxResidency.id : 0,
-            contragentId: user.id,
-            questAnswer: user.addTaxResidency.ids,
+            contragentId: Number(user.id),
+            questAnswer: String(user.addTaxResidency.ids ?? ''),
             questAnswerName: user.addTaxResidency.nameRu,
             questName: 'Указать если налоговое резиденство  выбрано  другое',
             questId: '507777',
@@ -594,7 +672,7 @@ export const useDataStore = defineStore('data', {
           if (addTaxResidency && addTaxResidency.questAnswer !== null) {
             questionariesData.push({
               id: addTaxResidency.id,
-              contragentId: user.id,
+              contragentId: Number(user.id),
               questAnswer: null,
               questAnswerName: null,
               questName: 'Указать если налоговое резиденство  выбрано  другое',
@@ -603,101 +681,96 @@ export const useDataStore = defineStore('data', {
           }
         }
 
-        // ! SaveContragent -> Contacts
-        let contactsData = [];
-        if (user.phoneNumber !== '' && user.phoneNumber !== null) {
+        const userResponseContacts = 'response' in user && user.response && 'contacts' in user.response && user.response.contacts ? user.response.contacts : null;
+        const contactsData: ContragentContacts[] = [];
+        if (!!user.phoneNumber) {
           contactsData.push({
-            contragentId: user.id,
-            id: 'response' in user && 'contacts' in user.response ? user.response.contacts.find(i => i.type === 'MOBILE').id : 0,
+            contragentId: Number(user.id),
+            id: userResponseContacts !== null ? Number(userResponseContacts.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,
-            verifyDate: user.otpTokenId
-              ? this.currentDate()
-              : 'response' in user && 'contacts' in user.response
-              ? user.response.contacts.find(i => i.type === 'MOBILE').verifyDate
-              : null,
+            verifyType: user.otpTokenId ? 'BMG' : userResponseContacts !== null ? userResponseContacts.find(i => i.type === 'MOBILE')?.verifyType : null,
+            verifyDate: user.otpTokenId ? this.currentDate() : userResponseContacts !== null ? userResponseContacts.find(i => i.type === 'MOBILE')?.verifyDate : null,
           });
         }
-        if (user.email !== '' && user.email !== null) {
+        if (!!user.email) {
           contactsData.push({
-            contragentId: user.id,
-            id: 'response' in user && 'contacts' in user.response ? user.response.contacts.find(i => i.type === 'EMAIL').id : 0,
+            contragentId: Number(user.id),
+            id: userResponseContacts !== null ? Number(userResponseContacts.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 : userResponseContacts !== null ? userResponseContacts.find(i => i.type === 'EMAIL')?.value ?? '' : '',
           });
         }
-        if (user.homePhone !== '' && user.homePhone !== null) {
+        if (!!user.homePhone) {
           contactsData.push({
-            contragentId: user.id,
-            id: 'response' in user && 'contacts' in user.response ? user.response.contacts.find(i => i.type === 'HOME').id : 0,
+            contragentId: Number(user.id),
+            id: userResponseContacts !== null ? Number(userResponseContacts.find(i => i.type === 'HOME')?.id) : 0,
             newValue: '',
             note: '',
             primaryFlag: 'N',
             type: 'HOME',
             typeName: 'Домашний телефон',
-            value: user.homePhone
-              ? formatPhone(user.homePhone)
-              : 'response' in user && 'contacts' in user.response
-              ? user.response.contacts.find(i => i.type === 'HOME').value
-              : '',
+            value: user.homePhone ? formatPhone(user.homePhone) : userResponseContacts !== null ? userResponseContacts.find(i => i.type === 'HOME')?.value ?? '' : '',
           });
         }
 
-        // ! SaveContragent -> Documents
-        let documentsData = [];
-        documentsData.push({
-          contragentId: user.id,
-          id: 'response' in user && 'documents' in user.response ? user.response.documents[0].id : 0,
+        const documentsData = user.documentsList;
+        const hasAlreadyDocument = documentsData.findIndex(i => i.type === user.documentType.ids && i.number === user.documentNumber);
+        const userDocument: ContragentDocuments = {
+          contragentId: Number(user.id),
+          id: hasAlreadyDocument !== -1 ? documentsData[hasAlreadyDocument].id : 0,
           description: null,
-          expireDate: user.getDateByKey('documentExpire'),
-          issueDate: user.getDateByKey('documentDate'),
+          expireDate: user.getDateByKey('documentExpire')!,
+          issueDate: user.getDateByKey('documentDate')!,
           issuerId: Number(user.documentIssuers.ids),
           issuerName: user.documentIssuers.nameKz,
           issuerNameRu: user.documentIssuers.nameRu,
           note: null,
           number: user.documentNumber,
-          type: user.documentType.ids,
+          type: user.documentType.ids ? String(user.documentType.ids) : '',
           typeName: user.documentType.nameRu,
           serial: null,
           verifyType: user.verifyType,
           verifyDate: user.verifyDate,
-        });
-
-        const checkForNull = value => (value ? value : '');
+        };
+        if (hasAlreadyDocument !== -1) {
+          documentsData[hasAlreadyDocument] = userDocument;
+        } else {
+          documentsData.push(userDocument);
+        }
 
-        // ! SaveContragent -> Addresses
-        let addressData = [];
+        const checkForNull = (value: any) => (value ? value : '');
+        const userResponseAddress = 'response' in user && user.response && 'addresses' in user.response && user.response.addresses ? user.response.addresses : null;
+        const addressData: ContragentAddress[] = [];
         addressData.push({
-          id: 'response' in user && 'addresses' in user.response ? user.response.addresses[0].id : 0,
-          contragentId: user.id,
-          countryCode: user.birthPlace.ids,
-          countryName: user.birthPlace.nameRu,
-          stateCode: user.registrationProvince.ids,
-          stateName: user.registrationProvince.nameRu,
-          cityCode: user.registrationCity.code,
-          cityName: user.registrationCity.nameRu,
-          regionCode: user.registrationRegion.ids,
+          id: userResponseAddress !== null ? userResponseAddress[0].id : 0,
+          contragentId: Number(user.id),
+          countryCode: String(user.registrationCountry.ids ?? ''),
+          countryName: user.registrationCountry.nameRu ?? '',
+          stateCode: String(user.registrationProvince.ids ?? ''),
+          stateName: user.registrationProvince.nameRu ?? '',
+          cityCode: String(user.registrationCity.code ?? ''),
+          cityName: user.registrationCity.nameRu ?? '',
+          regionCode: String(user.registrationRegion.ids ?? ''),
           regionName: user.registrationRegion.nameRu,
-          streetName: user.registrationStreet,
+          streetName: user.registrationStreet ?? '',
           kvartal: user.registrationQuarter,
           microRaion: user.registrationMicroDistrict,
           cityTypeId: Number(user.registrationRegionType.ids) > 0 ? Number(user.registrationRegionType.ids) : null,
-          cityTypeName: user.registrationRegionType.nameRu,
-          blockNumber: user.registrationNumberHouse,
-          apartmentNumber: user.registrationNumberApartment,
-          address: `${checkForNull(user.birthPlace.nameRu)}, ${checkForNull(user.registrationRegionType.nameRu)} ${checkForNull(user.registrationCity.nameRu)}, ул. ${checkForNull(
-            user.registrationStreet,
-          )}, д. ${checkForNull(user.registrationNumberHouse)} кв. ${checkForNull(user.registrationNumberApartment)}`,
-
+          cityTypeName: user.registrationRegionType.nameRu ?? '',
+          blockNumber: user.registrationNumberHouse ?? '',
+          apartmentNumber: 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',
         });
 
@@ -710,9 +783,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;
@@ -723,13 +798,13 @@ export const useDataStore = defineStore('data', {
       }
       return true;
     },
-    async saveMember(member, whichMember, memberFromApplicaiton) {
-      let data = {};
+    async saveMember(member: Member, whichMember: keyof typeof MemberCodes, memberFromApplicaiton: any) {
+      let data: any = {};
       try {
         data = {
           processInstanceId: this.formStore.applicationData.processInstanceId,
           insisId: member.id,
-          iin: member.iin.replace(/-/g, ''),
+          iin: member.iin?.replace(/-/g, ''),
           longName: member.longName,
           isIpdl: member.signOfIPDL.nameRu == 'Да' ? true : false,
           isTerror: member.isTerror,
@@ -751,21 +826,31 @@ export const useDataStore = defineStore('data', {
             await this.api.deleteMember('Spokesman', this.formStore.applicationData.processInstanceId);
           }
           data.migrationCard = member.migrationCard;
-          const migrationCardIssueDate = formatDate(member.migrationCardIssueDate);
-          if (migrationCardIssueDate) data.migrationCardIssueDate = migrationCardIssueDate.toISOString();
-          const migrationCardExpireDate = formatDate(member.migrationCardExpireDate);
-          if (migrationCardExpireDate) data.migrationCardExpireDate = migrationCardExpireDate.toISOString();
+          if (member.migrationCardIssueDate) {
+            const migrationCardIssueDate = formatDate(member.migrationCardIssueDate);
+            if (migrationCardIssueDate) data.migrationCardIssueDate = migrationCardIssueDate.toISOString();
+          }
+          if (member.migrationCardExpireDate) {
+            const migrationCardExpireDate = formatDate(member.migrationCardExpireDate);
+            if (migrationCardExpireDate) data.migrationCardExpireDate = migrationCardExpireDate.toISOString();
+          }
           data.confirmDocType = member.confirmDocType;
           data.confirmDocNumber = member.confirmDocNumber;
-          const confirmDocIssueDate = formatDate(member.confirmDocIssueDate);
-          if (confirmDocIssueDate) data.confirmDocIssueDate = confirmDocIssueDate.toISOString();
-          const confirmDocExpireDate = formatDate(member.confirmDocExpireDate);
-          if (confirmDocExpireDate) data.confirmDocExpireDate = confirmDocExpireDate.toISOString();
+          if (member.confirmDocIssueDate) {
+            const confirmDocIssueDate = formatDate(member.confirmDocIssueDate);
+            if (confirmDocIssueDate) data.confirmDocIssueDate = confirmDocIssueDate.toISOString();
+          }
+          if (member.confirmDocExpireDate) {
+            const confirmDocExpireDate = formatDate(member.confirmDocExpireDate);
+            if (confirmDocExpireDate) data.confirmDocExpireDate = confirmDocExpireDate.toISOString();
+          }
           data.clientLongName = this.formStore.applicationData.clientApp.longName;
           data.notaryLongName = member.notaryLongName;
           data.notaryLicenseNumber = member.notaryLicenseNumber;
-          const notaryLicenseDate = formatDate(member.notaryLicenseDate);
-          if (notaryLicenseDate) data.notaryLicenseDate = notaryLicenseDate.toISOString();
+          if (member.notaryLicenseDate) {
+            const notaryLicenseDate = formatDate(member.notaryLicenseDate);
+            if (notaryLicenseDate) data.notaryLicenseDate = notaryLicenseDate.toISOString();
+          }
           data.notaryLicenseIssuer = member.notaryLicenseIssuer;
           data.jurLongName = member.jurLongName;
           data.fullNameRod = member.fullNameRod;
@@ -774,18 +859,17 @@ 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) {
+            if (this.members.insuredApp.has) {
+              await this.deleteInsuredLogic();
+            }
+            if (this.formStore.applicationData.insuredApp.every((i: any) => 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;
+          data.disabilityGroupId = data.isDisability && member.disabilityGroup ? member.disabilityGroup.id : null;
           data.profession = member.job;
           data.position = member.jobPosition;
           data.jobName = member.jobPlace;
@@ -798,7 +882,7 @@ export const useDataStore = defineStore('data', {
             this.formStore.applicationData &&
             this.formStore.applicationData.beneficiaryApp &&
             this.formStore.applicationData.beneficiaryApp.length &&
-            this.formStore.applicationData.beneficiaryApp.every(i => i.iin !== data.iin) &&
+            this.formStore.applicationData.beneficiaryApp.every((i: any) => i.iin !== data.iin) &&
             data.id !== null
           ) {
             await this.api.deleteMember('Beneficiary', data.id);
@@ -808,6 +892,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) {
@@ -817,7 +904,7 @@ export const useDataStore = defineStore('data', {
             this.formStore.applicationData &&
             this.formStore.applicationData.beneficialOwnerApp &&
             this.formStore.applicationData.beneficialOwnerApp.length &&
-            this.formStore.applicationData.beneficialOwnerApp.every(i => i.iin !== data.iin) &&
+            this.formStore.applicationData.beneficialOwnerApp.every((i: any) => i.iin !== data.iin) &&
             data.id !== null
           ) {
             await this.api.deleteMember('BeneficialOwner', data.id);
@@ -828,48 +915,179 @@ export const useDataStore = defineStore('data', {
         await this.api.setMember(whichMember, data);
         return true;
       } catch (err) {
-        return ErrorHandler(err, err.response?.data?.errors && Object.values(err.response?.data?.errors).join(' -> '));
+        if (err instanceof AxiosError) {
+          return ErrorHandler(err, err.response?.data?.errors && Object.values(err.response?.data?.errors).join(' -> '));
+        }
+      }
+    },
+    getConditionsData() {
+      const conditionsData: {
+        policyAppDto: PolicyAppDto;
+        addCoversDto: AddCover[];
+      } = {
+        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(String(this.formStore.productConditionsForm.requestedSumInsured).replace(/\s/g, '')) : null,
+          premium:
+            this.formStore.productConditionsForm.insurancePremiumPerMonth != null
+              ? Number(String(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
+            ? String(this.formStore.productConditionsForm.processIndexRate.id)
+            : String(this.processIndexRate.find(i => i.code === '0')?.id ?? ''),
+          paymentPeriodId: String(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 ? Number(this.formStore.productConditionsForm.riskGroup.id) : 1,
+        },
+        addCoversDto: this.formStore.additionalInsuranceTerms,
+      };
+      if (this.isKazyna) {
+        conditionsData.policyAppDto.premiumInCurrency = getNumber(String(this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar));
+        conditionsData.policyAppDto.amountInCurrency = getNumber(String(this.formStore.productConditionsForm.requestedSumInsuredInDollar));
+        conditionsData.policyAppDto.currencyExchangeRate = this.currencies.usd;
+      }
+      if (this.isLiferenta) {
+        conditionsData.policyAppDto.guaranteedPaymentPeriod = this.formStore.productConditionsForm.guaranteedPeriod || 0;
+        conditionsData.policyAppDto.annuityTypeId = String(this.formStore.productConditionsForm.typeAnnuityInsurance.id ?? '');
+        conditionsData.policyAppDto.paymentPeriod = Number(this.formStore.productConditionsForm.termAnnuityPayments);
+        conditionsData.policyAppDto.annuityPaymentPeriodId = String(this.formStore.productConditionsForm.periodAnnuityPayment.id ?? '');
+      }
+      return conditionsData;
+    },
+    async clearAddCovers(coverCode: number, coverValue: string) {
+      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 && answers.length) {
+          const newCover = answers.find(i => i.code === coverValue);
+          if (newCover) {
+            applicationData.addCoversDto[termCoverIndex].coverSumId = newCover.id;
+            applicationData.addCoversDto[termCoverIndex].coverSumName = newCover.nameRu;
+          }
+        }
       }
     },
-    searchFromList(member, searchIt) {
-      const getQuestionariesData = () => {
-        switch (searchIt.questId) {
-          case '500003':
-            return [this.economySectorCode, 'economySectorCode'];
-          case '500011':
-            return [this.residents, 'signOfResidency'];
-          case '500012':
-            return [this.citizenshipCountries, 'countryOfCitizenship'];
-          case '500014':
-            return [this.taxCountries, 'countryOfTaxResidency'];
-          case '507777':
-            return [this.addTaxCountries, 'addTaxResidency'];
-          case '500147':
-            return [[]];
-          case '500148':
-            return [[]];
-        }
-      };
-
-      const [searchFrom, whichField] = getQuestionariesData();
-      if (searchFrom && searchFrom.length) {
-        const result = searchFrom.find(i => i.ids === searchIt.questAnswer);
-        member[whichField] = result ? result : new Value();
+    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 setSurvey(data) {
+    async getAdditionalInsuranceTermsAnswers(questionId: string) {
+      if (!this.processCode) return null;
+      try {
+        const answers = await this.api.getAdditionalInsuranceTermsAnswers(this.processCode, questionId);
+        return answers;
+      } catch (err) {
+        console.log(err);
+      }
+      return null;
+    },
+    async definedAnswers(
+      filter: string,
+      whichSurvey: 'surveyByHealthBase' | 'surveyByHealthBasePolicyholder' | 'surveyByCriticalBase' | 'surveyByCriticalBasePolicyholder',
+      value: any = null,
+      index: number | null = null,
+    ) {
+      if (!this.formStore.definedAnswersId[whichSurvey].hasOwnProperty(filter)) {
+        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: any) => answer.nameRu.match(new RegExp(value, 'i')));
+        //@ts-ignore
+        this.formStore[whichSurvey].body[index].first.answerId = answer.ids;
+      }
+      return this.formStore.definedAnswersId[whichSurvey];
+    },
+    async setSurvey(data: AnketaFirst) {
       try {
         this.isLoading = true;
         const anketaToken = await this.api.setSurvey(data);
         this.showToaster('success', this.t('toaster.successSaved'), 2000);
         return anketaToken;
-      } catch (error) {
+      } catch (err) {
         return ErrorHandler(err);
       } finally {
         this.isLoading = false;
       }
     },
-    async getFromApi(whichField, whichRequest, parameter, reset = false) {
+    async setINSISWorkData() {
+      if (!this.formStore.applicationData.insisWorkDataApp) return;
+      const data: InsisWorkDataApp = {
+        id: this.formStore.applicationData.insisWorkDataApp.id,
+        processInstanceId: String(this.formStore.applicationData.processInstanceId),
+        agentId: Number(this.formStore.AgentData.agentId),
+        agentName: this.formStore.AgentData.fullName,
+        salesChannel: this.formStore.applicationData.insisWorkDataApp.salesChannel,
+        salesChannelName: this.formStore.applicationData.insisWorkDataApp.salesChannelName,
+        insrType: this.formStore.applicationData.insisWorkDataApp.insrType,
+        saleChanellPolicy: String(this.formStore.SaleChanellPolicy.ids ?? ''),
+        saleChanellPolicyName: this.formStore.SaleChanellPolicy.nameRu ?? '',
+        regionPolicy: String(this.formStore.RegionPolicy.ids ?? ''),
+        regionPolicyName: this.formStore.RegionPolicy.nameRu ?? '',
+        managerPolicy: String(this.formStore.ManagerPolicy.ids),
+        managerPolicyName: this.formStore.ManagerPolicy.nameRu ?? '',
+        insuranceProgramType: this.formStore.applicationData.insisWorkDataApp.insuranceProgramType,
+      };
+      try {
+        this.isLoading = true;
+        await this.api.setINSISWorkData(data);
+      } catch (err) {
+        ErrorHandler(err);
+      } finally {
+        this.isLoading = false;
+      }
+    },
+    async setConfirmation() {
+      const data = {
+        id: this.formStore.affilationResolution.id,
+        processInstanceId: this.formStore.affilationResolution.processInstanceId,
+        number: this.formStore.affilationResolution.number,
+        date: formatDate(this.formStore.affilationResolution.date!)?.toISOString(),
+      };
+      try {
+        this.isLoading = true;
+        await this.api.setConfirmation(data);
+        this.showToaster('success', this.t('toaster.successSaved'));
+        return true;
+      } catch (err) {
+        return ErrorHandler(err);
+      } finally {
+        this.isLoading = false;
+      }
+    },
+    async getFromApi(whichField: string, whichRequest: string, parameter?: any, reset: boolean = false): Promise<Value[]> {
       const storageValue = JSON.parse(localStorage.getItem(whichField) || 'null');
       const currentHour = new Date().getHours();
       const currentMinutePart = Math.ceil((new Date().getMinutes() + 1) / 15);
@@ -888,9 +1106,11 @@ export const useDataStore = defineStore('data', {
           return true;
       };
       if (!!getDataCondition() || reset === true) {
+        //@ts-ignore
         this[whichField] = [];
         try {
-          const response = await this.api[whichRequest](parameter);
+          //@ts-ignore
+          const response: Value[] = await this.api[whichRequest](parameter);
           if (response) {
             localStorage.setItem(
               whichField,
@@ -901,15 +1121,18 @@ export const useDataStore = defineStore('data', {
                 mode: import.meta.env.MODE,
               }),
             );
+            //@ts-ignore
             this[whichField] = response;
           }
         } catch (err) {
           console.log(err);
         }
       } else {
+        //@ts-ignore
         this[whichField] = storageValue.value;
       }
 
+      //@ts-ignore
       return this[whichField];
     },
     async getCountries() {
@@ -924,30 +1147,27 @@ export const useDataStore = defineStore('data', {
     async getAdditionalTaxCountries() {
       return await this.getFromApi('addTaxCountries', 'getAdditionalTaxCountries');
     },
-    async getStates(key, member) {
+    async getStates(key?: string, member?: Member) {
       await this.getFromApi('states', 'getStates');
-      if (key && member[key] && member[key].ids !== null) {
-        return this.states.filter(i => i.code === member[key].ids);
-      }
+      //@ts-ignore
+      if (key && member[key] && member[key].ids !== null) return this.states.filter(i => i.code === member[key].ids);
       return this.states;
     },
-    async getRegions(key, member) {
+    async getRegions(key?: string, member?: Member) {
       await this.getFromApi('regions', 'getRegions');
-      if (key && member[key] && member[key].ids !== null) {
-        return this.regions.filter(i => i.code === member[key].ids);
-      }
-      if (member.registrationProvince.ids !== null) {
+      //@ts-ignore
+      if (key && member[key] && member[key].ids !== null) return this.regions.filter(i => i.code === member[key].ids);
+      if (member && member.registrationProvince.ids !== null) {
         return this.regions.filter(i => i.code === member.registrationProvince.ids);
       } else {
         return this.regions;
       }
     },
-    async getCities(key, member) {
+    async getCities(key?: string, member?: Member) {
       await this.getFromApi('cities', 'getCities');
-      if (key && member[key] && member[key].ids !== null) {
-        return this.cities.filter(i => i.code === member[key].ids);
-      }
-      if (member.registrationProvince.ids !== null) {
+      //@ts-ignore
+      if (key && member[key] && member[key].ids !== null) return this.cities.filter(i => i.code === member[key].ids);
+      if (member && member.registrationProvince.ids !== null) {
         return this.cities.filter(i => i.code === member.registrationProvince.ids);
       } else {
         return this.cities;
@@ -956,6 +1176,9 @@ export const useDataStore = defineStore('data', {
     async getLocalityTypes() {
       return await this.getFromApi('localityTypes', 'getLocalityTypes');
     },
+    async getDicFileTypeList() {
+      return await this.getFromApi('dicFileTypeList', 'getDicFileTypeList');
+    },
     async getDocumentTypes() {
       const document_list = await this.getFromApi('documentTypes', 'getDocumentTypes');
       await this.getDicFileTypeList();
@@ -967,9 +1190,6 @@ export const useDataStore = defineStore('data', {
         }
       });
     },
-    async getDicFileTypeList() {
-      return await this.getFromApi('dicFileTypeList', 'getDicFileTypeList');
-    },
     async getDocumentIssuers() {
       return await this.getFromApi('documentIssuers', 'getDocumentIssuers');
     },
@@ -977,69 +1197,156 @@ export const useDataStore = defineStore('data', {
       return await this.getFromApi('residents', 'getResidents');
     },
     async getSectorCodeList() {
-      await this.getFromApi('economySectorCode', 'getSectorCode');
-      return this.economySectorCode;
+      return await this.getFromApi('economySectorCode', 'getSectorCode');
     },
     async getFamilyStatuses() {
       return await this.getFromApi('familyStatuses', 'getFamilyStatuses');
     },
     async getRelationTypes() {
-      // TODO Remove this & add filtering in openPanel method
-      await this.getFromApi('relations', 'getRelationTypes');
-      const filteredRelations = this.relations.filter(i => Number(i.ids) >= 6 && Number(i.ids) <= 15);
-      const otherRelations = this.relations.filter(i => Number(i.ids) < 6 || Number(i.ids) > 15);
-      return [...filteredRelations, ...otherRelations];
+      return await this.getFromApi('relations', 'getRelationTypes');
     },
     async getProcessIndexRate() {
-      const response = await this.getFromApi('processIndexRate', 'getProcessIndexRate', this.processCode);
-      return response ? response : [];
+      return await this.getFromApi('processIndexRate', 'getProcessIndexRate', this.processCode);
     },
-    async getProcessCoverTypeSum(type) {
+    async getProcessCoverTypeSum(type?: any) {
       return await this.getFromApi('processCoverTypeSum', 'getProcessCoverTypeSum', type);
     },
     async getProcessPaymentPeriod() {
       return await this.getFromApi('processPaymentPeriod', 'getProcessPaymentPeriod', this.processCode);
     },
-    async getQuestionRefs(id) {
+    async getQuestionRefs(id?: string) {
       return await this.getFromApi('questionRefs', 'getQuestionRefs', id, true);
     },
     async getProcessTariff() {
       return await this.getFromApi('processTariff', 'getProcessTariff');
     },
-    async getAdditionalInsuranceTermsAnswers(questionId) {
+    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 answers = await this.api.getAdditionalInsuranceTermsAnswers(this.processCode, questionId);
-        return answers;
+        const currencies = await this.api.getCurrencies();
+        this.currencies = currencies;
+        return currencies;
       } catch (err) {
         console.log(err);
       }
+      return null;
     },
-    async getQuestionList(surveyType, processInstanceId, insuredId, baseField, secondaryField) {
+    async getDictionaryItems(dictName: string) {
+      return await this.getFromApi(dictName, 'getDictionaryItems', dictName);
+    },
+    async getAllFormsData() {
+      await Promise.allSettled([
+        this.getCountries(),
+        this.getCitizenshipCountries(),
+        this.getTaxCountries(),
+        this.getAdditionalTaxCountries(),
+        this.getStates(),
+        this.getRegions(),
+        this.getCities(),
+        this.getLocalityTypes(),
+        this.getDocumentTypes(),
+        this.getDocumentIssuers(),
+        this.getResidents(),
+        this.getSectorCodeList(),
+        this.getFamilyStatuses(),
+        this.getRelationTypes(),
+        this.getProcessIndexRate(),
+        this.getProcessTariff(),
+        this.getProcessPaymentPeriod(),
+        this.getDicFileTypeList(),
+        this.getDicAnnuityTypeList(),
+        this.getProcessAnnuityPaymentPeriod(),
+        this.getInsurancePay(),
+        this.getDictionaryItems('RegionPolicy'),
+        this.getDictionaryItems('SaleChanellPolicy'),
+      ]);
+    },
+    async getQuestionList(
+      surveyType: 'health' | 'critical',
+      processInstanceId: string | number,
+      insuredId: any,
+      baseField: string,
+      secondaryField: string,
+      whichMember: 'insured' | 'policyholder' = 'insured',
+    ) {
+      //@ts-ignore
       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 [baseQuestions, secondaryQuestions] = await Promise.allSettled([
+              this.api.getQuestionList(surveyType, processInstanceId, insuredId),
+              this.api.getQuestionListSecond(`${surveyType}second`, processInstanceId, insuredId),
+            ]);
+            if (baseQuestions.status === 'fulfilled') {
+              //@ts-ignore
+              this.formStore[baseField] = baseQuestions.value;
+            }
+            if (secondaryQuestions.status === 'fulfilled') {
+              //@ts-ignore
+              this.formStore[secondaryField] = secondaryQuestions;
+            }
+          }
+          if (whichMember === 'policyholder') {
+            const [baseQuestions, secondaryQuestions] = await Promise.allSettled([
+              this.api.getClientQuestionList(surveyType, processInstanceId, insuredId),
+              this.api.getClientQuestionListSecond(`${surveyType}second`, processInstanceId, insuredId),
+            ]);
+            if (baseQuestions.status === 'fulfilled') {
+              //@ts-ignore
+              this.formStore[baseField] = baseQuestions.value;
+            }
+            if (secondaryQuestions.status === 'fulfilled') {
+              //@ts-ignore
+              this.formStore[secondaryField] = secondaryQuestions;
+            }
+          }
         } catch (err) {
           console.log(err);
         }
       }
+      //@ts-ignore
       return this.formStore[baseField];
     },
-    getNumberWithSpaces(n) {
+    getNumberWithSpaces(n: any) {
       return n === null ? null : Number((typeof n === 'string' ? n : n.toFixed().toString()).replace(/[^0-9]+/g, '')).toLocaleString('ru');
     },
-    async getTaskList(search = '', groupCode = 'Work', onlyGet = false, needToReturn = false, key = 'dateCreated', processInstanceId = null, byOneProcess = null) {
+    getNumberWithDot(n: any) {
+      return n === null ? null : n.toLocaleString('ru', { maximumFractionDigits: 2, minimumFractionDigits: 2 }).replace(/,/g, '.');
+    },
+    async getTaskList(
+      search: string = '',
+      groupCode: string = 'Work',
+      onlyGet: boolean = false,
+      needToReturn: boolean = false,
+      key: string = 'dateCreated',
+      processInstanceId: string | number | null = null,
+      byOneProcess: number | null = null,
+    ) {
       if (onlyGet === false) {
         this.isLoading = true;
       }
       try {
-        const column = this.isColumnAsc[key] === null ? 'dateCreated' : key;
-        const direction = this.isColumnAsc[key] === null ? 'desc' : this.isColumnAsc[key] === true ? 'asc' : 'desc';
-        const query = {
+        type ColumnKey = keyof typeof this.isColumnAsc;
+        const column = this.isColumnAsc[key as ColumnKey] === null ? 'dateCreated' : key;
+        const direction = this.isColumnAsc[key as ColumnKey] === null ? 'desc' : this.isColumnAsc[key as ColumnKey] === true ? 'asc' : 'desc';
+        const query: {
+          pageIndex: number;
+          pageSize: number;
+          search: string;
+          column: string;
+          direction: string;
+          groupCode: string;
+          processCode?: number;
+          processCodes?: number[];
+        } = {
           pageIndex: processInstanceId === null ? this.historyPageIndex - 1 : 0,
           pageSize: this.historyPageSize,
           search: search ? search.replace(/-/g, '') : '',
@@ -1061,8 +1368,7 @@ export const useDataStore = defineStore('data', {
           this.historyTotalItems = taskList.totalItems;
         }
       } catch (err) {
-        this.showToaster('error', err?.response?.data, 2000);
-        console.log(err);
+        ErrorHandler(err);
       } finally {
         this.isLoading = false;
       }
@@ -1070,7 +1376,7 @@ export const useDataStore = defineStore('data', {
         this.isLoading = false;
       }
     },
-    async getProcessHistoryList(id) {
+    async getProcessHistoryList(id: string) {
       try {
         const processHistory = await this.api.getProcessHistory(id);
         if (processHistory.length > 0) {
@@ -1082,7 +1388,7 @@ export const useDataStore = defineStore('data', {
         console.log(err);
       }
     },
-    async getProcessHistory(id) {
+    async getProcessHistory(id: string) {
       this.isLoading = true;
       try {
         const processHistory = await this.api.getProcessHistory(id);
@@ -1096,42 +1402,11 @@ export const useDataStore = defineStore('data', {
       }
       this.isLoading = false;
     },
-    findObject(from, key, searchKey) {
-      const found = this[from].find(i => i[key] == searchKey);
-      return found || new Value();
-    },
-    async getAllFormsData() {
-      await Promise.allSettled([
-        this.getCountries(),
-        this.getCitizenshipCountries(),
-        this.getTaxCountries(),
-        this.getAdditionalTaxCountries(),
-        this.getStates(),
-        this.getRegions(),
-        this.getCities(),
-        this.getLocalityTypes(),
-        this.getDocumentTypes(),
-        this.getDocumentIssuers(),
-        this.getResidents(),
-        this.getSectorCodeList(),
-        this.getFamilyStatuses(),
-        this.getRelationTypes(),
-        this.getProcessIndexRate(),
-        this.getProcessTariff(),
-        this.getProcessPaymentPeriod(),
-        this.getDicFileTypeList(),
-        this.getDictionaryItems('RegionPolicy'),
-        this.getDictionaryItems('SaleChanellPolicy'),
-      ]);
-    },
-    async getUserGroups() {
+    async getProcessHistoryLog(taskId: string) {
       try {
-        this.isLoading = true;
-        this.userGroups = await this.api.getUserGroups();
+        return await this.api.getProcessHistoryLog(taskId);
       } catch (err) {
-        console.log(err);
-      } finally {
-        this.isLoading = false;
+        ErrorHandler(err);
       }
     },
     async getProcessList() {
@@ -1146,28 +1421,34 @@ export const useDataStore = defineStore('data', {
       }
       this.isLoading = false;
     },
-    sortTaskList(key) {
+    sortTaskList(key: string) {
       if (this.taskList.length !== 0) {
         if (key in this.isColumnAsc) {
-          if (this.isColumnAsc[key] === true) {
+          type ColumnKey = keyof typeof this.isColumnAsc;
+          if (this.isColumnAsc[key as ColumnKey] === true) {
             this.isColumnAsc = { ...InitialColumns() };
-            this.isColumnAsc[key] = false;
+            this.isColumnAsc[key as ColumnKey] = false;
             return;
           }
-          if (this.isColumnAsc[key] === false) {
+          if (this.isColumnAsc[key as ColumnKey] === false) {
             this.isColumnAsc = { ...InitialColumns() };
-            this.isColumnAsc[key] = null;
+            this.isColumnAsc[key as ColumnKey] = null;
             return;
           }
-          if (this.isColumnAsc[key] === null) {
+          if (this.isColumnAsc[key as ColumnKey] === null) {
             this.isColumnAsc = { ...InitialColumns() };
-            this.isColumnAsc[key] = true;
+            this.isColumnAsc[key as ColumnKey] = true;
             return;
           }
         }
       }
     },
-    async searchAgentByName(name) {
+    findObject(from: string, key: string, searchKey: any): any {
+      // @ts-ignore
+      const found = this[from].find(i => i[key] == searchKey);
+      return found || new Value();
+    },
+    async searchAgentByName(name: string) {
       try {
         this.AgentData = await this.api.searchAgentByName(name);
         if (!this.AgentData.length) {
@@ -1177,45 +1458,16 @@ export const useDataStore = defineStore('data', {
         console.log(err);
       }
     },
-    async setINSISWorkData() {
-      const data = {
-        id: this.formStore.applicationData.insisWorkDataApp.id,
-        processInstanceId: this.formStore.applicationData.processInstanceId,
-        agentId: this.formStore.AgentData.agentId,
-        agentName: this.formStore.AgentData.fullName,
-        salesChannel: this.formStore.applicationData.insisWorkDataApp.salesChannel,
-        salesChannelName: this.formStore.applicationData.insisWorkDataApp.salesChannelName,
-        insrType: this.formStore.applicationData.insisWorkDataApp.insrType,
-        saleChanellPolicy: this.formStore.SaleChanellPolicy.ids,
-        saleChanellPolicyName: this.formStore.SaleChanellPolicy.nameRu,
-        regionPolicy: this.formStore.RegionPolicy.ids,
-        regionPolicyName: this.formStore.RegionPolicy.nameRu,
-        managerPolicy: this.formStore.ManagerPolicy.ids,
-        managerPolicyName: this.formStore.ManagerPolicy.nameRu,
-        insuranceProgramType: this.formStore.applicationData.insisWorkDataApp.insuranceProgramType,
-      };
-      try {
-        this.isLoading = true;
-        await this.api.setINSISWorkData(data);
-      } catch (err) {
-        console.log(err);
-      } finally {
-        this.isLoading = false;
-      }
-    },
-    async getDictionaryItems(dictName) {
-      return await this.getFromApi(dictName, 'getDictionaryItems', dictName);
-    },
-    async filterManagerByRegion(filterName) {
+    async filterManagerByRegion(filterName: string) {
       try {
         this.ManagerPolicy = await this.api.filterManagerByRegion('ManagerPolicy', filterName);
       } catch (err) {
         console.log(err);
       }
     },
-    async getUnderwritingCouncilData(id) {
+    async getUnderwritingCouncilData(id: string | number) {
       try {
-        const response = await this.api.getUnderwritingCouncilData(id);
+        const response: any = await this.api.getUnderwritingCouncilData(id);
         this.formStore.affilationResolution.id = response.underwritingCouncilAppDto.id;
         this.formStore.affilationResolution.date = response.underwritingCouncilAppDto.date ? reformatDate(response.underwritingCouncilAppDto.date) : null;
         this.formStore.affilationResolution.number = response.underwritingCouncilAppDto.number ? response.underwritingCouncilAppDto.number : null;
@@ -1223,93 +1475,75 @@ export const useDataStore = defineStore('data', {
         console.log(err);
       }
     },
-    async setConfirmation() {
-      const data = {
-        id: this.formStore.affilationResolution.id,
-        processInstanceId: this.formStore.affilationResolution.processInstanceId,
-        number: this.formStore.affilationResolution.number,
-        date: formatDate(this.formStore.affilationResolution.date)?.toISOString(),
-      };
-      try {
-        this.isLoading = true;
-        await this.api.setConfirmation(data);
-        this.showToaster('success', this.t('toaster.successSaved'));
-        return true;
-      } catch (err) {
-        this.showToaster('error', this.t('toaster.error'));
-        return false;
-      } finally {
-        this.isLoading = false;
-      }
-    },
-    async sendUnderwritingCouncilTask(data) {
+    async sendUnderwritingCouncilTask(data: any) {
       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;
-      }
-    },
-    async definedAnswers(filter, whichSurvey, value = null, index = null) {
-      if (!this.formStore.definedAnswersId[whichSurvey].hasOwnProperty(filter)) {
-        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);
-        this.formStore[whichSurvey].body[index].first.answerId = answer.ids;
-      }
-      return this.formStore.definedAnswersId[whichSurvey];
-    },
-    async getPaymentTable(id) {
-      try {
-        const paymentResultTable = await this.api.calculatePremuim(id);
-        if (paymentResultTable.length > 0) {
-          this.paymentResultTable = paymentResultTable;
-        } else {
-          this.paymentResultTable = [];
-        }
-      } catch (err) {
-        console.log(err);
+        return ErrorHandler(err);
       }
     },
-    async getDefaultCalculationData(showLoader = false) {
+    async getDefaultCalculationData(showLoader: boolean = false, product: string | null = 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);
+        return null;
       } finally {
         this.isLoading = false;
       }
     },
-    async calculateWithoutApplication(showLoader = false) {
+    async calculateWithoutApplication(showLoader: boolean = false, product: string | null = null) {
       this.isLoading = showLoader;
       try {
-        const calculationData = {
-          signDate: formatDate(this.formStore.productConditionsForm.signDate)?.toISOString(),
-          birthDate: formatDate(this.formStore.productConditionsForm.birthDate)?.toISOString(),
-          gender: this.formStore.productConditionsForm.gender.id,
-          amount: getNumber(this.formStore.productConditionsForm.requestedSumInsured),
-          premium: getNumber(this.formStore.productConditionsForm.insurancePremiumPerMonth),
-          coverPeriod: this.formStore.productConditionsForm.coverPeriod,
-          payPeriod: this.formStore.productConditionsForm.coverPeriod,
+        if (!this.formStore.productConditionsForm.signDate || !this.formStore.productConditionsForm.birthDate) {
+          return;
+        }
+        const signDate = formatDate(this.formStore.productConditionsForm.signDate);
+        const birthDate = formatDate(this.formStore.productConditionsForm.birthDate);
+        if (!signDate || !birthDate) return;
+        const calculationData: RecalculationDataType & PolicyAppDto = {
+          signDate: signDate.toISOString(),
+          birthDate: birthDate.toISOString(),
+          gender: Number(this.formStore.productConditionsForm.gender.id),
+          amount: getNumber(String(this.formStore.productConditionsForm.requestedSumInsured)),
+          premium: getNumber(String(this.formStore.productConditionsForm.insurancePremiumPerMonth)),
+          coverPeriod: Number(this.formStore.productConditionsForm.coverPeriod),
+          payPeriod: Number(this.formStore.productConditionsForm.coverPeriod),
           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,
+            ? String(this.formStore.productConditionsForm.processIndexRate.id)
+            : String(this.processIndexRate.find(i => i.code === '0')?.id),
+          paymentPeriodId: String(this.formStore.productConditionsForm.paymentPeriod.id),
           addCovers: this.formStore.additionalInsuranceTermsWithout,
         };
-        const calculationResponse = await this.api.calculateWithoutApplication(calculationData);
+        if (this.isKazyna || product === 'halykkazyna') {
+          calculationData.premiumInCurrency = getNumber(String(this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar));
+          calculationData.amountInCurrency = getNumber(String(this.formStore.productConditionsForm.requestedSumInsuredInDollar));
+          calculationData.currencyExchangeRate = this.currencies.usd;
+        }
+        if (this.isLiferenta) {
+          calculationData.guaranteedPaymentPeriod = this.formStore.productConditionsForm.guaranteedPeriod || 0;
+          calculationData.annuityTypeId = String(this.formStore.productConditionsForm.typeAnnuityInsurance.id);
+          calculationData.paymentPeriod = Number(this.formStore.productConditionsForm.termAnnuityPayments);
+          calculationData.annuityPaymentPeriodId = String(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);
@@ -1318,76 +1552,47 @@ export const useDataStore = defineStore('data', {
         return !!this.formStore.productConditionsForm.requestedSumInsured && !!this.formStore.productConditionsForm.insurancePremiumPerMonth;
       }
     },
-    async calculate(taskId) {
+    async calculate(taskId: string) {
       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(String(id));
+        const applicationData = await this.api.getApplicationData(taskId);
+        this.formStore.applicationData = applicationData;
+        if (this.formStore.applicationData.addCoverDto) this.formStore.additionalInsuranceTerms = this.formStore.applicationData.addCoverDto;
+        if (this.isKazyna && this.currencies.usd) {
+          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);
+          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(applicationData.policyAppDto.premium);
+        } else {
+          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(result.value);
+          this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(applicationData.policyAppDto.amount);
+        }
+        if (this.isLiferenta) {
+          this.formStore.productConditionsForm.amountAnnuityPayments = this.getNumberWithSpaces(applicationData.policyAppDto.annuityMonthPay);
+        }
+        this.showToaster('success', this.t('toaster.calculated'), 1000);
       } catch (err) {
         ErrorHandler(err);
       }
       this.isLoading = false;
     },
-    async startApplication(member) {
+    async startApplication(member: Member) {
+      if (!member.iin) return false;
       try {
-        const data = {
+        const data: StartApplicationType = {
           clientId: member.id,
           iin: member.iin.replace(/-/g, ''),
-          longName: member.longName,
-          processCode: this.processCode,
+          longName: member.longName ?? '',
+          processCode: Number(this.processCode),
           policyId: 0,
         };
         const response = await this.api.startApplication(data);
@@ -1397,10 +1602,8 @@ export const useDataStore = defineStore('data', {
         return ErrorHandler(err);
       }
     },
-    async getApplicationData(taskId, onlyGet = true, setMembersField = true, fetchMembers = true, setProductConditions = true) {
-      if (onlyGet) {
-        this.isLoading = true;
-      }
+    async getApplicationData(taskId: string, onlyGet: boolean = true, setMembersField: boolean = true, fetchMembers: boolean = true, setProductConditions: boolean = true) {
+      this.isLoading = onlyGet;
       try {
         const applicationData = await this.api.getApplicationData(taskId);
         if (this.processCode !== applicationData.processCode) {
@@ -1424,10 +1627,10 @@ export const useDataStore = defineStore('data', {
         this.formStore.AgentData.agentId = applicationData.insisWorkDataApp.agentId;
 
         const clientData = applicationData.clientApp;
-        const insuredData = applicationData.insuredApp;
-        const spokesmanData = applicationData.spokesmanApp;
-        const beneficiaryData = applicationData.beneficiaryApp;
-        const beneficialOwnerData = applicationData.beneficialOwnerApp;
+        const insuredData: any[] = applicationData.insuredApp;
+        const beneficiaryData: any[] = applicationData.beneficiaryApp;
+        const beneficialOwnerData: any[] = applicationData.beneficialOwnerApp;
+        const spokesmanData: any = applicationData.spokesmanApp;
 
         this.formStore.isPolicyholderInsured = clientData.isInsured;
         this.formStore.isActOwnBehalf = clientData.isActOwnBehalf;
@@ -1436,6 +1639,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 = [
             {
@@ -1461,7 +1670,7 @@ export const useDataStore = defineStore('data', {
                 member.index = index;
                 allMembers.push(member);
                 if (this.formStore.insuredForm.length - 1 < index) {
-                  this.formStore.insuredForm.push(new InsuredForm());
+                  this.formStore.insuredForm.push(new Member());
                 }
               }
             });
@@ -1474,7 +1683,7 @@ export const useDataStore = defineStore('data', {
                 member.index = index;
                 allMembers.push(member);
                 if (this.formStore.beneficiaryForm.length - 1 < index) {
-                  this.formStore.beneficiaryForm.push(new BeneficiaryForm());
+                  this.formStore.beneficiaryForm.push(new Member());
                 }
               }
             });
@@ -1487,7 +1696,7 @@ export const useDataStore = defineStore('data', {
                 member.index = index;
                 allMembers.push(member);
                 if (this.formStore.beneficialOwnerForm.length - 1 < index) {
-                  this.formStore.beneficialOwnerForm.push(new BeneficialOwnerForm());
+                  this.formStore.beneficialOwnerForm.push(new Member());
                 }
               }
             });
@@ -1504,9 +1713,9 @@ export const useDataStore = defineStore('data', {
           this.setMembersField(this.formStore.policyholderFormKey, 'clientApp');
           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();
-              this.setMembersFieldIndex(this.formStore.insuredFormKey, 'insuredApp', index);
             });
           }
 
@@ -1516,6 +1725,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();
+              }
             });
           }
 
@@ -1551,15 +1764,34 @@ 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);
 
-          let processIndexRate = this.processIndexRate.find(item => item.id == applicationData.policyAppDto.indexRateId);
-          this.formStore.productConditionsForm.processIndexRate = processIndexRate ? processIndexRate : this.processIndexRate.find(item => item.code === '0');
+          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,
+            );
+
+            const annuityType = this.dicAnnuityTypeList.find(item => item.id == applicationData.policyAppDto.annuityTypeId);
+            this.formStore.productConditionsForm.typeAnnuityInsurance = annuityType ? annuityType : new Value();
 
-          let paymentPeriod = this.processPaymentPeriod.find(item => item.id == applicationData.policyAppDto.paymentPeriodId);
+            const annuityPaymentPeriod = this.processAnnuityPaymentPeriod.find(item => item.id == applicationData.policyAppDto.annuityPaymentPeriodId);
+            this.formStore.productConditionsForm.periodAnnuityPayment = annuityPaymentPeriod ? annuityPaymentPeriod : new Value();
+          }
+
+          const processIndexRate = this.processIndexRate.find(item => item.id == applicationData.policyAppDto.indexRateId);
+          this.formStore.productConditionsForm.processIndexRate = processIndexRate ? processIndexRate : this.processIndexRate.find(item => item.code === '0') ?? new Value();
+
+          const paymentPeriod = this.processPaymentPeriod.find(item => item.id == applicationData.policyAppDto.paymentPeriodId);
           this.formStore.productConditionsForm.paymentPeriod = paymentPeriod ? paymentPeriod : new Value();
 
           this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(
@@ -1568,19 +1800,22 @@ export const useDataStore = defineStore('data', {
           this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(
             applicationData.policyAppDto.premium === null ? null : applicationData.policyAppDto.premium,
           );
-
-          let riskGroup = this.riskGroup.find(item => {
+          if (this.isKazyna) {
+            this.formStore.productConditionsForm.requestedSumInsuredInDollar = this.getNumberWithSpaces(applicationData.policyAppDto.amountInCurrency);
+            this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar = this.getNumberWithSpaces(applicationData.policyAppDto.premiumInCurrency);
+          }
+          const riskGroup = this.riskGroup.find(item => {
             if (applicationData.policyAppDto.riskGroup == 0) {
               return true;
             }
             return item.id == applicationData.policyAppDto.riskGroup;
           });
-          this.formStore.productConditionsForm.riskGroup = riskGroup ? riskGroup : this.riskGroup.find(item => item.id == 1);
+          this.formStore.productConditionsForm.riskGroup = riskGroup ? riskGroup : this.riskGroup.find(item => item.id == 1) ?? new Value();
         }
       } catch (err) {
-        console.log(err);
-        if ('response' in err) {
-          this.sendToParent(constants.postActions.toHomePage, err.response.data);
+        ErrorHandler(err);
+        if (err instanceof AxiosError) {
+          this.sendToParent(constants.postActions.toHomePage, err.response?.data);
           this.isLoading = false;
           return false;
         }
@@ -1589,17 +1824,10 @@ export const useDataStore = defineStore('data', {
         this.isLoading = false;
       }
     },
-    async setApplication() {
-      try {
-        await this.api.setApplication(this.formStore.applicationData);
-      } catch (err) {
-        console.log(err);
-      }
-    },
-    async deleteTask(taskId) {
+    async deleteTask(taskId: string) {
       this.isLoading = true;
       try {
-        const data = {
+        const data: SendTask = {
           taskId: taskId,
           decision: 'rejectclient',
           comment: 'Клиент отказался',
@@ -1612,7 +1840,8 @@ export const useDataStore = defineStore('data', {
       }
       this.isLoading = false;
     },
-    async sendTask(taskId, decision, comment = null) {
+    async sendTask(taskId: string, decision: keyof typeof constants.actions | null, comment: string | null = null) {
+      if (!decision) return;
       this.isLoading = true;
       try {
         const data = {
@@ -1628,7 +1857,8 @@ export const useDataStore = defineStore('data', {
         return ErrorHandler(err);
       }
     },
-    async handleTask(action, taskId, comment) {
+    async handleTask(action: keyof typeof constants.actions | null, taskId: string, comment: string | null = null) {
+      if (!this.formStore.applicationTaskId) return;
       if (action && Object.keys(constants.actions).includes(action)) {
         this.isButtonsLoading = true;
         switch (action) {
@@ -1636,7 +1866,7 @@ 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);
@@ -1661,16 +1891,32 @@ export const useDataStore = defineStore('data', {
             }
             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;
       } else {
         console.error('No handleTask action');
       }
     },
-    async getInvoiceData(processInstanceId) {
+    async getInvoiceData(processInstanceId: string | number) {
       try {
         const response = await this.api.getInvoiceData(processInstanceId);
         if (response) {
+          this.formStore.invoiceData = response;
           return response;
         } else {
           return false;
@@ -1680,6 +1926,7 @@ export const useDataStore = defineStore('data', {
       }
     },
     async createInvoice() {
+      if (!this.formStore.applicationData.policyAppDto?.premium) return;
       try {
         const created = await this.api.createInvoice(this.formStore.applicationData.processInstanceId, this.formStore.applicationData.policyAppDto.premium);
         return !!created;
@@ -1697,7 +1944,7 @@ export const useDataStore = defineStore('data', {
         console.log(err);
       }
     },
-    setMembersField(whichForm, whichMember) {
+    setMembersField(whichForm: SingleMember, whichMember: keyof typeof MemberAppCodes) {
       this.formStore[whichForm].familyStatus = this.findObject('familyStatuses', 'id', this.formStore.applicationData[whichMember].familyStatusId);
       this.formStore[whichForm].signOfIPDL = this.findObject(
         'ipdl',
@@ -1708,7 +1955,7 @@ export const useDataStore = defineStore('data', {
       if (!!this.formStore.applicationData[whichMember].position) this.formStore[whichForm].jobPosition = this.formStore.applicationData[whichMember].position;
       if (!!this.formStore.applicationData[whichMember].jobName) this.formStore[whichForm].jobPlace = this.formStore.applicationData[whichMember].jobName;
     },
-    setMembersFieldIndex(whichForm, whichMember, index) {
+    setMembersFieldIndex(whichForm: MultipleMember, whichMember: keyof typeof MemberAppCodes, index: number) {
       if ('familyStatus' in this.formStore[whichForm][index]) {
         this.formStore[whichForm][index].familyStatus = this.findObject('familyStatuses', 'id', this.formStore.applicationData[whichMember][index].familyStatusId);
       }
@@ -1729,19 +1976,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 = (): SignDataType[] => {
+          switch (this.formStore.applicationData.statusCode) {
+            case 'ContractSignedFrom':
+              return [{ processInstanceId: String(this.formStore.applicationData.processInstanceId), name: 'Contract', format: 'pdf' }];
+            default:
+              return [
+                { processInstanceId: String(this.formStore.applicationData.processInstanceId), name: 'Agreement', format: 'pdf' },
+                { processInstanceId: String(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;
@@ -1749,12 +2000,31 @@ export const useDataStore = defineStore('data', {
         ErrorHandler(err);
       }
     },
-    async sendSMS(type, phoneNumber, text) {
+    async registerNumber() {
+      try {
+        if (!this.formStore.finCenterData.date) return;
+        const formattedData = formatDate(this.formStore.finCenterData.date);
+        if (!formattedData) return;
+        this.isLoading = true;
+        const data: RegNumberDataType = {
+          processInstanceId: String(this.formStore.applicationData.processInstanceId),
+          regNumber: String(this.formStore.finCenterData.regNumber),
+          date: formattedData.toISOString(),
+        };
+        const result = await this.api.registerNumber(data);
+        return result;
+      } catch (err) {
+        return ErrorHandler(err);
+      } finally {
+        this.isLoading = false;
+      }
+    },
+    async sendSMS(type: 'SignUrl' | 'PayUrl', phoneNumber: string, text: string) {
       if (!type || !phoneNumber || !text) return;
-      const smsData = {
+      const smsData: SmsDataType = {
         iin: this.formStore.applicationData.clientApp.iin,
         phoneNumber: formatPhone(phoneNumber),
-        processInstanceId: this.formStore.applicationData.processInstanceId,
+        processInstanceId: String(this.formStore.applicationData.processInstanceId),
         text: text,
         type: type,
       };
@@ -1768,15 +2038,13 @@ export const useDataStore = defineStore('data', {
         this.isLoading = false;
       }
     },
-    sanitize(text) {
-      if (text) {
-        return text
-          .replace(/\r?\n|\r/g, '')
-          .replace(/\\/g, '')
-          .replace(/"/g, '');
-      }
+    sanitize(text: string) {
+      return text
+        .replace(/\r?\n|\r/g, '')
+        .replace(/\\/g, '')
+        .replace(/"/g, '');
     },
-    async getSignedDocList(processInstanceId) {
+    async getSignedDocList(processInstanceId: string | number) {
       if (processInstanceId !== 0) {
         try {
           this.formStore.signedDocumentList = await this.api.getSignedDocList({
@@ -1787,12 +2055,12 @@ export const useDataStore = defineStore('data', {
         }
       }
     },
-    setFormsDisabled(isDisabled) {
+    setFormsDisabled(isDisabled: boolean) {
       Object.keys(this.formStore.isDisabled).forEach(key => {
-        this.formStore.isDisabled[key] = !!isDisabled;
+        this.formStore.isDisabled[key as keyof typeof this.formStore.isDisabled] = !!isDisabled;
       });
     },
-    async reCalculate(processInstanceId, recalculationData, taskId, whichSum) {
+    async reCalculate(processInstanceId: string | number, recalculationData: any, taskId: string, whichSum: string) {
       this.isLoading = true;
       try {
         const data = {
@@ -1801,7 +2069,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(
@@ -1815,7 +2083,7 @@ export const useDataStore = defineStore('data', {
       }
       this.isLoading = false;
     },
-    async getValidateClientESBD(data) {
+    async getValidateClientESBD(data: ESBDValidationType) {
       try {
         return await this.api.getValidateClientESBD(data);
       } catch (err) {
@@ -1823,12 +2091,12 @@ export const useDataStore = defineStore('data', {
         return ErrorHandler(err);
       }
     },
-    validateMultipleMembers(localKey, applicationKey, text) {
+    validateMultipleMembers(localKey: MultipleMember, applicationKey: keyof typeof this.formStore.applicationData, text: string) {
       if (this.formStore[localKey].length === this.formStore.applicationData[applicationKey].length) {
         if (this.formStore[localKey].length !== 0 && this.formStore.applicationData[applicationKey].length !== 0) {
-          const localMembers = [...this.formStore[localKey]].sort((a, b) => a.id - b.id);
+          const localMembers = [...this.formStore[localKey]].sort((a, b) => Number(a.id) - Number(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) {
+          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', { text: text }), 3000);
             return false;
           }
@@ -1843,7 +2111,7 @@ export const useDataStore = defineStore('data', {
           }
         }
       } else {
-        if (this.formStore[localKey].some(i => i.iin !== null)) {
+        if (this.formStore[localKey].some((i: any) => i.iin !== null)) {
           this.showToaster('error', this.t('toaster.notSavedMember', { text: text }), 3000);
           return false;
         }
@@ -1859,7 +2127,7 @@ export const useDataStore = defineStore('data', {
       }
       return true;
     },
-    async validateAllMembers(taskId, localCheck = false) {
+    async validateAllMembers(taskId: string, localCheck: boolean = false) {
       if (taskId === '0') {
         this.showToaster('error', this.t('toaster.needToRunStatement'), 2000);
         return false;
@@ -1868,22 +2136,45 @@ export const useDataStore = defineStore('data', {
         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 => Number(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 => Number(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 => Number(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(
@@ -1896,11 +2187,20 @@ export const useDataStore = defineStore('data', {
             return false;
           }
         }
+        if (this.members.spokesmanApp.required) {
+          const inStatement = Number(this.formStore.policyholdersRepresentativeForm.id) > 0;
+          if (inStatement === false) {
+            this.showToaster('error', this.t('toaster.requiredMember', { text: this.t('toaster.spokesman') }));
+            return false;
+          }
+        }
       }
       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();
+          if (this.isInitiator()) {
+            await this.setINSISWorkData();
+          }
         } else {
           this.isLoading = false;
           this.showToaster('error', this.t('toaster.attachManagerError'), 3000);
@@ -1909,10 +2209,10 @@ export const useDataStore = defineStore('data', {
       }
       if (localCheck === false) {
         try {
-          if (!this.isGons) {
+          if (this.isInitiator() && !this.isGons) {
             if (this.formStore.isActOwnBehalf === true && this.formStore.applicationData.beneficialOwnerApp.length !== 0) {
               await Promise.allSettled(
-                this.formStore.applicationData.beneficialOwnerApp.map(async member => {
+                this.formStore.applicationData.beneficialOwnerApp.map(async (member: any) => {
                   await this.api.deleteMember('BeneficialOwner', member.id);
                 }),
               );
@@ -1920,16 +2220,15 @@ export const useDataStore = defineStore('data', {
           }
           await this.getApplicationData(taskId, false);
         } catch (err) {
-          console.log(err);
-          this.showToaster('error', err, 5000);
-          return false;
+          return ErrorHandler(err);
         }
       }
-
       return true;
     },
-    validateAnketa(whichSurvey) {
-      const list = this.formStore[whichSurvey].body;
+    validateAnketa(whichSurvey: 'surveyByHealthBase' | 'surveyByHealthBasePolicyholder' | 'surveyByCriticalBase' | 'surveyByCriticalBasePolicyholder') {
+      const anketa = this.formStore[whichSurvey];
+      if (!anketa) return false;
+      const list = anketa.body;
       if (!list || (list && list.length === 0)) return false;
       let notAnswered = 0;
       for (let x = 0; x < list.length; x++) {
@@ -1939,13 +2238,13 @@ export const useDataStore = defineStore('data', {
       }
       return notAnswered === 0;
     },
-    async validateAllForms(taskId) {
+    async validateAllForms(taskId: string) {
       this.isLoading = true;
       const areMembersValid = await this.validateAllMembers(taskId);
       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',
@@ -1961,15 +2260,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(
@@ -1979,14 +2299,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 !== 'не включено') {
@@ -2000,6 +2338,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;
             }
@@ -2014,7 +2357,7 @@ export const useDataStore = defineStore('data', {
       this.isLoading = false;
       return false;
     },
-    async getFamilyInfo(iin, phoneNumber) {
+    async getFamilyInfo(iin: string, phoneNumber: string) {
       this.isLoading = true;
       try {
         const familyResponse = await this.api.getFamilyInfo({ iin: iin.replace(/-/g, ''), phoneNumber: formatPhone(phoneNumber) });
@@ -2043,7 +2386,7 @@ export const useDataStore = defineStore('data', {
               if (this.isBolashak) return 15;
             })();
             const baseCondition = !!member.childBirthDate && typeof member.childLifeStatus === 'number' && member.childLifeStatus === 0;
-            return typeof filterAge === 'number' ? baseCondition && getAgeByBirthDate(member.childBirthDate) <= filterAge : baseCondition;
+            return typeof filterAge === 'number' ? baseCondition && getAgeByBirthDate(member.childBirthDate!)! <= filterAge : baseCondition;
           });
           if (filteredBirthInfos && filteredBirthInfos.length) {
             this.formStore.birthInfos = filteredBirthInfos;
@@ -2062,36 +2405,40 @@ export const useDataStore = defineStore('data', {
         this.isLoading = false;
       }
     },
-    async getContragentFromGBDFL(member) {
+    async getContragentFromGBDFL(member: Member) {
+      // null - ожидание
+      // false - ошибка или неправильно
+      // true - успешно и данные получены
       this.isLoading = true;
       try {
         const data = {
-          iin: member.iin.replace(/-/g, ''),
-          phoneNumber: formatPhone(member.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 (member.gosPersonData !== null && member.gosPersonData.iin !== iin.replace(/-/g, '')) {
+        if (member.gosPersonData !== null && member.gosPersonData.iin !== member.iin!.replace(/-/g, '')) {
           member.resetMember(false);
         }
         member.gosPersonData = person;
@@ -2099,12 +2446,14 @@ export const useDataStore = defineStore('data', {
         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, member) {
+    async saveInStoreUserGBDFL(person: any, member: Member) {
       member.firstName = person.name;
       member.lastName = person.surname;
       member.middleName = person.patronymic ? person.patronymic : '';
@@ -2115,31 +2464,31 @@ export const useDataStore = defineStore('data', {
       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')));
+      const birthPlace = this.countries.find(i => (i.nameRu as string).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')));
+      const countryOfCitizenship = this.citizenshipCountries.find(i => (i.nameRu as string).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')));
+      const regCountry = this.countries.find(i => (i.nameRu as string).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')));
+      const regProvince = this.states.find(i => (i.nameRu as string).match(new RegExp(person.regAddress.district.nameRu, 'i')));
       if (regProvince) member.registrationProvince = regProvince;
 
       if ('city' in person.regAddress && !!person.regAddress.city) {
         if (person.regAddress.city.includes(', ')) {
           const personCities = person.regAddress.city.split(', ');
-          for (let i = 0; i < personCities.length; ++i) {
-            const possibleCity = this.cities.find(i => i.nameRu.includes(personCities[i]));
+          for (let ind = 0; ind < personCities.length; ++ind) {
+            const possibleCity = this.cities.find(i => (i.nameRu as string).includes(personCities[ind]));
             if (possibleCity) {
               member.registrationCity = possibleCity;
               break;
             }
           }
           if (member.registrationCity.nameRu === null) {
-            for (let i = 0; i < personCities.length; ++i) {
-              const possibleRegion = this.regions.find(i => i.nameRu.includes(personCities[i]));
+            for (let ind = 0; ind < personCities.length; ++ind) {
+              const possibleRegion = this.regions.find(i => String(i.nameRu).includes(personCities[ind]));
               if (possibleRegion) {
                 member.registrationRegion = possibleRegion;
                 break;
@@ -2147,11 +2496,11 @@ export const useDataStore = defineStore('data', {
             }
           }
         } else {
-          const regCity = this.cities.find(i => i.nameRu.match(new RegExp(person.regAddress.city, 'i')));
+          const regCity = this.cities.find(i => String(i.nameRu).match(new RegExp(person.regAddress.city, 'i')));
           if (regCity) member.registrationCity = regCity;
 
           if (member.registrationCity.nameRu === null) {
-            const regRegion = this.regions.find(i => i.nameRu.match(new RegExp(person.regAddress.city), 'i'));
+            const regRegion = this.regions.find(i => String(i.nameRu).match(new RegExp(person.regAddress.city, 'i')));
             if (regRegion) member.registrationRegion = regRegion;
           }
         }
@@ -2159,19 +2508,19 @@ export const useDataStore = defineStore('data', {
 
       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')),
+          i => String(i.nameRu).match(new RegExp(person.regAddress.region.nameRu, 'i')) || String(i.nameRu).match(new RegExp(person.regAddress.district.nameRu, 'i')),
         );
         if (regCity) {
           member.registrationCity = regCity;
-          const regType = this.localityTypes.find(i => i.nameRu === 'город');
+          const regType = this.localityTypes.find(i => String(i.nameRu) === 'город');
           if (regType) member.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')),
+            i => String(i.nameRu).match(new RegExp(person.regAddress.region.nameRu, 'i')) || String(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 === 'поселок');
+            const regType = this.localityTypes.find(i => String(i.nameRu) === 'село' || String(i.nameRu) === 'поселок');
             if (regType) member.registrationRegionType = regType;
           }
         }
@@ -2179,9 +2528,9 @@ export const useDataStore = defineStore('data', {
 
       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')));
+        const microDistrict = personAddress.find((i: string) => i.match(new RegExp('микрорайон', 'i')));
+        const quarter = personAddress.find((i: string) => i.match(new RegExp('квартал', 'i')));
+        const street = personAddress.find((i: string) => i.match(new RegExp('улица', 'i')));
         if (microDistrict) member.registrationMicroDistrict = microDistrict;
         if (quarter) member.registrationQuarter = quarter;
         if (street) member.registrationStreet = street;
@@ -2193,7 +2542,7 @@ export const useDataStore = defineStore('data', {
 
       // 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');
+        const validDocument = person.documents.document.find((i: any) => 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;
@@ -2203,15 +2552,15 @@ export const useDataStore = defineStore('data', {
           member.documentDate = reformatDate(validDocument.beginDate);
           member.documentNumber = validDocument.number;
 
-          const documentIssuer = this.documentIssuers.find(i => i.nameRu.match(new RegExp('МВД РК', 'i')));
+          const documentIssuer = this.documentIssuers.find(i => (i.nameRu as string).match(new RegExp('МВД РК', 'i')));
           if (documentIssuer) member.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')))
+            : this.documentTypes.find(i => (i.nameRu as string).match(new RegExp(person.documents.document.type.nameRu, 'i')))
+            ? this.documentTypes.find(i => (i.nameRu as string).match(new RegExp(person.documents.document.type.nameRu, 'i')))
             : new Value();
         if (documentType) member.documentType = documentType;
 
@@ -2225,13 +2574,21 @@ export const useDataStore = defineStore('data', {
         if (documentExpire) member.documentExpire = reformatDate(documentExpire);
 
         // TODO уточнить
-        const documentIssuer = this.documentIssuers.find(i => i.nameRu.match(new RegExp('МВД РК', 'i')));
+        const documentIssuer = this.documentIssuers.find(i => (i.nameRu as string).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) {
+    async isCourseChanged(processInstanceId: string) {
+      try {
+        const response = await this.api.isCourseChanged(processInstanceId);
+        return response;
+      } catch (err) {
+        return ErrorHandler(err);
+      }
+    },
+    hasJobSection(whichForm: keyof typeof StoreMembers) {
       switch (whichForm) {
         case this.formStore.beneficiaryFormKey:
         case this.formStore.beneficialOwnerFormKey:
@@ -2241,7 +2598,7 @@ export const useDataStore = defineStore('data', {
           return true;
       }
     },
-    hasBirthSection(whichForm) {
+    hasBirthSection(whichForm: keyof typeof StoreMembers) {
       if (this.isGons) return false;
       switch (whichForm) {
         case this.formStore.beneficiaryFormKey:
@@ -2250,36 +2607,43 @@ export const useDataStore = defineStore('data', {
           return true;
       }
     },
-    hasPlaceSection(whichForm) {
+    hasPlaceSection(whichForm: keyof typeof StoreMembers) {
       switch (whichForm) {
         default:
           return true;
       }
     },
-    hasDocumentSection(whichForm) {
+    hasDocumentSection(whichForm: keyof typeof StoreMembers) {
       switch (whichForm) {
         default:
           return true;
       }
     },
-    hasContactSection(whichForm) {
+    hasContactSection(whichForm: keyof typeof StoreMembers) {
       if (this.isGons) return false;
       switch (whichForm) {
         default:
           return true;
       }
     },
+    hasPercentageOfPayoutAmount() {
+      return true;
+    },
+    canViewInvoiceInfo() {
+      return this.isAdmin();
+    },
   },
 });
 
-export const useContragentStore = defineStore('contragent', {
-  state: () => ({
-    ...new Contragent(),
-    formatDate: new Contragent().formatDate,
-    getDateByKey: new Contragent().getDateByKey,
-    getBirthDate: new Contragent().getBirthDate,
-    getDocumentExpireDate: new Contragent().getDocumentExpireDate,
-    getDocumentDate: new Contragent().getDocumentDate,
-    getAgeByBirthDate: new Contragent().getAgeByBirthDate,
-  }),
-});
+// Для карты клиента
+// export const useContragentStore = defineStore('contragent', {
+//   state: () => ({
+//     ...new Contragent(),
+//     formatDate: new Contragent().formatDate,
+//     getDateByKey: new Contragent().getDateByKey,
+//     getBirthDate: new Contragent().getBirthDate,
+//     getDocumentExpireDate: new Contragent().getDocumentExpireDate,
+//     getDocumentDate: new Contragent().getDocumentDate,
+//     getAgeByBirthDate: new Contragent().getAgeByBirthDate,
+//   }),
+// });