hl-core 0.0.10-beta.48 → 0.0.10-beta.49

package/api/base.api.ts

@@ -423,12 +423,14 @@ export class ApiClass {
     });
   }
 
-  async startApplication(data: any) {
+  async startApplication(data: any, processCodeEnum?: number) {
+    const params = processCodeEnum !== undefined ? { processCodeEnum } : undefined;
     return await this.axiosCall<{
       processInstanceId: string;
     }>({
       method: Methods.POST,
       url: `/${this.productUrl}/api/Application/StartApplication`,
+      params: params,
       data: data,
     });
   }
@@ -539,18 +541,22 @@ export class ApiClass {
     });
   }
 
-  async calculateWithoutApplication(data: Types.RecalculationDataType, product: string | undefined | null = this.productUrl) {
+  async calculateWithoutApplication(data: Types.RecalculationDataType, product: string | undefined | null = this.productUrl, processCodeEnum?: number) {
+    const params = processCodeEnum !== undefined ? { processCodeEnum } : undefined;
     return await this.axiosCall<Types.RecalculationResponseType>({
       method: Methods.POST,
       url: `/${product}/api/Application/Calculate`,
+      params: params,
       data: data,
     });
   }
 
-  async getDefaultCalculationData(product: string | undefined | null = this.productUrl) {
+  async getDefaultCalculationData(product: string | undefined | null = this.productUrl, processCodeEnum?: number) {
+    const params = processCodeEnum !== undefined ? { processCodeEnum } : undefined;
     return await this.axiosCall<Types.RecalculationDataType>({
       method: Methods.GET,
       url: `/${product}/api/Application/DefaultCalculatorValues`,
+      params: params,
     });
   }
 
@@ -812,10 +818,10 @@ export class ApiClass {
     });
   }
 
-  async saveInsuredList(processInstanceId: string | number, data: any) {
+  async saveInsuredList(processInstanceId: string | number, newInsureds: boolean, data: any) {
     return await this.axiosCall({
       method: Methods.POST,
-      url: `/${this.productUrl}/api/Application/saveInsuredList/?processInstanceId=${processInstanceId}`,
+      url: `/${this.productUrl}/api/Application/saveInsuredList/?processInstanceId=${processInstanceId}&newInsureds=${newInsureds}`,
       data: data,
     });
   }
@@ -828,6 +834,13 @@ export class ApiClass {
     });
   }
 
