hl-core 0.0.9-beta.34 → 0.0.9-beta.36

package/api/base.api.ts

@@ -690,14 +690,14 @@ export class ApiClass {
   }
 
   async getTripInsuredAmount(data: getTripInsuredAmountRequest) {
-    return this.axiosCall<TripInsuranceAmount>({
+    return await this.axiosCall<TripInsuranceAmount>({
       method: Methods.POST,
       url: `/${this.productUrl}/api/Application/InsuranceAmountOptions`,
       data: data,
     });
   }
   async downloadTemplate(fileType: number) {
-    return this.axiosCall({
+    return await this.axiosCall({
       method: Methods.GET,
       url: `/${this.productUrl}/api/Application/DownloadTemplate?fileType=${fileType}`,
       responseType: 'arraybuffer',
@@ -705,7 +705,7 @@ export class ApiClass {
   }
 
   async sendTemplateToEmail(email: string) {
-    return this.axiosCall({
+    return await this.axiosCall({
       method: Methods.GET,
       url: `/${this.productUrl}/api/Application/SendTemplateToEmail?emailTo=${email}`,
     });
@@ -782,8 +782,8 @@ export class ApiClass {
     });
   }
 
-  async getClientData(clientId: string) {
-    return this.axiosCall({
+  async getClientData<T>(clientId: string) {
+    return await this.axiosCall<T>({
       method: Methods.GET,
       url: `/${this.productUrl}/api/Application/GetClientData`,
       params: {
@@ -792,18 +792,18 @@ export class ApiClass {
     });
   }
 
-  async getInsuredData(insuredId: string) {
-    return this.axiosCall({
+  async getInsuredData<T>(insuredId: string) {
+    return await this.axiosCall<T>({
       method: Methods.GET,
-      url: `/${this.productUrl}/api/Application/GetClientData`,
+      url: `/${this.productUrl}/api/Application/GetInsuredData`,
       params: {
         insuredId,
       },
     });
   }
 
-  async getBeneficiaryData(beneficiaryId: string) {
-    return this.axiosCall({
+  async getBeneficiaryData<T>(beneficiaryId: string) {
+    return await this.axiosCall<T>({
       method: Methods.GET,
       url: `/${this.productUrl}/api/Application/GetBeneficiaryData`,
       params: {
@@ -812,47 +812,73 @@ export class ApiClass {
     });
   }
 
-  async saveClientData(clientId: string) {
-    return this.axiosCall({
+  async getBeneficialOwnerData<T>(beneficiaryId: string) {
+    return await this.axiosCall<T>({
+      method: Methods.GET,
+      url: `/${this.productUrl}/api/Application/GetBeneficialOwnerData`,
+      params: {
+        beneficiaryId,
+      },
+    });
+  }
+
+  async saveClientData<T>(clientId: string, data: T) {
+    return await this.axiosCall({
       method: Methods.POST,
       url: `/${this.productUrl}/api/Application/SaveClient`,
       params: {
         clientId,
       },
+      data: data,
     });
   }
 
-  async saveInsuredData(processInstanceId: string, insuredId: string) {
-    return this.axiosCall({
+  async saveInsuredData<T>(processInstanceId: string, insuredId: string, data: T) {
+    return await this.axiosCall({
       method: Methods.POST,
       url: `/${this.productUrl}/api/Application/SaveInsured`,
       params: {
         processInstanceId,
         insuredId,
       },
+      data: data,
     });
   }
 
-  async saveBeneficiaryData(processInstanceId: string, benificiaryId: string) {
-    return this.axiosCall({
+  async saveBeneficiaryData<T>(processInstanceId: string, benificiaryId: string, data: T) {
+    return await this.axiosCall({
       method: Methods.POST,
       url: `/${this.productUrl}/api/Application/SaveBenificiary`,
       params: {
         processInstanceId,
         benificiaryId,
       },
+      data: data,
+    });
+  }
+
+  async saveBeneficialOwnerData<T>(processInstanceId: string, benificiaryId: string, data: T) {
+    return await this.axiosCall({
+      method: Methods.POST,
+      url: `/${this.productUrl}/api/Application/SaveBeneficialOwner`,
+      params: {
+        processInstanceId,
+        benificiaryId,
+      },
+      data: data,
     });
   }
 
-  async setApplicationData() {
-    return this.axiosCall({
+  async setApplicationData(data: SetApplicationRequest) {
+    return await this.axiosCall({
       method: Methods.POST,
       url: `/${this.productUrl}/api/Application/SetApplicationData`,
+      data: data,
     });
   }
 
   async calculate(processInstanceId: string) {
-    return this.axiosCall({
+    return await this.axiosCall({
       method: Methods.POST,
       url: `/${this.productUrl}/api/Application/Calculator`,
       params: {

package/components/Form/DynamicForm.vue

@@ -12,7 +12,7 @@
             v-for="(item, index) of panelList.filter(i => i.nameRu && (i.nameRu as string).match(new RegExp(searchQuery, 'i')))"
             :key="index"
             :text="(item.nameRu as string)"
-            :selected="item.nameRu === panelValue.nameRu"
+            :selected="item.nameRu === panelValue"
             @click="pickPanelValue(item)"
           />
         </div>
@@ -35,7 +35,7 @@ export default defineComponent({
   setup() {
     const dataStore = useDataStore();
     const isPanelOpen = ref<boolean>(false);
-    const panelValue = ref<Value>(new Value());
+    const panelValue = ref<any>(new Value());
     const panelList = ref<Value[]>([]);
     const isPanelLoading = ref<boolean>(false);
     const searchQuery = ref<string>('');
@@ -80,6 +80,7 @@ export default defineComponent({
         isPanelOpen.value = true;
         dataStore.rightPanel.open = true;
         dataStore.rightPanel.title = dataStore.t(listOfPanelTitles[field.fetchFrom]);
+        panelValue.value = field.modelValue;
         panelList.value = (await dataStore[field.fetchFrom]()) as Value[];
         isPanelLoading.value = false;
       }

package/components/Form/FormToggle.vue

@@ -1,6 +1,6 @@
 <template>
   <div
-    class="h-[74px] !pl-2 md:!pl-5 flex items-center justify-start gap-4"
+    class="min-h-[74px] !pl-2 md:!pl-5 flex items-center justify-start gap-5"
     :class="[$styles.whiteBg, hasBorder ? 'border-[1px] rounded-lg' : 'border-b-[1px] border-b-[#f3f6fc] rounded']"
   >
     <v-switch
@@ -14,8 +14,10 @@
       hide-details
       :disabled="disabled"
     />
-    <p :class="[$styles.textSimple]">{{ `${title}` }}</p>
-    <p class="mr-3" :class="[modelValue ? $styles.greenText : '', $styles.textSimple]">{{ `${modelValue ? $dataStore.t('confirm.yes') : $dataStore.t('confirm.no')}` }}</p>
+    <p class="p-2" :class="[$styles.textSimple]">{{ `${title}` }}</p>
+    <p v-if="showValue" class="mr-3" :class="[modelValue ? $styles.greenText : '', $styles.textSimple]">
+      {{ `${modelValue ? $dataStore.t('confirm.yes') : $dataStore.t('confirm.no')}` }}
+    </p>
   </div>
 </template>
 
@@ -38,6 +40,10 @@ export default defineComponent({
       type: Boolean,
       default: true,
     },
+    showValue: {
+      type: Boolean,
+      default: true,
+    },
   },
   emits: ['update:modelValue', 'clicked'],
 });

package/components/Pages/Anketa.vue

@@ -375,6 +375,10 @@ export default defineComponent({
       await onInit();
     });
 
+    onUnmounted(() => {
+      dataStore.abortRequests();
+    });
+
     watch(
       () => dataStore.rightPanel.open,
       () => {

package/components/Pages/MemberForm.vue

@@ -513,7 +513,7 @@
           :clearable="!isDisabled"
           :rules="whichForm === formStore.beneficiaryFormKey || member.isInsuredUnderage ? [] : $rules.phoneFormat"
         />
-        <base-form-input v-model.trim="member.email" :label="$dataStore.t('form.email')" :rules="$rules.email" />
+        <base-form-input v-model.trim="member.email" :label="$dataStore.t('form.email')" :readonly="isDisabled" :clearable="!isDisabled" :rules="$rules.email" />
       </base-form-section>
     </v-form>
     <base-btn v-if="showSaveButton" :loading="isButtonLoading || isSubmittingForm" :text="$dataStore.t('buttons.save')" @click="submitForm" />

package/components/Pages/ProductConditions.vue

@@ -457,10 +457,10 @@
             :value="term.coverSumName"
             :readonly="isTermsDisabled"
             :clearable="false"
-            :label="term.coverTypeName"
+            :label="coverTypeName(term)"
             append-inner-icon="mdi mdi-chevron-right"
             :suffix="!!term.amount ? `${formatTermValue(term.amount)} ${currencySymbolsAddTerm}` : ''"
-            @append="openTermPanel(term.coverTypeName, $dataStore.getAdditionalInsuranceTermsAnswers, term.coverTypeId, index)"
+            @append="openTermPanel(coverTypeName(term), $dataStore.getAdditionalInsuranceTermsAnswers, term.coverTypeId, index)"
           />
         </div>
       </base-form-section>
@@ -1198,6 +1198,14 @@ export default defineComponent({
       }
       return true;
     };
+
+    const coverTypeName = (term: AddCover) => {
+      if (whichProduct.value === 'lifebusiness') {
+        return String(term.coverTypeNameRu);
+      }
+      return term.coverTypeName;
+    };
+
     const submitForm = async () => {
       vForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
         if (v.valid) {
@@ -1557,6 +1565,7 @@ export default defineComponent({
       pickfixInsValue,
       openFixInsPanel,
       pickCoverPeriodValue,
+      coverTypeName,
     };
   },
 });

package/composables/axios.ts

@@ -4,6 +4,7 @@ import interceptors from '../api/interceptors';
 export const useAxiosInstance = (baseURL: string) => {
   const axiosInstance = axios.create({
     baseURL: baseURL,
+    signal: useDataStore().rController.signal,
   });
   interceptors(axiosInstance);
 

package/composables/classes.ts

@@ -576,7 +576,7 @@ export class Member extends Person {
     this.isDisability = isDisability;
     this.disabilityGroup = disabilityGroupId;
     this.percentageOfPayoutAmount = percentageOfPayoutAmount;
-    this._cyrPattern = /[\u0400-\u04FF]+/;
+    this._cyrPattern = /[\u0400-\u04FF -]+/;
     this._numPattern = /[0-9]+/;
     this._phonePattern = /\(?([0-9]{3})\)?([ .-]?)([0-9]{3})\2([0-9]{4})/;
     this._emailPattern = /.+@.+\..+/;
@@ -1230,7 +1230,13 @@ export class FormStoreClass {
   signedContractFormData: any;
   lfb: {
     clients: ClientV2[];
-    policyholder: MemberV2;
+    policyholder: {
+      isIpdl: boolean;
+      clientData: {
+        company: MemberV2;
+        authoritedPerson: MemberV2;
+      };
+    };
     hasAccidentIncidents: boolean;
     accidentIncidents: AccidentIncidents[];
     policyholderActivities: PolicyholderActivity[];
@@ -1336,7 +1342,13 @@ export class FormStoreClass {
     this.signedContractFormData = null;
     this.lfb = {
       clients: [],
-      policyholder: new MemberV2(),
+      policyholder: {
+        isIpdl: false,
+        clientData: {
+          company: new MemberV2(),
+          authoritedPerson: new MemberV2(),
+        },
+      },
       hasAccidentIncidents: true,
       policyholderActivities: [new PolicyholderActivity()],
       beneficialOwners: [new BeneficialOwner()],
@@ -1433,15 +1445,19 @@ export class FormStoreClass {
 export class MemberV2 {
   iin: string | null;
   phoneNumber: string | null;
-  firstName: string | null;
-  middleName: string | null;
-  lastName: string | null;
+  firstName?: string | null;
+  middleName?: string | null;
+  lastName?: string | null;
+  name?: string | null;
+  longName?: string | null;
+  nameKz?: string | null;
+  longNameKz?: string | null;
   citizenship: Value;
   email: string | null;
   resident: Value;
   taxResidentCountry: Value;
   economySectorCode: Value;
-  isPublicPerson: boolean;
+  isActualAddressEqualLegalAddres: boolean;
   identityDocument?: {
     documentType: Value;
     documentNumber: string | null;
@@ -1456,7 +1472,7 @@ export class MemberV2 {
     bik: string | null;
     kbe: string | null;
   };
-  workDetails: {
+  workDetails?: {
     workplace: string | null;
     position: string | null;
     jobDuties: string | null;
@@ -1466,26 +1482,14 @@ export class MemberV2 {
     documentNumber: string | null;
     date: string | null;
   };
-  organizationInfo: {
-    bin: string | null;
-    organizationName: string | null;
-    kbe: string | null;
-    resident: Value;
-    taxResidentCountry: Value;
-    economySectorCode: Value;
-    typeOfEconomicActivity: string | null;
-    organizationPhone: string | null;
-    organizationEmail: string | null;
-    organizationInternetResource: string | null;
-    organizationStartDate: string | null;
-    isActualAddressEqualLegalAddres: boolean;
-    organizationLegalAddress: Address;
-    organizationActualAddress: Address;
-    activityTypes: {
-      activityTypeName: string | null;
-      empoloyeeCount: number | null;
-    }[];
-  };
+  kbe: string | null;
+  typeOfEconomicActivity: string | null;
+  legalAddress: Address;
+  actualAddress: Address;
+  activityTypes: {
+    activityTypeName: string | null;
+    empoloyeeCount: number | null;
+  }[];
   isLeader?: boolean;
   beneficalOwnerQuest?: {
     order: number;
@@ -1498,12 +1502,16 @@ export class MemberV2 {
     this.firstName = null;
     this.middleName = null;
     this.lastName = null;
+    this.name = null;
+    this.longName = null;
+    this.nameKz = null;
+    this.longNameKz = null;
     this.citizenship = new Value();
     this.email = null;
     this.resident = new Value();
     this.taxResidentCountry = new Value();
     this.economySectorCode = new Value();
-    this.isPublicPerson = false;
+    this.isActualAddressEqualLegalAddres = true;
     this.identityDocument = {
       documentType: new Value(),
       documentNumber: null,
@@ -1528,28 +1536,16 @@ export class MemberV2 {
       documentNumber: null,
       date: null,
     };
-    this.organizationInfo = {
-      bin: null,
-      organizationName: null,
-      kbe: null,
-      resident: new Value(),
-      taxResidentCountry: new Value(),
-      economySectorCode: new Value(),
-      typeOfEconomicActivity: null,
-      organizationPhone: null,
-      organizationEmail: null,
-      organizationInternetResource: null,
-      organizationStartDate: null,
-      isActualAddressEqualLegalAddres: true,
-      organizationLegalAddress: new Address(),
-      organizationActualAddress: new Address(),
-      activityTypes: [
-        {
-          activityTypeName: null,
-          empoloyeeCount: null,
-        },
-      ],
-    };
+    this.kbe = null;
+    this.typeOfEconomicActivity = null;
+    this.legalAddress = new Address();
+    this.actualAddress = new Address();
+    this.activityTypes = [
+      {
+        activityTypeName: null,
+        empoloyeeCount: null,
+      },
+    ];
     this.isLeader = false;
     this.beneficalOwnerQuest = [
       {
@@ -1630,7 +1626,7 @@ export class BeneficialOwner {
     this.insisId = 0;
     this.iin = null;
     this.longName = null;
-    this.isIpdl = true;
+    this.isIpdl = false;
     this.isTerror = true;
     this.isIpdlCompliance = true;
     this.isTerrorCompliance = true;

package/composables/constants.ts

@@ -2,6 +2,7 @@ import { Actions, PostActions, Roles, Statuses } from '../types/enum';
 
 export const constants = Object.freeze({
   products: {
+    pensionannuity: 1,
     baiterek: 3,
     halykmycar: 5,
     lifetrip: 7,
@@ -18,7 +19,7 @@ export const constants = Object.freeze({
     checkcontract: 2,
   },
   extractedProducts: ['dso', 'uu'],
-  editableStatuses: [Statuses.StartForm, Statuses.EditBeneficiaryForm, Statuses.EditForm],
+  editableStatuses: [Statuses.StartForm, Statuses.EditBeneficiaryForm, Statuses.EditForm, Statuses.InputDataForm],
   documentsLinkVisibleStatuses: [
     Statuses.DocumentsSignedFrom,
     Statuses.UnderwriterForm,
@@ -26,13 +27,22 @@ export const constants = Object.freeze({
     Statuses.Completed,
     Statuses.InsurancePremiumOnlinePaid,
   ],
-  returnStatementStatuses: [Statuses.DocumentsSignedFrom, Statuses.ContractSignedFrom, Statuses.WaitingInsurancePremiumForm, Statuses.UnderwriterForm],
+  returnStatementStatuses: [
+    Statuses.DocumentsSignedFrom,
+    Statuses.DocumentsSignedClientFrom,
+    Statuses.ContractSignedFrom,
+    Statuses.WaitingInsurancePremiumForm,
+    Statuses.UnderwriterForm,
+    Statuses.InputDataForm,
+  ],
   cancelApplicationStatuses: [
     Statuses.StartForm,
     Statuses.EditForm,
     Statuses.EditBeneficiaryForm,
     Statuses.WaitingInsurancePremiumForm,
     Statuses.DocumentsSignedFrom,
+    Statuses.DocumentsSignedClientFrom,
+    Statuses.InputDataForm,
     Statuses.ContractSignedFrom,
   ],
   gbdErrors: ['INVALID', 'TIMEOUT', 'ERROR', 'NOT_FOUND'],

package/locales/ru.json

@@ -146,6 +146,7 @@
     "createStatement": "Создать заявку",
     "add": "Добавить",
     "addRelative": "Добавить родственника",
+    "addRiskPoint": "Добавить уровень риска",
     "deleteAML": "Исключить",
     "deleteRelative": "Исключить родственника",
     "editRelative": "Изменить родственника",
@@ -478,7 +479,14 @@
     "contracts": "Контракты",
     "contragents": "Контрагенты",
     "stateRegistrationDate": "Дата государственной регистрации",
-    "numberRegistration": "Номер государственной регистрации"
+    "numberRegistration": "Номер государственной регистрации",
+    "id": "ID",
+    "sum": "Минимальная сумма",
+    "changes": "Кол-во изменений",
+    "termDays": "Срок договора в днях",
+    "termYears": "Срок договора в годах",
+    "notResident": "Не резидент",
+    "uploadExcel": "Загрузить excel файл"
   },
   "agent": {
     "currency": "Валюта",
@@ -750,7 +758,8 @@
     "noResidentOffline": "Обратитесь в филиал для оффлайн оформления нерезидента",
     "calculationPreliminary": "Расчет предварительный. Требуется заполнить все необходимые данные",
     "planDate": "Дата должна превышать сегодняшнюю дату",
-    "iik": "ИИК должен состоять из 20 символов"
+    "iik": "ИИК должен состоять из 20 символов",
+    "dataInPast": "Указанная дата осталась в прошлом"
   },
   "code": "КЭС",
   "fontSize": "Размер шрифта",
@@ -888,7 +897,8 @@
   "clients": {
     "listInsured": "Список Застрахованных",
     "templateInsured": "Шаблон для заполнения данных Застрахованных",
-    "sendListToFill": "Отправить список Страхователю для заполнения",
+    "sendListToFill": "Скачать или Отправить список Страхователю для заполнения",
+    "sendDeclarationToFill": "Скачать или Отправить декларацию Страхователю для заполнения",
     "completedListInsured": "Заполненный список Застрахованных",
     "selectInsSum": "Выберите страховую сумму",
     "isPolicyholderBeneficialOwner": "Является ли Страхователь Бенефициарным собственником",
@@ -902,6 +912,7 @@
     "documentsBeneficialOwner": "Документы Бенефициарного собственника",
     "coveragePeriod": "Период покрытия",
     "attachScansSignDocs": "Вложить сканы подписанных документов",
+    "declarationHealthInsured": "Декларация о здоровье Застрахованных",
     "form": {
       "calculation": "Расчеты",
       "paymentAmount": "Размер выплаты",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.9-beta.34",
+  "version": "0.0.9-beta.36",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",
@@ -28,8 +28,8 @@
     "dev": "nuxt dev",
     "generate": "nuxt generate",
     "preview": "nuxt preview",
-    "tk:all": "cd .. && cd amuletlife && yarn typecheck && cd .. && cd baiterek && yarn typecheck && cd .. && cd bolashak && yarn typecheck && cd .. && cd calculator && yarn typecheck && cd .. && cd daskamkorlyk && yarn typecheck && cd .. && cd efo && yarn typecheck && cd .. && cd gons && yarn typecheck && cd .. && cd kazyna && yarn typecheck && cd .. && cd lifebusiness && yarn typecheck && cd .. && cd liferenta && yarn typecheck && cd .. && cd lifetrip && yarn typecheck && cd .. && cd core",
-    "i:all": "cd .. && cd amuletlife && yarn && cd .. && cd baiterek && yarn && cd .. && cd bolashak && yarn && cd .. && cd calculator && yarn && cd .. && cd daskamkorlyk && yarn && cd .. && cd efo && yarn && cd .. && cd gons && yarn && cd .. && cd kazyna && yarn && cd .. && cd lifebusiness && yarn && cd .. && cd liferenta && yarn && cd .. && cd lifetrip && yarn && cd .. && cd core",
+    "tk:all": "cd .. && cd amuletlife && yarn typecheck && cd .. && cd baiterek && yarn typecheck && cd .. && cd bolashak && yarn typecheck && cd .. && cd calculator && yarn typecheck && cd .. && cd daskamkorlyk && yarn typecheck && cd .. && cd efo && yarn typecheck && cd .. && cd gons && yarn typecheck && cd .. && cd kazyna && yarn typecheck && cd .. && cd lifebusiness && yarn typecheck && cd .. && cd liferenta && yarn typecheck && cd .. && cd lifetrip && yarn typecheck && cd .. && cd pensionannuity && yarn typecheck && cd .. && cd core",
+    "i:all": "cd .. && cd amuletlife && yarn && cd .. && cd baiterek && yarn && cd .. && cd bolashak && yarn && cd .. && cd calculator && yarn && cd .. && cd daskamkorlyk && yarn && cd .. && cd efo && yarn && cd .. && cd gons && yarn && cd .. && cd kazyna && yarn && cd .. && cd lifebusiness && yarn && cd .. && cd liferenta && yarn && cd .. && cd lifetrip && yarn && cd .. && cd pensionannuity && yarn && cd .. && cd core",
     "update:core": "git checkout -b %npm_package_version% && git add . && git commit -m \"%npm_package_version%\" && git push && git checkout main",
     "update:aml": "cd ../../aml/aml && yarn && cd ../checkcontract && yarn && cd ../checkcontragent && yarn && cd.. && git checkout -b %npm_package_version% && git add . && git commit -m \"%npm_package_version%\" && git push && git checkout main && cd ../efo/core",
     "update:lka": "cd .. && cd lka && yarn && git checkout -b %npm_package_version% && git add . && git commit -m \"%npm_package_version%\" && git push && git checkout main && cd .. && cd core",

package/store/data.store.ts

@@ -22,6 +22,7 @@ export const useDataStore = defineStore('data', {
     formStore: useFormStore(),
     // contragent: useContragentStore(),
     api: new ApiClass(),
+    rController: new AbortController(),
     yearEnding: (year: number) => yearEnding(year, constants.yearTitles, constants.yearCases),
     currentDate: () => new Date(Date.now() - new Date().getTimezoneOffset() * 60 * 1000).toISOString().slice(0, -1),
     showToaster: (type: 'success' | 'error' | 'warning' | 'info', msg: string, timeout?: number) =>
@@ -45,6 +46,7 @@ export const useDataStore = defineStore('data', {
     isGons: state => state.product === 'gons',
     isKazyna: state => state.product === 'halykkazyna',
     isDas: state => state.product === 'daskamkorlyk',
+    isPension: state => state.product === 'pensionannuity',
     isAmulet: state => state.product === 'amuletlife',
     isCalculator: state => state.product === 'calculator',
     isCheckContract: state => state.product === 'checkcontract',
@@ -77,6 +79,14 @@ export const useDataStore = defineStore('data', {
         childFrame.contentWindow.postMessage({ action: action, value: value }, '*');
       }
     },
+    abortRequests() {
+      try {
+        this.rController.abort();
+        this.rController = new AbortController();
+      } catch (err) {
+        console.log(err);
+      }
+    },
     async copyToClipboard(text: unknown) {
       if (typeof text === 'string' || typeof text === 'number') {
         if (navigator.clipboard && window.isSecureContext) {
@@ -206,6 +216,9 @@ export const useDataStore = defineStore('data', {
     isSupervisor() {
       return this.isRole(constants.roles.Supervisor);
     },
+    isHeadManager() {
+      return this.isRole(constants.roles.HeadManager);
+    },
     isProcessEditable(statusCode?: keyof typeof Statuses) {
       const getEditibleStatuses = () => {
         const defaultStatuses = constants.editableStatuses;
@@ -1232,31 +1245,80 @@ export const useDataStore = defineStore('data', {
     async getAdditionalTaxCountries() {
       return await this.getFromApi('addTaxCountries', 'getAdditionalTaxCountries');
     },
-    async getStates(key?: string, member?: Member) {
+    async getStates(key?: string, member?: Member, keys?: { key?: string; deepKey?: string; subDeepKey?: string }) {
       await this.getFromApi('states', 'getStates');
-      //@ts-ignore
-      if (key && member[key] && member[key].ids !== null) return this.states.filter((i: Value) => i.code === member[key].ids);
+      if (!!keys) {
+        if (!!keys.key) {
+          if (!!keys.deepKey) {
+            if (!!keys.subDeepKey) {
+              //@ts-ignore
+              return this.states.filter(i => i.code === member[keys.key][keys.deepKey][keys.subDeepKey].ids);
+            } else {
+              //@ts-ignore
+              return this.states.filter(i => i.code === member[keys.key][keys.deepKey].ids);
+            }
+          } else {
+            //@ts-ignore
+            return this.states.filter(i => i.code === member[keys.key].ids);
+          }
+        }
+      } else {
+        //@ts-ignore
+        if (key && member[key] && member[key].ids !== null) return this.states.filter((i: Value) => i.code === member[key].ids);
+      }
       return this.states;
     },
-    async getRegions(key?: string, member?: Member) {
+    async getRegions(key?: string, member?: Member, keys?: { key?: string; deepKey?: string; subDeepKey?: string }) {
       await this.getFromApi('regions', 'getRegions');
-      //@ts-ignore
-      if (key && member[key] && member[key].ids !== null) return this.regions.filter((i: Value) => i.code === member[key].ids);
-      if (member && member.registrationProvince.ids !== null) {
-        return this.regions.filter((i: Value) => i.code === member.registrationProvince.ids);
+      if (!!keys) {
+        if (!!keys.key) {
+          if (!!keys.deepKey) {
+            if (!!keys.subDeepKey) {
+              //@ts-ignore
+              return this.regions.filter(i => i.code === member[keys.key][keys.deepKey][keys.subDeepKey].ids);
+            } else {
+              //@ts-ignore
+              return this.regions.filter(i => i.code === member[keys.key][keys.deepKey].ids);
+            }
+          } else {
+            //@ts-ignore
+            return this.regions.filter(i => i.code === member[keys.key].ids);
+          }
+        }
       } else {
-        return this.regions;
+        //@ts-ignore
+        if (key && member[key] && member[key].ids !== null) return this.regions.filter((i: Value) => i.code === member[key].ids);
+        if (member && member.registrationProvince.ids !== null) {
+          return this.regions.filter((i: Value) => i.code === member.registrationProvince.ids);
+        }
       }
+      return this.regions;
     },
-    async getCities(key?: string, member?: Member) {
+    async getCities(key?: string, member?: Member, keys?: { key?: string; deepKey?: string; subDeepKey?: string }) {
       await this.getFromApi('cities', 'getCities');
-      //@ts-ignore
-      if (key && member[key] && member[key].ids !== null) return this.cities.filter((i: Value) => i.code === member[key].ids);
-      if (member && member.registrationProvince.ids !== null) {
-        return this.cities.filter((i: Value) => i.code === member.registrationProvince.ids);
+      if (!!keys) {
+        if (!!keys.key) {
+          if (!!keys.deepKey) {
+            if (!!keys.subDeepKey) {
+              //@ts-ignore
+              return this.cities.filter(i => i.code === member[keys.key][keys.deepKey][keys.subDeepKey].ids);
+            } else {
+              //@ts-ignore
+              return this.cities.filter(i => i.code === member[keys.key][keys.deepKey].ids);
+            }
+          } else {
+            //@ts-ignore
+            return this.cities.filter(i => i.code === member[keys.key].ids);
+          }
+        }
       } else {
-        return this.cities;
+        //@ts-ignore
+        if (key && member[key] && member[key].ids !== null) return this.cities.filter((i: Value) => i.code === member[key].ids);
+        if (member && member.registrationProvince.ids !== null) {
+          return this.cities.filter((i: Value) => i.code === member.registrationProvince.ids);
+        }
       }
+      return this.cities;
     },
     async getCitiesEfo(key?: string, member?: MemberV2, parentKey?: string) {
       if (this.isLifeBusiness) {
@@ -1810,22 +1872,7 @@ export const useDataStore = defineStore('data', {
     async calculatePrice(taskId?: string) {
       this.isLoading = true;
       try {
-        const priceForm: {
-          processInstanceId?: string | number | null;
-          id?: string | null;
-          addCoversDto?: AddCover[];
-          insuredAmountId?: string | number | null;
-          age?: string | number | null;
-          lifeTripCountries?: string[] | null;
-          tripPurposeId?: string | number | null;
-          workTypeId?: string | number | null;
-          sportsTypeId?: string | number | null;
-          singleTripDays?: number;
-          multipleTripMaxDays?: number;
-          tripInsurancePeriod?: number;
-          startDate?: string | null;
-          endDate?: string | null;
-        } = {};
+        const priceForm: SetApplicationRequest = {};
         priceForm.insuredAmountId = this.formStore.productConditionsForm.calculatorForm.amount.id;
         priceForm.age = this.formStore.productConditionsForm.calculatorForm.age;
         priceForm.lifeTripCountries = this.formStore.productConditionsForm.calculatorForm.countries!.map(item => item.id as string);
@@ -1906,7 +1953,6 @@ export const useDataStore = defineStore('data', {
         this.formStore.ManagerPolicy.ids = applicationData.insisWorkDataApp.managerPolicy;
         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;
 
@@ -3047,8 +3093,8 @@ export const useDataStore = defineStore('data', {
       if (economySectorCode) member.economySectorCode = economySectorCode;
     },
     async startApplicationV2(data: any) {
-      const policyholder = data.clientData as MemberV2;
-      if (!policyholder.iin) return false;
+      const policyholder = data.clientData;
+      if (!policyholder.authoritedPerson.iin) return false;
       try {
         const response = await this.api.startApplication(data);
         this.sendToParent(constants.postActions.applicationCreated, response.processInstanceId);
@@ -3057,10 +3103,9 @@ export const useDataStore = defineStore('data', {
         return ErrorHandler(err);
       }
     },
-    async saveClient(policyholder: MemberV2) {
+    async saveClient(policyholder: any) {
       try {
-        this.formStore.applicationData.clientApp.clientData = policyholder;
-        await this.api.saveClient(this.formStore.applicationData.processInstanceId, this.formStore.lfb.clientId, this.formStore.applicationData.clientApp);
+        await this.api.saveClient(this.formStore.applicationData.processInstanceId, this.formStore.lfb.clientId, policyholder);
       } catch (err) {
         return ErrorHandler(err);
       }
@@ -3098,18 +3143,21 @@ export const useDataStore = defineStore('data', {
         const clientId = applicationData.clientApp.id;
 
         this.formStore.applicationData.processInstanceId = applicationData.processInstanceId;
-        this.formStore.lfb.policyholder = clientData;
-        this.formStore.lfb.policyholder.iin = reformatIin(clientData.iin);
+        this.formStore.lfb.policyholder.isIpdl = applicationData.clientApp.isIpdl;
+        this.formStore.lfb.policyholder.clientData.company = clientData;
+        this.formStore.lfb.policyholder.clientData.authoritedPerson = clientData.authoritedPerson;
+        this.formStore.lfb.policyholder.clientData.company.iin = reformatIin(clientData.iin);
+        this.formStore.lfb.policyholder.clientData.authoritedPerson.iin = reformatIin(clientData.authoritedPerson.iin);
         this.formStore.lfb.clientId = clientId;
-        this.formStore.lfb.policyholder.authorityDetails.date = reformatDate(clientData.authorityDetails.date);
+        this.formStore.lfb.policyholder.clientData.company.authorityDetails.date = reformatDate(clientData.authorityDetails.date);
 
-        if (clientData && clientData.organizationInfo.activityTypes !== null) {
-          this.formStore.lfb.policyholderActivities = clientData.organizationInfo.activityTypes;
+        if (clientData && clientData.activityTypes !== null) {
+          this.formStore.lfb.policyholderActivities = clientData.activityTypes;
         }
 
         if (beneficialOwnerApp && beneficialOwnerApp.length) {
           this.formStore.lfb.beneficialOwners = beneficialOwnerApp;
-          this.formStore.lfb.isPolicyholderBeneficialOwner = clientData.iin.replace(/-/g, '') === beneficialOwnerApp[0].beneficialOwnerData.iin ? true : false;
+          this.formStore.lfb.isPolicyholderBeneficialOwner = clientData.authoritedPerson.iin.replace(/-/g, '') === beneficialOwnerApp[0].beneficialOwnerData.iin ? true : false;
           this.formStore.lfb.beneficialOwners.forEach(beneficial => {
             beneficial.beneficialOwnerData.identityDocument!.validUntil = reformatDate(beneficial.beneficialOwnerData.identityDocument!.validUntil as string);
             beneficial.beneficialOwnerData.iin = reformatIin(beneficial.beneficialOwnerData.iin as string);
@@ -3270,7 +3318,7 @@ export const useDataStore = defineStore('data', {
         }
       }
 
-      if (this.formStore.applicationData.clientApp.clientData.organizationInfo.activityTypes === null) {
+      if (this.formStore.applicationData.clientApp.clientData.activityTypes === null) {
         this.showToaster('error', this.t('toaster.notSavedMember', { text: 'деятельности Страхователя' }), 3000);
         return false;
       }

package/store/rules.ts

@@ -48,14 +48,14 @@ export const rules = {
       return t('rules.required');
     },
   ],
-  cyrillic: [(v: any) => v === null || /^[\u0400-\u04FF ]+$/.test(v) || t('rules.cyrillic')],
+  cyrillic: [(v: any) => v === null || /^[\u0400-\u04FF -]+$/.test(v) || t('rules.cyrillic')],
   latin: [(v: any) => v === null || /^[a-zA-Z]+$/.test(v) || t('rules.latin')],
   latinAndNumber: [(v: any) => v === null || /^[0-9a-zA-Z]+$/.test(v) || t('rules.latinAndNumber')],
   cyrillicNonRequired: [
     (v: any) => {
       if (!v) return true;
       else {
-        return /^[\u0400-\u04FF ]+$/.test(v) || t('rules.cyrillic');
+        return /^[\u0400-\u04FF -]+$/.test(v) || t('rules.cyrillic');
       }
     },
   ],
@@ -212,6 +212,17 @@ export const rules = {
   ],
   policyholderAgeLimit: [(v: any) => v >= 18 || t('rules.policyholderAgeLimit')],
   beneficiaryAgeLimit: [(v: any) => v <= 15 || t('rules.beneficiaryAgeLimit')],
+  dateInPast: [
+    (v: any) => {
+      const givenDate = new Date(formatDate(v)!);
+      const currentDate = new Date();
+      if (givenDate.getTime() < currentDate.getTime()) {
+        return t('rules.dataInPast');
+      } else {
+        return true;
+      }
+    },
+  ],
   guaranteedPeriodLimit(v: any, termAnnuityPayments: any) {
     if (Number(v) > Number(termAnnuityPayments)) {
       return t('rules.guaranteedPeriodLimit');

package/types/enum.ts

@@ -52,6 +52,7 @@ export enum Roles {
   ManagerHalykBank = 'ManagerHalykBank',
   ServiceManager = 'ServiceManager',
   DRNSJ = 'DRNSJ',
+  HeadManager = 'HeadManager',
 }
 
 export enum Statuses {
@@ -67,6 +68,9 @@ export enum Statuses {
   WaitingInsurancePremiumForm = 'WaitingInsurancePremiumForm',
   CheckFinCenterForm = 'CheckFinCenterForm',
   RegistryFinCenterForm = 'RegistryFinCenterForm',
+  DocumentsSignedClientFrom = 'DocumentsSignedClientFrom',
+  InputDataForm = 'InputDataForm',
+  ApproveForm = 'ApproveForm',
 }
 
 export enum MemberCodes {

package/types/index.ts

@@ -24,6 +24,7 @@ declare global {
     | 'checkcontragent'
     | 'daskamkorlyk'
     | 'amuletlife'
+    | 'pensionannuity'
     | 'dso'
     | 'uu';
   type MemberKeys = keyof ReturnType<typeof useFormStore>;
@@ -323,6 +324,8 @@ declare global {
     coverPeriodName?: string;
     coverPeriodCode?: string;
     calculatorValue?: number;
+    coverTypeNameRu?: string;
+    coverTypeNameKz?: string;
   }
 
   type SignUrlType = {
@@ -621,6 +624,64 @@ declare global {
     tripInsurancePeriod?: number;
     startDate?: string | null;
     endDate?: string | null;
+    policyId?: number;
+    policyNumber?: string;
+    contractDate?: string;
+    contractEndDate?: string;
+    amount?: number;
+    premium?: number;
+    mainCoverPremium?: number;
+    currency?: string;
+    isSpokesman?: boolean;
+    coverPeriod?: number;
+    payPeriod?: number;
+    indexRateId?: string;
+    indexRateCode?: string;
+    indexRateName?: string;
+    paymentPeriodId?: string;
+    paymentPeriodName?: string;
+    lifeMultiply?: number;
+    lifeAdditive?: number;
+    adbMultiply?: number;
+    adbAdditive?: number;
+    disabilityMultiply?: number;
+    disabilityAdditive?: number;
+    documentSignTypeId?: string;
+    documentSignTypeCode?: string;
+    documentSignTypeName?: string;
+    isDocumentsSigned?: boolean;
+    paymentTypeId?: string;
+    paymentTypeName?: string;
+    isPayed?: boolean;
+    underwritingType?: number;
+    calcDirect?: number;
+    tariffId?: string;
+    tariffName?: string;
+    riskGroup?: number;
+    riskGroup2?: number;
+    lifeMultiplyClient?: number;
+    lifeAdditiveClient?: number;
+    annuityTypeId?: string;
+    annuityTypeName?: string;
+    annuityPaymentPeriodId?: string;
+    annuityPaymentPeriodName?: string;
+    guaranteedPaymentPeriod?: number;
+    paymentPeriod?: number;
+    annuityMonthPay?: number;
+    annuityPaymentBeginDate?: string;
+    annuityPaymentEndDate?: string;
+    calcDate?: string;
+    guaranteedPaymentBeginDate?: string;
+    guaranteedPaymentEndDate?: string;
+    annuityPaymentAmount?: number;
+    countPay?: number;
+    guaranteedPeriod?: number;
+    dateFirstPay?: string;
+    effectiveAnnualpercentage?: number;
+    factorCurrentValueGP?: number;
+    alfa?: number;
+    gamma?: number;
+    mrpPayment?: number;
   };
 
   type KGDResponse = {