hl-core 0.0.10-beta.5 → 0.0.10-beta.51

package/store/data.store.ts

@@ -2,12 +2,12 @@ import { defineStore } from 'pinia';
 import { rules } from './rules';
 import { i18n } from '../configs/i18n';
 import { Toast, Types as ToastTypes, Positions, ToastOptions } from './toast';
-import { isValidGUID, yearEnding, jwtDecode, ErrorHandler, getKeyWithPattern, getNumber, getAgeByBirthDate } from '../composables';
-import { DataStoreClass, DocumentItem, Member, Value, CountryValue, PolicyholderActivity, BeneficialOwner, PolicyholderClass } from '../composables/classes';
+import { isValidGUID, yearEnding, jwtDecode, ErrorHandler, getKeyWithPattern, getNumber, getAgeByBirthDate, RoleController, ProcessController, sanitize } from '../composables';
+import { DataStoreClass, DocumentItem, Member, Value, CountryValue, PolicyholderActivity, BeneficialOwner, PolicyholderClass, GroupMember } from '../composables/classes';
 import { ApiClass } from '../api';
 import { useFormStore } from './form.store';
 import { AxiosError } from 'axios';
-import { PostActions, StoreMembers, Roles, Statuses, MemberCodes, MemberAppCodes, Enums } from '../types/enum';
+import { PostActions, StoreMembers, MemberCodes, MemberAppCodes, CoreEnums } from '../types/enum';
 import type * as Types from '../types';
 //@ts-ignore
 import { NCALayerClient } from 'ncalayer-js-client';
