hl-core 0.0.7-beta.14 → 0.0.7-beta.16

package/store/data.store.js

@@ -2,7 +2,7 @@ import { defineStore } from 'pinia';
 import { t } from './messages';
 import { rules } from './rules';
 import { Toast, Types, Positions, ToastOptions } from './toast';
-import { isValidGUID, yearEnding, jwtDecode } from '../composables';
+import { isValidGUID, yearEnding, jwtDecode, ErrorHandler, getKeyWithPattern } from '../composables';
 import { DataStoreClass, Contragent } from '../composables/classes';
 import { ApiClass } from '@/api';
 import { useFormStore } from './form.store';
@@ -16,6 +16,7 @@ export const useDataStore = defineStore('data', {
     toastTypes: Types,
     toastPositions: Positions,
     isValidGUID: isValidGUID,
+    route: useRoute(),
     router: useRouter(),
     formStore: useFormStore(),
     contragent: useContragentStore(),
@@ -26,7 +27,7 @@ export const useDataStore = defineStore('data', {
       Toast.useToast()(msg, {
         ...ToastOptions,
         type: Types[type.toUpperCase()],
-        timeout: typeof timeout === ('number' || 'boolean') ? timeout : ToastOptions.timeout,
+        timeout: type === 'error' ? 6000 : typeof timeout === 'number' ? timeout : ToastOptions.timeout,
       }),
   }),
   getters: {
@@ -37,9 +38,17 @@ export const useDataStore = defineStore('data', {
     isLifetrip: state => state.product === 'lifetrip',
     isLiferenta: state => state.product === 'liferenta',
     isPension: state => state.product === 'pension',
+    isGons: state => state.product === 'gons',
     isEveryFormDisabled: state => Object.values(state.formStore.isDisabled).every(i => i === true),
   },
   actions: {
+    isIframe() {
+      try {
+        return window.self !== window.top;
+      } catch (err) {
+        return true;
+      }
+    },
     sendToParent(action, value) {
       window.parent.postMessage({ action: action, value: value }, '*');
     },
@@ -50,7 +59,7 @@ export const useDataStore = defineStore('data', {
       }
     },
     getFilesByIIN(iin) {
-      return this.signedDocumentList.filter(file => file.iin === iin && file.fileTypeName === 'Удостоверение личности');
+      return iin ? this.signedDocumentList.filter(file => file.iin === iin && file.fileTypeName === 'Удостоверение личности') : null;
     },
     async getNewAccessToken() {
       try {
@@ -82,7 +91,6 @@ export const useDataStore = defineStore('data', {
     async loginUser(login, password, numAttempt) {
       try {
         const token = localStorage.getItem('accessToken') || null;
-
         if (token && isValidToken(token)) {
           this.accessToken = token;
           this.getUserRoles();
@@ -97,28 +105,34 @@ export const useDataStore = defineStore('data', {
           this.refreshToken = response.refreshToken;
           this.getUserRoles();
         }
-        if (
-          this.isManager() ||
-          this.isUnderwriter() ||
-          this.isAdmin() ||
-          this.isAgent() ||
-          this.isCompliance() ||
-          this.isAgentMycar() ||
-          this.isAnalyst() ||
-          this.isUpk() ||
-          this.isFinanceCenter() ||
-          this.isSupervisor()
-        ) {
+        if (this.controls.onAuth) {
+          const hasPermission =
+            this.isManager() ||
+            this.isUnderwriter() ||
+            this.isAdmin() ||
+            this.isAgent() ||
+            this.isCompliance() ||
+            this.isAgentMycar() ||
+            this.isAnalyst() ||
+            this.isUpk() ||
+            this.isFinanceCenter() ||
+            this.isSupervisor() ||
+            this.isSupport() ||
+            this.isManagerHalykBank();
+          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);
-        } else {
-          this.showToaster('error', this.t('toaster.noProductPermission'), 5000);
         }
       } catch (err) {
-        console.log(err);
-        if ('response' in err) {
-          this.showToaster('error', err.response.data, 3000);
-        }
+        ErrorHandler(err);
       }
     },
     getUserRoles() {
@@ -145,7 +159,7 @@ export const useDataStore = defineStore('data', {
       return !!isRole;
     },
     isInitiator() {
-      return this.isRole(constants.roles.manager) || this.isRole(constants.roles.agent) || this.isRole(constants.roles.agentMycar);
+      return this.isManager() || this.isAgent() || this.isAgentMycar() || this.isManagerHalykBank();
     },
     isManager() {
       return this.isRole(constants.roles.manager);
@@ -159,6 +173,9 @@ export const useDataStore = defineStore('data', {
     isAgent() {
       return this.isRole(constants.roles.agent);
     },
+    isManagerHalykBank() {
+      return this.isRole(constants.roles.managerHalykBank);
+    },
     isUnderwriter() {
       return this.isRole(constants.roles.underwriter);
     },
@@ -171,18 +188,29 @@ export const useDataStore = defineStore('data', {
     isUpk() {
       return this.isRole(constants.roles.upk);
     },
+    isSupport() {
+      return this.isRole(constants.roles.support);
+    },
     isFinanceCenter() {
       return this.isRole(constants.roles.financeCenter);
     },
     isSupervisor() {
       return this.isRole(constants.roles.supervisor);
     },
-
     isProcessEditable(statusCode) {
       return !!constants.editableStatuses.find(status => status === statusCode);
     },
     isTask() {
-      return this.formStore.applicationData.processInstanceId != 0 && this.formStore.applicationData.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 logoutUser() {
       this.isLoading = true;
@@ -213,7 +241,17 @@ export const useDataStore = defineStore('data', {
           if (!['pdf', 'docx'].includes(fileType)) {
             const blob = new Blob([response], { type: `image/${fileType}` });
             const url = window.URL.createObjectURL(blob);
-            window.open(url, '_blank', `width=${screen.width},height=${screen.height},top=70`);
+            const link = document.createElement('a');
+            link.href = url;
+            if (mode === 'view') {
+              setTimeout(() => {
+                window.open(url, '_blank', `width=${screen.width},height=${screen.height},top=70`);
+              });
+            } else {
+              link.setAttribute('download', file.fileName);
+              document.body.appendChild(link);
+              link.click();
+            }
           } else {
             const blob = new Blob([response], {
               type: `application/${fileType}`,
@@ -233,7 +271,7 @@ export const useDataStore = defineStore('data', {
           }
         });
       } catch (err) {
-        this.showToaster('error', err.response.data, 5000);
+        ErrorHandler(err);
       } finally {
         this.isLoading = false;
       }
@@ -246,7 +284,7 @@ export const useDataStore = defineStore('data', {
         this.showToaster('error', err.response.data, 2000);
       }
     },
-    async uploadFiles(data, load = true) {
+    async uploadFiles(data, load = false) {
       try {
         if (load) {
           this.isLoading = true;
@@ -254,15 +292,14 @@ export const useDataStore = defineStore('data', {
         await this.api.uploadFiles(data);
         return true;
       } catch (err) {
-        this.showToaster('error', err.response.data, 5000);
-        return false;
+        return ErrorHandler(err);
       } finally {
         if (load) {
           this.isLoading = false;
         }
       }
     },
-    async getContragent(whichForm, whichIndex = null, load = true) {
+    async getContragent(member, whichForm, whichIndex, load = true) {
       if (load) {
         this.isLoading = true;
       }
@@ -273,14 +310,8 @@ export const useDataStore = defineStore('data', {
           lastName: '',
           middleName: '',
         };
-        if (whichIndex === null) {
-          queryData.iin = this.formStore[whichForm].iin.replace(/-/g, '');
-          response = await this.api.getContragent(queryData);
-        }
-        if (whichIndex !== null) {
-          queryData.iin = this.formStore[whichForm][whichIndex].iin.replace(/-/g, '');
-          response = await this.api.getContragent(queryData);
-        }
+        queryData.iin = member.iin.replace(/-/g, '');
+        response = await this.api.getContragent(queryData);
         if (response.totalItems > 0) {
           if (response.totalItems.length === 1) {
             await this.serializeContragentData(whichForm, response.items[0], whichIndex);
@@ -288,11 +319,7 @@ export const useDataStore = defineStore('data', {
             const sortedByRegistrationDate = response.items.sort((left, right) => new Date(right.registrationDate) - new Date(left.registrationDate));
             await this.serializeContragentData(whichForm, sortedByRegistrationDate[0], whichIndex);
           }
-          if (whichIndex === null) {
-            this.formStore[whichForm].gotFromInsis = true;
-          } else {
-            this.formStore[whichForm][whichIndex].gotFromInsis = true;
-          }
+          member.gotFromInsis = true;
         } else {
           this.userNotFound = true;
         }
@@ -308,7 +335,7 @@ export const useDataStore = defineStore('data', {
         this.isLoading = true;
       }
       try {
-        if (this.isAgentMycar() && whichForm == this.formStore.beneficiaryFormKey) {
+        if (this.isMycar && this.isAgentMycar() && whichForm === this.formStore.beneficiaryFormKey) {
           await this.serializeContragentData(whichForm, this.formStore.applicationData.beneficiaryApp[0], whichIndex);
           this.isLoading = false;
           return;
@@ -563,65 +590,29 @@ export const useDataStore = defineStore('data', {
         return false;
       }
     },
-    async saveContragent(user, whichForm, onlySaveAction = true, whichIndex = null) {
-      this.isLoading = true;
-      if (whichIndex === null) {
-        const hasInsisId = await this.alreadyInInsis(
-          this.formStore[whichForm].iin,
-          this.formStore[whichForm].firstName,
-          this.formStore[whichForm].lastName,
-          this.formStore[whichForm].middleName,
-        );
-        if (hasInsisId !== false) {
-          user.id = hasInsisId;
-          const [{ value: data }, { value: contacts }, { value: documents }, { value: address }] = await Promise.allSettled([
-            this.api.getContrAgentData(user.id),
-            this.api.getContrAgentContacts(user.id),
-            this.api.getContrAgentDocuments(user.id),
-            this.api.getContrAgentAddress(user.id),
-          ]);
-          this.formStore[whichForm].response = {};
-          if (data && data.length) {
-            this.formStore[whichForm].response.questionnaires = data;
-          }
-          if (contacts && contacts.length) {
-            this.formStore[whichForm].response.contacts = contacts;
-          }
-          if (documents && documents.length) {
-            this.formStore[whichForm].response.documents = documents;
-          }
-          if (address && address.length) {
-            this.formStore[whichForm].response.addresses = address;
-          }
+    async saveContragent(user, whichForm, whichIndex, onlySaveAction = true) {
+      this.isLoading = !onlySaveAction;
+      const hasInsisId = await this.alreadyInInsis(user.iin, user.firstName, user.lastName, user.middleName);
+      if (hasInsisId !== false) {
+        user.id = hasInsisId;
+        const [{ value: data }, { value: contacts }, { value: documents }, { value: address }] = 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;
         }
-      } else {
-        const hasInsisId = await this.alreadyInInsis(
-          this.formStore[whichForm][whichIndex].iin,
-          this.formStore[whichForm][whichIndex].firstName,
-          this.formStore[whichForm][whichIndex].lastName,
-          this.formStore[whichForm][whichIndex].middleName,
-        );
-        if (hasInsisId !== false) {
-          user.id = hasInsisId;
-          const [{ value: data }, { value: contacts }, { value: documents }, { value: address }] = await Promise.allSettled([
-            this.api.getContrAgentData(user.id),
-            this.api.getContrAgentContacts(user.id),
-            this.api.getContrAgentDocuments(user.id),
-            this.api.getContrAgentAddress(user.id),
-          ]);
-          this.formStore[whichForm][whichIndex].response = {};
-          if (data && data.length) {
-            this.formStore[whichForm][whichIndex].response.questionnaires = data;
-          }
-          if (contacts && contacts.length) {
-            this.formStore[whichForm][whichIndex].response.contacts = contacts;
-          }
-          if (documents && documents.length) {
-            this.formStore[whichForm][whichIndex].response.documents = documents;
-          }
-          if (address && address.length) {
-            this.formStore[whichForm][whichIndex].response.addresses = address;
-          }
+        if (contacts && contacts.length) {
+          user.response.contacts = contacts;
+        }
+        if (documents && documents.length) {
+          user.response.documents = documents;
+        }
+        if (address && address.length) {
+          user.response.addresses = address;
         }
       }
       try {
@@ -709,12 +700,8 @@ export const useDataStore = defineStore('data', {
             type: 'MOBILE',
             typeName: 'Сотовый телефон',
             value: formatPhone(user.phoneNumber),
-            verifyType: this.formStore.otpTokenId
-              ? 'BMG'
-              : 'response' in user && 'contacts' in user.response
-              ? user.response.contacts.find(i => i.type === 'MOBILE').verifyType
-              : null,
-            verifyDate: this.formStore.otpTokenId
+            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
@@ -801,148 +788,120 @@ export const useDataStore = defineStore('data', {
           documents: documentsData,
           addresses: addressData,
         };
-        try {
-          const personId = await this.api.saveContragent(data);
-          if (personId) {
-            await this.getContragentById(personId, whichForm, false, whichIndex);
-            this.formStore.otpTokenId = null;
-          }
-        } catch (saveErr) {
-          console.log(saveErr);
-          if ('response' in saveErr) {
-            this.showToaster('error', saveErr.response.data, 5000);
-            this.isLoading = false;
-            return false;
-          }
+
+        const personId = await this.api.saveContragent(data);
+        if (personId) {
+          await this.getContragentById(personId, whichForm, false, whichIndex);
+          user.otpTokenId = null;
         }
       } catch (err) {
-        console.log(err);
         this.isLoading = false;
-        this.showToaster('error', this.t('toaster.error') + err?.response?.data, 2000);
-        return false;
+        return ErrorHandler(err);
       }
       if (onlySaveAction) {
         this.isLoading = false;
       }
       return true;
     },
-    async saveMember(whichForm, key, whichMember, whichIndex = null) {
+    async saveMember(member, whichMember, memberFromApplicaiton) {
       let data = {};
       try {
-        if (whichIndex === null) {
-          data = {
-            processInstanceId: this.formStore.applicationData.processInstanceId,
-            insisId: this.formStore[whichForm].id,
-            iin: this.formStore[whichForm].iin.replace(/-/g, ''),
-            longName: this.formStore[whichForm].longName,
-            isIpdl: this.formStore[whichForm].signOfIPDL.nameRu == 'Да' ? true : false,
-            isTerror: this.formStore[whichForm].isTerror,
-            isIpdlCompliance: null,
-            isTerrorCompliance: null,
-          };
-          data.id = this.formStore.applicationData[key] && this.formStore.applicationData[key].id ? this.formStore.applicationData[key].id : null;
-          if (whichMember == 'Client') {
-            data.isInsured = this.formStore.isPolicyholderInsured;
-            data.isActOwnBehalf = this.formStore.isActOwnBehalf;
-            data.profession = this.formStore[whichForm].job;
-            data.position = this.formStore[whichForm].jobPosition;
-            data.jobName = this.formStore[whichForm].jobPlace;
-            data.familyStatusId = this.formStore[whichForm].familyStatus.id;
-          }
-          if (whichMember == 'Spokesman') {
-            if (!!this.formStore.applicationData.spokesmanApp && this.formStore.applicationData.spokesmanApp.iin !== data.iin) {
-              delete data.id;
-              await this.api.deleteMember('Spokesman', this.formStore.applicationData.processInstanceId);
-            }
-            data.migrationCard = this.formStore[whichForm].migrationCard;
-            data.migrationCardIssueDate = formatDate(this.formStore[whichForm].migrationCardIssueDate);
-            data.migrationCardExpireDate = formatDate(this.formStore[whichForm].migrationCardExpireDate);
-            data.confirmDocType = this.formStore[whichForm].confirmDocType;
-            data.confirmDocNumber = this.formStore[whichForm].confirmDocNumber;
-            data.confirmDocIssueDate = formatDate(this.formStore[whichForm].migrationCardIssueDate);
-            data.confirmDocExpireDate = formatDate(this.formStore[whichForm].migrationCardExpireDate);
-            data.clientLongName = this.formStore.applicationData.clientApp.longName;
-            data.notaryLongName = this.formStore[whichForm].notaryLongName;
-            data.notaryLicenseNumber = this.formStore[whichForm].notaryLicenseNumber;
-            data.notaryLicenseDate = formatDate(this.formStore[whichForm].notaryLicenseDate);
-            data.notaryLicenseIssuer = this.formStore[whichForm].notaryLicenseIssuer;
-            data.jurLongName = this.formStore[whichForm].jurLongName;
-            data.fullNameRod = this.formStore[whichForm].fullNameRod;
-            data.confirmDocTypeKz = this.formStore[whichForm].confirmDocTypeKz;
-            data.confirmDocTypeRod = this.formStore[whichForm].confirmDocTypeRod;
-            data.isNotary = this.formStore[whichForm].isNotary;
-          }
-        }
-        if (whichIndex !== null) {
-          data = {
-            processInstanceId: this.formStore.applicationData.processInstanceId,
-            insisId: this.formStore[whichForm][whichIndex].id,
-            iin: this.formStore[whichForm][whichIndex].iin.replace(/-/g, ''),
-            longName: this.formStore[whichForm][whichIndex].longName,
-            isIpdl: this.formStore[whichForm][whichIndex].signOfIPDL.nameRu == 'Да' ? true : false,
-            isTerror: this.formStore[whichForm][whichIndex].isTerror,
-            isIpdlCompliance: null,
-            isTerrorCompliance: null,
-          };
-          data.id =
-            this.formStore.applicationData[key] && this.formStore.applicationData[key][whichIndex] && this.formStore.applicationData[key][whichIndex].id
-              ? this.formStore.applicationData[key][whichIndex].id
-              : null;
-          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;
-            }
-            data.isDisability = this.formStore.isPolicyholderInsured ? false : this.formStore[whichForm][whichIndex].isDisability.nameRu == 'Да';
-            data.disabilityGroupId = data.isDisability ? this.formStore[whichForm][whichIndex].disabilityGroupId.id : null;
-            data.profession = this.formStore[whichForm][whichIndex].job;
-            data.position = this.formStore[whichForm][whichIndex].jobPosition;
-            data.jobName = this.formStore[whichForm][whichIndex].jobPlace;
-            data.familyStatusId = this.formStore[whichForm][whichIndex].familyStatus.id;
-          }
-          if (whichMember == 'Beneficiary') {
-            if (
-              this.formStore.applicationData &&
-              this.formStore.applicationData.beneficiaryApp &&
-              this.formStore.applicationData.beneficiaryApp.length &&
-              this.formStore.applicationData.beneficiaryApp.every(i => i.iin !== data.iin) &&
-              data.id !== null
-            ) {
-              await this.api.deleteMember('Beneficiary', data.id);
-              delete data.id;
-            }
-            data.familyStatusId = this.formStore[whichForm][whichIndex].familyStatus.id == 0 ? null : this.formStore[whichForm][whichIndex].familyStatus.id;
-            data.percentage = Number(this.formStore[whichForm][whichIndex].percentageOfPayoutAmount);
-            data.relationId = this.formStore[whichForm][whichIndex].relationDegree.ids;
-            data.relationName = this.formStore[whichForm][whichIndex].relationDegree.nameRu;
-          }
-          if (whichMember == 'BeneficialOwner') {
-            if (data.id === 0) {
-              data.id = null;
-            }
-            if (
-              this.formStore.applicationData &&
-              this.formStore.applicationData.beneficialOwnerApp &&
-              this.formStore.applicationData.beneficialOwnerApp.length &&
-              this.formStore.applicationData.beneficialOwnerApp.every(i => i.iin !== data.iin) &&
-              data.id !== null
-            ) {
-              await this.api.deleteMember('BeneficialOwner', data.id);
-              delete data.id;
-            }
-            data.familyStatusId = this.formStore[whichForm][whichIndex].familyStatus.id;
-          }
+        data = {
+          processInstanceId: this.formStore.applicationData.processInstanceId,
+          insisId: member.id,
+          iin: member.iin.replace(/-/g, ''),
+          longName: member.longName,
+          isIpdl: member.signOfIPDL.nameRu == 'Да' ? true : false,
+          isTerror: member.isTerror,
+          isIpdlCompliance: null,
+          isTerrorCompliance: null,
+        };
+        data.id = memberFromApplicaiton && memberFromApplicaiton.id ? memberFromApplicaiton.id : null;
+        if (whichMember === 'Client') {
+          data.isInsured = this.formStore.isPolicyholderInsured;
+          data.isActOwnBehalf = this.formStore.isActOwnBehalf;
+          data.profession = member.job;
+          data.position = member.jobPosition;
+          data.jobName = member.jobPlace;
+          data.familyStatusId = member.familyStatus.id;
+        }
+        if (whichMember === 'Spokesman') {
+          if (!!memberFromApplicaiton && memberFromApplicaiton.iin !== data.iin) {
+            delete data.id;
+            await this.api.deleteMember('Spokesman', this.formStore.applicationData.processInstanceId);
+          }
+          data.migrationCard = member.migrationCard;
+          data.migrationCardIssueDate = formatDate(member.migrationCardIssueDate);
+          data.migrationCardExpireDate = formatDate(member.migrationCardExpireDate);
+          data.confirmDocType = member.confirmDocType;
+          data.confirmDocNumber = member.confirmDocNumber;
+          data.confirmDocIssueDate = formatDate(member.migrationCardIssueDate);
+          data.confirmDocExpireDate = formatDate(member.migrationCardExpireDate);
+          data.clientLongName = this.formStore.applicationData.clientApp.longName;
+          data.notaryLongName = member.notaryLongName;
+          data.notaryLicenseNumber = member.notaryLicenseNumber;
+          data.notaryLicenseDate = formatDate(member.notaryLicenseDate);
+          data.notaryLicenseIssuer = member.notaryLicenseIssuer;
+          data.jurLongName = member.jurLongName;
+          data.fullNameRod = member.fullNameRod;
+          data.confirmDocTypeKz = member.confirmDocTypeKz;
+          data.confirmDocTypeRod = member.confirmDocTypeRod;
+          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;
+          }
+          data.isDisability = this.formStore.isPolicyholderInsured ? false : member.isDisability.nameRu == 'Да';
+          data.disabilityGroupId = data.isDisability ? member.disabilityGroupId.id : null;
+          data.profession = member.job;
+          data.position = member.jobPosition;
+          data.jobName = member.jobPlace;
+          data.familyStatusId = member.familyStatus.id;
+        }
+        if (whichMember === 'Beneficiary') {
+          if (
+            this.formStore.applicationData &&
+            this.formStore.applicationData.beneficiaryApp &&
+            this.formStore.applicationData.beneficiaryApp.length &&
+            this.formStore.applicationData.beneficiaryApp.every(i => i.iin !== data.iin) &&
+            data.id !== null
+          ) {
+            await this.api.deleteMember('Beneficiary', data.id);
+            delete data.id;
+          }
+          data.familyStatusId = member.familyStatus.id == 0 ? null : member.familyStatus.id;
+          data.percentage = Number(member.percentageOfPayoutAmount);
+          data.relationId = member.relationDegree.ids;
+          data.relationName = member.relationDegree.nameRu;
+        }
+        if (whichMember === 'BeneficialOwner') {
+          if (data.id === 0) {
+            data.id = null;
+          }
+          if (
+            this.formStore.applicationData &&
+            this.formStore.applicationData.beneficialOwnerApp &&
+            this.formStore.applicationData.beneficialOwnerApp.length &&
+            this.formStore.applicationData.beneficialOwnerApp.every(i => i.iin !== data.iin) &&
+            data.id !== null
+          ) {
+            await this.api.deleteMember('BeneficialOwner', data.id);
+            delete data.id;
+          }
+          data.familyStatusId = member.familyStatus.id;
         }
         await this.api.setMember(whichMember, data);
         return true;
       } catch (err) {
-        console.log(err);
+        return ErrorHandler(err, err.response?.data?.errors && Object.values(err.response?.data?.errors).join(' -> '));
       }
     },
     searchFromList(whichForm, searchIt, whichIndex = null) {
@@ -983,7 +942,7 @@ export const useDataStore = defineStore('data', {
         this.showToaster('success', this.t('toaster.successSaved'), 2000);
         return anketaToken;
       } catch (error) {
-        this.showToaster('error', this.t('toaster.undefinedError'), 1000);
+        ErrorHandler(err);
       } finally {
         this.isLoading = false;
       }
@@ -1002,7 +961,7 @@ export const useDataStore = defineStore('data', {
       };
 
       if (getDataCondition()) {
-        this.whichField = [];
+        this[whichField] = [];
         try {
           const response = await this.api[whichRequest](parameter);
           if (response) {
@@ -1015,9 +974,6 @@ export const useDataStore = defineStore('data', {
               }),
             );
             this[whichField] = response;
-            if (this[whichField].length && this[whichField][this[whichField].length - 1].nameRu == 'невключено') {
-              this[whichField].unshift(this[whichField].pop());
-            }
           }
         } catch (err) {
           console.log(err);
@@ -1040,33 +996,31 @@ export const useDataStore = defineStore('data', {
     async getAdditionalTaxCountries() {
       return await this.getFromApi('addTaxCountries', 'getAdditionalTaxCountries');
     },
-    async getStates(key) {
+    async getStates(key, member) {
       await this.getFromApi('states', 'getStates');
-      if (key && this.contragent[key] && this.contragent[key].ids !== null) {
-        return this.states.filter(i => i.code === this.contragent[key].ids);
+      if (key && member[key] && member[key].ids !== null) {
+        return this.states.filter(i => i.code === member[key].ids);
       }
       return this.states;
     },
-    async getRegions(key) {
+    async getRegions(key, member) {
       await this.getFromApi('regions', 'getRegions');
-      if (key && this.contragent[key] && this.contragent[key].ids !== null) {
-        return this.regions.filter(i => i.code === this.contragent[key].ids);
+      if (key && member[key] && member[key].ids !== null) {
+        return this.regions.filter(i => i.code === member[key].ids);
       }
-      let registrationProvince = this.contragent.registrationProvince;
-      if (registrationProvince.ids !== null) {
-        return this.regions.filter(i => i.code === registrationProvince.ids);
+      if (member.registrationProvince.ids !== null) {
+        return this.regions.filter(i => i.code === member.registrationProvince.ids);
       } else {
         return this.regions;
       }
     },
-    async getCities(key) {
+    async getCities(key, member) {
       await this.getFromApi('cities', 'getCities');
-      if (key && this.contragent[key] && this.contragent[key].ids !== null) {
-        return this.cities.filter(i => i.code === this.contragent[key].ids);
+      if (key && member[key] && member[key].ids !== null) {
+        return this.cities.filter(i => i.code === member[key].ids);
       }
-      let registrationProvince = this.contragent.registrationProvince;
-      if (registrationProvince.ids !== null) {
-        return this.cities.filter(i => i.code === registrationProvince.ids);
+      if (member.registrationProvince.ids !== null) {
+        return this.cities.filter(i => i.code === member.registrationProvince.ids);
       } else {
         return this.cities;
       }
@@ -1105,15 +1059,13 @@ export const useDataStore = defineStore('data', {
     },
     async getSectorCodeList() {
       await this.getFromApi('economySectorCode', 'getSectorCode');
-      if (this.economySectorCode[1].ids != '500003.9') {
-        this.economySectorCode = this.economySectorCode.reverse();
-      }
       return this.economySectorCode;
     },
     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);
@@ -1261,107 +1213,6 @@ export const useDataStore = defineStore('data', {
         this.isLoading = false;
       }
     },
-    async getOtpStatus(iin, phone, processInstanceId = null) {
-      try {
-        const otpData = {
-          iin: iin.replace(/-/g, ''),
-          phoneNumber: formatPhone(phone),
-          type: 'AgreementOtp',
-        };
-        return await this.api.getOtpStatus(
-          processInstanceId !== null && processInstanceId != 0
-            ? {
-                ...otpData,
-                processInstanceId: processInstanceId,
-              }
-            : otpData,
-        );
-      } catch (err) {
-        console.log(err);
-        this.showToaster('error', err.response.data, 3000);
-      }
-    },
-    async sendOtp(iin, phone, processInstanceId = null, onInit = false) {
-      this.isLoading = true;
-      let otpStatus = false;
-      let otpResponse = {};
-      try {
-        if (iin && iin.length === 15 && phone && phone.length === 18) {
-          const status = await this.getOtpStatus(iin, phone, processInstanceId);
-          if (status === true) {
-            this.showToaster('success', this.t('toaster.hasSuccessOtp'), 3000);
-            otpStatus = true;
-            this.isLoading = false;
-            return { otpStatus, otpResponse };
-          } else if (status === false && onInit === false) {
-            const otpData = {
-              iin: iin.replace(/-/g, ''),
-              phoneNumber: formatPhone(phone),
-              type: 'AgreementOtp',
-            };
-            otpResponse = await this.api.sendOtp(
-              processInstanceId !== null && processInstanceId != 0
-                ? {
-                    ...otpData,
-                    processInstanceId: processInstanceId,
-                  }
-                : otpData,
-            );
-            this.isLoading = false;
-            if (!!otpResponse) {
-              if ('errMessage' in otpResponse && otpResponse.errMessage !== null) {
-                this.showToaster('error', otpResponse.errMessage, 3000);
-                return { otpStatus };
-              }
-              if ('result' in otpResponse && otpResponse.result === null) {
-                if ('statusName' in otpResponse && !!otpResponse.statusName) {
-                  this.showToaster('error', otpResponse.statusName, 3000);
-                  return { otpStatus };
-                }
-                if ('status' in otpResponse && !!otpResponse.status) {
-                  this.showToaster('error', otpResponse.status, 3000);
-                  return { otpStatus };
-                }
-              }
-              if ('tokenId' in otpResponse && otpResponse.tokenId) {
-                this.contragent.otpTokenId = otpResponse.tokenId;
-                this.showToaster('success', this.t('toaster.successOtp'), 3000);
-              }
-            } else {
-              this.showToaster('error', this.t('toaster.undefinedError'), 3000);
-              return { otpStatus };
-            }
-          }
-        } else {
-          if (onInit === false) {
-            this.showToaster(
-              'error',
-              this.t('toaster.errorFormField', {
-                text: 'Номер телефона, ИИН',
-              }),
-            );
-            this.isLoading = false;
-          }
-        }
-        return { otpStatus, otpResponse };
-      } catch (err) {
-        this.isLoading = false;
-        if ('response' in err) {
-          if ('statusName' in err.response.data && !!err.response.data.statusName) {
-            this.showToaster('error', this.t('toaster.phoneNotFoundInBMG'), 3000);
-            return { otpStatus };
-          }
-          if ('status' in err.response.data && !!err.response.data.status) {
-            this.showToaster('error', err.response.data.status, 3000);
-            return { otpStatus };
-          }
-        }
-      } finally {
-        this.isLoading = false;
-      }
-      this.isLoading = false;
-      return { otpStatus, otpResponse };
-    },
     async getProcessList() {
       this.isLoading = true;
       try {
@@ -1580,17 +1431,17 @@ export const useDataStore = defineStore('data', {
           console.log(err);
         }
       } catch (err) {
-        this.showToaster('error', this.t('toaster.undefinedError'), 5000);
+        ErrorHandler(err);
         console.log(err, 'error');
       }
       this.isLoading = false;
     },
-    async startApplication(whichForm) {
+    async startApplication(member) {
       try {
         const data = {
-          clientId: this.formStore[whichForm].id,
-          iin: this.formStore[whichForm].iin.replace(/-/g, ''),
-          longName: this.formStore[whichForm].longName,
+          clientId: member.id,
+          iin: member.iin.replace(/-/g, ''),
+          longName: member.longName,
           processCode: this.processCode,
           policyId: 0,
         };
@@ -1598,11 +1449,7 @@ export const useDataStore = defineStore('data', {
         this.sendToParent(constants.postActions.applicationCreated, response.processInstanceId);
         return response.processInstanceId;
       } catch (err) {
-        console.log(err);
-        if ('response' in err && err.response.data) {
-          this.showToaster('error', err.response.data, 0);
-        }
-        return null;
+        return ErrorHandler(err);
       }
     },
     async getApplicationData(taskId, onlyGet = true, setMembersField = true, fetchMembers = true, setProductConditions = true) {
@@ -2000,7 +1847,7 @@ export const useDataStore = defineStore('data', {
             4000,
           );
         } else {
-          this.showToaster('error', this.t('toaster.undefinedError'), 2000);
+          ErrorHandler(err);
         }
       } catch (err) {
         console.log(err);
@@ -2205,7 +2052,7 @@ export const useDataStore = defineStore('data', {
       this.isLoading = false;
       return false;
     },
-    async getContragentFromGBDFL(iin, phoneNumber, whichForm, whichIndex = null) {
+    async getContragentFromGBDFL(iin, phoneNumber, whichForm, whichIndex) {
       this.isLoading = true;
       try {
         const data = {
@@ -2229,13 +2076,9 @@ export const useDataStore = defineStore('data', {
         }
         const { person } = parseXML(gbdResponse.content, true, 'person');
         const { responseInfo } = parseXML(gbdResponse.content, true, 'responseInfo');
-        if (whichIndex === null) {
+        if (typeof whichIndex !== 'number') {
           if (this.formStore[whichForm].gosPersonData !== null && this.formStore[whichForm].gosPersonData.iin !== iin.replace(/-/g, '')) {
-            if (whichForm === this.formStore.policyholdersRepresentativeFormKey) {
-              this.formStore[whichForm].resetMember(false);
-            } else {
-              this.formStore[whichForm].resetForm(false);
-            }
+            this.formStore[whichForm].resetForm(false);
           }
           this.formStore[whichForm].gosPersonData = person;
         } else {
@@ -2245,8 +2088,8 @@ export const useDataStore = defineStore('data', {
           this.formStore[whichForm][whichIndex].gosPersonData = person;
         }
 
-        await this.getContragent(whichForm, whichIndex, false);
-        if (whichIndex === null) {
+        await this.getContragent(typeof whichIndex === 'number' ? this.formStore[whichForm][whichIndex] : this.formStore[whichForm], whichForm, whichIndex, false);
+        if (typeof whichIndex !== 'number') {
           this.formStore[whichForm].verifyDate = responseInfo.responseDate;
           this.formStore[whichForm].verifyType = 'GBDFL';
         } else {
@@ -2515,134 +2358,43 @@ export const useDataStore = defineStore('data', {
         if (economySectorCode) this.formStore[whichForm][whichIndex].economySectorCode = economySectorCode;
       }
     },
-    async getOtpStatus(iin, phone, processInstanceId = null) {
-      try {
-        const otpData = {
-          iin: iin.replace(/-/g, ''),
-          phoneNumber: formatPhone(phone),
-          type: 'AgreementOtp',
-        };
-        return await api.getOtpStatus(
-          processInstanceId !== null && processInstanceId != 0
-            ? {
-                ...otpData,
-                processInstanceId: processInstanceId,
-              }
-            : otpData,
-        );
-      } catch (err) {
-        console.log(err);
-        this.showToaster('error', err.response.data, 3000);
+    hasJobSection(whichForm) {
+      switch (whichForm) {
+        case this.formStore.beneficiaryFormKey:
+        case this.formStore.beneficialOwnerFormKey:
+        case this.formStore.policyholdersRepresentativeFormKey:
+          return false;
+        default:
+          return true;
       }
     },
-    async sendOtp(iin, phone, processInstanceId = null, onInit = false) {
-      this.isLoading = true;
-      let otpStatus = false;
-      let otpResponse = {};
-      try {
-        if (iin && iin.length === 15 && phone && phone.length === 18) {
-          const status = await this.getOtpStatus(iin, phone, processInstanceId);
-          if (status === true) {
-            this.showToaster('success', this.t('toaster.hasSuccessOtp'), 3000);
-            otpStatus = true;
-            this.isLoading = false;
-            return { otpStatus, otpResponse };
-          } else if (status === false && onInit === false) {
-            const otpData = {
-              iin: iin.replace(/-/g, ''),
-              phoneNumber: formatPhone(phone),
-              type: 'AgreementOtp',
-            };
-            otpResponse = await api.sendOtp(
-              processInstanceId !== null && processInstanceId != 0
-                ? {
-                    ...otpData,
-                    processInstanceId: processInstanceId,
-                  }
-                : otpData,
-            );
-            this.isLoading = false;
-            if (!!otpResponse) {
-              if ('errMessage' in otpResponse && otpResponse.errMessage !== null) {
-                this.showToaster('error', otpResponse.errMessage, 3000);
-                return { otpStatus };
-              }
-              if ('result' in otpResponse && otpResponse.result === null) {
-                if ('statusName' in otpResponse && !!otpResponse.statusName) {
-                  this.showToaster('error', otpResponse.statusName, 3000);
-                  return { otpStatus };
-                }
-                if ('status' in otpResponse && !!otpResponse.status) {
-                  this.showToaster('error', otpResponse.status, 3000);
-                  return { otpStatus };
-                }
-              }
-              if ('tokenId' in otpResponse && otpResponse.tokenId) {
-                this.formStore.otpTokenId = otpResponse.tokenId;
-                this.showToaster('success', this.t('toaster.successOtp'), 3000);
-              }
-            } else {
-              this.showToaster('error', this.t('toaster.undefinedError'), 3000);
-              return { otpStatus };
-            }
-          }
-        } else {
-          if (onInit === false) {
-            this.showToaster('error', this.t('toaster.errorFormField', { text: 'Номер телефона, ИИН' }));
-            this.isLoading = false;
-          }
-        }
-        return { otpStatus, otpResponse };
-      } catch (err) {
-        this.isLoading = false;
-        if ('response' in err) {
-          if ('statusName' in err.response.data && !!err.response.data.statusName) {
-            this.showToaster('error', this.t('toaster.phoneNotFoundInBMG'), 3000);
-            return { otpStatus };
-          }
-          if ('status' in err.response.data && !!err.response.data.status) {
-            this.showToaster('error', err.response.data.status, 3000);
-            return { otpStatus };
-          }
-        }
-      } finally {
-        this.isLoading = false;
+    hasBirthSection(whichForm) {
+      if (this.isGons) return false;
+      switch (whichForm) {
+        case this.formStore.beneficiaryFormKey:
+          return false;
+        default:
+          return true;
       }
-      this.isLoading = false;
-      return { otpStatus, otpResponse };
     },
-    async checkOtp(otpToken, phone, code) {
-      try {
-        this.isLoading = true;
-        const otpData = {
-          tokenId: otpToken,
-          phoneNumber: formatPhone(phone),
-          code: code,
-        };
-        const otpResponse = await this.api.checkOtp(otpData);
-        if (otpResponse !== null) {
-          if ('errMessage' in otpResponse && otpResponse.errMessage !== null) {
-            this.showToaster('error', otpResponse.errMessage, 3000);
-            return false;
-          }
-          if ('status' in otpResponse && !!otpResponse.status) {
-            // TODO Доработать и менять значение hasAgreement.value => true
-            this.showToaster(otpResponse.status !== 2 ? 'error' : 'success', otpResponse.statusName, 3000);
-            if (otpResponse.status === 2) {
-              return true;
-            }
-          }
-        }
-        return false;
-      } catch (err) {
-        console.log(err);
-        if ('response' in err) {
-          this.showToaster('error', err.response.data, 3000);
-        }
-      } finally {
-        this.isLoading = false;
+    hasPlaceSection(whichForm) {
+      switch (whichForm) {
+        default:
+          return true;
+      }
+    },
+    hasDocumentSection(whichForm) {
+      switch (whichForm) {
+        default:
+          return true;
+      }
+    },
+    hasContactSection(whichForm) {
+      if (this.isGons) return false;
+      switch (whichForm) {
+        default:
+          return true;
       }
-      return null;
     },
   },
 });