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

package/api/base.api.ts

@@ -812,6 +812,16 @@ export class ApiClass {
     });
   }
 
+  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,
@@ -847,6 +857,18 @@ export class ApiClass {
     });
   }
 
+  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(data: SetApplicationRequest) {
     return await this.axiosCall({
       method: Methods.POST,

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/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/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,

package/locales/ru.json

@@ -146,6 +146,7 @@
     "createStatement": "Создать заявку",
     "add": "Добавить",
     "addRelative": "Добавить родственника",
+    "addRiskPoint": "Добавить уровень риска",
     "deleteAML": "Исключить",
     "deleteRelative": "Исключить родственника",
     "editRelative": "Изменить родственника",
@@ -483,7 +484,9 @@
     "sum": "Минимальная сумма",
     "changes": "Кол-во изменений",
     "termDays": "Срок договора в днях",
-    "termYears": "Срок договора в годах"
+    "termYears": "Срок договора в годах",
+    "notResident": "Не резидент",
+    "uploadExcel": "Загрузить excel файл"
   },
   "agent": {
     "currency": "Валюта",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.9-beta.35",
+  "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

@@ -46,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',
@@ -1244,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) {
@@ -3043,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);
@@ -3053,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);
       }
@@ -3094,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);
@@ -3266,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');
       }
     },
   ],

package/types/index.ts

@@ -24,6 +24,7 @@ declare global {
     | 'checkcontragent'
     | 'daskamkorlyk'
     | 'amuletlife'
+    | 'pensionannuity'
     | 'dso'
     | 'uu';
   type MemberKeys = keyof ReturnType<typeof useFormStore>;