@@ -15,11 +15,14 @@ import { NCALayerClient } from 'ncalayer-js-client';
 export const useDataStore = defineStore('data', {
   state: () => ({
     ...new DataStoreClass(),
+    ...new RoleController(),
+    ...new ProcessController(),
     t: i18n.t,
     rules: rules,
     toast: Toast,
     toastTypes: ToastTypes,
     toastPositions: Positions,
+    sanitize: sanitize,
     isValidGUID: isValidGUID,
     router: useRouter(),
     formStore: useFormStore(),
@@ -60,10 +63,14 @@ export const useDataStore = defineStore('data', {
     isCheckContract: state => state.product === 'checkcontract',
     isCheckContragent: state => state.product === 'checkcontragent',
     isPrePension: state => state.product === 'prepensionannuity',
+    isCritical: state => state.product === 'criticalillness',
+    isBalam: state => state.product === 'balam',
+    isTumar: state => state.product === 'tumar',
     isDSO: state => state.product === 'dso',
     isUU: state => state.product === 'uu',
-    hasClientAnketa: state => state.formStore.additionalInsuranceTerms.find(i => i.coverTypeCode === 10),
+    hasClientAnketa: state => Array.isArray(state.formStore.additionalInsuranceTerms) && state.formStore.additionalInsuranceTerms.find(i => i.coverTypeCode === 10),
     isClientAnketaCondition: state =>
+      Array.isArray(state.formStore.additionalInsuranceTerms) &&
       !state.formStore.insuredForm.find(member => member.iin === state.formStore.policyholderForm.iin) &&
       !!state.formStore.additionalInsuranceTerms.find(i => i.coverTypeCode === 10 && i.coverSumCode === 'included'),
   },
@@ -138,7 +145,7 @@ export const useDataStore = defineStore('data', {
         if (showError) this.showToaster('error', this.t('toaster.noUrl'));
       }
     },
-    getFilesByIIN(iin: string) {
+    getDocsByIIN(iin: string) {
       return iin ? this.formStore.signedDocumentList.filter(file => file.iin === iin && file.fileTypeName === 'Удостоверение личности') : null;
     },
     async getNewAccessToken() {
@@ -160,22 +167,23 @@ export const useDataStore = defineStore('data', {
     getUserRoles() {
       if (this.accessToken && this.user.roles.length === 0) {
         const decoded = jwtDecode(this.accessToken);
-        this.user.id = decoded.sub;
-        this.user.fullName = `${decoded.lastName} ${decoded.firstName} ${decoded.middleName ? decoded.middleName : ''}`;
-        const key = getKeyWithPattern(decoded, 'role');
-        if (key) {
-          const roles = decoded[key];
-          if (typeof roles === 'string') {
-            this.user.roles.push(roles);
-          } else if (typeof roles === 'object') {
-            this.user.roles = roles;
+        if (decoded) {
+          this.user.id = String(decoded.sub);
+          this.user.fullName = `${decoded.lastName} ${decoded.firstName} ${decoded.middleName ?? ''}`;
+          this.user.code = decoded.code;
+          this.user.branchCode = decoded.branchCode;
+          const key = getKeyWithPattern(decoded, 'role');
+          if (key) {
+            const roles = decoded[key as keyof Types.Utils.JwtToken];
+            if (typeof roles === 'string') {
+              this.user.roles.push(roles);
+            } else if (typeof roles === 'object') {
+              this.user.roles = roles;
+            }
           }
         }
       }
     },
-    getUserData() {
-      return this.accessToken ? jwtDecode(this.accessToken) : null;
-    },
     async getUserGroups() {
       try {
         this.isLoading = true;
@@ -186,140 +194,17 @@ export const useDataStore = defineStore('data', {
         this.isLoading = false;
       }
     },
-    isRole(whichRole: keyof typeof Roles) {
-      if (this.user.roles.length === 0) {
-        this.getUserRoles();
-      }
-      const isRole = this.user.roles.find(i => i === whichRole);
-      return !!isRole;
-    },
-    isInitiator() {
-      return this.isManager() || this.isAgent() || this.isAgentMycar() || this.isManagerHalykBank() || this.isServiceManager() || this.isAgentAuletti();
-    },
-    isManager() {
-      return this.isRole(constants.roles.Manager);
-    },
-    isCompliance() {
-      return this.isRole(constants.roles.Compliance);
-    },
-    isAdmin() {
-      return this.isRole(constants.roles.Admin);
-    },
-    isJurist() {
-      return this.isRole(constants.roles.Jurist);
-    },
-    isAgent() {
-      return this.isRole(constants.roles.Agent);
-    },
-    isManagerHalykBank() {
-      return this.isRole(constants.roles.ManagerHalykBank);
-    },
-    isServiceManager() {
-      return this.isRole(constants.roles.ServiceManager);
-    },
-    isUnderwriter() {
-      return this.isRole(constants.roles.Underwriter);
-    },
-    isActuary() {
-      return this.isRole(constants.roles.Actuary);
-    },
-    isAgentMycar() {
-      return this.isRole(constants.roles.AgentMycar);
-    },
-    isAgentAuletti() {
-      return this.isRole(constants.roles.AgentAuletti);
-    },
-    isAnalyst() {
-      return this.isRole(constants.roles.Analyst);
-    },
-    isUpk() {
-      return this.isRole(constants.roles.UPK);
-    },
-    isUrp() {
-      return this.isRole(constants.roles.URP);
-    },
-    isUsns() {
-      return this.isRole(constants.roles.USNS);
-    },
-    isAccountant() {
-      return this.isRole(constants.roles.Accountant);
-    },
-    isDrn() {
-      return this.isRole(constants.roles.DRNSJ);
-    },
-    isSupport() {
-      return this.isRole(constants.roles.Support);
-    },
-    isFinCenter() {
-      return this.isRole(constants.roles.FinCenter);
-    },
-    isSupervisor() {
-      return this.isRole(constants.roles.Supervisor);
-    },
-    isHeadManager() {
-      return this.isRole(constants.roles.HeadManager);
-    },
-    isBranchDirector() {
-      return this.isRole(constants.roles.BranchDirector);
-    },
-    isUSNSACCINS() {
-      return this.isRole(constants.roles.USNSACCINS);
-    },
-    isDsuio() {
-      return this.isRole(constants.roles.Dsuio);
-    },
-    isAdjuster() {
-      return this.isRole(constants.roles.Adjuster);
-    },
-    isDsoDirector() {
-      return this.isRole(constants.roles.DsoDirector);
-    },
-    isAccountantDirector() {
-      return this.isRole(constants.roles.AccountantDirector);
-    },
-    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);
-    },
-    isProcessReject(statusCode?: keyof typeof Statuses) {
-      const getRejectStatuses = () => {
-        const defaultStatuses = constants.rejectApplicationStatuses;
-        return defaultStatuses;
-      };
-      return !!getRejectStatuses().find(status => status === statusCode);
-    },
     isTask() {
       return this.formStore.applicationData.processInstanceId !== 0 && this.formStore.applicationData.isTask;
     },
     validateAccess() {
-      try {
-        const hasAccess = this.hasAccess();
-        if (this.isAML) return hasAccess.toAML;
-        if (this.isLKA) return hasAccess.toLKA;
-        if (this.isEFO) return hasAccess.toEFO;
-        if (this.isAULETTI) return hasAccess.toAULETTI;
-        if (this.isLKA_A) return hasAccess.toLKA_A;
-        return false;
-      } catch (err) {
-        return ErrorHandler(err);
-      }
+      const hasAccess = this.hasAccess();
+      if (this.isAML) return hasAccess.toAML;
+      if (this.isLKA) return hasAccess.toLKA;
+      if (this.isEFO) return hasAccess.toEFO;
+      if (this.isAULETTI) return hasAccess.toAULETTI;
+      if (this.isLKA_A) return hasAccess.toLKA_A;
+      return false;
     },
     async loginUser(login: string, password: string, numAttempt: number) {
       try {
@@ -394,53 +279,91 @@ export const useDataStore = defineStore('data', {
         await this.router.replace({ name: route.name });
       }
     },
-    async getFile(file: DocumentItem, mode: string = 'view', fileType: string = 'pdf') {
+    async getDoc(file: DocumentItem, mode: string = 'view', fileType: string = 'pdf') {
       if (!file.id) return;
       try {
         this.isLoading = true;
-        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);
-            const link = document.createElement('a');
-            link.href = url;
-            if (mode === 'view') {
-              setTimeout(() => {
-                window.open(url, '_blank', `width=${screen.width},height=${screen.height},top=70`);
-              });
+        if (this.isPension) {
+          await this.api.file.getDocNew(file.id).then((response: any) => {
+            if (!['pdf', 'docx'].includes(fileType)) {
+              const blob = new Blob([response], { type: `image/${fileType}` });
+              const url = window.URL.createObjectURL(blob);
+              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 {
-              link.setAttribute('download', file.fileName!);
-              document.body.appendChild(link);
-              link.click();
-            }
-          } else {
-            const blob = new Blob([response], {
-              type: `application/${fileType}`,
-            });
-            const url = window.URL.createObjectURL(blob);
-            const link = document.createElement('a');
-            link.href = url;
-            if (mode === 'view') {
-              setTimeout(() => {
-                window.open(url, '_blank', `right=100`);
+              const blob = new Blob([response], {
+                type: `application/${fileType}`,
               });
+              const url = window.URL.createObjectURL(blob);
+              const link = document.createElement('a');
+              link.href = url;
+              if (mode === 'view') {
+                setTimeout(() => {
+                  window.open(url, '_blank', `right=100`);
+                });
+              } else {
+                link.setAttribute('download', file.fileName!);
+                document.body.appendChild(link);
+                link.click();
+              }
+            }
+          });
+        } else {
+          await this.api.file.getDoc(file.id).then((response: any) => {
+            if (!['pdf', 'docx'].includes(fileType)) {
+              const blob = new Blob([response], { type: `image/${fileType}` });
+              const url = window.URL.createObjectURL(blob);
+              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 {
-              link.setAttribute('download', file.fileName!);
-              document.body.appendChild(link);
-              link.click();
+              const blob = new Blob([response], {
+                type: `application/${fileType}`,
+              });
+              const url = window.URL.createObjectURL(blob);
+              const link = document.createElement('a');
+              link.href = url;
+              if (mode === 'view') {
+                setTimeout(() => {
+                  window.open(url, '_blank', `right=100`);
+                });
+              } else {
+                link.setAttribute('download', file.fileName!);
+                document.body.appendChild(link);
+                link.click();
+              }
             }
-          }
-        });
+          });
+        }
       } catch (err) {
         ErrorHandler(err);
       } finally {
         this.isLoading = false;
       }
     },
-    async deleteFile(data: DocumentItem) {
+    async deleteFile(data: DocumentItem, showToaster: boolean = true) {
       try {
-        await this.api.deleteFile(data);
-        this.showToaster('success', this.t('toaster.fileWasDeleted'), 3000);
+        await this.api.file.deleteFile(data);
+        if (showToaster) {
+          this.showToaster('success', this.t('toaster.fileWasDeleted'), 3000);
+        }
       } catch (err) {
         ErrorHandler(err);
       }
@@ -448,7 +371,7 @@ export const useDataStore = defineStore('data', {
     async uploadFiles(data: FormData, load: boolean = false) {
       this.isLoading = load;
       try {
-        await this.api.uploadFiles(data);
+        await this.api.file.uploadFiles(data);
         return true;
       } catch (err) {
         return ErrorHandler(err);
@@ -458,14 +381,28 @@ export const useDataStore = defineStore('data', {
     },
     async getContragent(member: Member, load: boolean = true, showToaster: boolean = true) {
       this.isLoading = load;
-      if (!member.iin) return;
+      const isNonResident = this.isPension && member.signOfResidency.ids === '500011.2';
+      if (isNonResident) {
+        if (!member.firstName || !member.lastName) return;
+      } else {
+        if (!member.iin) return;
+      }
       try {
-        const queryData = {
-          firstName: '',
-          lastName: '',
-          middleName: '',
-          iin: member.iin.replace(/-/g, ''),
-        };
+        const queryData = isNonResident
+          ? {
+            firstName: member.firstName ?? '',
+            lastName: member.lastName ?? '',
+            middleName: member.middleName ?? '',
+            iin: '',
+            birthDate: member.birthDate ? formatDate(member.birthDate)?.toISOString() ?? '' : '',
+          }
+          : {
+            firstName: '',
+            lastName: '',
+            middleName: '',
+            iin: member.iin ? member.iin.replace(/-/g, '') : '',
+            birthDate: '',
+          };
         const contragentResponse = await this.api.getContragent(queryData);
         if (contragentResponse.totalItems > 0) {
           if (contragentResponse.items.length === 1) {
@@ -474,25 +411,32 @@ export const useDataStore = defineStore('data', {
             const sortedByRegistrationDate = contragentResponse.items.sort(
               (left, right) => new Date(right.registrationDate).getMilliseconds() - new Date(left.registrationDate).getMilliseconds(),
             );
-            await this.serializeContragentData(member, sortedByRegistrationDate[0]);
+            if (!isNonResident) await this.serializeContragentData(member, sortedByRegistrationDate[0]);
           }
           member.gotFromInsis = true;
         } else {
           if (showToaster) this.showToaster('error', this.t('toaster.notFoundUser'));
         }
+        if (isNonResident) return contragentResponse;
       } catch (err) {
         ErrorHandler(err);
       }
       this.isLoading = false;
     },
-    async getContragentById(id: number, whichForm: keyof typeof StoreMembers, load: boolean = true, whichIndex: number | null = null) {
+    async getContragentById(id: number, whichForm: keyof typeof StoreMembers | 'slaveInsuredForm', load: boolean = true, whichIndex: number | null = null) {
       if (Number(id) === 0) return;
       this.isLoading = load;
       try {
-        const member = whichIndex === null ? this.formStore[whichForm as Types.SingleMember] : this.formStore[whichForm as Types.MultipleMember][whichIndex];
+        const member =
+          this.isPension && whichForm === 'slaveInsuredForm'
+            ? this.formStore.slaveInsuredForm
+            : whichIndex === null
+              ? this.formStore[whichForm as Types.SingleMember]
+              : this.formStore[whichForm as Types.MultipleMember][whichIndex];
+
         const contragentResponse = await this.api.getContragentById(id);
         if (contragentResponse.totalItems > 0) {
-          await this.serializeContragentData(member, contragentResponse.items[0]);
+          await this.serializeContragentData(member, contragentResponse.items[0], whichForm);
         } else {
           this.showToaster('error', this.t('toaster.notFoundUser'));
         }
@@ -502,7 +446,7 @@ export const useDataStore = defineStore('data', {
         this.isLoading = false;
       }
     },
-    async serializeContragentData(member: Member, contragent: Types.ContragentType) {
+    async serializeContragentData(member: Member, contragent: Types.ContragentType, whichForm?: keyof typeof StoreMembers | 'slaveInsuredForm') {
       const [questionairesResponse, contactsResponse, documentsResponse, addressResponse] = await Promise.allSettled([
         this.api.getContrAgentData(contragent.id),
         this.api.getContrAgentContacts(contragent.id),
@@ -524,23 +468,34 @@ export const useDataStore = defineStore('data', {
       if (addressResponse.status === 'fulfilled' && addressResponse.value && addressResponse.value.length) {
         member.response.addresses = addressResponse.value;
       }
-      this.parseContragent(member, {
-        personalData: contragent,
-        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,
-      });
+      this.parseContragent(
+        member,
+        {
+          personalData: contragent,
+          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,
+        },
+        whichForm,
+      );
     },
     parseContragent(
       member: Member,
-      user: { personalData: Types.ContragentType; data?: Types.ContragentQuestionaries[]; contacts?: Types.ContragentContacts[]; documents?: Types.ContragentDocuments[]; address?: Types.ContragentAddress[] },
+      user: {
+        personalData: Types.ContragentType;
+        data?: Types.ContragentQuestionaries[];
+        contacts?: Types.ContragentContacts[];
+        documents?: Types.ContragentDocuments[];
+        address?: Types.ContragentAddress[];
+      },
+      whichForm?: keyof typeof StoreMembers | 'slaveInsuredForm',
     ) {
       member.verifyType = user.personalData.verifyType;
       member.verifyDate = user.personalData.verifyDate;
       member.iin = reformatIin(user.personalData.iin);
       member.age = String(user.personalData.age);
-      const country = this.countries.find((i: Value) => i.nameRu?.match(new RegExp(user.personalData.birthPlace, 'i')));
+      const country = this.countries.find((i: Value) => i.nameRu?.match(new RegExp(user.personalData.birthPlace ?? 'undefined', 'i')));
       member.birthPlace = country && Object.keys(country).length ? country : new Value();
       const gender = this.gender.find((i: Value) => i.nameRu === user.personalData.genderName);
       member.gender = gender ? gender : new Value();
@@ -557,13 +512,23 @@ export const useDataStore = defineStore('data', {
 
       if ('documents' in user && user.documents && user.documents.length) {
         member.documentsList = user.documents;
-        const documentByPriority = user.documents.find(i => i.type === Enums.Insis.DocTypes['1UDL']);
+        const documentByPriority = user.documents.find(i => {
+          if (this.isLifetrip && (whichForm !== this.formStore.policyholderFormKey || this.formStore.isPolicyholderInsured === true)) {
+            return i.type === CoreEnums.Insis.DocTypes['PS'];
+          }
+          return i.type === CoreEnums.Insis.DocTypes['1UDL'];
+        });
         const userDocument = documentByPriority ? documentByPriority : user.documents[0];
         const documentType = this.documentTypes.find((i: Value) => i.ids === userDocument.type);
         const documentIssuer = this.documentIssuers.find((i: Value) => i.nameRu === userDocument.issuerNameRu);
         member.documentType = documentType ? documentType : new Value();
         member.documentNumber = userDocument.number;
         member.documentIssuers = documentIssuer ? documentIssuer : new Value();
+        if (userDocument.issuerNameRu === 'Другое') {
+          member.documentIssuers.issuerOtherNameRu = userDocument.issuerOtherNameRu;
+          member.documentIssuers.issuerOtherNameOrig = userDocument.issuerOtherNameOrig;
+          member.documentIssuers.issuerOtherName = userDocument.issuerOtherName;
+        }
         member.documentDate = reformatDate(userDocument.issueDate);
         member.documentExpire = reformatDate(userDocument.expireDate);
       }
@@ -639,23 +604,30 @@ export const useDataStore = defineStore('data', {
       if (qData && qData.from && qData.from.length && qData.field) {
         const qResult = qData.from.find((i: Value) => i.ids === searchIt.questAnswer);
         //@ts-ignore
-        member[qData.field] = qResult ? qResult : new Value();
+        member[qData.field] = qResult ?? new Value();
       }
     },
     async alreadyInInsis(member: Member) {
-      if (!member.iin) return null;
+      const isNonResident = this.isPension && member.signOfResidency.ids === '500011.2';
+      if (isNonResident) {
+        if (!member.firstName || !member.lastName) return;
+      } else {
+        if (!member.iin) return;
+      }
       try {
         const queryData = {
-          iin: member.iin.replaceAll('-', ''),
+          iin: !!member.iin && !isNonResident ? member.iin.replaceAll('-', '') : '',
           firstName: !!member.firstName ? member.firstName : '',
           lastName: !!member.lastName ? member.lastName : '',
           middleName: !!member.middleName ? member.middleName : '',
+          birthDate: !!member.birthDate ? formatDate(member.birthDate)?.toISOString() ?? '' : '',
         };
         const contragent = await this.api.getContragent(queryData);
         if (contragent.totalItems > 0) {
           if (contragent.items.length === 1) {
             return contragent.items[0];
           } else {
+            if (this.isPension && queryData.iin === '') return contragent.items.find(i => i.id === member.id);
             const sortedByRegistrationDate = contragent.items.sort(
               (left, right) => new Date(right.registrationDate).getMilliseconds() - new Date(left.registrationDate).getMilliseconds(),
             );
@@ -689,8 +661,8 @@ export const useDataStore = defineStore('data', {
       }
     },
     async saveContragent(user: Member, whichForm: keyof typeof StoreMembers | 'contragent', whichIndex: number | null, onlySaveAction: boolean = true) {
-      if (this.isGons && user.iin && whichForm === 'beneficiaryForm' && useEnv().isProduction) {
-        const doesHaveActiveContract = await this.api.checkBeneficiariesInActualPolicy(user.iin.replace(/-/g, ''));
+      if (this.isGons && user.iin && whichForm === 'beneficiaryForm') {
+        const doesHaveActiveContract = await this.api.checkBeneficiariesActualPolicy(String(this.formStore.applicationData.processInstanceId));
         if (doesHaveActiveContract) {
           this.showToaster('error', this.t('toaster.doesHaveActiveContract'), 6000);
           return false;
@@ -727,7 +699,7 @@ export const useDataStore = defineStore('data', {
         const contragentData: Types.ContragentType = {
           id: Number(user.id),
           type: Number(user.type),
-          iin: user.iin!.replace(/-/g, ''),
+          iin: user.iin ? user.iin.replace(/-/g, '') : '',
           longName: user.longName !== null ? user.longName : (user.lastName ?? '') + (user.firstName ?? '') + (user.middleName ?? ''),
           lastName: user.lastName ?? '',
           firstName: user.firstName ?? '',
@@ -881,6 +853,11 @@ export const useDataStore = defineStore('data', {
           verifyType: user.verifyType,
           verifyDate: user.verifyDate,
         };
+        if (user.documentIssuers.ids === '1') {
+          userDocument.issuerOtherName = user.documentIssuers.issuerOtherName;
+          userDocument.issuerOtherNameOrig = user.documentIssuers.issuerOtherNameOrig;
+          userDocument.issuerOtherNameRu = user.documentIssuers.issuerOtherNameRu;
+        }
         if (hasAlreadyDocument !== -1) {
           documentsData[hasAlreadyDocument] = userDocument;
         } else {
@@ -954,7 +931,12 @@ export const useDataStore = defineStore('data', {
           isTerror: member.isTerror,
           isIpdlCompliance: null,
           isTerrorCompliance: null,
+          fromService: this.isGons && whichMember === 'Beneficiary' ? (member.chooseChild === 'Добавить выгодоприобретателя' ? false : true) : true,
         };
+
+        if (this.isPension && memberFromApplicaiton && memberFromApplicaiton.processInstanceId === this.formStore.applicationData.slave?.processInstanceId) {
+          data.processInstanceId = this.formStore.applicationData.slave.processInstanceId;
+        }
         data.id = memberFromApplicaiton && memberFromApplicaiton.id ? memberFromApplicaiton.id : null;
         if (whichMember === 'Client') {
           data.isInsured = this.formStore.isPolicyholderInsured;
@@ -964,6 +946,12 @@ export const useDataStore = defineStore('data', {
           data.jobName = member.jobPlace;
           data.positionCode = member.positionCode;
           data.familyStatusId = member.familyStatus.id;
+          if (this.isPension) {
+            data.id =
+              memberFromApplicaiton.processInstanceId === this.formStore.applicationData.processInstanceId
+                ? this.formStore.applicationData.clientApp.id
+                : this.formStore.applicationData.slave.clientApp.id;
+          }
         }
         if (whichMember === 'Spokesman') {
           if (!!memberFromApplicaiton && memberFromApplicaiton.iin !== data.iin) {
@@ -1022,6 +1010,12 @@ export const useDataStore = defineStore('data', {
           data.familyStatusId = member.familyStatus.id;
           data.relationId = member.relationDegree.ids;
           data.relationName = member.relationDegree.nameRu;
+          if (this.isPension) {
+            data.id =
+              memberFromApplicaiton.processInstanceId === this.formStore.applicationData.processInstanceId
+                ? this.formStore.applicationData.insuredApp[0].id
+                : this.formStore.applicationData.slave.insuredApp[0].id;
+          }
         }
         if (whichMember === 'Beneficiary') {
           if (
@@ -1066,10 +1060,20 @@ export const useDataStore = defineStore('data', {
         }
       }
     },
-    async setApplication(applicationData: object, calculate: boolean = false) {
+    async setApplication(applicationData: any, calculate: boolean = false) {
       try {
         this.isLoading = true;
         this.isButtonsLoading = true;
+        if (this.isPension) {
+          applicationData.transferContractCompany = '';
+          if (applicationData.slave) {
+            applicationData.slave.guaranteedPeriod = applicationData.slave.guaranteedPeriod ?? 0;
+            applicationData.slave.transferContractCompany = '';
+          }
+          if (Number(this.formStore.applicationData.processCode) === 24) {
+            applicationData.transferContractAmount = applicationData.parentContractAmount - applicationData.refundAmount;
+          }
+        }
         await this.api.setApplication(applicationData);
         if (calculate) {
           await this.api.calculatePension(String(this.formStore.applicationData.processInstanceId));
@@ -1124,6 +1128,22 @@ export const useDataStore = defineStore('data', {
         conditionsData.policyAppDto.amountInCurrency = getNumber(String(this.formStore.productConditionsForm.requestedSumInsuredInDollar));
         conditionsData.policyAppDto.currencyExchangeRate = this.currencies.usd;
       }
+      if (this.isGons) {
+        conditionsData.policyAppDto.premiumInCurrency =
+          this.formStore.productConditionsForm.currency.code === 'KZT' ? null : getNumber(String(this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar));
+        conditionsData.policyAppDto.amountInCurrency =
+          this.formStore.productConditionsForm.currency.code === 'KZT' ? null : getNumber(String(this.formStore.productConditionsForm.requestedSumInsuredInDollar));
+        conditionsData.policyAppDto.currencyExchangeRate = this.formStore.productConditionsForm.currency.code === 'KZT' ? null : this.currencies.usd;
+        conditionsData.policyAppDto.currency = this.formStore.productConditionsForm.currency.code as string;
+        //@ts-ignore
+        if (isNaN(String(this.formStore.productConditionsForm.requestedSumInsured).replace(/\s/g, ''))) {
+          conditionsData.policyAppDto.amount = parseFloat(String(this.formStore.productConditionsForm.requestedSumInsured).replace(/\s/g, '').replace(',', '.'));
+        }
+        //@ts-ignore
+        if (isNaN(String(this.formStore.productConditionsForm.insurancePremiumPerMonth).replace(/\s/g, ''))) {
+          conditionsData.policyAppDto.premium = parseFloat(String(this.formStore.productConditionsForm.insurancePremiumPerMonth).replace(/\s/g, '').replace(',', '.'));
+        }
+      }
       if (this.isLiferenta) {
         conditionsData.policyAppDto.guaranteedPaymentPeriod = this.formStore.productConditionsForm.guaranteedPeriod || 0;
         conditionsData.policyAppDto.annuityTypeId = (this.formStore.productConditionsForm.typeAnnuityInsurance.id as string) ?? undefined;
@@ -1210,8 +1230,10 @@ export const useDataStore = defineStore('data', {
       }
       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;
+        if (this.formStore[whichSurvey]) {
+          //@ts-ignore
+          this.formStore[whichSurvey].body[index].first.answerId = answer.ids;
+        }
       }
       return this.formStore.definedAnswersId[whichSurvey];
     },
@@ -1243,6 +1265,8 @@ export const useDataStore = defineStore('data', {
         regionPolicyName: this.formStore.RegionPolicy.nameRu ?? '',
         managerPolicy: this.formStore.ManagerPolicy.ids as string,
         managerPolicyName: this.formStore.ManagerPolicy.nameRu ?? '',
+        executorGPH: (this.formStore.ExecutorGPH.ids as string) ?? undefined,
+        executorGPHName: this.formStore.ExecutorGPH.nameRu ?? undefined,
         insuranceProgramType: this.formStore.applicationData.insisWorkDataApp.insuranceProgramType,
       };
       try {
@@ -1455,7 +1479,8 @@ export const useDataStore = defineStore('data', {
       return await this.getFromApi('economySectorCode', 'getSectorCode');
     },
     async getEconomicActivityType() {
-      if (this.isLifeBusiness || this.isGns || this.isDas || this.isUU || this.isPrePension) return await this.getFromApi('economicActivityType', 'getEconomicActivityType');
+      const makeCall = this.isLifeBusiness || this.isGns || this.isDas || this.isUU || this.isPrePension || this.isCritical;
+      if (makeCall) return await this.getFromApi('economicActivityType', 'getEconomicActivityType');
     },
     async getFamilyStatuses() {
       return await this.getFromApi('familyStatuses', 'getFamilyStatuses');
@@ -1467,48 +1492,53 @@ export const useDataStore = defineStore('data', {
       return await this.getFromApi('relations', 'getRelationTypes');
     },
     async getBanks() {
-      if (this.isLifeBusiness || this.isDas || this.isUU || this.isPension || this.isGns || this.isPrePension || this.isDSO) return await this.getFromApi('banks', 'getBanks');
+      const makeCall = this.isLifeBusiness || this.isDas || this.isUU || this.isPension || this.isGns || this.isPrePension || this.isDSO || this.isCritical;
+      if (makeCall) return await this.getFromApi('banks', 'getBanks');
     },
     async getInsuranceCompanies() {
       if (this.isPension) return await this.getFromApi('transferContractCompanies', 'getInsuranceCompanies');
     },
     async getProcessIndexRate() {
-      if (this.processCode) {
-        return await this.getFromApi('processIndexRate', 'getProcessIndexRate', this.processCode);
-      }
+      const makeCall = (this.isBaiterek || this.isBolashak || this.isGons) && this.processCode;
+      if (makeCall) return await this.getFromApi('processIndexRate', 'getProcessIndexRate', this.processCode);
     },
     async getProcessPaymentPeriod() {
-      if (this.processCode) {
-        return await this.getFromApi('processPaymentPeriod', 'getProcessPaymentPeriod', this.processCode);
-      }
+      const makeCall = !this.isPension && this.processCode;
+      if (makeCall) return await this.getFromApi('processPaymentPeriod', 'getProcessPaymentPeriod', this.processCode);
+    },
+    async getProgramType() {
+      const makeCall = this.isCritical && this.processCode;
+      if (makeCall) return await this.getFromApi('programType', 'getProgramType', this.processCode);
     },
     async getQuestionRefs(id?: string) {
       return await this.getFromApi('questionRefs', 'getQuestionRefs', id, true);
     },
-    async getProcessTariff() {
-      if (this.processCode) return await this.getFromApi('processTariff', 'getProcessTariff', this.processCode);
-    },
     async getDicAnnuityTypeList() {
       return await this.getFromApi('dicAnnuityTypeList', 'getDicAnnuityTypeList');
     },
     async getProcessAnnuityPaymentPeriod() {
-      if (this.processCode) {
-        return await this.getFromApi('processAnnuityPaymentPeriod', 'getProcessAnnuityPaymentPeriod', this.processCode);
-      }
+      const makeCall = this.isLiferenta && this.processCode;
+      if (makeCall) return await this.getFromApi('processAnnuityPaymentPeriod', 'getProcessAnnuityPaymentPeriod', this.processCode);
     },
     async getInsurancePay() {
       return await this.getFromApi('insurancePay', 'getInsurancePay');
     },
     async getProcessGfot() {
-      if (this.processCode) {
-        return await this.getFromApi('processGfot', 'getProcessGfot', this.processCode);
-      }
+      const makeCall = (this.isLifeBusiness || this.isGns) && this.processCode;
+      if (makeCall) return await this.getFromApi('processGfot', 'getProcessGfot', this.processCode);
+    },
+    async getSource() {
+      return await this.getFromApi('Source', 'getSource');
     },
     async getCurrencies() {
       try {
-        const currencies = await this.api.getCurrencies();
-        this.currencies = currencies;
-        return currencies;
+        const makeCall = !this.isLKA && !this.isLKA_A;
+        if (makeCall) {
+          const currencies = await this.api.getCurrencies();
+          this.currencies = currencies;
+          return currencies;
+        }
+        return null;
       } catch (err) {
         console.log(err);
       }
@@ -1521,7 +1551,8 @@ export const useDataStore = defineStore('data', {
       return this.gender;
     },
     async getAuthorityBasis() {
-      if (this.isDas || this.isLifeBusiness || this.isGns || this.isUU || this.isPrePension) return await this.getFromApi('authorityBasis', 'getArmDicts', 'DicAuthorityBasis');
+      if (this.isDas || this.isLifeBusiness || this.isGns || this.isUU || this.isPrePension || this.isCritical)
+        return await this.getFromApi('authorityBasis', 'getArmDicts', 'DicAuthorityBasis');
     },
     async getWorkPosition(search: string) {
       try {
@@ -1549,8 +1580,8 @@ export const useDataStore = defineStore('data', {
         this.getFamilyStatuses(),
         this.getRelationTypes(),
         this.getProcessIndexRate(),
-        this.getProcessTariff(),
         this.getProcessPaymentPeriod(),
+        this.getProgramType(),
         this.getDicFileTypeList(),
         this.getDicAnnuityTypeList(),
         this.getProcessAnnuityPaymentPeriod(),
@@ -1564,6 +1595,7 @@ export const useDataStore = defineStore('data', {
         this.getDicTripPurpose(),
         this.getCurrencies(),
         this.getProcessGfot(),
+        this.getSource(),
         this.getBanks(),
         this.getInsuranceCompanies(),
         this.getEconomicActivityType(),
@@ -1592,16 +1624,19 @@ export const useDataStore = defineStore('data', {
         if (secondaryQuestions.status === 'fulfilled') {
           const baseAnketa = this.formStore[baseField];
           if (baseAnketa && baseAnketa.body && baseAnketa.body.length) {
-            baseAnketa.body.forEach(i => {
-              if (i.first.definedAnswers === 'Y' && i.second === null && secondaryQuestions.value) {
-                i.second = structuredClone(secondaryQuestions.value);
+            const isSpecialSurvey = this.isBaiterek || this.isBolashak || this.isLiferenta;
+            for (const i of baseAnketa.body) {
+              if (i.second === null && secondaryQuestions.value) {
+                i.second = isSpecialSurvey
+                  ? await this.api.getQuestionListSecondById(`${surveyType}second`, processInstanceId, insuredId, i.first.id)
+                  : structuredClone(secondaryQuestions.value);
               }
               if (i.first.definedAnswers === 'Y' && i.second && i.second.length) {
                 i.second.forEach(second => {
                   if (second.answerType === 'D') second.answerText = reformatDate(String(second.answerText));
                 });
               }
-            });
+            }
           }
         }
       } catch (err) {
@@ -1621,11 +1656,11 @@ export const useDataStore = defineStore('data', {
       return n === null
         ? null
         : n
-            .toLocaleString('ru', {
-              maximumFractionDigits: 2,
-              minimumFractionDigits: 2,
-            })
-            .replace(/,/g, '.');
+          .toLocaleString('ru', {
+            maximumFractionDigits: 2,
+            minimumFractionDigits: 2,
+          })
+          .replace(/,/g, '.');
     },
     async getTaskList(
       search: string = '',
@@ -1659,23 +1694,23 @@ export const useDataStore = defineStore('data', {
           column: column,
           direction: direction,
           groupCode: groupCode,
-          processCodes: Object.values(constants.products),
+          processCodes: this.isEFO
+            ? Object.values(constants.products).filter(
+              i => i !== constants.products.pensionannuity && i !== constants.products.pensionannuityrefund && i !== constants.products.pensionannuityjoint,
+            )
+            : [constants.products.baiterek],
         };
         if (byOneProcess !== null) {
           delete query.processCodes;
           query.processCode = byOneProcess;
         }
-        if (byOneProcess === 19 && !useEnv().isProduction) {
-          query.processCodes = [19, 2];
-          delete query.processCode;
-        }
         const taskList = await this.api.getTaskList(
           processInstanceId === null
             ? query
             : {
-                ...query,
-                processInstanceId: processInstanceId,
-              },
+              ...query,
+              processInstanceId: processInstanceId,
+            },
         );
         if (needToReturn) {
           this.isLoading = false;
@@ -1782,6 +1817,13 @@ export const useDataStore = defineStore('data', {
         console.log(err);
       }
     },
+    async filterExecutorByRegion(filterName: string) {
+      try {
+        this.ExecutorGPH = await this.api.filterExecutorByRegion('ExecutorGPH', filterName);
+      } catch (err) {
+        console.log(err);
+      }
+    },
     async getUnderwritingCouncilData(id: string | number) {
       try {
         const response: any = await this.api.getUnderwritingCouncilData(id);
@@ -1804,7 +1846,10 @@ export const useDataStore = defineStore('data', {
     async getDefaultCalculationData(showLoader: boolean = false, product: string | null = null) {
       this.isLoading = showLoader;
       try {
-        const calculationData = await this.api.getDefaultCalculationData(this.isCalculator ? product : undefined);
+        const calculationData = await this.api.getDefaultCalculationData(
+          this.isCalculator ? product : undefined,
+          this.isLifeBusiness || product === 'lifebusiness' || this.isGns || product === 'gns' ? Number(this.processCode) : undefined,
+        );
         return calculationData;
       } catch (err) {
         ErrorHandler(err);
@@ -1892,6 +1937,23 @@ export const useDataStore = defineStore('data', {
           calculationData.amountInCurrency = getNumber(String(this.formStore.productConditionsForm.requestedSumInsuredInDollar));
           calculationData.currencyExchangeRate = this.currencies.usd;
         }
+        if (this.isGons || product === 'gons') {
+          calculationData.premiumInCurrency =
+            this.formStore.productConditionsForm.currency.code === 'KZT' ? null : getNumber(String(this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar));
+          calculationData.amountInCurrency =
+            this.formStore.productConditionsForm.currency.code === 'KZT' ? null : getNumber(String(this.formStore.productConditionsForm.requestedSumInsuredInDollar));
+          calculationData.currencyExchangeRate = this.formStore.productConditionsForm.currency.code === 'KZT' ? null : this.currencies.usd;
+
+          calculationData.currency = this.formStore.productConditionsForm.currency.code as string;
+          //@ts-ignore
+          if (isNaN(String(this.formStore.productConditionsForm.requestedSumInsured).replace(/\s/g, ''))) {
+            calculationData.amount = parseFloat(String(this.formStore.productConditionsForm.requestedSumInsured).replace(/\s/g, '').replace(',', '.'));
+          }
+          //@ts-ignore
+          if (isNaN(String(this.formStore.productConditionsForm.insurancePremiumPerMonth).replace(/\s/g, ''))) {
+            calculationData.premium = parseFloat(String(this.formStore.productConditionsForm.insurancePremiumPerMonth).replace(/\s/g, '').replace(',', '.'));
+          }
+        }
         if (this.isLiferenta || product === 'liferenta') {
           calculationData.guaranteedPaymentPeriod = this.formStore.productConditionsForm.guaranteedPeriod || 0;
           calculationData.annuityTypeId = (this.formStore.productConditionsForm.typeAnnuityInsurance.id as string) ?? undefined;
@@ -1909,11 +1971,20 @@ export const useDataStore = defineStore('data', {
           calculationData.contractEndDate = formatDate(this.formStore.productConditionsForm.contractEndDate as string)!.toISOString();
           calculationData.calcDate = formatDate(this.formStore.productConditionsForm.calcDate as string)!.toISOString();
         }
-        const calculationResponse = await this.api.calculateWithoutApplication(calculationData, this.isCalculator ? product : undefined);
-        if (calculationResponse.amount) this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(calculationResponse.amount);
-        if (calculationResponse.premium) this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(calculationResponse.premium);
+        const calculationResponse = await this.api.calculateWithoutApplication(
+          calculationData,
+          this.isCalculator ? product : undefined,
+          this.isLifeBusiness || product === 'lifebusiness' || this.isGns || product === 'gns' ? Number(this.processCode) : undefined,
+        );
+        if (calculationResponse.amount)
+          this.formStore.productConditionsForm.requestedSumInsured =
+            this.isGons || product === 'gons' ? this.getNumberWithSpacesAfterComma(calculationResponse.amount) : this.getNumberWithSpaces(calculationResponse.amount);
+        if (calculationResponse.premium)
+          this.formStore.productConditionsForm.insurancePremiumPerMonth =
+            this.isGons || product === 'gons' ? this.getNumberWithSpacesAfterComma(calculationResponse.premium) : this.getNumberWithSpaces(calculationResponse.premium);
+
         this.formStore.additionalInsuranceTermsWithout = calculationResponse.addCovers;
-        if (this.isKazyna || product === 'halykkazyna') {
+        if (this.isKazyna || product === 'halykkazyna' || this.isGons || product === 'gons') {
           if (this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar != null) {
             this.formStore.productConditionsForm.requestedSumInsuredInDollar = this.getNumberWithSpaces(calculationResponse.amountInCurrency);
           } else {
@@ -1930,7 +2001,7 @@ export const useDataStore = defineStore('data', {
           this.formStore.productConditionsForm.statePremium7 = this.getNumberWithSpaces(calculationResponse.statePremium7);
         }
         if (this.isLifeBusiness || product === 'lifebusiness' || this.isGns || product === 'gns') {
-          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(calculationResponse.mainPremiumWithCommission);
+          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpacesAfterComma(calculationResponse.mainPremiumWithCommission as number);
           this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(calculationResponse.mainInsSum === 0 ? null : calculationResponse.mainInsSum);
           this.formStore.additionalInsuranceTermsWithout = calculationResponse.addCovers;
           if (calculationResponse.agentCommission) {
@@ -1950,17 +2021,23 @@ export const useDataStore = defineStore('data', {
         return !!this.formStore.productConditionsForm.requestedSumInsured && !!this.formStore.productConditionsForm.insurancePremiumPerMonth;
       }
     },
-    async calculate(taskId: string) {
+    async calculate(taskId: string, isHalykBank: boolean = false) {
       this.isLoading = true;
       try {
         const id = this.formStore.applicationData.processInstanceId;
-        if (!this.isPension) await this.api.setApplication(this.getConditionsData());
+        if (!this.isPension && !(this.formStore.lfb.add && (this.isLifeBusiness || this.isGns))) await this.api.setApplication(this.getConditionsData());
         const result = ref();
-        result.value = await this.api.getCalculation(String(id));
-        const applicationData = await this.api.getApplicationData(taskId);
+        let applicationData = null;
+        if (!isHalykBank) result.value = await this.api.getCalculation(String(id));
+        if (this.isLifeBusiness || this.isGns) {
+          await this.getApplicationDataV2(taskId);
+          return;
+        } else {
+          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.isKazyna || this.isGons) && this.currencies.usd) {
           if (this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar != null) {
             this.formStore.productConditionsForm.requestedSumInsuredInDollar = this.getNumberWithSpaces(result.value / this.currencies.usd);
           } else {
@@ -1968,11 +2045,15 @@ export const useDataStore = defineStore('data', {
           }
         }
         if (this.formStore.productConditionsForm.insurancePremiumPerMonth != null) {
-          this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(result.value);
-          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(applicationData.policyAppDto.premium);
+          this.formStore.productConditionsForm.requestedSumInsured = this.isGons ? this.getNumberWithSpacesAfterComma(result.value) : this.getNumberWithSpaces(result.value);
+          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.isGons
+            ? this.getNumberWithSpacesAfterComma(applicationData.policyAppDto.premium)
+            : this.getNumberWithSpaces(applicationData.policyAppDto.premium);
         } else {
-          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(result.value);
-          this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(applicationData.policyAppDto.amount);
+          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.isGons ? this.getNumberWithSpacesAfterComma(result.value) : this.getNumberWithSpaces(result.value);
+          this.formStore.productConditionsForm.requestedSumInsured = this.isGons
+            ? this.getNumberWithSpacesAfterComma(applicationData.policyAppDto.amount)
+            : this.getNumberWithSpaces(applicationData.policyAppDto.amount);
         }
         if (this.isLiferenta) {
           this.formStore.productConditionsForm.amountAnnuityPayments = this.getNumberWithSpaces(applicationData.policyAppDto.annuityMonthPay);
@@ -1985,11 +2066,22 @@ export const useDataStore = defineStore('data', {
           this.formStore.productConditionsForm.statePremium7 = this.getNumberWithSpaces(govPremiums.statePremium7 === null ? null : govPremiums.statePremium7);
         }
         if (this.isLifeBusiness || this.isGns) {
-          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(result.value);
+          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpacesAfterComma(result.value);
           if (applicationData.insuredApp && applicationData.insuredApp.length) {
             const res = await this.newInsuredList(applicationData.insuredApp);
             this.formStore.lfb.clients = res;
           }
+          if (this.formStore.lfb.add) {
+            this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpacesAfterComma(applicationData.policyAppDto.premium);
+            this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpacesAfterComma(applicationData.policyAppDto.amount);
+            if (applicationData.policyAppDto.mainPremiumWithCommission > 0) {
+              this.formStore.productConditionsForm.amountPaid = this.getNumberWithSpacesAfterComma(applicationData.policyAppDto.mainPremiumWithCommission);
+              this.formStore.productConditionsForm.amountRefunded = null;
+            } else {
+              this.formStore.productConditionsForm.amountRefunded = this.getNumberWithSpacesAfterComma(applicationData.policyAppDto.mainPremiumWithCommission);
+              this.formStore.productConditionsForm.amountPaid = null;
+            }
+          }
         }
 
         this.showToaster('success', this.t('toaster.calculated'), 1000);
@@ -1998,6 +2090,53 @@ export const useDataStore = defineStore('data', {
       }
       this.isLoading = false;
     },
+    async reCalculateRefund(insSum: number, insSumMain: number, guaranteedPeriod: number, isOppv: boolean, transferContractMonthCount: number | null) {
+      this.isLoading = true;
+      try {
+        const data = {
+          processInstanceId: this.formStore.applicationData.processInstanceId,
+          insSum: insSum,
+          insSumMain: insSumMain,
+          guaranteedPeriod: guaranteedPeriod,
+          isOppv: isOppv,
+          transferContractMonthCount: transferContractMonthCount,
+        };
+        const response = await this.api.pensionannuityNew.reCalculateRefund(data);
+      } catch (err) {
+        ErrorHandler(err);
+      }
+      this.isLoading = false;
+    },
+    async getDividendSchedule() {
+      this.isLoading = true;
+      try {
+        const response = await this.api.pensionannuityNew.getDividendSchedule(this.formStore.applicationData.processInstanceId);
+        return response;
+      } catch (err) {
+        ErrorHandler(err);
+        return {
+          "scheduleDividend": null,
+          "scheduleDividend2": null
+        };
+      } finally {
+        this.isLoading = false;
+      }
+    },
+    async calcParentContractSums(closeContractCompanyCode: string, closeContractCompanyName: string, isContractClosed: boolean) {
+      this.isLoading = true;
+      try {
+        const data = {
+          processInstanceId: this.formStore.applicationData.processInstanceId,
+          closeContractCompanyCode: closeContractCompanyCode,
+          closeContractCompanyName: closeContractCompanyName,
+          isContractClosed: isContractClosed,
+        };
+        const response = await this.api.pensionannuityNew.calcParentContractSums(data);
+      } catch (err) {
+        ErrorHandler(err);
+      }
+      this.isLoading = false;
+    },
     async calculatePremium(data: any) {
       this.isLoading = true;
       try {
@@ -2084,11 +2223,6 @@ export const useDataStore = defineStore('data', {
       this.isLoading = onlyGet;
       try {
         const applicationData = await this.api.getApplicationData(taskId);
-        if (this.processCode !== applicationData.processCode && !this.isPension) {
-          this.isLoading = false;
-          this.sendToParent(constants.postActions.toHomePage, this.t('toaster.noSuchProduct'));
-          return;
-        }
         this.formStore.regNumber = applicationData.regNumber;
         this.formStore.applicationData = applicationData;
         this.formStore.additionalInsuranceTerms = applicationData.addCoverDto;
@@ -2099,13 +2233,23 @@ export const useDataStore = defineStore('data', {
         this.formStore.RegionPolicy.ids = applicationData.insisWorkDataApp.regionPolicy;
         this.formStore.ManagerPolicy.nameRu = applicationData.insisWorkDataApp.managerPolicyName;
         this.formStore.ManagerPolicy.ids = applicationData.insisWorkDataApp.managerPolicy;
+        this.formStore.ExecutorGPH.nameRu = applicationData.insisWorkDataApp.executorGPHName;
+        this.formStore.ExecutorGPH.ids = applicationData.insisWorkDataApp.executorGPH;
         this.formStore.SaleChanellPolicy.nameRu = applicationData.insisWorkDataApp.saleChanellPolicyName;
         this.formStore.SaleChanellPolicy.ids = applicationData.insisWorkDataApp.saleChanellPolicy;
         this.formStore.AgentData.fullName = applicationData.insisWorkDataApp.agentName;
         this.formStore.AgentData.agentId = applicationData.insisWorkDataApp.agentId;
+        if ('sourceId' in applicationData.insisWorkDataApp && applicationData.insisWorkDataApp.sourceId !== null) {
+          const source = this.Source.find((i: Value) => i.id === applicationData.insisWorkDataApp.sourceId);
+          this.formStore.Source = source ? source : new Value();
+        } else {
+          const sourceEfo = this.Source.find((i: Value) => i.id === '3f9e5327-328c-4bc7-8d28-fa25c36ba153');
+          this.formStore.Source = sourceEfo ? sourceEfo : new Value();
+        }
 
         const clientData = applicationData.clientApp;
         const insuredData: any[] = applicationData.insuredApp;
+        const slaveInsuredData: any = applicationData.slave?.insuredApp[0] ?? null;
         const beneficiaryData: any[] = applicationData.beneficiaryApp;
         const beneficialOwnerData: any[] = applicationData.beneficialOwnerApp;
         const spokesmanData: any = applicationData.spokesmanApp;
@@ -2119,6 +2263,21 @@ export const useDataStore = defineStore('data', {
           this.formStore.isPolicyholderBeneficiary = beneficiaryPolicyholderIndex !== -1;
         }
 
+        if ('pensionApp' in applicationData && applicationData.pensionApp) {
+          this.formStore.pensionApp = applicationData.pensionApp;
+          if ('slave' in applicationData && applicationData.slave) this.formStore.pensionApp.slave = applicationData.slave.pensionApp;
+          if (setProductConditions) {
+            const pensionKeysWithSpace = ['compulsoryContractAmount', 'compulsoryProfContractAmount', 'voluntaryContractAmount', 'ownFundsRaisAmount'];
+            pensionKeysWithSpace.forEach(key => {
+              if (/\s/g.test(this.formStore.pensionApp[key]) === false) this.formStore.pensionApp[key] = this.getNumberWithSpaces(this.formStore.pensionApp[key]);
+            });
+            if (this.formStore.pensionApp.slave)
+              pensionKeysWithSpace.forEach(key => {
+                if (/\s/g.test(this.formStore.pensionApp.slave[key]) === false)
+                  this.formStore.pensionApp.slave[key] = this.getNumberWithSpaces(this.formStore.pensionApp.slave[key]);
+              });
+          }
+        }
         if ('finCenterData' in applicationData && !!applicationData.finCenterData) {
           this.formStore.finCenterData = applicationData.finCenterData;
           this.formStore.finCenterData.regNumber = applicationData.finCenterData.regNumber;
@@ -2183,11 +2342,6 @@ export const useDataStore = defineStore('data', {
               index: null,
             });
           }
-
-          if (applicationData.slave) {
-            insuredData.push(applicationData.slave.insuredApp[0]);
-          }
-
           if (insuredData && insuredData.length) {
             insuredData.forEach((member, index) => {
               const inStore = this.formStore.insuredForm.find(each => each.id == member.insisId);
@@ -2201,6 +2355,13 @@ export const useDataStore = defineStore('data', {
               }
             });
           }
+          if (slaveInsuredData) {
+            allMembers.push({
+              ...slaveInsuredData,
+              key: 'slaveInsuredForm',
+              index: null,
+            });
+          }
           if (beneficiaryData && beneficiaryData.length) {
             beneficiaryData.forEach((member, index) => {
               const inStore = this.formStore.beneficiaryForm.find(each => each.id == member.insisId);
@@ -2238,18 +2399,23 @@ 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: Value) => i.ids == each.relationId);
-              this.formStore.insuredForm[index].relationDegree = relationDegree ? relationDegree : new Value();
+              if (each) {
+                this.setMembersFieldIndex(this.formStore.insuredFormKey, 'insuredApp', index);
+                const relationDegree = this.relations.find((i: Value) => i.ids == each.relationId);
+                this.formStore.insuredForm[index].relationDegree = relationDegree ? relationDegree : new Value();
+              }
             });
           }
-
+          if (slaveInsuredData) this.setMembersFieldSlave();
           if (beneficiaryData && beneficiaryData.length) {
             beneficiaryData.forEach((each, index) => {
               this.setMembersFieldIndex(this.formStore.beneficiaryFormKey, 'beneficiaryApp', index);
               const relationDegree = this.relations.find((i: Value) => i.ids == each.relationId);
               this.formStore.beneficiaryForm[index].relationDegree = relationDegree ? relationDegree : new Value();
               this.formStore.beneficiaryForm[index].percentageOfPayoutAmount = each.percentage;
+              if (this.isGons) {
+                this.formStore.beneficiaryForm[index].chooseChild = each.fromService === false ? 'Добавить выгодоприобретателя' : each.longName;
+              }
               if (this.isLiferenta || this.isBolashak) {
                 const insurancePay = this.insurancePay.find((i: Value) => i.id == each.beneficiaryInsurancePayId);
                 this.formStore.beneficiaryForm[index].insurancePay = insurancePay ? insurancePay : new Value();
@@ -2321,15 +2487,32 @@ export const useDataStore = defineStore('data', {
           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(
-            applicationData.policyAppDto.amount === null ? null : applicationData.policyAppDto.amount,
-          );
-          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(
-            applicationData.policyAppDto.premium === null ? null : applicationData.policyAppDto.premium,
-          );
-          if (this.isKazyna) {
+          this.formStore.productConditionsForm.requestedSumInsured = this.isGons
+            ? this.getNumberWithSpacesAfterComma(applicationData.policyAppDto.amount === null ? null : applicationData.policyAppDto.amount)
+            : this.getNumberWithSpaces(applicationData.policyAppDto.amount === null ? null : applicationData.policyAppDto.amount);
+          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.isGons
+            ? this.getNumberWithSpacesAfterComma(applicationData.policyAppDto.premium === null ? null : applicationData.policyAppDto.premium)
+            : this.getNumberWithSpaces(applicationData.policyAppDto.premium === null ? null : applicationData.policyAppDto.premium);
+
+          if (this.isGons) {
+            const govPremiums = await this.api.getGovernmentPremiums(String(this.formStore.applicationData.processInstanceId));
+            this.formStore.productConditionsForm.totalAmount5 = this.getNumberWithSpaces(govPremiums.totalAmount5 === null ? null : govPremiums.totalAmount5);
+            this.formStore.productConditionsForm.totalAmount7 = this.getNumberWithSpaces(govPremiums.totalAmount7 === null ? null : govPremiums.totalAmount7);
+            this.formStore.productConditionsForm.statePremium5 = this.getNumberWithSpaces(govPremiums.statePremium5 === null ? null : govPremiums.statePremium5);
+            this.formStore.productConditionsForm.statePremium7 = this.getNumberWithSpaces(govPremiums.statePremium7 === null ? null : govPremiums.statePremium7);
+            const currency = constants.currencyList.find(item => item.code === applicationData.policyAppDto.currency);
+            this.formStore.productConditionsForm.currency = currency ? currency : new Value();
+          }
+
+          if (this.isKazyna || this.isGons) {
             this.formStore.productConditionsForm.requestedSumInsuredInDollar = this.getNumberWithSpaces(applicationData.policyAppDto.amountInCurrency);
-            this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar = this.getNumberWithSpaces(applicationData.policyAppDto.premiumInCurrency);
+            this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar =
+              this.formStore.applicationData.processCode === constants.products.halykkazynaap
+                ? this.getNumberWithSpacesAfterComma(applicationData.policyAppDto.premiumInCurrency)
+                : this.getNumberWithSpaces(applicationData.policyAppDto.premiumInCurrency);
+            if (applicationData.policyAppDto.currency === 'USD' && applicationData.policyAppDto.amount !== null && applicationData.policyAppDto.premium !== null) {
+              this.currencies.usd = applicationData.policyAppDto.currencyExchangeRate;
+            }
           }
           const riskGroup = this.riskGroup.find(item => {
             if (applicationData.policyAppDto.riskGroup == 0) {
@@ -2410,6 +2593,7 @@ export const useDataStore = defineStore('data', {
           case constants.actions.signed:
           case constants.actions.rejectclient:
           case constants.actions.accept:
+          case constants.actions.recalc:
           case constants.actions.payed: {
             try {
               const sended = await this.sendTask(taskId, action, comment);
@@ -2463,9 +2647,14 @@ export const useDataStore = defineStore('data', {
       }
     },
     async createInvoice() {
-      if (!this.formStore.applicationData.policyAppDto?.premium) return;
+      const premium =
+        this.isLifeBusiness || this.isGns ? this.formStore.applicationData.policyAppDto?.mainPremiumWithCommission : this.formStore.applicationData.policyAppDto?.premium;
+      if (!premium) {
+        this.showToaster('error', this.t('toaster.notZeroPremium'));
+        return;
+      }
       try {
-        const created = await this.api.createInvoice(this.formStore.applicationData.processInstanceId, this.formStore.applicationData.policyAppDto.premium);
+        const created = await this.api.createInvoice(this.formStore.applicationData.processInstanceId, premium);
         return !!created;
       } catch (err) {
         this.isLoading = false;
@@ -2498,14 +2687,43 @@ export const useDataStore = defineStore('data', {
         const disabilityGroup = this.disabilityGroups.find(i => i.id === this.formStore.applicationData[whichMember].disabilityGroupId);
         this.formStore[whichForm].disabilityGroup = disabilityGroup ? disabilityGroup : new Value();
       }
-      if (whichForm === this.formStore.policyholderFormKey && this.isPension && 'pensionApp' in this.formStore.applicationData && !!this.formStore.applicationData.pensionApp) {
-        this.formStore[whichForm].bankInfo.iik = this.formStore.applicationData.pensionApp.account;
-        this.formStore[whichForm].bankInfo.bik = this.formStore.applicationData.pensionApp.bankBik;
-        const bank = this.banks.find(i => i.ids === this.formStore.applicationData.pensionApp.bankBin);
-        const transferCompany = this.transferContractCompanies.find(i => i.nameRu === this.formStore.applicationData.pensionApp.transferContractCompany);
-        this.formStore[whichForm].bankInfo.bankName = bank ? bank : new Value();
-        this.formStore[whichForm].bankInfo.bin = bank ? String(bank.ids) : '';
-        this.formStore.applicationData.pensionApp.transferContractCompany = transferCompany ? transferCompany : new Value();
+      if (whichForm === this.formStore.policyholderFormKey && this.isPension && 'pensionApp' in this.formStore.applicationData && !!this.formStore.pensionApp) {
+        this.formStore[whichForm].bankInfo.iik = this.formStore.pensionApp.account;
+        this.formStore[whichForm].bankInfo.bik = this.formStore.pensionApp.bankBik;
+        this.formStore[whichForm].bankInfo.bankName.id = this.formStore.pensionApp.bankId;
+        this.formStore[whichForm].bankInfo.bankName.nameRu = this.formStore.pensionApp.bankName;
+        this.formStore[whichForm].bankInfo.bin = reformatIin(this.formStore.pensionApp.bankBin);
+        const transferCompany = this.transferContractCompanies.find(i => i.nameRu === this.formStore.pensionApp.transferContractCompany);
+        this.formStore.pensionApp.transferContractCompany = transferCompany ? transferCompany : new Value();
+      }
+    },
+    setMembersFieldSlave() {
+      this.formStore.slaveInsuredForm.familyStatus = this.findObject('familyStatuses', 'id', this.formStore.applicationData.slave['insuredApp'].familyStatusId);
+      this.formStore.slaveInsuredForm.signOfIPDL = this.findObject(
+        'ipdl',
+        'nameRu',
+        this.formStore.applicationData.slave.insuredApp[0].isIpdl === null ? null : this.formStore.applicationData.slave.insuredApp[0].isIpdl == true ? 'Да' : 'Нет',
+      );
+      this.formStore.slaveInsuredForm.gotFromInsis = false;
+      if (!!this.formStore.applicationData.slave.insuredApp[0].profession) this.formStore.slaveInsuredForm.job = this.formStore.applicationData.slave.insuredApp[0].profession;
+      if (!!this.formStore.applicationData.slave.insuredApp[0].position) this.formStore.slaveInsuredForm.jobPosition = this.formStore.applicationData.slave.insuredApp[0].position;
+      if (!!this.formStore.applicationData.slave.insuredApp[0].jobName) this.formStore.slaveInsuredForm.jobPlace = this.formStore.applicationData.slave.insuredApp[0].jobName;
+      if (!!this.formStore.applicationData.slave.insuredApp[0].positionCode)
+        this.formStore.slaveInsuredForm.positionCode = this.formStore.applicationData.slave.insuredApp[0].positionCode;
+      if (typeof this.formStore.applicationData.slave.insuredApp[0].isDisability === 'boolean')
+        this.formStore.slaveInsuredForm.isDisability = this.formStore.applicationData.slave.insuredApp[0].isDisability;
+      if (!!this.formStore.applicationData.slave.insuredApp[0].disabilityGroupId) {
+        const disabilityGroup = this.disabilityGroups.find(i => i.id === this.formStore.applicationData.slave.insuredApp[0].disabilityGroupId);
+        this.formStore.slaveInsuredForm.disabilityGroup = disabilityGroup ? disabilityGroup : new Value();
+      }
+      if (this.formStore.slaveInsuredForm.bankInfo) {
+        this.formStore.slaveInsuredForm.bankInfo.iik = this.formStore.pensionApp.slave.account;
+        this.formStore.slaveInsuredForm.bankInfo.bik = this.formStore.pensionApp.slave.bankBik;
+        this.formStore.slaveInsuredForm.bankInfo.bankName.id = this.formStore.pensionApp.slave.bankId;
+        this.formStore.slaveInsuredForm.bankInfo.bankName.nameRu = this.formStore.pensionApp.slave.bankName;
+        this.formStore.slaveInsuredForm.bankInfo.bin = reformatIin(this.formStore.pensionApp.slave.bankBin);
+        const transferCompany = this.transferContractCompanies.find(i => i.nameRu === this.formStore.pensionApp.slave.transferContractCompany);
+        this.formStore.pensionApp.slave.transferContractCompany = transferCompany ? transferCompany : new Value();
       }
     },
     setMembersFieldIndex(whichForm: Types.MultipleMember, whichMember: keyof typeof MemberAppCodes, index: number) {
@@ -2602,94 +2820,17 @@ export const useDataStore = defineStore('data', {
         };
         const data = prepareSignDocuments();
         if (type === 'qr') {
-          const groupId = await this.api.signQR(data);
+          const groupId = await this.api.file.signQR(data);
           return groupId;
         } else if (type === 'qrXml') {
-          const signData = await this.api.signXml(data);
+          const signData = await this.api.file.signXml(data);
           return signData;
-        } else if (type === 'signature') {
-          const ncaLayerClient = new NCALayerClient();
-          const formTemplate = new FormData();
-          formTemplate.append('format', 'pdf');
-          formTemplate.append('processInstanceId', String(this.formStore.applicationData.processInstanceId));
-          let activeTokens;
-          try {
-            await ncaLayerClient.connect();
-            activeTokens = await ncaLayerClient.getActiveTokens();
-            const storageType = activeTokens[0] || NCALayerClient.fileStorageType;
-            if (this.formStore.applicationData.statusCode === 'ContractSignedFrom') {
-              const document = await this.generatePDFDocument('PA_Contract', '38', 'pdf');
-              const base64EncodedSignature = await ncaLayerClient.basicsSignCMS(storageType, document, NCALayerClient.basicsCMSParams, NCALayerClient.basicsSignerSignAny);
-              const formData = formTemplate;
-              formData.append('base64EncodedSignature', base64EncodedSignature);
-              formData.append('name', 'PA_Contract');
-              try {
-                await this.api.uploadDigitalCertifijcate(formData);
-                await this.handleTask('accept', String(this.formStore.applicationTaskId));
-              } catch (e) {
-                this.showToaster('error', String(e));
-                return;
-              }
-            } else if (this.formStore.applicationData.statusCode === 'HeadManagerForm') {
-              const document = await this.generatePDFDocument('PA_Contract', '38', 'pdf');
-              const base64EncodedSignature = await ncaLayerClient.basicsSignCMS(storageType, document, NCALayerClient.basicsCMSParams, NCALayerClient.basicsSignerSignAny);
-              const formData = formTemplate;
-              formData.append('base64EncodedSignature', base64EncodedSignature);
-              formData.append('name', 'PA_Contract');
-              try {
-                await this.api.uploadDigitalCertificatePensionAnnuityNew(formData);
-                await this.handleTask('accept', String(this.formStore.applicationTaskId));
-              } catch (e) {
-                this.showToaster('error', String(e));
-                return;
-              }
-            } else {
-              if (!!this.formStore.signedDocumentList.find(i => i.fileTypeCode === '43')?.signed) {
-                const statement = await this.generatePDFDocument('PA_Statement', '37', 'pdf');
-                const statementSignature = await ncaLayerClient.basicsSignCMS(storageType, statement, NCALayerClient.basicsCMSParams, NCALayerClient.basicsSignerSignAny);
-                const statementData = formTemplate;
-                statementData.append('base64EncodedSignature', statementSignature);
-                statementData.append('name', 'PA_Statement');
-                await this.api.uploadDigitalCertifijcate(statementData);
-                const agreement = await this.generatePDFDocument('Agreement', '19', 'pdf');
-                const agreementSignature = await ncaLayerClient.basicsSignCMS(storageType, agreement, NCALayerClient.basicsCMSParams, NCALayerClient.basicsSignerSignAny);
-                const agreementData = formTemplate;
-                agreementData.append('base64EncodedSignature', agreementSignature);
-                agreementData.append('name', 'Agreement');
-                await this.api.uploadDigitalCertifijcate(agreementData);
-                await this.handleTask('accept', String(this.formStore.applicationTaskId));
-              } else {
-                const document = {
-                  processInstanceId: String(this.formStore.applicationData.processInstanceId),
-                  name: 'PAEnpf_Agreement',
-                  format: 'xml',
-                };
-                const signData = await this.api.signXml([document]);
-                const agreementXml = await this.api.getDocumentsByEdsXmlId(signData.data);
-                const wnd = window.open('about:blank', '', '_blank');
-                wnd?.document.write(agreementXml.data.document.documentXml);
-                const signedAgreement = await ncaLayerClient.signXml(storageType, agreementXml.data.document.documentXml, 'SIGNATURE', '');
-                const data = new FormData();
-                data.append('processInstanceId', String(this.formStore.applicationData.processInstanceId));
-                data.append('xmlData', signedAgreement);
-                data.append('name', 'PAEnpf_Agreement');
-                data.append('format', 'xml');
-                data.append('EdsXmlId', signData.data);
-                await this.api.uploadXml(data);
-                await this.getSignedDocList(this.formStore.applicationData.processInstanceId);
-                this.showToaster('success', this.t('pension.consentGiven'), 3000);
-              }
-            }
-          } catch (error) {
-            this.showToaster('error', String(error));
-            return;
-          }
         } else {
-          if (this.processCode === 19 || this.processCode === 2 || this.processCode === 4) {
-            const result = await this.api.signBts(data);
+          if (this.processCode === 19 || this.processCode === 24 || this.processCode === 25) {
+            const result = await this.api.file.signBts(data);
             if (result.code === 0) this.formStore.signUrls = result.data;
           } else {
-            const result = await this.api.signDocument(data);
+            const result = await this.api.file.signDocument(data);
             this.formStore.signUrls = result;
           }
           return this.formStore.signUrls;
@@ -2698,6 +2839,84 @@ export const useDataStore = defineStore('data', {
         ErrorHandler(err);
       }
     },
+    async nclayerSign(groupId: string, signType: number, isXml: boolean = false, processInstanceId?: string) {
+      try {
+        const ncaLayerClient = new NCALayerClient();
+        await ncaLayerClient.connect();
+        const activeTokens = await ncaLayerClient.getActiveTokens();
+        const storageType = activeTokens[0] || NCALayerClient.fileStorageType;
+        const document = await this.getDocNew(groupId, signType, isXml);
+        if (isXml) {
+          const signedAgreement = await ncaLayerClient.signXml(storageType, document, 'SIGNATURE', '');
+          const data = new FormData();
+          data.append('processInstanceId', processInstanceId ?? String(this.formStore.applicationData.processInstanceId));
+          data.append('xmlData', signedAgreement);
+          data.append('name', 'PAEnpf_Agreement');
+          data.append('format', 'xml');
+          data.append('EdsXmlId', groupId);
+          await this.api.file.uploadXml(data);
+        } else {
+          const base64EncodedSignature = await ncaLayerClient.createCAdESFromBase64(storageType, document, 'SIGNATURE', true);
+          await this.api.file.uploadDigitalCertificateNca(groupId, { Base64EncodedSignature: base64EncodedSignature });
+        }
+        return true;
+      } catch (err: any) {
+        return err.name === 'NCALayerError' ? null : ErrorHandler(err);
+      }
+    },
+    async getDocNew(groupId: string, documentSignType: number, xml: boolean, fileName?: string) {
+      try {
+        let response: any = await this.api.file.generalGetDoc(groupId, xml ? 5 : documentSignType);
+        let blob;
+        if (response.hasOwnProperty('data')) {
+          const document = JSON.parse(response.data).Document;
+          blob = new Blob([document.documentXml], {
+            type: `application/xml`,
+          });
+          response = document.documentXml;
+        } else {
+          blob = new Blob([response], {
+            type: `application/pdf`,
+          });
+        }
+        const url = window.URL.createObjectURL(blob);
+        if (!xml) {
+          const link = document.createElement('a');
+          link.href = url;
+          link.setAttribute('download', fileName ?? `Документ ПА`);
+          document.body.appendChild(link);
+          link.click();
+        }
+        window.open(url, '_blank', `right=100`);
+        return response;
+      } catch (err) {
+        ErrorHandler(err);
+      }
+    },
+    async generateSign(taskId: string) {
+      try {
+        const signatories = await this.api.file.generateSign({ taskId });
+        if (Array.isArray(signatories)) {
+          signatories.forEach(signatory =>
+            signatory.fileDatas?.sort(function (a: any, b: any) {
+              return a.orderFile > b.orderFile ? 1 : b.orderFile > a.orderFile ? -1 : 0;
+            }),
+          );
+          this.formStore.signatories = signatories;
+        }
+      } catch (err) {
+        ErrorHandler(err);
+        this.formStore.signatories = [];
+      }
+    },
+    async generalSign(data: Types.Api.Sign.New.GeneralResponse) {
+      try {
+        const response = await this.api.file.generalSign(data);
+        return response;
+      } catch (err) {
+        ErrorHandler(err);
+      }
+    },
     async downloadTemplate(documentType: number, fileType: string = 'pdf', processInstanceId?: string | number) {
       try {
         this.isButtonsLoading = true;
@@ -2764,7 +2983,7 @@ export const useDataStore = defineStore('data', {
           name: 'Contract',
           format: 'pdf',
         };
-        const response: any = await this.api.generateDocument(data);
+        const response: any = await this.api.file.generateDocument(data);
         const blob = new Blob([response], {
           type: `application/pdf`,
         });
@@ -2847,16 +3066,10 @@ export const useDataStore = defineStore('data', {
         this.isLoading = false;
       }
     },
-    sanitize(text: string) {
-      return text
-        .replace(/\r?\n|\r/g, '')
-        .replace(/\\/g, '')
-        .replace(/"/g, '');
-    },
     async getSignedDocList(processInstanceId: string | number) {
       if (processInstanceId !== 0) {
         try {
-          this.formStore.signedDocumentList = await this.api.getSignedDocList({
+          this.formStore.signedDocumentList = await this.api.file.getSignedDocList({
             processInstanceId: processInstanceId,
           });
         } catch (err) {
@@ -2923,6 +3136,15 @@ export const useDataStore = defineStore('data', {
             }
           }
         }
+      } else if (applicationKey === 'slave') {
+        if (this.formStore.slaveInsuredForm && this.formStore.applicationData.slave) {
+          const localSlave = this.formStore.slaveInsuredForm;
+          const applicationSlave = this.formStore.applicationData.slave.insuredApp[0];
+          if ((localSlave.id === applicationSlave.insisId && applicationSlave.iin === localSlave.iin?.replace(/-/g, '')) === false) {
+            this.showToaster('error', this.t('toaster.notSavedMember', { text: text }), 3000);
+            return false;
+          }
+        }
       } else {
         if (this.formStore[localKey].some(i => i.iin !== null)) {
           this.showToaster('error', this.t('toaster.notSavedMember', { text: text }), 3000);
@@ -2941,6 +3163,9 @@ export const useDataStore = defineStore('data', {
       return true;
     },
     async validateAllMembers(taskId: string, localCheck: boolean = false) {
+      const policyholderDoc = this.formStore.signedDocumentList.find(
+        i => i.iin === String(this.formStore.policyholderForm.iin).replaceAll('-', '') && (i.fileTypeCode === '1' || i.fileTypeCode === '2' || i.fileTypeCode === '4'),
+      );
       if (taskId === '0') {
         this.showToaster('error', this.t('toaster.needToRunStatement'), 2000);
         return false;
@@ -2949,6 +3174,10 @@ export const useDataStore = defineStore('data', {
         this.showToaster('error', this.t('toaster.notSavedMember', { text: 'страхователя' }), 3000);
         return false;
       }
+      if (useEnv().isProduction && this.isInitiator() && this.isEfoParent && this.formStore.policyholderForm.iin && !policyholderDoc) {
+        this.showToaster('error', this.t('toaster.needDigDoc', { text: 'страхователя' }));
+        return false;
+      }
       if (this.members.insuredApp.has) {
         if (this.validateMultipleMembers(this.formStore.insuredFormKey, 'insuredApp', 'застрахованных') === false) {
           return false;
@@ -2961,6 +3190,9 @@ export const useDataStore = defineStore('data', {
           }
         }
       }
+      if (this.formStore.applicationData.slave && this.validateMultipleMembers(this.formStore.insuredFormKey, 'slave', 'застрахованных') === false) {
+        return false;
+      }
       if (this.members.beneficiaryApp.has) {
         if (this.validateMultipleMembers(this.formStore.beneficiaryFormKey, 'beneficiaryApp', 'выгодоприобретателей') === false) {
           return false;
@@ -3009,7 +3241,11 @@ export const useDataStore = defineStore('data', {
         }
       }
       if (this.controls.hasAttachment) {
-        const areValid = this.formStore.SaleChanellPolicy.nameRu && this.formStore.RegionPolicy.nameRu && this.formStore.ManagerPolicy.nameRu && this.formStore.AgentData.fullName;
+        const areValid =
+          this.formStore.SaleChanellPolicy.nameRu &&
+          this.formStore.RegionPolicy.nameRu &&
+          this.formStore.AgentData.fullName &&
+          (this.isPension && this.isServiceManager() ? true : this.formStore.ManagerPolicy.nameRu);
         if (areValid) {
           if (this.isLifetrip && this.formStore.AgentData.fullName === 'Без агента') {
             this.isLoading = false;
@@ -3041,6 +3277,27 @@ export const useDataStore = defineStore('data', {
           return ErrorHandler(err);
         }
       }
+      if (this.isGons) {
+        const { relationDegree } = this.formStore.beneficiaryForm[0];
+        const siblingRelationIds = ['14', '15', '24', '25'];
+        const grandchildRelationIds = ['20', '21'];
+        let hasSiblingRelationId = siblingRelationIds.includes(String(relationDegree?.ids));
+        let hasGrandchildRelationId = grandchildRelationIds.includes(String(relationDegree?.ids));
+        const hasRelationDoc = this.formStore.signedDocumentList.filter(i => i.fileTypeCode === '46' || i.fileTypeCode === '53').length >= 2;
+
+        if (hasSiblingRelationId && !hasRelationDoc) {
+          this.isLoading = false;
+          hasSiblingRelationId = false;
+          this.showToaster('error', this.t('toaster.siblingRelationDoc'), 3000);
+          return false;
+        }
+        if (hasGrandchildRelationId && !hasRelationDoc) {
+          this.isLoading = false;
+          hasGrandchildRelationId = false;
+          this.showToaster('error', this.t('toaster.grandchildRelationDoc'), 3000);
+          return false;
+        }
+      }
       return true;
     },
     validateAnketa(whichSurvey: 'surveyByHealthBase' | 'surveyByHealthBasePolicyholder' | 'surveyByCriticalBase' | 'surveyByCriticalBasePolicyholder') {
@@ -3077,7 +3334,12 @@ export const useDataStore = defineStore('data', {
       this.isLoading = true;
       const areMembersValid = await this.validateAllMembers(taskId);
       if (areMembersValid) {
-        if ((!!this.formStore.productConditionsForm.insurancePremiumPerMonth && !!this.formStore.productConditionsForm.requestedSumInsured) || this.isPension) {
+        if (
+          (!!this.formStore.productConditionsForm.insurancePremiumPerMonth && !!this.formStore.productConditionsForm.requestedSumInsured) ||
+          (this.isPension &&
+            this.formStore.applicationData.pensionApp.isCalculated === true &&
+            (this.formStore.applicationData.pensionApp.slave ? this.formStore.applicationData.pensionApp.slave.isCalculated === true : true))
+        ) {
           if (this.controls.hasAnketa) {
             const hasCritical =
               this.formStore.additionalInsuranceTerms?.find(cover => cover.coverTypeName.match(new RegExp('Критическое заболевание Застрахованного', 'i'))) ?? null;
@@ -3085,62 +3347,62 @@ export const useDataStore = defineStore('data', {
               await Promise.allSettled([
                 this.getQuestionList('health', this.formStore.applicationData.processInstanceId, this.formStore.applicationData.insuredApp[0].id, 'surveyByHealthBase'),
                 this.isClientAnketaCondition &&
-                  this.getQuestionList(
-                    'health',
-                    this.formStore.applicationData.processInstanceId,
-                    this.formStore.applicationData.clientApp.id,
-                    'surveyByHealthBasePolicyholder',
-                    'policyholder',
-                  ),
+                this.getQuestionList(
+                  'health',
+                  this.formStore.applicationData.processInstanceId,
+                  this.formStore.applicationData.clientApp.id,
+                  'surveyByHealthBasePolicyholder',
+                  'policyholder',
+                ),
                 ,
               ]);
               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');
-                    }),
-                  ])
+                  ...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');
-                    }),
-                  );
+                  this.formStore.surveyByHealthBase!.body.map(async question => {
+                    await this.definedAnswers(question.first.id, 'surveyByHealthBase');
+                  }),
+                );
             } else {
               await Promise.allSettled([
                 this.getQuestionList('health', this.formStore.applicationData.processInstanceId, this.formStore.applicationData.insuredApp[0].id, 'surveyByHealthBase'),
                 this.getQuestionList('critical', this.formStore.applicationData.processInstanceId, this.formStore.applicationData.insuredApp[0].id, 'surveyByCriticalBase'),
                 this.isClientAnketaCondition &&
-                  this.getQuestionList(
-                    'health',
-                    this.formStore.applicationData.processInstanceId,
-                    this.formStore.applicationData.clientApp.id,
-                    'surveyByHealthBasePolicyholder',
-                    'policyholder',
-                  ),
+                this.getQuestionList(
+                  'health',
+                  this.formStore.applicationData.processInstanceId,
+                  this.formStore.applicationData.clientApp.id,
+                  'surveyByHealthBasePolicyholder',
+                  'policyholder',
+                ),
               ]);
               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');
-                    }),
-                  ])
+                  ...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');
-                    }),
-                  ]);
+                  ...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');
+                  }),
+                ]);
             }
             if (this.validateAnketa('surveyByHealthBase')) {
               let hasCriticalAndItsValid = null;
@@ -3244,13 +3506,16 @@ export const useDataStore = defineStore('data', {
       if (!this.accessToken) return null;
       try {
         const decoded = jwtDecode(this.accessToken);
-        const data = {
-          userName: decoded.code,
-          branchName: decoded.branchCode,
-          bin: bin.replace(/-/g, ''),
-        };
-        const gbdulResponse = await this.api.getGbdUl(data);
-        return gbdulResponse;
+        if (decoded) {
+          const data = {
+            userName: decoded.code,
+            branchName: decoded.branchCode,
+            bin: bin.replace(/-/g, ''),
+          };
+          const gbdulResponse = await this.api.getGbdUl(data);
+          return gbdulResponse;
+        }
+        return null;
       } catch (err) {
         return ErrorHandler(err);
       }
@@ -3332,69 +3597,72 @@ export const useDataStore = defineStore('data', {
       const gender = this.gender.find((i: Value) => i.id == person.gender.code);
       if (gender) member.gender = gender;
 
-      const birthPlace = this.countries.find(i => (i.nameRu as string).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 ?? 'undefined', 'i')));
       if (birthPlace) member.birthPlace = birthPlace;
 
-      const countryOfCitizenship = this.citizenshipCountries.find(i => (i.nameRu as string).match(new RegExp(person.citizenship.nameRu, 'i')));
+      const countryOfCitizenship = this.citizenshipCountries.find(i => (i.nameRu as string).match(new RegExp(person.citizenship.nameRu ?? 'undefined', 'i')));
       if (countryOfCitizenship) member.countryOfCitizenship = countryOfCitizenship;
 
-      const regCountry = this.countries.find(i => (i.nameRu as string).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 ?? 'undefined', 'i')));
       if (regCountry) member.registrationCountry = regCountry;
 
-      const regProvince = this.states.find(i => (i.nameRu as string).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 ?? 'undefined', 'i')));
       if (regProvince) member.registrationProvince = regProvince;
+      else member.registrationProvince = new Value();
 
-      if ('city' in person.regAddress && !!person.regAddress.city) {
-        if (person.regAddress.city.includes(', ')) {
-          const personCities = person.regAddress.city.split(', ');
+      let hasSetCity = false;
+      let hasSetRegion = false;
+      if (person.regAddress.city && String(person.regAddress.city).includes(', ')) {
+        const personCities = String(person.regAddress.city).split(', ');
+        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;
+            hasSetCity = true;
+            break;
+          }
+        }
+        if (member.registrationCity.nameRu === null) {
           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;
+            const possibleRegion = this.regions.find(i => String(i.nameRu).includes(personCities[ind]));
+            if (possibleRegion) {
+              member.registrationRegion = possibleRegion;
+              hasSetRegion = true;
               break;
             }
           }
-          if (member.registrationCity.nameRu === null) {
-            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;
-              }
-            }
-          }
-        } else {
-          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 => String(i.nameRu).match(new RegExp(person.regAddress.city, 'i')));
-            if (regRegion) member.registrationRegion = regRegion;
-          }
         }
       }
 
-      if (member.registrationCity.nameRu === null && member.registrationRegion.nameRu === null) {
+      if (hasSetCity === false) {
         const regCity = this.cities.find(
-          i => String(i.nameRu).match(new RegExp(person.regAddress.region.nameRu, 'i')) || String(i.nameRu).match(new RegExp(person.regAddress.district.nameRu, 'i')),
+          i =>
+            String(i.nameRu).match(new RegExp(person.regAddress.city ?? 'undefined', 'i')) ||
+            String(i.nameRu).match(new RegExp(person.regAddress.region.nameRu ?? 'undefined', 'i')) ||
+            String(i.nameRu).match(new RegExp(person.regAddress.district.nameRu ?? 'undefined', 'i')),
         );
         if (regCity) {
           member.registrationCity = regCity;
           const regType = this.localityTypes.find(i => String(i.nameRu) === 'город');
           if (regType) member.registrationRegionType = regType;
-        } else {
-          const regRegion = this.regions.find(
-            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 => String(i.nameRu) === 'село' || String(i.nameRu) === 'поселок');
-            if (regType) member.registrationRegionType = regType;
-          }
-        }
+        } else member.registrationCity = new Value();
       }
 
-      if (person.regAddress.street.includes(', ')) {
+      if (hasSetRegion === false) {
+        const regRegion = this.regions.find(
+          i =>
+            String(i.nameRu).match(new RegExp(person.regAddress.city ?? 'undefined', 'i')) ||
+            String(i.nameRu).match(new RegExp(person.regAddress.region.nameRu ?? 'undefined', 'i')) ||
+            String(i.nameRu).match(new RegExp(person.regAddress.district.nameRu ?? 'undefined', 'i')),
+        );
+        if (regRegion) {
+          member.registrationRegion = regRegion;
+          const regType = this.localityTypes.find(i => String(i.nameRu) === 'село' || String(i.nameRu) === 'поселок');
+          if (regType) member.registrationRegionType = regType;
+        } else member.registrationRegion = new Value();
+      }
+
+      if (person.regAddress.street && person.regAddress.street.includes(', ')) {
         const personAddress = person.regAddress.street.split(', ');
         const microDistrict = personAddress.find((i: string) => i.match(new RegExp('микрорайон', 'i')));
         const quarter = personAddress.find((i: string) => i.match(new RegExp('квартал', 'i')));
@@ -3409,19 +3677,28 @@ export const useDataStore = defineStore('data', {
       if (person.regAddress.flat) member.registrationNumberApartment = person.regAddress.flat;
 
       if (Array.isArray(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 === Enums.GBD.DocTypes['1UDL'] || i.type.code === Enums.GBD.DocTypes.VNZ || i.type.code === Enums.GBD.DocTypes.PS),
-        );
+        const filteredDocuments = person.documents.document.filter(i => new Date(i.endDate) > new Date(Date.now()) && i.status.code === '00');
+        const validDocument = this.isLifetrip
+          ? filteredDocuments.find(i => i.type.code === CoreEnums.GBD.DocTypes.PS)
+          : filteredDocuments.find(i => i.type.code === CoreEnums.GBD.DocTypes['1UDL']) ??
+          filteredDocuments.find(i => i.type.code === CoreEnums.GBD.DocTypes.VNZ) ??
+          filteredDocuments.find(i => i.type.code === CoreEnums.GBD.DocTypes.PS);
         if (validDocument) {
-          const documentType = this.documentTypes.find((i: Value) => i.ids === Object.keys(Enums.GBD.DocTypes)[Object.values(Enums.GBD.DocTypes).indexOf(validDocument.type.code)]);
+          const documentType = this.documentTypes.find(
+            (i: Value) => i.ids === Object.keys(CoreEnums.GBD.DocTypes)[Object.values(CoreEnums.GBD.DocTypes).indexOf(validDocument.type.code)],
+          );
           if (documentType) member.documentType = documentType;
           if (validDocument.number) member.documentNumber = validDocument.number;
           if (validDocument.beginDate) member.documentDate = reformatDate(validDocument.beginDate);
           if (validDocument.endDate) member.documentExpire = reformatDate(validDocument.endDate);
-          const documentIssuer = this.documentIssuers.find(i => (i.nameRu as string).match(new RegExp('МВД РК', 'i')));
+          const documentIssuer = this.documentIssuers.find(i =>
+            (i.nameRu as string).match(
+              new RegExp(
+                validDocument.issueOrganization.code === '001' ? 'МЮ РК' : validDocument.issueOrganization.code === '002' ? 'МВД РК' : validDocument.issueOrganization.nameRu,
+                'i',
+              ),
+            ),
+          );
           if (documentIssuer) member.documentIssuers = documentIssuer;
         }
       } else {
@@ -3429,9 +3706,11 @@ export const useDataStore = defineStore('data', {
         if (
           personDoc.status.code === '00' &&
           new Date(personDoc.endDate) > new Date(Date.now()) &&
-          (personDoc.type.code === Enums.GBD.DocTypes['1UDL'] || personDoc.type.code === Enums.GBD.DocTypes.VNZ || personDoc.type.code === Enums.GBD.DocTypes.PS)
+          (personDoc.type.code === CoreEnums.GBD.DocTypes['1UDL'] || personDoc.type.code === CoreEnums.GBD.DocTypes.VNZ || personDoc.type.code === CoreEnums.GBD.DocTypes.PS)
         ) {
-          const documentType = this.documentTypes.find((i: Value) => i.ids === Object.keys(Enums.GBD.DocTypes)[Object.values(Enums.GBD.DocTypes).indexOf(personDoc.type.code)]);
+          const documentType = this.documentTypes.find(
+            (i: Value) => i.ids === Object.keys(CoreEnums.GBD.DocTypes)[Object.values(CoreEnums.GBD.DocTypes).indexOf(personDoc.type.code)],
+          );
           if (documentType) member.documentType = documentType;
           const documentNumber = personDoc.number;
           if (documentNumber) member.documentNumber = documentNumber;
@@ -3439,7 +3718,11 @@ export const useDataStore = defineStore('data', {
           if (documentDate) member.documentDate = reformatDate(documentDate);
           const documentExpire = personDoc.endDate;
           if (documentExpire) member.documentExpire = reformatDate(documentExpire);
-          const documentIssuer = this.documentIssuers.find(i => (i.nameRu as string).match(new RegExp('МВД РК', 'i')));
+          const documentIssuer = this.documentIssuers.find(i =>
+            (i.nameRu as string).match(
+              new RegExp(personDoc.issueOrganization.code === '001' ? 'МЮ РК' : personDoc.issueOrganization.code === '002' ? 'МВД РК' : personDoc.issueOrganization.nameRu, 'i'),
+            ),
+          );
           if (documentIssuer) member.documentIssuers = documentIssuer;
         }
       }
@@ -3463,6 +3746,22 @@ export const useDataStore = defineStore('data', {
         });
       }
     },
+    uniqPreparePersonData(local: GroupMember) {
+      const checkForNull = (value: any) => (value ? value : '');
+      try {
+        (Object.keys(local) as Array<keyof GroupMember>).forEach(key => {
+          if (key === 'actualAddress' || key === 'legalAddress') {
+            const address = `${checkForNull(local[key].country.nameRu)}, ${checkForNull(local[key].state.nameRu)},${local[key].region.nameRu ? ` ${local[key].region.nameRu},` : ''
+              } ${checkForNull(local[key].regionType.nameRu)} ${checkForNull(local[key].city.nameRu)},${local[key].square ? ` квартал ${local[key].square},` : ''}${local[key].microdistrict ? ` мкр ${local[key].microdistrict},` : ''
+              } ул. ${checkForNull(local[key].street)}, д. ${checkForNull(local[key].houseNumber)}`;
+            local[key].longName = address;
+            local[key].longNameKz = address;
+          }
+        });
+      } catch (e) {
+        ErrorHandler(e);
+      }
+    },
     async startApplicationV2(data: PolicyholderClass) {
       const policyholder = JSON.parse(JSON.stringify(data)) as any;
       this.preparePersonData(policyholder);
@@ -3478,14 +3777,17 @@ export const useDataStore = defineStore('data', {
         'clientData.authoritedPerson.bankInfo',
         'clientData.authoritedPerson.economySectorCode',
         'clientData.authoritedPerson.legalAddress',
-        'clientData.authoritedPerson.placeOfBirth',
-        'clientData.authoritedPerson.resident',
         'clientData.authoritedPerson.taxResidentCountry',
         'clientData.authoritedPerson.addTaxResidency',
       ]);
       policyholder.clientData.authoritedPerson.gender = policyholder.clientData.authoritedPerson.gender.nameRu === 'Мужской' ? 1 : 2;
+      this.uniqPreparePersonData(policyholder.clientData);
+      if (this.formStore.lfb.add) {
+        policyholder.parentContractNumber = localStorage.getItem('policyNo');
+        policyholder.parentContractId = localStorage.getItem('policyId');
+      }
       try {
-        const response = await this.api.startApplication(policyholder);
+        const response = await this.api.startApplication(policyholder, Number(this.processCode));
         this.sendToParent(constants.postActions.applicationCreated, response.processInstanceId);
         return response.processInstanceId;
       } catch (err) {
@@ -3496,6 +3798,7 @@ export const useDataStore = defineStore('data', {
       const policyholder = JSON.parse(JSON.stringify(data)) as any;
       policyholder.clientData.authoritedPerson.gender = policyholder.clientData.authoritedPerson.gender.nameRu === 'Мужской' ? 1 : 2;
       this.preparePersonData(policyholder);
+      this.uniqPreparePersonData(policyholder.clientData);
       try {
         await this.api.saveClient(this.formStore.applicationData.processInstanceId, this.formStore.lfb.clientId, policyholder);
       } catch (err) {
@@ -3515,7 +3818,6 @@ export const useDataStore = defineStore('data', {
         this.formStore.applicationData = applicationData;
         this.formStore.regNumber = applicationData.regNumber;
         this.formStore.additionalInsuranceTerms = applicationData.addCoverDto;
-
         this.formStore.canBeClaimed = await this.api.isClaimTask(taskId);
         this.formStore.applicationTaskId = taskId;
         this.formStore.RegionPolicy.nameRu = applicationData.insisWorkDataApp.regionPolicyName;
@@ -3536,17 +3838,8 @@ export const useDataStore = defineStore('data', {
 
         this.formStore.applicationData.processInstanceId = applicationData.processInstanceId;
         this.formStore.lfb.policyholder.isIpdl = applicationData.clientApp.isIpdl;
-        this.formStore.lfb.policyholder.clientData = clientData;
-        this.formStore.lfb.policyholder.clientData.authoritedPerson = clientData.authoritedPerson;
-        this.formStore.lfb.policyholder.clientData.iin = reformatIin(clientData.iin);
-        this.formStore.lfb.policyholder.clientData.authoritedPerson.iin = reformatIin(clientData.authoritedPerson.iin);
         this.formStore.lfb.clientId = clientId;
-        this.formStore.lfb.policyholder.clientData.authoritedPerson.authorityDetails.date = reformatDate(clientData.authoritedPerson.authorityDetails.date);
-        this.formStore.lfb.policyholder.clientData.authoritedPerson.birthDate = reformatDate(clientData.authoritedPerson.birthDate) ?? '';
-        this.formStore.lfb.policyholder.clientData.authoritedPerson.identityDocument.issuedOn = reformatDate(clientData.authoritedPerson.identityDocument.issuedOn) ?? '';
-        this.formStore.lfb.policyholder.clientData.authoritedPerson.identityDocument.validUntil = reformatDate(clientData.authoritedPerson.identityDocument.validUntil) ?? '';
-        const gender = this.gender.find((i: Value) => i.id === clientData.authoritedPerson.gender);
-        this.formStore.lfb.policyholder.clientData.authoritedPerson.gender = gender ? gender : new Value();
+        this.getClientData(clientData);
 
         if (clientData && clientData.activityTypes !== null) {
           this.formStore.lfb.policyholderActivities = clientData.activityTypes;
@@ -3566,9 +3859,8 @@ export const useDataStore = defineStore('data', {
           });
         }
 
-        if (insuredApp && insuredApp.length) {
-          const res = await this.newInsuredList(insuredApp);
-          this.formStore.lfb.clients = res;
+        if (insuredApp === null) {
+          await this.getInsuredsData();
         }
 
         if (accidentIncidents && accidentIncidents.length) {
@@ -3579,19 +3871,43 @@ export const useDataStore = defineStore('data', {
           });
         }
 
+        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);
+
         this.formStore.productConditionsForm.calcDate = reformatDate(applicationData.policyAppDto.calcDate);
         this.formStore.productConditionsForm.contractEndDate = reformatDate(applicationData.policyAppDto.contractEndDate);
-        this.formStore.productConditionsForm.agentCommission = applicationData.policyAppDto.agentCommission === 0 ? null : applicationData.policyAppDto.agentCommission;
+        this.formStore.productConditionsForm.agentCommission = applicationData.policyAppDto.agentCommission;
         this.formStore.productConditionsForm.fixInsSum = this.getNumberWithSpaces(applicationData.policyAppDto.fixInsSum === 0 ? null : applicationData.policyAppDto.fixInsSum);
         this.formStore.productConditionsForm.coverPeriod = 12;
         this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(applicationData.policyAppDto.amount === 0 ? null : applicationData.policyAppDto.amount);
-        this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(
-          applicationData.policyAppDto.mainPremiumWithCommission === 0 ? null : applicationData.policyAppDto.mainPremiumWithCommission,
-        );
+        this.formStore.productConditionsForm.insurancePremiumPerMonth =
+          applicationData.policyAppDto.mainPremiumWithCommission === 0 ? null : this.getNumberWithSpacesAfterComma(applicationData.policyAppDto.mainPremiumWithCommission);
         const paymentPeriod = this.processPaymentPeriod.find(item => item.id == applicationData.policyAppDto.paymentPeriodId);
         this.formStore.productConditionsForm.paymentPeriod = paymentPeriod ? paymentPeriod : new Value();
         const processGfot = this.processGfot.find(item => item.id == applicationData.policyAppDto.processDefinitionFgotId);
         this.formStore.productConditionsForm.processGfot = processGfot ? processGfot : new Value();
+
+        if (applicationData.parentPolicyDto !== null) {
+          this.formStore.productConditionsForm.calcDate = reformatDate(applicationData.parentPolicyDto.contractInsrBegin);
+          this.formStore.productConditionsForm.contractEndDate = reformatDate(applicationData.parentPolicyDto.contractInsrEnd);
+        }
+        if (this.formStore.lfb.add) {
+          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpacesAfterComma(applicationData.policyAppDto.premium);
+          this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpacesAfterComma(applicationData.policyAppDto.amount);
+          if (applicationData.policyAppDto.mainPremiumWithCommission > 0) {
+            this.formStore.productConditionsForm.amountPaid = this.getNumberWithSpacesAfterComma(applicationData.policyAppDto.mainPremiumWithCommission);
+            this.formStore.productConditionsForm.amountRefunded = null;
+          } else {
+            this.formStore.productConditionsForm.amountRefunded = this.getNumberWithSpacesAfterComma(applicationData.policyAppDto.mainPremiumWithCommission);
+            this.formStore.productConditionsForm.amountPaid = null;
+          }
+        }
       } catch (err) {
         ErrorHandler(err);
         if (err instanceof AxiosError) {
@@ -3670,9 +3986,9 @@ export const useDataStore = defineStore('data', {
         return ErrorHandler(err);
       }
     },
-    async saveInsuredList(insuredList: any) {
+    async saveInsuredList(insuredList: any, newInsureds: boolean) {
       try {
-        await this.api.saveInsuredList(this.formStore.applicationData.processInstanceId, insuredList);
+        await this.api.saveInsuredList(this.formStore.applicationData.processInstanceId, newInsureds, insuredList);
         return true;
       } catch (err) {
         return ErrorHandler(err);
@@ -3686,6 +4002,18 @@ export const useDataStore = defineStore('data', {
         return ErrorHandler(err);
       }
     },
+    async getInsuredsData() {
+      try {
+        const result = await this.api.getInsuredsData(this.formStore.applicationData.processInstanceId);
+        if (result && result.length) {
+          this.formStore.applicationData.insuredApp = result;
+          const res = await this.newInsuredList(result);
+          this.formStore.lfb.clients = res;
+        }
+      } catch (err) {
+        return ErrorHandler(err);
+      }
+    },
     newInsuredList(list: any) {
       const clients = list.map((item: any, index: number) => {
         const client = item.insuredData;
@@ -3700,6 +4028,9 @@ export const useDataStore = defineStore('data', {
           premium: client.insuredPolicyData.premium,
           premiumWithLoad: client.insuredPolicyData.premiumWithLoad,
           hasAttachedFile: client.hasAttachedFile,
+          insrBeginDate: client.insuredPolicyData.insrBeginDate ?? 'no',
+          insrEndDate: client.insuredPolicyData.insrEndDate ?? 'no',
+          tableNumber: client.tableNumber,
         };
       });
       return clients;
@@ -3748,7 +4079,7 @@ export const useDataStore = defineStore('data', {
         return false;
       }
 
-      if (this.formStore.lfb.beneficialOwners) {
+      if (!this.formStore.lfb.add && this.formStore.lfb.beneficialOwners) {
         if (this.validateMultipleMembersV2('beneficialOwners', 'beneficialOwnerApp', 'бенефициарных собственников') === false) {
           return false;
         }
@@ -3759,12 +4090,16 @@ export const useDataStore = defineStore('data', {
         }
       }
 
-      if (this.formStore.applicationData.clientApp.clientData.activityTypes === null) {
+      if (!this.formStore.lfb.add && this.formStore.applicationData.clientApp.clientData.activityTypes === null) {
         this.showToaster('error', this.t('toaster.notSavedMember', { text: 'деятельности Страхователя' }), 3000);
         return false;
       }
 
-      if (this.formStore.lfb.clients) {
+      const isHalykBank = this.formStore.lfb.policyholder.clientData.iin.replace(/-/g, '') === '940140000385';
+      if (this.formStore.lfb.clients.length === 0 && !isHalykBank) {
+        await this.getInsuredsData();
+      }
+      if (this.formStore.lfb.clients && !isHalykBank) {
         if (this.validateMultipleMembersV2('clients', 'insuredApp', 'застрахованных') === false) {
           return false;
         }
@@ -3775,7 +4110,7 @@ export const useDataStore = defineStore('data', {
         }
       }
 
-      if (this.formStore.lfb.clients && this.formStore.lfb.clients.length <= 10) {
+      if (!this.formStore.lfb.add && this.formStore.lfb.clients && this.formStore.lfb.clients.length <= 10) {
         for (const client of this.formStore.lfb.clients) {
           if (client.hasAttachedFile === false) {
             this.showToaster('error', this.t('toaster.needAttachQuestionnaire'), 3000);
@@ -3784,18 +4119,75 @@ export const useDataStore = defineStore('data', {
         }
       }
 
-      if (this.formStore.productConditionsForm.insurancePremiumPerMonth === null) {
+      if (!this.formStore.lfb.add && this.formStore.productConditionsForm.insurancePremiumPerMonth === null) {
         this.showToaster('error', this.t('toaster.emptyProductConditions'), 3000);
         return false;
       }
 
-      if (this.formStore.productConditionsForm.insurancePremiumPerMonth === '0') {
+      if (!this.formStore.lfb.add && this.formStore.productConditionsForm.insurancePremiumPerMonth === '0') {
         this.showToaster('error', this.t('toaster.notZeroPremium'), 3000);
         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) {
+          if (this.isInitiator()) {
+            await this.setINSISWorkData();
+          }
+        } else {
+          this.isLoading = false;
+          this.showToaster('error', this.t('toaster.attachManagerError'), 3000);
+          return false;
+        }
+      }
+
       return true;
     },
+    async getOnlineAccess(iin: string, documentType: string) {
+      try {
+        const data = {
+          iinBin: iin.replaceAll('-', ''),
+          documentType: documentType,
+        };
+        const response = await this.api.externalServices.getOnlineAccess(data);
+        if (response.code === 'PROFILE_DIGIDOCS_INTERNAL_ERROR') {
+          this.showToaster('error', this.t('toaster.notDigDoc'), 3000);
+          return false;
+        } else {
+          return true;
+        }
+      } catch (err) {
+        ErrorHandler(err);
+        return null;
+      }
+    },
+    async getDigitalDocuments(iin: string, processInstanceId: string, code: string) {
+      try {
+        const data = {
+          iin: iin.replaceAll('-', ''),
+          processInstanceId: processInstanceId,
+          code: code.replace(/\s/g, ''),
+        };
+        await this.api.externalServices.getDigitalDocuments(data);
+        return true;
+      } catch (err) {
+        ErrorHandler(err);
+        return null;
+      }
+    },
+    async updateDigitalDocumentsProfile(iin: string) {
+      try {
+        const data = {
+          iinBin: iin.replaceAll('-', ''),
+        };
+        await this.api.externalServices.updateDigitalDocumentsProfile(data);
+        this.showToaster('success', this.t('toaster.successProfile'), 3000);
+      } catch (err) {
+        ErrorHandler(err);
+        return null;
+      }
+    },
     async getVariableData(processCode: number) {
       try {
         const response = await this.api.getVariableData(0, processCode);
@@ -3808,6 +4200,16 @@ export const useDataStore = defineStore('data', {
         return null;
       }
     },
+    async getProcessDividendPeriods() {
+      try {
+        if (!this.processCode) return null;
+        const response = await this.api.getProcessDividendPeriods(this.processCode);
+        return response;
+      } catch (err) {
+        ErrorHandler(err);
+        return null;
+      }
+    },
     async checkIIN(iin: string) {
       try {
         const response = await this.api.checkIIN(iin);
@@ -3825,6 +4227,24 @@ export const useDataStore = defineStore('data', {
         return ErrorHandler(err);
       }
     },
+    async getBankByAccountNumber(accountNumber: string) {
+      try {
+        const bank = await this.api.getBankByAccountNumber(accountNumber);
+        return bank;
+      } catch (err) {
+        ErrorHandler(err);
+      }
+    },
+    async getContractByBin(bin: string) {
+      try {
+        const contract = await this.api.getContractByBin(bin);
+        contract.insrBegin = reformatDate(contract.insrBegin) ?? '';
+        contract.insrEnd = reformatDate(contract.insrEnd) ?? '';
+        return contract;
+      } catch (err) {
+        ErrorHandler(err);
+      }
+    },
     async isCourseChanged(processInstanceId: string) {
       try {
         const response = await this.api.isCourseChanged(processInstanceId);
@@ -3845,8 +4265,30 @@ export const useDataStore = defineStore('data', {
         return ErrorHandler(err);
       }
     },
+    getClientData(clientData: GroupMember) {
+      this.formStore.lfb.policyholder.clientData = clientData;
+      this.formStore.lfb.policyholder.clientData.authoritedPerson = clientData.authoritedPerson;
+      this.formStore.lfb.policyholder.clientData.iin = reformatIin(clientData.iin);
+      this.formStore.lfb.policyholder.clientData.authoritedPerson.iin = reformatIin(clientData.authoritedPerson.iin);
+      this.formStore.lfb.policyholder.clientData.authoritedPerson.authorityDetails.date = reformatDate(clientData.authoritedPerson.authorityDetails.date as string);
+      this.formStore.lfb.policyholder.clientData.authoritedPerson.birthDate = reformatDate(clientData.authoritedPerson.birthDate) ?? '';
+      this.formStore.lfb.policyholder.clientData.authoritedPerson.identityDocument.issuedOn = reformatDate(clientData.authoritedPerson.identityDocument.issuedOn) ?? '';
+      this.formStore.lfb.policyholder.clientData.authoritedPerson.identityDocument.validUntil = reformatDate(clientData.authoritedPerson.identityDocument.validUntil) ?? '';
+      const gender = this.gender.find((i: Value) => i.id === Number(clientData.authoritedPerson.gender));
+      this.formStore.lfb.policyholder.clientData.authoritedPerson.gender = gender ? gender : new Value();
+    },
+    async getParentApplication(bin: string) {
+      try {
+        const response = await this.api.getParentApplication(bin);
+        if (response) {
+          this.getClientData(response.clientApp.clientData);
+        }
+      } catch (err) {
+        return ErrorHandler(err);
+      }
+    },
     hasJobSection(whichForm: keyof typeof StoreMembers) {
-      if (this.isLifetrip || this.isPension) return false;
+      if (this.isLifetrip || this.isPension || this.isBalam || this.isTumar) return false;
       switch (whichForm) {
         case this.formStore.beneficiaryFormKey:
         case this.formStore.beneficialOwnerFormKey:
@@ -3857,7 +4299,7 @@ export const useDataStore = defineStore('data', {
       }
     },
     hasBirthSection(whichForm: keyof typeof StoreMembers) {
-      if (this.isGons || this.isPension) return false;
+      if (this.isPension) return false;
       switch (whichForm) {
         case this.formStore.beneficiaryFormKey:
           return false;
@@ -3865,18 +4307,6 @@ export const useDataStore = defineStore('data', {
           return true;
       }
     },
-    hasPlaceSection(whichForm: keyof typeof StoreMembers) {
-      switch (whichForm) {
-        default:
-          return true;
-      }
-    },
-    hasDocumentSection(whichForm: keyof typeof StoreMembers) {
-      switch (whichForm) {
-        default:
-          return true;
-      }
-    },
     hasContactSection(whichForm: keyof typeof StoreMembers) {
       if (this.isGons || this.isPension) return false;
       switch (whichForm) {
@@ -3885,7 +4315,7 @@ export const useDataStore = defineStore('data', {
       }
     },
     hasBankSection(whichForm: keyof typeof StoreMembers) {
-      if (!this.isPension) return false;
+      if (!this.isPension || Number(this.formStore.applicationData.processCode) === 24) return false;
       switch (whichForm) {
         case 'beneficiaryForm':
           return false;
@@ -3894,7 +4324,7 @@ export const useDataStore = defineStore('data', {
       }
     },
     hasAdditionalDocumentsSection(whichForm: keyof typeof StoreMembers) {
-      if (!this.isPension) return false;
+      if (!this.isPension || Number(this.formStore.applicationData.processCode) === 24) return false;
       switch (whichForm) {
         case 'beneficiaryForm':
           return false;
@@ -3913,44 +4343,5 @@ export const useDataStore = defineStore('data', {
           return false;
       }
     },
-    hasPercentageOfPayoutAmount() {
-      return true;
-    },
-    hasAccess() {
-      const baseAccessRoles = this.isAdmin() || this.isSupport() || this.isAnalyst() || this.isDrn();
-      return {
-        invoiceInfo: this.isAdmin(),
-        toLKA: this.isAgent() || baseAccessRoles,
-        toAML: this.isCompliance() || baseAccessRoles,
-        toAULETTI: this.isAgentAuletti() || baseAccessRoles,
-        toLKA_A: this.isAgentAuletti() || baseAccessRoles,
-        toEFO:
-          this.isManager() ||
-          this.isAgent() ||
-          this.isAgentMycar() ||
-          this.isManagerHalykBank() ||
-          this.isHeadManager() ||
-          this.isServiceManager() ||
-          this.isUnderwriter() ||
-          this.isActuary() ||
-          this.isAdmin() ||
-          this.isCompliance() ||
-          this.isAnalyst() ||
-          this.isUpk() ||
-          this.isFinCenter() ||
-          this.isSupervisor() ||
-          this.isSupport() ||
-          this.isDrn() ||
-          this.isUrp() ||
-          this.isUsns() ||
-          this.isAccountant() ||
-          this.isBranchDirector() ||
-          this.isUSNSACCINS() ||
-          this.isDsuio() ||
-          this.isAdjuster() ||
-          this.isDsoDirector() ||
-          this.isAccountantDirector(),
-      };
-    },
   },
 });