+  async getInsuredsData(processInstanceId: string | number) {
+    return await this.axiosCall<Types.ClientV2[]>({
+      method: Methods.GET,
+      url: `/${this.productUrl}/api/Application/GetInsuredsData/?processInstanceId=${processInstanceId}`,
+    });
+  }
+
   async getProcessGfot(processCode: string | number) {
     return await this.axiosCall<Value[]>({
       method: Methods.GET,

package/components/Input/FileInput.vue

@@ -8,7 +8,7 @@
     variant="solo"
     show-size
     multiple
-    accept=".pdf,.doc,.docx,.jpeg,.jpg,.jpg,.xlsx,.xls"
+    accept=".pdf,.doc,.docx,.jpeg,.jpg,.jpg,.xlsx,.xls,.xlsm"
     truncate-length="15"
     clear-icon="mdi mdi-close"
     :label="label"

package/components/Pages/ProductConditions.vue

@@ -215,16 +215,16 @@
           append-inner-icon="mdi mdi-chevron-right"
           @append="openPanel($dataStore.t('productConditionsForm.processIndexRate'), $dataStore.processIndexRate, 'processIndexRate', $dataStore.getProcessIndexRate)"
         />
-        <base-form-input
-          v-if="hasFixInsSum"
-          v-model="productConditionsForm.fixInsSum"
-          :readonly="isDisabledFixInsSum"
-          :clearable="!isDisabled"
-          :rules="fixInsSumRule"
-          :label="$dataStore.t('productConditionsForm.fixInsSum')"
-          :suffix="$constants.currencySymbols.kzt"
-          @input="onInputFixInsSum"
-        />
+        <!--        <base-form-input-->
+        <!--          v-if="hasFixInsSum"-->
+        <!--          v-model="productConditionsForm.fixInsSum"-->
+        <!--          :readonly="isDisabledFixInsSum"-->
+        <!--          :clearable="!isDisabled"-->
+        <!--          :rules="fixInsSumRule"-->
+        <!--          :label="$dataStore.t('productConditionsForm.fixInsSum')"-->
+        <!--          :suffix="$constants.currencySymbols.kzt"-->
+        <!--          @input="onInputFixInsSum"-->
+        <!--        />-->
         <base-form-input
           v-if="hasRequestedSumInsured"
           v-model="productConditionsForm.requestedSumInsured"
@@ -326,7 +326,7 @@
           :label="$dataStore.t('productConditionsForm.agencyPart')"
           :readonly="isDisabledAgentCommission"
           :clearable="!isDisabledAgentCommission"
-          :rules="!formStore.lfb.add ? $rules.required.concat($rules.numbers, $rules.agentCommission) : productConditionsForm.agentCommission === 0 ? [] : $rules.required"
+          :rules="agencyPartRule"
         />
       </base-form-section>
       <section v-if="whichProduct === 'pensionannuitynew'">
@@ -958,6 +958,7 @@ export default defineComponent({
     const customPension = ref<boolean>(false);
     const transferSum = ref<number>(0);
     const firstAmount = ref<boolean>(true);
+    const isHalykBank = formStore.lfb.policyholder.clientData.iin.replace(/-/g, '') === '940140000385';
 
     const isShownAdditionalTerms = computed(() => {
       if (whichProduct.value === 'gons') {
@@ -1013,6 +1014,13 @@ export default defineComponent({
         ? dataStore.rules.required.concat(dataStore.rules.sums, dataStore.rules.fixInsSumLimit(getNumber(productConditionsForm.fixInsSum as string), minInsSum.value))
         : [],
     );
+    const agencyPartRule = computed(() => {
+      if (formStore.lfb.add || isHalykBank) {
+        return productConditionsForm.agentCommission === 0 ? [] : dataStore.rules.required;
+      } else {
+        return dataStore.rules.required.concat(dataStore.rules.numbers, dataStore.rules.agentCommission);
+      }
+    });
     const amountAnnuityPayments = computed(() => (!!productConditionsForm.amountAnnuityPayments ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
     const hasCalculated = computed(() => {
       if ((whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') && productConditionsForm.requestedSumInsured === null) {
@@ -1271,6 +1279,9 @@ export default defineComponent({
       return true;
     });
     const isDisabledAgentCommission = computed(() => {
+      if (isHalykBank) {
+        return true;
+      }
       if (formStore.lfb.add && (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns')) {
         return true;
       }
@@ -2058,7 +2069,7 @@ export default defineComponent({
               if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
                 const setApplicationData = dataStore.getConditionsData();
                 const hasSetApplication = await dataStore.setApplication(setApplicationData);
-                if (hasSetApplication) await dataStore.calculate(route.params.taskId as string);
+                if (hasSetApplication && !isHalykBank) await dataStore.calculate(route.params.taskId as string);
                 additionalTerms.value = formStore.additionalInsuranceTerms;
               } else {
                 await dataStore.reCalculate(formStore.applicationData.processInstanceId, recalculationData, route.params.taskId as string, whichSum.value);
@@ -2072,7 +2083,7 @@ export default defineComponent({
               additionalTerms.value = formStore.additionalInsuranceTermsWithout;
             } else {
               if (dataStore.isProcessEditable(formStore.applicationData.statusCode)) {
-                await dataStore.calculate(route.params.taskId as string);
+                await dataStore.calculate(route.params.taskId as string, isHalykBank);
                 additionalTerms.value = formStore.additionalInsuranceTerms;
               }
             }
@@ -2184,7 +2195,7 @@ export default defineComponent({
           const kazynaPaymentPeriod = dataStore.processPaymentPeriod.find(i => i.code === 'single');
           if (kazynaPaymentPeriod) productConditionsForm.paymentPeriod = kazynaPaymentPeriod;
         }
-        if (!formStore.lfb.add && (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns')) {
+        if (!formStore.lfb.add && !isHalykBank && (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns')) {
           productConditionsForm.requestedSumInsured = dataStore.getNumberWithSpaces(
             formStore.lfb.clients.reduce((sum: number, i: any) => {
               return sum + Number(i.insSum);
@@ -2490,8 +2501,9 @@ export default defineComponent({
       isSlavePensionForm,
 
       // Rules
-      coverPeriodRule,
       fixInsSumRule,
+      agencyPartRule,
+      coverPeriodRule,
 
       // Functions
       submitForm,

package/composables/classes.ts

@@ -1439,6 +1439,7 @@ export class FormStoreClass {
     insisWorkDataApp?: Types.InsisWorkDataApp;
     addCoverDto?: Types.AddCover[];
     slave?: any;
+    insuredCount?: number;
   };
   policyholderForm: Member;
   policyholderFormKey: StoreMembers.policyholderForm;

package/composables/index.ts

@@ -533,9 +533,9 @@ export const getStrValuePerEnv = (which: WhichValuePerEnv) => {
       test: 'http://aml-dev.halyklife.nb/api',
     },
     lkaUrl: {
-      production: 'https://dev.lka-web.halyklife.nb/efo',
-      development: 'https://dev.lka-web.halyklife.nb/efo',
-      test: 'https://dev.lka-web.halyklife.nb/efo',
+      production: '/#/efo',
+      development: '/#/efo',
+      test: '/#/efo',
     },
   };
   return valuesPerEnv[which][import.meta.env.VITE_MODE as EnvModes];
@@ -864,12 +864,13 @@ export class RoleController {
   isSecurity = () => this.isRole(constants.roles.Security);
   isURAP = () => this.isRole(constants.roles.URAP);
   isTravelAgent = () => this.isRole(constants.roles.TravelAgent);
+  isHR = () => this.isRole(constants.roles.HR);
   hasAccess = () => {
     const baseAccessRoles = this.isAdmin() || this.isSupport() || this.isAnalyst() || this.isDrn() || this.isDsuioOrv();
     return {
       invoiceInfo: this.isAdmin() || this.isSupport(),
       toLKA: this.isAgent() || this.isManagerHalykBank() || baseAccessRoles,
-      toLKAv2: this.isAgent() || this.isManagerHalykBank() || this.isServiceManager() || baseAccessRoles,
+      toLKAv2: this.isAgent() || this.isManagerHalykBank() || this.isServiceManager() || this.isHR() || baseAccessRoles,
       toAML: this.isCompliance() || baseAccessRoles,
       toAULETTI: this.isAgentAuletti() || this.isManagerAuletti() || baseAccessRoles,
       toLKA_A: this.isAgentAuletti() || baseAccessRoles,
@@ -929,6 +930,7 @@ export class RoleController {
         this.isSecurity() ||
         this.isURAP() ||
         this.isTravelAgent() ||
+        this.isHR() ||
         baseAccessRoles,
     };
   };

package/package.json

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

package/store/data.store.ts

@@ -1844,7 +1844,10 @@ export const useDataStore = defineStore('data', {
     async getDefaultCalculationData(showLoader: boolean = false, product: string | null = null) {
       this.isLoading = showLoader;
       try {
-        const calculationData = await this.api.getDefaultCalculationData(this.isCalculator ? product : undefined);
+        const calculationData = await this.api.getDefaultCalculationData(
+          this.isCalculator ? product : undefined,
+          this.isLifeBusiness || product === 'lifebusiness' || this.isGns || product === 'gns' ? Number(this.processCode) : undefined,
+        );
         return calculationData;
       } catch (err) {
         ErrorHandler(err);
@@ -1966,7 +1969,11 @@ export const useDataStore = defineStore('data', {
           calculationData.contractEndDate = formatDate(this.formStore.productConditionsForm.contractEndDate as string)!.toISOString();
           calculationData.calcDate = formatDate(this.formStore.productConditionsForm.calcDate as string)!.toISOString();
         }
-        const calculationResponse = await this.api.calculateWithoutApplication(calculationData, this.isCalculator ? product : undefined);
+        const calculationResponse = await this.api.calculateWithoutApplication(
+          calculationData,
+          this.isCalculator ? product : undefined,
+          this.isLifeBusiness || product === 'lifebusiness' || this.isGns || product === 'gns' ? Number(this.processCode) : undefined,
+        );
         if (calculationResponse.amount)
           this.formStore.productConditionsForm.requestedSumInsured =
             this.isGons || product === 'gons' ? this.getNumberWithSpacesAfterComma(calculationResponse.amount) : this.getNumberWithSpaces(calculationResponse.amount);
@@ -2012,14 +2019,20 @@ export const useDataStore = defineStore('data', {
         return !!this.formStore.productConditionsForm.requestedSumInsured && !!this.formStore.productConditionsForm.insurancePremiumPerMonth;
       }
     },
-    async calculate(taskId: string) {
+    async calculate(taskId: string, isHalykBank: boolean = false) {
       this.isLoading = true;
       try {
         const id = this.formStore.applicationData.processInstanceId;
         if (!this.isPension && !(this.formStore.lfb.add && (this.isLifeBusiness || this.isGns))) await this.api.setApplication(this.getConditionsData());
         const result = ref();
-        result.value = await this.api.getCalculation(String(id));
-        const applicationData = await this.api.getApplicationData(taskId);
+        let applicationData = null;
+        if (!isHalykBank) result.value = await this.api.getCalculation(String(id));
+        if (this.isLifeBusiness || this.isGns) {
+          await this.getApplicationDataV2(taskId);
+          return;
+        } else {
+          applicationData = await this.api.getApplicationData(taskId);
+        }
         this.formStore.applicationData = applicationData;
         if (this.formStore.applicationData.addCoverDto) this.formStore.additionalInsuranceTerms = this.formStore.applicationData.addCoverDto;
         if ((this.isKazyna || this.isGons) && this.currencies.usd) {
@@ -3735,7 +3748,7 @@ export const useDataStore = defineStore('data', {
         policyholder.parentContractId = localStorage.getItem('policyId');
       }
       try {
-        const response = await this.api.startApplication(policyholder);
+        const response = await this.api.startApplication(policyholder, Number(this.processCode));
         this.sendToParent(constants.postActions.applicationCreated, response.processInstanceId);
         return response.processInstanceId;
       } catch (err) {
@@ -3807,9 +3820,8 @@ export const useDataStore = defineStore('data', {
           });
         }
 
-        if (insuredApp && insuredApp.length) {
-          const res = await this.newInsuredList(insuredApp);
-          this.formStore.lfb.clients = res;
+        if (insuredApp === null) {
+          await this.getInsuredsData();
         }
 
         if (accidentIncidents && accidentIncidents.length) {
@@ -3935,9 +3947,9 @@ export const useDataStore = defineStore('data', {
         return ErrorHandler(err);
       }
     },
-    async saveInsuredList(insuredList: any) {
+    async saveInsuredList(insuredList: any, newInsureds: boolean) {
       try {
-        await this.api.saveInsuredList(this.formStore.applicationData.processInstanceId, insuredList);
+        await this.api.saveInsuredList(this.formStore.applicationData.processInstanceId, newInsureds, insuredList);
         return true;
       } catch (err) {
         return ErrorHandler(err);
@@ -3951,6 +3963,18 @@ export const useDataStore = defineStore('data', {
         return ErrorHandler(err);
       }
     },
+    async getInsuredsData() {
+      try {
+        const result = await this.api.getInsuredsData(this.formStore.applicationData.processInstanceId);
+        if (result && result.length) {
+          this.formStore.applicationData.insuredApp = result;
+          const res = await this.newInsuredList(result);
+          this.formStore.lfb.clients = res;
+        }
+      } catch (err) {
+        return ErrorHandler(err);
+      }
+    },
     newInsuredList(list: any) {
       const clients = list.map((item: any, index: number) => {
         const client = item.insuredData;
@@ -3967,6 +3991,7 @@ export const useDataStore = defineStore('data', {
           hasAttachedFile: client.hasAttachedFile,
           insrBeginDate: client.insuredPolicyData.insrBeginDate ?? 'no',
           insrEndDate: client.insuredPolicyData.insrEndDate ?? 'no',
+          tableNumber: client.tableNumber,
         };
       });
       return clients;
@@ -4031,7 +4056,11 @@ export const useDataStore = defineStore('data', {
         return false;
       }
 
-      if (this.formStore.lfb.clients) {
+      const isHalykBank = this.formStore.lfb.policyholder.clientData.iin.replace(/-/g, '') === '940140000385';
+      if (this.formStore.lfb.clients.length === 0 && !isHalykBank) {
+        await this.getInsuredsData();
+      }
+      if (this.formStore.lfb.clients && !isHalykBank) {
         if (this.validateMultipleMembersV2('clients', 'insuredApp', 'застрахованных') === false) {
           return false;
         }

package/types/enum.ts

@@ -124,6 +124,7 @@ export enum Roles {
   Security = 'Security',
   URAP = 'URAP',
   TravelAgent = 'TravelAgent',
+  HR = 'HR',
 }
 
 export enum Statuses {

package/types/index.ts

@@ -263,6 +263,7 @@ export interface ClientV2 {
   insrEndDate?: string;
   economySectorCode?: Value;
   resident?: Value;
+  tableNumber?: string;
 }
 
 export type RecalculationResponseType = {