hl-core 0.0.8-beta.21 → 0.0.8-beta.23

package/api/index.ts

@@ -13,7 +13,10 @@ export class ApiClass {
 
   private async axiosCall<T>(config: AxiosRequestConfig): Promise<T> {
     const dataStore = useDataStore();
-    if ((dataStore.isBridge && !this.baseURL) || (!dataStore.isEFO && !dataStore.isAML && !dataStore.isLKA && (!this.baseURL || !this.productUrl))) {
+    if (dataStore.isBridge && !this.baseURL) {
+      console.error('No Axios baseURL');
+    }
+    if (!dataStore.isBridge && !dataStore.isCalculator && (!this.baseURL || !this.productUrl)) {
       console.error('No Axios baseURL or productURL');
     }
     const { data } = await useAxios(this.baseURL).request<T>(config);
@@ -137,6 +140,13 @@ export class ApiClass {
     });
   }
 
+  async getDicAnnuityTypeList(): Promise<Value[]> {
+    return this.axiosCall({
+      method: Methods.GET,
+      url: '/Arm/api/Dictionary/GetDictionaryItems/DicAnnuityType',
+    });
+  }
+
   async getCurrencies(): Promise<{ eur: number; usd: number }> {
     return this.axiosCall({
       method: Methods.GET,
@@ -208,6 +218,13 @@ export class ApiClass {
     });
   }
 
+  async getProcessAnnuityPaymentPeriod(processCode: string | number) {
+    return this.axiosCall({
+      method: Methods.GET,
+      url: `/Arm/api/Dictionary/ProcessAnnuityPaymentPeriod/${processCode}`,
+    });
+  }
+
   async getContragentById(id: any) {
     return this.axiosCall({
       method: Methods.GET,
@@ -455,18 +472,18 @@ export class ApiClass {
     });
   }
 
-  async calculateWithoutApplication(data: RecalculationDataType): Promise<RecalculationResponseType> {
+  async calculateWithoutApplication(data: RecalculationDataType, product = this.productUrl): Promise<RecalculationResponseType> {
     return this.axiosCall({
       method: Methods.POST,
-      url: `/${this.productUrl}/api/Application/Calculate`,
+      url: `/${product}/api/Application/Calculate`,
       data: data,
     });
   }
 
-  async getDefaultCalculationData(): Promise<RecalculationDataType> {
+  async getDefaultCalculationData(product = this.productUrl): Promise<RecalculationDataType> {
     return this.axiosCall({
       method: Methods.GET,
-      url: `/${this.productUrl}/api/Application/DefaultCalculatorValues`,
+      url: `/${product}/api/Application/DefaultCalculatorValues`,
     });
   }
 

package/api/interceptors.ts

@@ -4,7 +4,9 @@ export default function (axios: AxiosInstance) {
   axios.interceptors.request.use(
     request => {
       const dataStore = useDataStore();
-      request.headers.Authorization = `Bearer ${dataStore.accessToken}`;
+      if (dataStore.accessToken) {
+        request.headers.Authorization = `Bearer ${dataStore.accessToken}`;
+      }
       return request;
     },
     error => {
@@ -17,19 +19,21 @@ export default function (axios: AxiosInstance) {
     },
     error => {
       const dataStore = useDataStore();
-      const router = useRouter();
-      if (error.response.status === 401) {
-        dataStore.$reset();
-        localStorage.clear();
-        if (dataStore.isBridge) {
-          router.push({ name: 'Auth', query: { error: 401 } });
-        } else {
-          dataStore.sendToParent(constants.postActions.Error401, 401);
+      if (!dataStore.isCalculator) {
+        const router = useRouter();
+        if (error.response.status === 401) {
+          dataStore.$reset();
+          localStorage.clear();
+          if (dataStore.isBridge) {
+            router.push({ name: 'Auth', query: { error: 401 } });
+          } else {
+            dataStore.sendToParent(constants.postActions.Error401, 401);
+          }
         }
-      }
-      if (error.response.status >= 500) {
-        if (router.currentRoute.value.name !== 'Auth') {
-          dataStore.showToaster('error', error.stack, 5000);
+        if (error.response.status >= 500) {
+          if (router.currentRoute.value.name !== 'Auth') {
+            dataStore.showToaster('error', error.stack, 5000);
+          }
         }
       }
       return Promise.reject(error);

package/components/Pages/Anketa.vue

@@ -74,7 +74,7 @@
     <v-btn
       v-if="secondQuestionList && secondQuestionList.length && firstPanel"
       icon="mdi mdi-close"
-      class="ml-3 !absolute"
+      class="ml-3 !absolute z-10"
       @click="
         firstPanel = false;
         secondPanel = false;

package/components/Pages/ProductConditions.vue

@@ -1,7 +1,7 @@
 <template>
   <section class="flex flex-col gap-4 px-[10px]">
     <v-form ref="vForm" @submit="submitForm" class="max-h-[82svh] overflow-y-scroll">
-      <base-form-section v-if="$dataStore.isGons" :title="$t('productConditionsForm.requestedProductConditions')" :class="[$libStyles.textSimple]">
+      <base-form-section v-if="whichProduct === 'gons'" :title="$t('productConditionsForm.requestedProductConditions')" :class="[$libStyles.textSimple]">
         <base-form-text-section
           class="mb-4"
           title="Инвалидность I или II группы по причине несчастного случая, начиная с третьего года по любой причине, с освобождением от уплаты страховых взносов"
@@ -87,7 +87,7 @@
         ></base-panel-input>
       </base-form-section>
       <base-form-section :title="$t('generalConditions')">
-        <div v-if="isRecalculation && $route.params.taskId === '0'">
+        <div v-if="isRecalculation && ($route.params.taskId === '0' || $dataStore.isCalculator)">
           <base-form-input
             v-model="productConditionsForm.signDate"
             :maska="$maska.date"
@@ -122,7 +122,7 @@
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :rules="coverPeriodRule"
-          :label="$t($dataStore.isGons ? 'productConditionsForm.coverPeriodFrom3to20' : 'productConditionsForm.coverPeriod')"
+          :label="$t(whichProduct === 'gons' ? 'productConditionsForm.coverPeriodFrom3to20' : 'productConditionsForm.coverPeriod')"
         ></base-form-input>
         <base-panel-input
           v-if="hasPaymentPeriod"
@@ -192,6 +192,58 @@
           :suffix="$constants.currencySymbols.kzt"
         ></base-form-input>
       </base-form-section>
+      <base-form-section :title="$t('calculationAnnuityPayments')" v-if="hasAnnuityPayments">
+        <base-form-toggle
+          v-model="productConditionsForm.additionalConditionAnnuityPayments"
+          :title="$t('productConditionsForm.guaranteedTermAnnuityPayments')"
+          :disabled="isDisabled"
+          :has-border="false"
+          @clicked="handleToggler"
+        ></base-form-toggle>
+        <base-form-input
+          v-if="productConditionsForm.additionalConditionAnnuityPayments"
+          v-model="productConditionsForm.guaranteedPeriod"
+          :readonly="isDisabled"
+          :clearable="!isDisabled"
+          :rules="productConditionsForm.termAnnuityPayments ? [$dataStore.rules.guaranteedPeriodLimit(productConditionsForm.guaranteedPeriod, productConditionsForm.termAnnuityPayments)] : []"
+          :label="$t('productConditionsForm.guaranteedPeriod')"
+        ></base-form-input>
+        <base-panel-input
+          v-model="productConditionsForm.typeAnnuityInsurance"
+          :value="productConditionsForm.typeAnnuityInsurance.nameRu"
+          :readonly="isDisabled"
+          :clearable="!isDisabled"
+          :rules="$rules.objectRequired"
+          :label="$t('productConditionsForm.typeAnnuityInsurance')"
+          append-inner-icon="mdi mdi-chevron-right"
+          @append="openPanel($t('productConditionsForm.typeAnnuityInsurance'), $dataStore.dicAnnuityTypeList, 'typeAnnuityInsurance', $dataStore.getDicAnnuityTypeList)"
+        ></base-panel-input>
+        <base-form-input
+          v-if="productConditionsForm.typeAnnuityInsurance.code !== 'Lifelong'"
+          v-model="productConditionsForm.termAnnuityPayments"
+          :readonly="isDisabled"
+          :clearable="!isDisabled"
+          :rules="$dataStore.rules.required.concat($dataStore.rules.numbers)"
+          :label="$t('productConditionsForm.termAnnuityPayments')"
+        ></base-form-input>
+        <base-panel-input
+          v-model="productConditionsForm.periodAnnuityPayment"
+          :value="productConditionsForm.periodAnnuityPayment.nameRu"
+          :readonly="isDisabled"
+          :clearable="!isDisabled"
+          :rules="$rules.objectRequired"
+          :label="$t('productConditionsForm.periodAnnuityPayment')"
+          append-inner-icon="mdi mdi-chevron-right"
+          @append="openPanel($t('productConditionsForm.processPaymentPeriod'), $dataStore.processAnnuityPaymentPeriod, 'periodAnnuityPayment', $dataStore.getProcessAnnuityPaymentPeriod)"
+        ></base-panel-input>
+        <base-form-input
+          v-model="productConditionsForm.amountAnnuityPayments"
+          :readonly="isDisabled"
+          :clearable="!isDisabled"
+          :rules="amountAnnuityPayments"
+          :label="$t('productConditionsForm.amountAnnuityPayments')"
+        ></base-form-input>
+      </base-form-section>
       <base-form-section v-if="additionalTerms && additionalTerms.length" :title="$t('productConditionsForm.additional')">
         <div v-for="(term, index) of additionalTerms" :key="index">
           <base-panel-input
@@ -207,9 +259,9 @@
         </div>
       </base-form-section>
     </v-form>
-    <base-btn v-if="isRecalculation && hasCalculated" :btn="$libStyles.greenLightBtn" :text="$t('buttons.toStatement')" @click="toStatement"></base-btn>
+    <base-btn v-if="!$dataStore.isCalculator && isRecalculation && hasCalculated" :btn="$libStyles.greenLightBtn" :text="$t('buttons.toStatement')" @click="toStatement"></base-btn>
     <base-btn
-      v-if="!isDisabled && isTask && ($dataStore.isInitiator() || $dataStore.isUnderwriter())"
+      v-if="$dataStore.isCalculator ? true : !isDisabled && isTask && ($dataStore.isInitiator() || $dataStore.isUnderwriter())"
       :loading="isCalculating"
       :text="$t('buttons.calculate')"
       @click="submitForm"
@@ -261,6 +313,10 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    product: {
+      type: String,
+      default: false,
+    },
   },
   setup(props) {
     const vForm = ref<any>();
@@ -270,6 +326,7 @@ export default defineComponent({
     const dataStore = useDataStore();
     const memberStore = useMemberStore();
 
+    const whichProduct = ref<string>(dataStore.isCalculator ? props.product : dataStore.product!);
     const isCalculating = ref<boolean>(false);
     const isPanelLoading = ref<boolean>(false);
     const isPanelOpen = ref<boolean>(false);
@@ -291,73 +348,80 @@ export default defineComponent({
         return formStore.applicationData.statusCode === 'UnderwriterForm';
       }
     });
-    const isDisabled = computed(() => !memberStore.isStatementEditible(formStore.productConditionsFormKey));
+    const isDisabled = computed(() => (dataStore.isCalculator ? false : !memberStore.isStatementEditible(formStore.productConditionsFormKey)));
     const isTask = computed(() => (route.params.taskId === '0' && props.isRecalculation === true) || dataStore.isTask());
     const isRecalculationDisabled = computed(() => formStore.isDisabled.recalculationForm);
     const isUnderwriterRole = computed(() => dataStore.isUnderwriter() || dataStore.isAdmin() || dataStore.isSupport());
     const insurancePremiumPerMonth = computed(() => (!!productConditionsForm.insurancePremiumPerMonth ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
     const requestedSumInsured = computed(() => (!!productConditionsForm.requestedSumInsured ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
     const hasCalculated = computed(() => !!productConditionsForm.requestedSumInsured && !!productConditionsForm.insurancePremiumPerMonth);
+    const amountAnnuityPayments = computed(() => (!!productConditionsForm.amountAnnuityPayments ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
     const hasProcessIndexRate = computed(() => {
-      if (dataStore.isGons || dataStore.isKazyna) {
+      if (whichProduct.value === 'gons' || whichProduct.value === 'halykkazyna' || whichProduct.value === 'liferenta') {
         return false;
       }
       return true;
     });
     const hasPaymentPeriod = computed(() => {
-      if (dataStore.isKazyna) {
+      if (whichProduct.value === 'halykkazyna') {
         return false;
       }
       return true;
     });
     const hasRequestedSumInsuredInDollar = computed(() => {
-      if (dataStore.isKazyna) {
+      if (whichProduct.value === 'halykkazyna') {
         return true;
       }
       return false;
     });
     const hasInsurancePremiumPerMonthInDollar = computed(() => {
-      if (dataStore.isKazyna) {
+      if (whichProduct.value === 'halykkazyna') {
         return true;
       }
       return false;
     });
     const hasCurrency = computed(() => {
-      if (dataStore.isKazyna) {
+      if (whichProduct.value === 'halykkazyna') {
         return true;
       }
       return false;
     });
     const hasAdbMultiply = computed(() => {
-      if (dataStore.isGons) {
+      if (whichProduct.value === 'gons') {
         return false;
       }
       return true;
     });
     const hasAdbAdditive = computed(() => {
-      if (dataStore.isGons) {
+      if (whichProduct.value === 'gons') {
         return false;
       }
       return true;
     });
     const hasRiskGroup = computed(() => {
-      if (dataStore.isGons) {
+      if (whichProduct.value === 'gons') {
         return false;
       }
       return true;
     });
+    const hasAnnuityPayments = computed(() => {
+      if (whichProduct.value === 'liferenta') {
+        return true;
+      }
+      return false;
+    });
     const coverPeriodRule = computed(() => {
       const baseCondition = dataStore.rules.required.concat(dataStore.rules.numbers);
-      if (dataStore.isGons) {
+      if (whichProduct.value === 'gons') {
         return baseCondition.concat(dataStore.rules.coverPeriodFrom3to20);
       }
-      if (dataStore.isKazyna) {
+      if (whichProduct.value === 'halykkazyna') {
         return baseCondition.concat(dataStore.rules.coverPeriodFrom2to20);
       }
       return baseCondition;
     });
     const currencySymbolsAddTerm = computed(() => {
-      if (dataStore.isKazyna) {
+      if (whichProduct.value === 'halykkazyna') {
         return constants.currencySymbols.usd;
       }
       return constants.currencySymbols.kzt;
@@ -562,7 +626,7 @@ export default defineComponent({
           }
           isCalculating.value = true;
           if (props.isRecalculation) {
-            await dataStore.calculateWithoutApplication(true);
+            await dataStore.calculateWithoutApplication(true, whichProduct.value);
           } else {
             if (dataStore.isProcessEditable(formStore.applicationData.statusCode)) {
               await dataStore.calculate(route.params.taskId);
@@ -593,8 +657,13 @@ export default defineComponent({
 
     onMounted(async () => {
       if (props.isRecalculation === true) {
-        if (route.params.taskId === '0' && productConditionsForm.requestedSumInsured === null && productConditionsForm.insurancePremiumPerMonth === null) {
-          const defaultData = await dataStore.getDefaultCalculationData(true);
+        if (
+          (dataStore.isCalculator || route.params.taskId === '0') &&
+          productConditionsForm.requestedSumInsured === null &&
+          productConditionsForm.insurancePremiumPerMonth === null
+        ) {
+          // @ts-ignore
+          const defaultData = await dataStore.getDefaultCalculationData(true, whichProduct.value);
           if (!defaultData) {
             dataStore.showToaster('error', 'Отсутствуют базовые данные');
             return;
@@ -616,7 +685,11 @@ export default defineComponent({
       if (!!productConditionsForm.requestedSumInsured) {
         whichSum.value = 'requestedSumInsured';
       }
-      if (dataStore.isKazyna) {
+      if(dataStore.isCalculator) {
+        dataStore.processCode = constants.products[whichProduct.value];
+        await dataStore.getProcessPaymentPeriod();
+      }
+      if (whichProduct.value === 'halykkazyna') {
         const kazynaPaymentPeriod = dataStore.processPaymentPeriod.find(i => i.code === 'single');
         if (kazynaPaymentPeriod) productConditionsForm.paymentPeriod = kazynaPaymentPeriod;
         await dataStore.getCurrencies();
@@ -649,6 +722,18 @@ export default defineComponent({
         if (val) productConditionsForm.amountOfInsurancePremium = dataStore.getNumberWithSpaces(val);
       },
     );
+    watch(
+      () => formStore.productConditionsForm.amountAnnuityPayments,
+      val => {
+        if (val) formStore.productConditionsForm.amountAnnuityPayments = dataStore.getNumberWithSpaces(val);
+      },
+    );
+    watch(
+      () => formStore.productConditionsForm.typeAnnuityInsurance,
+      val => {
+        if (val.code === 'Lifelong') formStore.productConditionsForm.termAnnuityPayments = null;
+      },
+    );
 
     watch(
       () => dataStore.panel.open,
@@ -666,6 +751,7 @@ export default defineComponent({
       // State
       formStore,
       vForm,
+      whichProduct,
       productConditionsForm,
       additionalTerms,
       isCalculating,
@@ -696,7 +782,9 @@ export default defineComponent({
       hasAdbAdditive,
       hasRiskGroup,
       hasCalculated,
+      hasAnnuityPayments,
       currencySymbolsAddTerm,
+      amountAnnuityPayments,
 
       // Rules
       coverPeriodRule,

package/composables/classes.ts

@@ -711,6 +711,12 @@ export class ProductConditions {
   processTariff: Value;
   riskGroup: Value;
   riskGroup2: Value;
+  additionalConditionAnnuityPayments: boolean;
+  guaranteedPeriod: number | string | null;
+  typeAnnuityInsurance: Value;
+  termAnnuityPayments: number | string | null;
+  periodAnnuityPayment: Value;
+  amountAnnuityPayments: number | string | null;
   constructor(
     insuranceCase = null,
     coverPeriod = null,
@@ -740,6 +746,12 @@ export class ProductConditions {
     processTariff = new Value(),
     riskGroup = new Value(),
     riskGroup2 = new Value(),
+    additionalConditionAnnuityPayments = false,
+    guaranteedPeriod = null,
+    typeAnnuityInsurance = new Value(),
+    termAnnuityPayments = null,
+    periodAnnuityPayment = new Value(),
+    amountAnnuityPayments = null,
   ) {
     this.requestedSumInsuredInDollar = null;
     this.insurancePremiumPerMonthInDollar = null;
@@ -774,6 +786,12 @@ export class ProductConditions {
     this.processTariff = processTariff;
     this.riskGroup = riskGroup;
     this.riskGroup2 = riskGroup2;
+    this.additionalConditionAnnuityPayments = additionalConditionAnnuityPayments;
+    this.guaranteedPeriod = guaranteedPeriod;
+    this.typeAnnuityInsurance = typeAnnuityInsurance;
+    this.termAnnuityPayments = termAnnuityPayments;
+    this.periodAnnuityPayment = periodAnnuityPayment;
+    this.amountAnnuityPayments = amountAnnuityPayments;
   }
 }
 
@@ -891,6 +909,8 @@ export class DataStoreClass {
   processCoverTypeSum: Value[];
   processIndexRate: Value[];
   processPaymentPeriod: Value[];
+  dicAnnuityTypeList: Value[];
+  processAnnuityPaymentPeriod: Value[];
   taskList: TaskListItem[];
   processHistory: TaskHistory[];
   contragentList: any[];
@@ -957,6 +977,8 @@ export class DataStoreClass {
     this.hasLayoutMargins = true;
     this.processIndexRate = [];
     this.processPaymentPeriod = [];
+    this.dicAnnuityTypeList = [];
+    this.processAnnuityPaymentPeriod = [];
     this.questionRefs = [];
     this.SaleChanellPolicy = [];
     this.RegionPolicy = [];

package/composables/constants.ts

@@ -60,6 +60,7 @@ export const constants = Object.freeze({
   postActions: {
     font: 'font',
     route: 'route',
+    onRouteChange: 'onRouteChange',
     applicationCreated: 'applicationCreated',
     clipboard: 'clipboard',
     toHomePage: 'toHomePage',

package/locales/en.json

@@ -246,6 +246,7 @@
   "sumAndPremium": "Insurance Premium {paymentPeriod}: {insurancePremiumPerMonth}₸\nRequested Sum Insured: {requestedSumInsured}₸",
   "recalculation": "Recalculation",
   "survey": "Questionnaire",
+  "calculationAnnuityPayments": "Calculation of annuity payments",
   "productConditionsForm": {
     "coverPeriod": "Insurance Period",
     "payPeriod": "Insurance Premium Payment Period",
@@ -267,7 +268,13 @@
     "insurancePremiumAmountInDollar": "Amount of the Insurance premium (insurance fee) in dollars",
     "coverPeriodFrom2to22": "Cover Period (from 2y to 20y)",
     "dollarExchangeRateNBRK": "NBRK dollar exchange rate",
-    "contractDate": "Contract date"
+    "contractDate": "Contract date",
+    "guaranteedTermAnnuityPayments": "Guaranteed term of annuity payments",
+    "guaranteedPeriod": "Specify the period of the guaranteed period",
+    "typeAnnuityInsurance": "Requested type of annuity insurance",
+    "termAnnuityPayments": "Requested term of annuity payments",
+    "periodAnnuityPayment": "Requested annuity payment period",
+    "amountAnnuityPayments": "The requested amount of annuity payments"
   },
   "history": {
     "addRegNumber": "Number",

package/locales/kz.json

@@ -246,6 +246,7 @@
   "sumAndPremium": "Сақтандыру сыйлықақысы {paymentPeriod}: {insurancePremiumPerMonth}₸\nСұрауланатын страховая сумма: {requestedSumInsured}₸",
   "recalculation": "Перерасчет",
   "survey": "Сауалнама",
+  "calculationAnnuityPayments": "Аннуитеттік төлемдерді есептеу",
   "productConditionsForm": {
     "coverPeriod": "Страховық мерзім",
     "payPeriod": "Cақтандыру сыйлықақысы төлеу мерзімі",
@@ -267,7 +268,13 @@
     "insurancePremiumAmount": "Сақтандыру сыйлықақысы өлшемі (страховой взнос) в тенге",
     "insurancePremiumAmountInDollar": "Сақтандыру сыйлықақысы өлшемі доллармен (страховой взнос)",
     "dollarExchangeRateNBRK": "Доллардың НБРК айырымы",
-    "contractDate": "Контракт күні"
+    "contractDate": "Контракт күні",
+    "guaranteedTermAnnuityPayments": "Аннуитеттік төлемдердің кепілдендірілген мерзімі",
+    "guaranteedPeriod": "Кепілдендірілген мерзім кезеңін көрсетіңіз",
+    "typeAnnuityInsurance": "Аннуитеттік сақтандырудың сұратылған түрі",
+    "termAnnuityPayments": "Аннуитеттік төлемдердің сұралатын мерзімі",
+    "periodAnnuityPayment": "Аннуитеттік төлемнің сұратылған кезеңі",
+    "amountAnnuityPayments": "Аннуитеттік төлемдердің сұралатын мөлшері"
   },
   "history": {
     "addRegNumber": "Нөмір",

package/locales/ru.json

@@ -246,6 +246,7 @@
   "sumAndPremium": "Сумма страховой премии {paymentPeriod}: {insurancePremiumPerMonth}₸\nЗапрашиваемая страховая сумма: {requestedSumInsured}₸",
   "recalculation": "Перерасчет",
   "survey": "Анкета",
+  "calculationAnnuityPayments": "Расчет аннуитетных выплат",
   "productConditionsForm": {
     "coverPeriod": "Срок страхования",
     "payPeriod": "Период оплаты страховой премии",
@@ -267,7 +268,13 @@
     "insurancePremiumAmount": "Размер Страховой премии (страховой взнос) в тенге",
     "insurancePremiumAmountInDollar": "Размер Страховой премии (страховой взнос) в долларах",
     "dollarExchangeRateNBRK": "Курс доллара НБРК",
-    "contractDate": "Дата контракта"
+    "contractDate": "Дата контракта",
+    "guaranteedTermAnnuityPayments": "Гарантированный срок аннуитетных выплат",
+    "guaranteedPeriod": "Укажите период гарантированного срока",
+    "typeAnnuityInsurance": "Запрашиваемый вид аннуитетного страхования",
+    "termAnnuityPayments": "Запрашиваемый срок аннуитетных выплат",
+    "periodAnnuityPayment": "Запрашиваемый период аннуитетной выплаты",
+    "amountAnnuityPayments": "Запрашиваемый размер аннуитетных выплат"
   },
   "history": {
     "addRegNumber": "Номер",
@@ -460,7 +467,8 @@
     "ageMycar": "Пороговое значение по возрасту с 21 по 65",
     "noResident": "Нерезидентам отказано",
     "policyholderAgeLimit": "Возраст Застрахованного должен быть не менее 18-ти лет",
-    "beneficiaryAgeLimit": "На дату подписания полиса возраст Выгодоприобретателя должен быть не более 15 лет"
+    "beneficiaryAgeLimit": "На дату подписания полиса возраст Выгодоприобретателя должен быть не более 15 лет",
+    "guaranteedPeriodLimit": "Период гарантированного срока не может быть больше срока аннуитетных выплат",
   },
   "code": "КЭС",
   "fontSize": "Размер шрифта",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.8-beta.21",
+  "version": "0.0.8-beta.23",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",

package/store/data.store.js

@@ -42,6 +42,7 @@ export const useDataStore = defineStore('data', {
     isPension: state => state.product === 'pension',
     isGons: state => state.product === 'gons',
     isKazyna: state => state.product === 'halykkazyna',
+    isCalculator: state => state.product === 'calculator',
     isComplianceWindow: state => state.product === 'compliance',
     isEveryFormDisabled: state => Object.values(state.formStore.isDisabled).every(i => i === true),
   },
@@ -1056,6 +1057,12 @@ export const useDataStore = defineStore('data', {
     async getProcessTariff() {
       return await this.getFromApi('processTariff', 'getProcessTariff');
     },
+    async getDicAnnuityTypeList() {
+      return await this.getFromApi('dicAnnuityTypeList', 'getDicAnnuityTypeList');
+    },
+    async getProcessAnnuityPaymentPeriod() {
+      return await this.getFromApi('processAnnuityPaymentPeriod', 'getProcessAnnuityPaymentPeriod', this.processCode);
+    },
     async getCurrencies() {
       try {
         const currencies = await this.api.getCurrencies();
@@ -1179,6 +1186,8 @@ export const useDataStore = defineStore('data', {
         this.getProcessTariff(),
         this.getProcessPaymentPeriod(),
         this.getDicFileTypeList(),
+        this.getDicAnnuityTypeList(),
+        this.getProcessAnnuityPaymentPeriod(),
         this.getDictionaryItems('RegionPolicy'),
         this.getDictionaryItems('SaleChanellPolicy'),
       ]);
@@ -1331,10 +1340,10 @@ export const useDataStore = defineStore('data', {
         console.log(err);
       }
     },
-    async getDefaultCalculationData(showLoader = false) {
+    async getDefaultCalculationData(showLoader = false, product = null) {
       this.isLoading = showLoader;
       try {
-        const calculationData = await this.api.getDefaultCalculationData();
+        const calculationData = await this.api.getDefaultCalculationData(this.isCalculator ? product : undefined);
         return calculationData;
       } catch (err) {
         ErrorHandler(err);
@@ -1342,7 +1351,7 @@ export const useDataStore = defineStore('data', {
         this.isLoading = false;
       }
     },
-    async calculateWithoutApplication(showLoader = false) {
+    async calculateWithoutApplication(showLoader = false, product = null) {
       this.isLoading = showLoader;
       try {
         const calculationData = {
@@ -1359,19 +1368,28 @@ export const useDataStore = defineStore('data', {
           paymentPeriodId: this.formStore.productConditionsForm.paymentPeriod.id,
           addCovers: this.formStore.additionalInsuranceTermsWithout,
         };
-        if (this.isKazyna) {
+        if (this.isKazyna || product === 'halykkazyna') {
           calculationData.premiumInCurrency = getNumber(this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar);
           calculationData.amountInCurrency = getNumber(this.formStore.productConditionsForm.requestedSumInsuredInDollar);
           calculationData.currencyExchangeRate = this.currencies.usd;
         }
-        const calculationResponse = await this.api.calculateWithoutApplication(calculationData);
+        if (this.isLiferenta) {
+          calculationData.guaranteedPaymentPeriod = this.formStore.productConditionsForm.guaranteedPeriod || 0;
+          calculationData.annuityTypeId = this.formStore.productConditionsForm.typeAnnuityInsurance.id;
+          calculationData.paymentPeriod = this.formStore.productConditionsForm.termAnnuityPayments;
+          calculationData.annuityPaymentPeriodId = this.formStore.productConditionsForm.periodAnnuityPayment.id;
+        }
+        const calculationResponse = await this.api.calculateWithoutApplication(calculationData, this.isCalculator ? product : undefined);
         this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(calculationResponse.amount);
         this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(calculationResponse.premium);
         this.formStore.additionalInsuranceTermsWithout = calculationResponse.addCovers;
-        if (this.isKazyna) {
+        if (this.isKazyna || product === 'halykkazyna') {
           this.formStore.productConditionsForm.requestedSumInsuredInDollar = this.getNumberWithSpaces(calculationResponse.amountInCurrency);
           this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar = this.getNumberWithSpaces(calculationResponse.premiumInCurrency);
         }
+        if (this.isLiferenta) {
+          this.formStore.productConditionsForm.amountAnnuityPayments = this.getNumberWithSpaces(calculationResponse.annuityMonthPay);
+        }
         this.showToaster('success', this.t('toaster.calculated'), 1000);
       } catch (err) {
         ErrorHandler(err);
@@ -1418,6 +1436,12 @@ export const useDataStore = defineStore('data', {
           form1.policyAppDto.amountInCurrency = getNumber(this.formStore.productConditionsForm.requestedSumInsuredInDollar);
           form1.policyAppDto.currencyExchangeRate = this.currencies.usd;
         }
+        if (this.isLiferenta) {
+          form1.policyAppDto.guaranteedPaymentPeriod = this.formStore.productConditionsForm.guaranteedPeriod || 0;
+          form1.policyAppDto.annuityTypeId = this.formStore.productConditionsForm.typeAnnuityInsurance.id;
+          form1.policyAppDto.paymentPeriod = this.formStore.productConditionsForm.termAnnuityPayments;
+          form1.policyAppDto.annuityPaymentPeriodId = this.formStore.productConditionsForm.periodAnnuityPayment.id;
+        }
         try {
           let id = this.formStore.applicationData.processInstanceId;
 
@@ -1440,6 +1464,9 @@ export const useDataStore = defineStore('data', {
           } else {
             this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(result);
           }
+          if (this.isLiferenta) {
+            this.formStore.productConditionsForm.amountAnnuityPayments = this.getNumberWithSpaces(applicationData.policyAppDto.annuityMonthPay);
+          }
           this.showToaster('success', this.t('toaster.calculated'), 1000);
         } catch (err) {
           ErrorHandler(err);
@@ -1630,6 +1657,23 @@ export const useDataStore = defineStore('data', {
           this.formStore.productConditionsForm.disabilityMultiply = parseProcents(applicationData.policyAppDto.disabilityMultiply);
           this.formStore.productConditionsForm.disabilityAdditive = parseProcents(applicationData.policyAppDto.disabilityAdditive);
 
+          if (this.isLiferenta) {
+            this.formStore.productConditionsForm.additionalConditionAnnuityPayments =
+              applicationData.policyAppDto.guaranteedPaymentPeriod === null || applicationData.policyAppDto.guaranteedPaymentPeriod === 0 ? false : true;
+            this.formStore.productConditionsForm.guaranteedPeriod =
+              applicationData.policyAppDto.guaranteedPaymentPeriod === 0 ? null : applicationData.policyAppDto.guaranteedPaymentPeriod;
+            this.formStore.productConditionsForm.termAnnuityPayments = applicationData.policyAppDto.paymentPeriod;
+            this.formStore.productConditionsForm.amountAnnuityPayments = this.getNumberWithSpaces(
+              applicationData.policyAppDto.annuityMonthPay === 0 ? null : applicationData.policyAppDto.annuityMonthPay,
+            );
+
+            let annuityType = this.dicAnnuityTypeList.find(item => item.id == applicationData.policyAppDto.annuityTypeId);
+            this.formStore.productConditionsForm.typeAnnuityInsurance = annuityType ? annuityType : new Value();
+
+            let annuityPaymentPeriod = this.processAnnuityPaymentPeriod.find(item => item.id == applicationData.policyAppDto.annuityPaymentPeriodId);
+            this.formStore.productConditionsForm.periodAnnuityPayment = annuityPaymentPeriod ? annuityPaymentPeriod : new Value();
+          }
+
           let processIndexRate = this.processIndexRate.find(item => item.id == applicationData.policyAppDto.indexRateId);
           this.formStore.productConditionsForm.processIndexRate = processIndexRate ? processIndexRate : this.processIndexRate.find(item => item.code === '0');
 

package/store/rules.js

@@ -167,4 +167,10 @@ export const rules = {
   ],
   policyholderAgeLimit: [v => v >= 18 || t('rules.policyholderAgeLimit')],
   beneficiaryAgeLimit: [v => v <= 15 || t('rules.beneficiaryAgeLimit')],
+  guaranteedPeriodLimit(v, termAnnuityPayments) {
+    if (Number(v) > Number(termAnnuityPayments)) {
+      return t('rules.guaranteedPeriodLimit');
+    }
+    return true;
+  },
 };