hl-core 0.0.9-beta.40 → 0.0.9-beta.42

package/composables/classes.ts

@@ -754,6 +754,7 @@ export class ProductConditions {
   statePremium5: number | string | null;
   statePremium7: number | string | null;
   calculatorForm: CalculatorForm;
+  agentCommission: number | null;
   constructor(
     insuranceCase = null,
     coverPeriod = null,
@@ -796,6 +797,7 @@ export class ProductConditions {
     statePremium5 = null,
     statePremium7 = null,
     calculatorForm = new CalculatorForm(),
+    agentCommission = null,
   ) {
     this.requestedSumInsuredInDollar = null;
     this.insurancePremiumPerMonthInDollar = null;
@@ -843,6 +845,7 @@ export class ProductConditions {
     this.statePremium5 = statePremium5;
     this.statePremium7 = statePremium7;
     this.calculatorForm = calculatorForm;
+    this.agentCommission = agentCommission;
   }
   getSingleTripDays() {
     if (this.calculatorForm.startDate && this.calculatorForm.endDate) {
@@ -1238,13 +1241,7 @@ export class FormStoreClass {
   signedContractFormData: any;
   lfb: {
     clients: ClientV2[];
-    policyholder: {
-      isIpdl: boolean;
-      clientData: {
-        company: MemberV2;
-        authoritedPerson: MemberV2;
-      };
-    };
+    policyholder: PolicyholderClass;
     hasAccidentIncidents: boolean;
     accidentIncidents: AccidentIncidents[];
     policyholderActivities: PolicyholderActivity[];
@@ -1352,13 +1349,7 @@ export class FormStoreClass {
     this.signedContractFormData = null;
     this.lfb = {
       clients: [],
-      policyholder: {
-        isIpdl: false,
-        clientData: {
-          company: new MemberV2(),
-          authoritedPerson: new MemberV2(),
-        },
-      },
+      policyholder: new PolicyholderClass(),
       hasAccidentIncidents: true,
       policyholderActivities: [new PolicyholderActivity()],
       beneficialOwners: [new BeneficialOwner()],
@@ -1453,111 +1444,144 @@ export class FormStoreClass {
   }
 }
 
-export class MemberV2 {
-  iin: string | null;
-  phoneNumber: string | null;
-  firstName?: string | null;
-  middleName?: string | null;
-  lastName?: string | null;
-  name?: string | null;
-  longName?: string | null;
-  nameKz?: string | null;
-  longNameKz?: string | null;
+export class Address {
+  country: Value;
+  region: Value;
+  regionType: Value;
+  city: Value;
+  square: string | null;
+  microdistrict: string | null;
+  street: string | null;
+  houseNumber: string | null;
+  kato: string | null;
+  longName: string | null;
+  longNameKz: string | null;
+  constructor() {
+    this.country = new Value();
+    this.region = new Value();
+    this.regionType = new Value();
+    this.city = new Value();
+    this.square = null;
+    this.microdistrict = null;
+    this.street = null;
+    this.houseNumber = null;
+    this.kato = null;
+    this.longName = null;
+    this.longNameKz = null;
+  }
+}
+
+export class PolicyholderActivity {
+  activityTypeName: string | null;
+  empoloyeeCount: string | null;
+  constructor() {
+    this.activityTypeName = null;
+    this.empoloyeeCount = null;
+  }
+}
+
+export class BaseGroupClass {
+  id: string | number;
+  longName: string;
+  iin: string;
+  phoneNumber: string;
+  age: string;
+  name: string;
+  nameKz: string;
+  longNameKz: string;
   citizenship: Value;
-  email: string | null;
+  email: string;
   resident: Value;
   taxResidentCountry: Value;
+  addTaxResidency: Value;
   economySectorCode: Value;
+  hasAttachedFile: boolean;
+  actualAddress: Address;
   isActualAddressEqualLegalAddres: boolean;
-  identityDocument?: {
+  legalAddress: Address;
+  identityDocument: {
     documentType: Value;
-    documentNumber: string | null;
-    series: string | null;
+    documentNumber: string;
+    series: string;
     issuedBy: Value;
     validUntil: string | null;
   };
-  bankInfo: {
-    bin: string | null;
-    bankName: Value;
-    iik: string | null;
-    bik: string | null;
-    kbe: string | null;
-  };
-  workDetails?: {
-    workplace: string | null;
-    position: string | null;
-    jobDuties: string | null;
-  };
-  authorityDetails: {
-    basis: string | null;
-    documentNumber: string | null;
-    date: string | null;
-  };
-  kbe: string | null;
-  typeOfEconomicActivity: Value;
-  legalAddress: Address;
-  actualAddress: Address;
-  activityTypes: {
-    activityTypeName: string | null;
-    empoloyeeCount: number | null;
-  }[];
-  isLeader?: boolean;
-  beneficalOwnerQuest?: {
-    order: number;
-    text: string | null;
-    answer: boolean | null;
-  }[];
+  bankInfo: BankInfoClass;
+  kbe: string;
   constructor() {
-    this.iin = null;
-    this.phoneNumber = null;
-    this.firstName = null;
-    this.middleName = null;
-    this.lastName = null;
-    this.name = null;
-    this.longName = null;
-    this.nameKz = null;
-    this.longNameKz = null;
+    this.id = 0;
+    this.longName = '';
+    this.iin = '';
+    this.phoneNumber = '';
+    this.age = '';
+    this.name = '';
+    this.nameKz = '';
+    this.longNameKz = '';
     this.citizenship = new Value();
-    this.email = null;
+    this.email = '';
     this.resident = new Value();
     this.taxResidentCountry = new Value();
+    this.addTaxResidency = new Value();
     this.economySectorCode = new Value();
+    this.hasAttachedFile = false;
+    this.actualAddress = new Address();
     this.isActualAddressEqualLegalAddres = true;
+    this.legalAddress = new Address();
     this.identityDocument = {
       documentType: new Value(),
-      documentNumber: null,
-      series: null,
+      documentNumber: '',
+      series: '',
       issuedBy: new Value(),
-      validUntil: null,
-    };
-    this.bankInfo = {
-      bin: null,
-      bankName: new Value(),
-      iik: null,
-      bik: null,
-      kbe: null,
-    };
-    this.workDetails = {
-      workplace: null,
-      position: null,
-      jobDuties: null,
+      validUntil: '',
     };
+    this.bankInfo = new BankInfoClass();
+    this.kbe = '';
+  }
+}
+
+export class PhysGroupClass extends BaseGroupClass {
+  lastName: string;
+  firstName: string;
+  middleName: string;
+  birthDate: string | null;
+  placeOfBirth: Value;
+  workDetails: { workplace: string; position: string; jobDuties: string };
+  hasContactPerson: boolean;
+  constructor() {
+    super();
+    this.lastName = '';
+    this.firstName = '';
+    this.middleName = '';
+    this.birthDate = '';
+    this.placeOfBirth = new Value();
+    this.workDetails = { workplace: '', position: '', jobDuties: '' };
+    this.hasContactPerson = false;
+  }
+}
+
+export class GroupMember extends PhysGroupClass {
+  isLeader: boolean;
+  authorityDetails: {
+    basis: Value;
+    documentNumber: string | null;
+    date: string | null;
+  };
+  typeOfEconomicActivity: Value;
+  activityTypes: { activityTypeName: string; empoloyeeCount: number }[];
+  beneficalOwnerQuest: { order: number; text: string; answer: boolean | null }[];
+  authoritedPerson: PhysGroupClass;
+  insuredPolicyData: InsuredPolicyType;
+  constructor() {
+    super();
+    // Client
+    this.isLeader = false;
     this.authorityDetails = {
-      basis: null,
+      basis: new Value(),
       documentNumber: null,
       date: null,
     };
-    this.kbe = null;
     this.typeOfEconomicActivity = new Value();
-    this.legalAddress = new Address();
-    this.actualAddress = new Address();
-    this.activityTypes = [
-      {
-        activityTypeName: null,
-        empoloyeeCount: null,
-      },
-    ];
-    this.isLeader = false;
+    this.activityTypes = [];
     this.beneficalOwnerQuest = [
       {
         order: 0,
@@ -1575,82 +1599,60 @@ export class MemberV2 {
         answer: null,
       },
     ];
+    this.authoritedPerson = new PhysGroupClass();
+    // Insured
+    this.insuredPolicyData = {
+      insSum: 0,
+      insSumWithLoad: 0,
+      premium: 0,
+      premiumWithLoad: 0,
+      insuredRisk: {
+        lifeMultiply: 0,
+        lifeAdditive: 0,
+        disabilityMultiply: 0,
+        disabilityAdditive: 0,
+        traumaTableMultiple: 0,
+        accidentalLifeMultiply: 0,
+        accidentalLifeAdditive: 0,
+        criticalMultiply: 0,
+        criticalAdditive: 0,
+      },
+      insuredCoverData: [],
+    };
   }
 }
 
-export class Address {
-  country: Value;
-  region: Value;
-  regionType: Value;
-  city: Value;
-  square: string | null;
-  microdistrict: string | null;
-  street: string | null;
-  houseNumber: string | null;
-  kato: string | null;
+export class BankInfoClass {
+  bankName: Value;
+  bin: string;
+  iik: string;
+  bik: string;
+  kbe: string;
   constructor() {
-    this.country = new Value();
-    this.region = new Value();
-    this.regionType = new Value();
-    this.city = new Value();
-    this.square = null;
-    this.microdistrict = null;
-    this.street = null;
-    this.houseNumber = null;
-    this.kato = null;
+    this.bankName = new Value();
+    this.bin = '';
+    this.iik = '';
+    this.bik = '';
+    this.kbe = '';
   }
 }
 
-export class PolicyholderActivity {
-  activityTypeName: string | null;
-  empoloyeeCount: string | null;
+export class PolicyholderClass {
+  isIpdl: boolean;
+  clientData: GroupMember;
   constructor() {
-    this.activityTypeName = null;
-    this.empoloyeeCount = null;
+    this.isIpdl = false;
+    this.clientData = new GroupMember();
   }
 }
 
 export class BeneficialOwner {
-  id: string | null;
-  processInstanceId: string | number;
-  insisId: number;
-  iin: string | null;
-  longName: string | null;
+  id: string;
   isIpdl: boolean;
-  isTerror: boolean;
-  isIpdlCompliance: boolean;
-  isTerrorCompliance: boolean;
-  personType: number;
-  lastName: string | null;
-  firstName: string | null;
-  middleName: string | null;
-  countryId: string | null;
-  countryName: string | null;
-  residentId: string | null;
-  residentName: string | null;
-  taxResidentId: string | null;
-  taxResidentName: string | null;
-  beneficialOwnerData: MemberV2;
+  beneficialOwnerData: GroupMember;
   constructor() {
-    this.id = null;
-    this.processInstanceId = 0;
-    this.insisId = 0;
-    this.iin = null;
-    this.longName = null;
     this.isIpdl = false;
-    this.isTerror = true;
-    this.isIpdlCompliance = true;
-    this.isTerrorCompliance = true;
-    this.personType = 0;
-    this.lastName = null;
-    this.firstName = null;
-    this.middleName = null;
-    this.countryId = null;
-    this.countryName = null;
-    this.residentId = null;
-    this.residentName = null;
-    this.taxResidentId = null;
-    this.taxResidentName = null;
-    this.beneficialOwnerData = new MemberV2();
+    this.beneficialOwnerData = new GroupMember();
+    this.id = '';
   }
 }

package/locales/ru.json

@@ -725,7 +725,11 @@
     "attachApplication": "Вложить приложение №1",
     "attachPowerOfAttorney": "Вложить доверенность",
     "noDocuments": "Нет документов для просмотра",
-    "address": "Адрес"
+    "address": "Адрес",
+    "premiumWithLoad": "Страховая премия за факт период (с нагрузкой)",
+    "premiumWithoutLoad": "Страховая премия за факт период (без нагрузки)",
+    "policyStartDate": "Дата начала действия полиса",
+    "policyEndDate": "Дата окончания действия полиса",
   },
   "placeholders": {
     "login": "Логин",
@@ -761,7 +765,8 @@
     "calculationPreliminary": "Расчет предварительный. Требуется заполнить все необходимые данные",
     "planDate": "Дата должна превышать сегодняшнюю дату",
     "iik": "ИИК должен состоять из 20 символов",
-    "dataInPast": "Указанная дата осталась в прошлом"
+    "dataInPast": "Указанная дата осталась в прошлом",
+    "agentCommission": "Агентская комиссия не должно превышать 50"
   },
   "code": "КСЭ",
   "fontSize": "Размер шрифта",
@@ -915,6 +920,7 @@
     "coveragePeriod": "Период покрытия",
     "attachScansSignDocs": "Вложить сканы подписанных документов",
     "declarationHealthInsured": "Декларация о здоровье Застрахованных",
+    "uploadInsured": "Загрузите застрахованных",
     "form": {
       "calculation": "Расчеты",
       "paymentAmount": "Размер выплаты",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.9-beta.40",
+  "version": "0.0.9-beta.42",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",

package/store/data.store.ts

@@ -3,7 +3,18 @@ import { rules } from './rules';
 import { i18n } from '../configs/i18n';
 import { Toast, Types, Positions, ToastOptions } from './toast';
 import { isValidGUID, yearEnding, jwtDecode, ErrorHandler, getKeyWithPattern, getNumber, getAgeByBirthDate } from '../composables';
-import { DataStoreClass, Contragent, DocumentItem, Member, Value, CountryValue, MemberV2, PolicyholderActivity, BeneficialOwner } from '../composables/classes';
+import {
+  DataStoreClass,
+  Contragent,
+  DocumentItem,
+  Member,
+  Value,
+  CountryValue,
+  PolicyholderActivity,
+  BeneficialOwner,
+  GroupMember,
+  PolicyholderClass,
+} from '../composables/classes';
 import { ApiClass } from '../api';
 import { useFormStore } from './form.store';
 import { AxiosError } from 'axios';
@@ -1038,7 +1049,7 @@ export const useDataStore = defineStore('data', {
       if (this.isLifeBusiness) {
         conditionsData.policyAppDto.insTermInMonth = Number(this.formStore.productConditionsForm.coverPeriod);
         conditionsData.policyAppDto.fixInsSum = getNumber(String(this.formStore.productConditionsForm.requestedSumInsured));
-        conditionsData.policyAppDto.tariffId = String(this.formStore.productConditionsForm.processTariff.id);
+        conditionsData.policyAppDto.agentCommission = Number(this.formStore.productConditionsForm.agentCommission);
         conditionsData.policyAppDto.processDefinitionFgotId = (this.formStore.productConditionsForm.processGfot.id as string) ?? undefined;
       }
       return conditionsData;
@@ -1320,7 +1331,7 @@ export const useDataStore = defineStore('data', {
       }
       return this.cities;
     },
-    async getCitiesEfo(key?: string, member?: MemberV2, parentKey?: string) {
+    async getCitiesEfo(key?: string, member?: any, parentKey?: string) {
       if (this.isLifeBusiness) {
         await this.getFromApi('cities', 'getCities');
         //@ts-ignore
@@ -1784,7 +1795,7 @@ export const useDataStore = defineStore('data', {
           calculationData.insrCount = this.formStore.lfb.clients.length;
           calculationData.insTermInMonth = Number(this.formStore.productConditionsForm.coverPeriod);
           calculationData.fixInsSum = getNumber(String(this.formStore.productConditionsForm.requestedSumInsured));
-          calculationData.agentCommission = this.formStore.productConditionsForm.processTariff.id;
+          calculationData.agentCommission = Number(this.formStore.productConditionsForm.agentCommission);
           calculationData.processDefinitionFgotId = this.formStore.productConditionsForm.processGfot.id;
         }
         const calculationResponse = await this.api.calculateWithoutApplication(calculationData, this.isCalculator ? product : undefined);
@@ -1811,6 +1822,9 @@ export const useDataStore = defineStore('data', {
           this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(calculationResponse.mainPremium);
           this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(calculationResponse.fixInsSum === 0 ? null : calculationResponse.fixInsSum);
           this.formStore.additionalInsuranceTermsWithout = calculationResponse.addCovers;
+          if (calculationResponse.agentCommission) {
+            this.formStore.productConditionsForm.agentCommission = calculationResponse.agentCommission;
+          }
           if (calculationResponse.clients) {
             this.formStore.lfb.clients = calculationResponse.clients;
           }
@@ -3104,9 +3118,9 @@ export const useDataStore = defineStore('data', {
       const economySectorCode = this.economySectorCode.find((i: Value) => i.ids === '500003.9');
       if (economySectorCode) member.economySectorCode = economySectorCode;
     },
-    async startApplicationV2(data: any) {
+    async startApplicationV2(data: PolicyholderClass) {
       const policyholder = data.clientData;
-      if (!policyholder.authoritedPerson.iin) return false;
+      if (!policyholder.iin) return false;
       try {
         const response = await this.api.startApplication(data);
         this.sendToParent(constants.postActions.applicationCreated, response.processInstanceId);
@@ -3115,7 +3129,7 @@ export const useDataStore = defineStore('data', {
         return ErrorHandler(err);
       }
     },
-    async saveClient(policyholder: any) {
+    async saveClient(policyholder: PolicyholderClass) {
       try {
         await this.api.saveClient(this.formStore.applicationData.processInstanceId, this.formStore.lfb.clientId, policyholder);
       } catch (err) {
@@ -3156,12 +3170,12 @@ export const useDataStore = defineStore('data', {
 
         this.formStore.applicationData.processInstanceId = applicationData.processInstanceId;
         this.formStore.lfb.policyholder.isIpdl = applicationData.clientApp.isIpdl;
-        this.formStore.lfb.policyholder.clientData.company = clientData;
+        this.formStore.lfb.policyholder.clientData = clientData;
         this.formStore.lfb.policyholder.clientData.authoritedPerson = clientData.authoritedPerson;
-        this.formStore.lfb.policyholder.clientData.company.iin = reformatIin(clientData.iin);
+        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.company.authorityDetails.date = reformatDate(clientData.authorityDetails.date);
+        this.formStore.lfb.policyholder.clientData.authorityDetails.date = reformatDate(clientData.authorityDetails.date);
 
         if (clientData && clientData.activityTypes !== null) {
           this.formStore.lfb.policyholderActivities = clientData.activityTypes;
@@ -3171,6 +3185,7 @@ export const useDataStore = defineStore('data', {
           this.formStore.lfb.beneficialOwners = beneficialOwnerApp;
           this.formStore.lfb.isPolicyholderBeneficialOwner = clientData.authoritedPerson.iin.replace(/-/g, '') === beneficialOwnerApp[0].beneficialOwnerData.iin ? true : false;
           this.formStore.lfb.beneficialOwners.forEach(beneficial => {
+            beneficial.beneficialOwnerData.birthDate = reformatDate(beneficial.beneficialOwnerData.birthDate as string);
             beneficial.beneficialOwnerData.identityDocument!.validUntil = reformatDate(beneficial.beneficialOwnerData.identityDocument!.validUntil as string);
             beneficial.beneficialOwnerData.iin = reformatIin(beneficial.beneficialOwnerData.iin as string);
           });
@@ -3189,6 +3204,7 @@ export const useDataStore = defineStore('data', {
           });
         }
 
+        this.formStore.productConditionsForm.agentCommission = applicationData.policyAppDto.agentCommission === 0 ? null : applicationData.policyAppDto.agentCommission;
         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(
@@ -3196,8 +3212,8 @@ export const useDataStore = defineStore('data', {
         );
         const paymentPeriod = this.processPaymentPeriod.find(item => item.id == applicationData.policyAppDto.paymentPeriodId);
         this.formStore.productConditionsForm.paymentPeriod = paymentPeriod ? paymentPeriod : new Value();
-        const processTariff = this.processTariff.find(item => item.id == applicationData.policyAppDto.tariffId);
-        this.formStore.productConditionsForm.processTariff = processTariff ? processTariff : new Value();
+        // const processTariff = this.processTariff.find(item => item.id == applicationData.policyAppDto.tariffId);
+        // this.formStore.productConditionsForm.processTariff = processTariff ? processTariff : new Value();
         const processGfot = this.processGfot.find(item => item.id == applicationData.policyAppDto.processDefinitionFgotId);
         this.formStore.productConditionsForm.processGfot = processGfot ? processGfot : new Value();
       } catch (err) {
@@ -3218,9 +3234,9 @@ export const useDataStore = defineStore('data', {
         return ErrorHandler(err);
       }
     },
-    async saveClientAcivityTypes(data: PolicyholderActivity[]) {
+    async saveClientActivityTypes(data: PolicyholderActivity[]) {
       try {
-        const response = await this.api.saveClientAcivityTypes(this.formStore.applicationData.clientApp.id, data);
+        const response = await this.api.saveClientActivityTypes(this.formStore.applicationData.clientApp.id, data);
         return response;
       } catch (err) {
         return ErrorHandler(err);
@@ -3236,7 +3252,7 @@ export const useDataStore = defineStore('data', {
     },
     async saveBeneficialOwner(beneficialOwner: BeneficialOwner) {
       try {
-        const response = await this.api.saveBeneficialOwner(this.formStore.applicationData.processInstanceId, beneficialOwner.id, beneficialOwner);
+        const response = await this.api.saveBeneficialOwner(this.formStore.applicationData.processInstanceId, String(beneficialOwner.id), beneficialOwner);
         return response;
       } catch (err) {
         return ErrorHandler(err);
@@ -3265,7 +3281,7 @@ export const useDataStore = defineStore('data', {
           id: index,
           fullName: client.longName,
           gender: client.gender,
-          position: item.workDetails?.position,
+          position: client.workDetails.position,
           birthDate: client.birthDate,
           iin: reformatIin(client.iin),
           insSum: client.insuredPolicyData.insSum,
@@ -3323,7 +3339,7 @@ export const useDataStore = defineStore('data', {
         if (this.validateMultipleMembersV2('beneficialOwners', 'beneficialOwnerApp', 'бенефициарных собственников') === false) {
           return false;
         }
-        const inStatement = this.formStore.lfb.beneficialOwners.every(i => i.id !== null);
+        const inStatement = this.formStore.lfb.beneficialOwners.every(i => i.beneficialOwnerData.id !== null);
         if (inStatement === false) {
           this.showToaster('error', this.t('toaster.requiredMember', { text: this.t('toaster.beneficialOwner') }));
           return false;

package/store/rules.ts

@@ -9,6 +9,7 @@ export const rules = {
   recalculationAdditive: [(v: any) => (v !== null && v !== '' && v <= 100 && v >= 0) || t('toaster.valueShouldBeBetween', { floor: '0', ceil: '100' })],
   required: [(v: any) => !!v || t('rules.required')],
   iik: [(v: any) => v.length === 20 || t('rules.iik')],
+  agentCommission: [(v: any) => v <= 50 || t('rules.agentCommission')],
   objectRequired: [
     (v: any) => {
       if (!!v && 'nameRu' in v && v.nameRu != null) {

package/types/enum.ts

@@ -40,9 +40,6 @@ export enum Actions {
   affiliate = 'affiliate',
   affiliateCustom = 'affiliateCustom',
 
-  template = 'template',
-  templateCustom = 'templateCustom',
-
   chooseSign = 'chooseSign',
   chooseSignCustom = 'chooseSignCustom',
 }