hl-core 0.0.9-beta.47 → 0.0.9-beta.48

package/api/base.api.ts

@@ -712,10 +712,10 @@ export class ApiClass {
       data: data,
     });
   }
-  async downloadTemplate(fileType: number) {
+  async downloadTemplate(fileType: number, processInstanceId?: string | number) {
     return await this.axiosCall({
       method: Methods.GET,
-      url: `/${this.productUrl}/api/Application/DownloadTemplate?fileType=${fileType}`,
+      url: `/${this.productUrl}/api/Application/DownloadTemplate?fileType=${fileType}&processInstanceId=${processInstanceId}`,
       responseType: 'arraybuffer',
     });
   }
@@ -727,6 +727,13 @@ export class ApiClass {
     });
   }
 
+  async sendInvoiceToEmail(processInstanceId: string | number, email: string) {
+    return await this.axiosCall({
+      method: Methods.GET,
+      url: `/${this.productUrl}/api/Application/SendInvoiceToEmail?processInstanceId=${processInstanceId}&emailTo=${email}`,
+    });
+  }
+
   async getCalculator(data: SetApplicationRequest) {
     return await this.axiosCall<number>({
       method: Methods.POST,

package/components/Pages/ProductConditions.vue

@@ -1074,11 +1074,11 @@ export default defineComponent({
     };
 
     const filterList = (list: Value[], key: string) => {
-      if (whichProduct.value === 'baiterek') {
-        if (dataStore.isManagerHalykBank()) {
-          if (key === 'paymentPeriod') return list.filter(i => i.code !== 'single');
-        }
-      }
+      // if (whichProduct.value === 'baiterek') {
+      //   if (dataStore.isManagerHalykBank()) {
+      //     if (key === 'paymentPeriod') return list.filter(i => i.code !== 'single');
+      //   }
+      // }
       return list;
     };
 

package/components/Panel/PanelHandler.vue

@@ -62,7 +62,7 @@
     </div>
   </section>
   <section v-if="choosePayActions">
-    <div v-if="!isEpayPay" :class="[$styles.flexColNav]">
+    <div v-if="!isEpayPay && !isOfflinePay" :class="[$styles.flexColNav]">
       <base-btn :text="$dataStore.t('buttons.payEpay')" :loading="loading" @click="handlePayAction('epay')" />
       <base-btn :text="$dataStore.t('buttons.payOffline')" :loading="loading" @click="handlePayAction('offline')" />
     </div>
@@ -178,6 +178,7 @@ export default defineComponent({
     const isQrLoading = ref<boolean>(false);
     const urlCopy = ref<string>('');
     const isEpayPay = ref<boolean>(false);
+    const isOfflinePay = ref<boolean>(false);
 
     const vForm = ref<any>();
     const isSendNumberOpen = ref<boolean>(false);
@@ -282,7 +283,7 @@ export default defineComponent({
       }
       closePanel();
       dataStore.showToaster('success', dataStore.t('toaster.successOperation'));
-      await dataStore.handleTask(constants.actions.signedScans, route.params.taskId as string, actionCause.value);
+      await dataStore.handleTask(constants.actions.signed, route.params.taskId as string, 'scans');
     };
     const submitForm = async () => {
       await vForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
@@ -322,7 +323,7 @@ export default defineComponent({
       //   loading.value = false;
       //   return;
       // }
-      if (dataStore.isAML || dataStore.isCheckContract || dataStore.isCheckContragent || dataStore.isDas) {
+      if (dataStore.isAML || dataStore.isCheckContract || dataStore.isCheckContragent || dataStore.isDas || dataStore.isUU) {
         emit('task', [dataStore.panelAction, route.params.taskId as string, actionCause.value]);
       } else {
         await dataStore.handleTask(dataStore.panelAction, route.params.taskId as string, actionCause.value);
@@ -403,7 +404,7 @@ export default defineComponent({
     const price = computed(() => dataStore.getNumberWithSpaces(formStore.productConditionsForm.calculatorForm.price));
     const insuredAmount = computed(() => formStore.productConditionsForm.calculatorForm.amount!.nameRu! + dataStore.currency);
     const hasConditionsInfo = computed(() => {
-      if (dataStore.isLifetrip || dataStore.isDas) {
+      if (dataStore.isLifetrip || dataStore.isDas || dataStore.isUU) {
         return false;
       }
       if (dataStore.isFinCenter()) {
@@ -436,7 +437,7 @@ export default defineComponent({
       return true;
     });
     const downloadTemplate = async (documentType: number, fileType: string) => {
-      await dataStore.downloadTemplate(documentType, fileType);
+      await dataStore.downloadTemplate(documentType, fileType, formStore.applicationData.processInstanceId);
     };
 
     const handleSignAction = async (type: 'paper' | 'electronic' | 'scans' | 'qr') => {
@@ -468,6 +469,11 @@ export default defineComponent({
       if (type === 'epay') {
         await payEpay();
       }
+      if (type === 'offline') {
+        await dataStore.handleTask(constants.actions.payed, route.params.taskId as string, 'offline');
+        isOfflinePay.value = true;
+      }
+      loading.value = false;
     };
 
     // TODO Рефактор QR c npm
@@ -579,6 +585,7 @@ export default defineComponent({
       isQrLoading,
       urlCopy,
       isEpayPay,
+      isOfflinePay,
 
       // Functions
       closePanel,

package/composables/classes.ts

@@ -1513,7 +1513,8 @@ export class BaseGroupClass {
     documentNumber: string;
     series: string;
     issuedBy: Value;
-    validUntil: string | null;
+    issuedOn: string;
+    validUntil: string;
   };
   bankInfo: BankInfoClass;
   kbe: string;
@@ -1541,6 +1542,7 @@ export class BaseGroupClass {
       documentNumber: '',
       series: '',
       issuedBy: new Value(),
+      issuedOn: '',
       validUntil: '',
     };
     this.bankInfo = new BankInfoClass();
@@ -1552,7 +1554,8 @@ export class PhysGroupClass extends BaseGroupClass {
   lastName: string;
   firstName: string;
   middleName: string;
-  birthDate: string | null;
+  birthDate: string;
+  gender: Value;
   placeOfBirth: Value;
   workDetails: { workplace: string; position: string; jobDuties: string };
   hasContactPerson: boolean;
@@ -1562,6 +1565,7 @@ export class PhysGroupClass extends BaseGroupClass {
     this.firstName = '';
     this.middleName = '';
     this.birthDate = '';
+    this.gender = new Value();
     this.placeOfBirth = new Value();
     this.workDetails = { workplace: '', position: '', jobDuties: '' };
     this.hasContactPerson = false;

package/composables/constants.ts

@@ -68,6 +68,7 @@ export const constants = Object.freeze({
     application1: 33,
     insuredsList: 34,
     questionnaireInsured: 35,
+    invoicePayment: 36,
   },
   fixInsAmount: [
     {

package/composables/index.ts

@@ -2,6 +2,7 @@ import { useDisplay } from 'vuetify';
 import jwt_decode from 'jwt-decode';
 import { XMLParser } from 'fast-xml-parser';
 import { AxiosError } from 'axios';
+import { PolicyholderClass } from '../composables/classes';
 
 export const getBaseCredentials = () => {
   return {
@@ -202,6 +203,48 @@ export const ErrorHandler = (err: unknown, errorText?: string) => {
   return false;
 };
 
+export const policyholderToBeneficialOwner = (isPolicyholderBeneficialOwner: boolean, policyholder?: PolicyholderClass) => {
+  const formStore = useFormStore();
+  const dataStore = useDataStore();
+  const beneficialOwner = formStore.lfb.beneficialOwners[0].beneficialOwnerData;
+  if (isPolicyholderBeneficialOwner && policyholder) {
+    beneficialOwner.iin = policyholder.clientData.authoritedPerson.iin;
+    beneficialOwner.firstName = policyholder.clientData.authoritedPerson.firstName;
+    beneficialOwner.middleName = policyholder.clientData.authoritedPerson.middleName;
+    beneficialOwner.lastName = policyholder.clientData.authoritedPerson.lastName;
+    beneficialOwner.citizenship = policyholder.clientData.authoritedPerson.citizenship;
+    beneficialOwner.birthDate = policyholder.clientData.authoritedPerson.birthDate;
+    beneficialOwner.gender = policyholder.clientData.authoritedPerson.gender;
+    beneficialOwner.resident = policyholder.clientData.resident;
+    beneficialOwner.taxResidentCountry = policyholder.clientData.taxResidentCountry;
+    beneficialOwner.economySectorCode = policyholder.clientData.economySectorCode;
+    beneficialOwner.identityDocument.issuedOn = policyholder.clientData.authoritedPerson.identityDocument.issuedOn;
+    beneficialOwner.identityDocument.documentNumber = policyholder.clientData.authoritedPerson.identityDocument.documentNumber;
+    beneficialOwner.identityDocument.documentType = policyholder.clientData.authoritedPerson.identityDocument.documentType;
+    beneficialOwner.identityDocument.issuedBy = policyholder.clientData.authoritedPerson.identityDocument.issuedBy;
+    beneficialOwner.identityDocument.validUntil = policyholder.clientData.authoritedPerson.identityDocument.validUntil;
+    beneficialOwner.identityDocument.series = policyholder.clientData.authoritedPerson.identityDocument.series;
+    dataStore.showToaster('warning', dataStore.t('toaster.formFieldEmptyWarning'));
+  } else {
+    beneficialOwner.iin = '';
+    beneficialOwner.firstName = '';
+    beneficialOwner.middleName = '';
+    beneficialOwner.lastName = '';
+    beneficialOwner.citizenship = new Value();
+    beneficialOwner.birthDate = '';
+    beneficialOwner.gender = new Value();
+    beneficialOwner.resident = new Value();
+    beneficialOwner.taxResidentCountry = new Value();
+    beneficialOwner.economySectorCode = new Value();
+    beneficialOwner.identityDocument.issuedOn = '';
+    beneficialOwner.identityDocument.documentNumber = '';
+    beneficialOwner.identityDocument.documentType = new Value();
+    beneficialOwner.identityDocument.issuedBy = new Value();
+    beneficialOwner.identityDocument.validUntil = '';
+    beneficialOwner.identityDocument.series = '';
+  }
+};
+
 export const setAddressBeneficiary = (whichIndex: number, sameAddress: boolean) => {
   const formStore = useFormStore();
   const dataStore = useDataStore();

package/locales/ru.json

@@ -220,7 +220,8 @@
     "sendEgovMob": "Отправить на подпись через Egov Mobile",
     "sendToPay": "Отправить на оплату",
     "payEpay": "Оплатить через EPAY",
-    "payOffline": "Оплатить офлайн"
+    "payOffline": "Оплатить офлайн",
+    "paymentInvoice": "Cчет на оплату"
   },
   "dialog": {
     "title": "Подтверждение",

package/package.json

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

package/store/data.store.ts

@@ -2281,7 +2281,8 @@ export const useDataStore = defineStore('data', {
           case constants.actions.return:
           case constants.actions.signed:
           case constants.actions.rejectclient:
-          case constants.actions.accept: {
+          case constants.actions.accept:
+          case constants.actions.payed: {
             try {
               const sended = await this.sendTask(taskId, action, comment);
               if (!sended) return;
@@ -2427,10 +2428,10 @@ export const useDataStore = defineStore('data', {
         ErrorHandler(err);
       }
     },
-    async downloadTemplate(documentType: number, fileType: string = 'pdf') {
+    async downloadTemplate(documentType: number, fileType: string = 'pdf', processInstanceId?: string | number) {
       try {
         this.isButtonsLoading = true;
-        const response: any = await this.api.downloadTemplate(documentType);
+        const response: any = await this.api.downloadTemplate(documentType, processInstanceId);
         const blob = new Blob([response], {
           type: `application/${fileType}`,
         });
@@ -2453,6 +2454,9 @@ export const useDataStore = defineStore('data', {
           case constants.documentTypes.questionnaireInsured:
             link.setAttribute('download', 'Анкета Застрахованного.docx');
             break;
+          case constants.documentTypes.invoicePayment:
+            link.setAttribute('download', 'Счет на оплату.pdf');
+            break;
         }
         document.body.appendChild(link);
         link.click();
@@ -2471,6 +2475,16 @@ export const useDataStore = defineStore('data', {
       }
       this.isButtonsLoading = false;
     },
+    async sendInvoiceToEmail(processInstanceId: string | number, email: string) {
+      try {
+        this.isButtonsLoading = true;
+        await this.api.sendInvoiceToEmail(processInstanceId, email);
+        this.showToaster('info', this.t('toaster.successfullyDocSent'), 5000);
+      } catch (err) {
+        ErrorHandler(err);
+      }
+      this.isButtonsLoading = false;
+    },
     async generateDocument() {
       try {
         this.isButtonsLoading = true;
@@ -3147,20 +3161,26 @@ export const useDataStore = defineStore('data', {
     },
     async startApplicationV2(data: PolicyholderClass) {
       const policyholder = JSON.parse(JSON.stringify(data)) as any;
-      this.preparePersonData(policyholder);
-      delete policyholder.clientData.beneficalOwnerQuest;
-      delete policyholder.clientData.identityDocument;
-      delete policyholder.clientData.activityTypes;
-      delete policyholder.clientData.citizenship;
-      delete policyholder.clientData.authoritedPerson.identityDocument;
-      delete policyholder.clientData.authoritedPerson.actualAddress;
-      delete policyholder.clientData.authoritedPerson.bankInfo;
-      delete policyholder.clientData.authoritedPerson.economySectorCode;
-      delete policyholder.clientData.authoritedPerson.legalAddress;
-      delete policyholder.clientData.authoritedPerson.placeOfBirth;
-      delete policyholder.clientData.authoritedPerson.resident;
-      delete policyholder.clientData.authoritedPerson.taxResidentCountry;
       if (!policyholder.clientData.iin) return false;
+      this.preparePersonData(policyholder);
+      keyDeleter(policyholder as PolicyholderClass, [
+        'clientData.beneficalOwnerQuest',
+        'clientData.identityDocument',
+        'clientData.activityTypes',
+        'clientData.citizenship',
+        'clientData.addTaxResidency',
+        'clientData.gender',
+        'clientData.placeOfBirth',
+        'clientData.authoritedPerson.actualAddress',
+        '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;
       try {
         const response = await this.api.startApplication(policyholder);
         this.sendToParent(constants.postActions.applicationCreated, response.processInstanceId);
@@ -3171,6 +3191,7 @@ export const useDataStore = defineStore('data', {
     },
     async saveClient(data: PolicyholderClass) {
       const policyholder = JSON.parse(JSON.stringify(data)) as any;
+      policyholder.clientData.authoritedPerson.gender = policyholder.clientData.authoritedPerson.gender.nameRu === 'Мужской' ? 1 : 2;
       this.preparePersonData(policyholder);
       try {
         await this.api.saveClient(this.formStore.applicationData.processInstanceId, this.formStore.lfb.clientId, policyholder);
@@ -3218,6 +3239,11 @@ export const useDataStore = defineStore('data', {
         this.formStore.lfb.policyholder.clientData.authoritedPerson.iin = reformatIin(clientData.authoritedPerson.iin);
         this.formStore.lfb.clientId = clientId;
         this.formStore.lfb.policyholder.clientData.authorityDetails.date = reformatDate(clientData.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();
 
         if (clientData && clientData.activityTypes !== null) {
           this.formStore.lfb.policyholderActivities = clientData.activityTypes;
@@ -3227,9 +3253,13 @@ 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.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);
+            beneficial.beneficialOwnerData.identityDocument.issuedOn = reformatDate(beneficial.beneficialOwnerData.identityDocument.issuedOn as string) ?? '';
+            //@ts-ignore
+            const gender = this.gender.find((i: Value) => i.id === beneficial.beneficialOwnerData.gender);
+            beneficial.beneficialOwnerData.gender = gender ? gender : new Value();
           });
         }
 
@@ -3286,20 +3316,19 @@ export const useDataStore = defineStore('data', {
     async saveBeneficialOwnerList(data: BeneficialOwner[]) {
       const beneficialOwnerList = JSON.parse(JSON.stringify(data)) as any;
       for (const item of beneficialOwnerList) {
-        delete item.beneficialOwnerData.identityDocument.issuedOn;
-        delete item.beneficialOwnerData.activityTypes;
-        delete item.beneficialOwnerData.actualAddress;
-        delete item.beneficialOwnerData.addTaxResidency;
-        delete item.beneficialOwnerData.authoritedPerson;
-        delete item.beneficialOwnerData.authorityDetails;
-        delete item.beneficialOwnerData.bankInfo;
-        delete item.beneficialOwnerData.economySectorCode;
-        delete item.beneficialOwnerData.legalAddress;
-        delete item.beneficialOwnerData.placeOfBirth;
-        delete item.beneficialOwnerData.resident;
-        delete item.beneficialOwnerData.taxResidentCountry;
-        delete item.beneficialOwnerData.typeOfEconomicActivity;
+        keyDeleter(item as BeneficialOwner, [
+          'beneficialOwnerData.activityTypes',
+          'beneficialOwnerData.actualAddress',
+          'beneficialOwnerData.addTaxResidency',
+          'beneficialOwnerData.authoritedPerson',
+          'beneficialOwnerData.authorityDetails',
+          'beneficialOwnerData.bankInfo',
+          'beneficialOwnerData.legalAddress',
+          'beneficialOwnerData.placeOfBirth',
+          'beneficialOwnerData.typeOfEconomicActivity',
+        ]);
         item.processInstanceId = this.formStore.applicationData.processInstanceId;
+        item.beneficialOwnerData.gender = item.beneficialOwnerData.gender.nameRu === 'Мужской' ? 1 : 2;
         this.preparePersonData(item.beneficialOwnerData);
       }
       try {
@@ -3311,7 +3340,18 @@ export const useDataStore = defineStore('data', {
     },
     async saveBeneficialOwner(data: BeneficialOwner) {
       const beneficialOwner = JSON.parse(JSON.stringify(data)) as any;
-      delete beneficialOwner.beneficialOwnerData.identityDocument.issuedOn;
+      keyDeleter(beneficialOwner as BeneficialOwner, [
+        'beneficialOwnerData.activityTypes',
+        'beneficialOwnerData.actualAddress',
+        'beneficialOwnerData.addTaxResidency',
+        'beneficialOwnerData.authoritedPerson',
+        'beneficialOwnerData.authorityDetails',
+        'beneficialOwnerData.bankInfo',
+        'beneficialOwnerData.legalAddress',
+        'beneficialOwnerData.placeOfBirth',
+        'beneficialOwnerData.typeOfEconomicActivity',
+      ]);
+      beneficialOwner.beneficialOwnerData.gender = beneficialOwner.beneficialOwnerData.gender.nameRu === 'Мужской' ? 1 : 2;
       this.preparePersonData(beneficialOwner.beneficialOwnerData);
       try {
         const response = await this.api.saveBeneficialOwner(this.formStore.applicationData.processInstanceId, String(beneficialOwner.id), beneficialOwner);

package/types/enum.ts

@@ -46,8 +46,8 @@ export enum Actions {
   choosePay = 'choosePay',
   choosePayCustom = 'choosePayCustom',
 
-  signedScans = 'signedScans',
-  signedScansCustom = 'signedScansCustom',
+  payed = 'payed',
+  payedCustom = 'payedCustom',
 }
 
 export enum PostActions {