hl-core 0.0.8-beta.20 → 0.0.8-beta.22

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);
@@ -455,18 +458,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/Form/ProductConditionsBlock.vue

@@ -9,16 +9,16 @@
     <div class="mt-6 grid grid-cols-3 lg:grid-cols-5 auto-rows-fr items-center">
       <span v-if="hasSum" :class="[$libStyles.textSimple]" class="font-medium">{{ $t('productConditionsForm.requestedSumInsured') }}</span>
       <span v-if="hasPremium" :class="[$libStyles.textSimple]" class="font-medium">{{ $t('productConditionsForm.insurancePremiumPerMonth') }}</span>
-      <span v-if="hasPolicyNumber" :class="[$libStyles.textSimple]" class="font-medium">{{ $t('buttons.InsuranceContract') }}</span>
-      <span v-if="hasContractDate" :class="[$libStyles.textSimple]" class="font-medium">{{ $t('productConditionsForm.contractDate') }}</span>
+      <span v-if="hasPolicyNumber" :class="[$libStyles.textSimple]" class="font-medium hidden lg:block">{{ $t('buttons.InsuranceContract') }}</span>
+      <span v-if="hasContractDate" :class="[$libStyles.textSimple]" class="font-medium hidden lg:block">{{ $t('productConditionsForm.contractDate') }}</span>
       <span v-if="hasCoverPeriod" :class="[$libStyles.textSimple]" class="font-medium hidden lg:block">{{ $t('productConditionsForm.coverPeriod') }}</span>
       <span v-if="hasPayPeriod" :class="[$libStyles.textSimple]" class="font-medium hidden lg:block">{{ $t('productConditionsForm.payPeriod') }}</span>
     </div>
     <div class="grid grid-cols-3 lg:grid-cols-5 auto-rows-fr items-center">
       <span v-if="hasSum" :class="[amount === null && $libStyles.emptyBlockCol]">{{ amount }} </span>
       <span v-if="hasPremium" :class="[premium === null && $libStyles.emptyBlockCol]"> {{ premium }}</span>
-      <span v-if="hasPolicyNumber" :class="[policyNumber === null && $libStyles.emptyBlockCol]"> {{ policyNumber }}</span>
-      <span v-if="hasContractDate" :class="[policyNumber === null && $libStyles.emptyBlockCol]"> {{ contractDate }}</span>
+      <span v-if="hasPolicyNumber" :class="[policyNumber === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ policyNumber }}</span>
+      <span v-if="hasContractDate" :class="[policyNumber === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ contractDate }}</span>
       <span v-if="hasCoverPeriod" :class="[coverPeriod === null && $libStyles.emptyBlockCol]" class="hidden lg:block">{{ coverPeriod }} </span>
       <span v-if="hasPayPeriod" :class="[paymentPeriod === null && $libStyles.emptyBlockCol]" class="hidden lg:block">
         {{ paymentPeriod }}

package/components/Input/Datepicker.vue

@@ -9,7 +9,7 @@
     model-type="dd.MM.yyyy"
     position="left"
     menu-class-name="!left-[30vw] md:!left-[70vw] lg:!left-[75vw]"
-    teleport=".v-form"
+    :teleport="teleport"
     :offset="-50"
     :close-on-scroll="true"
     :enable-time-picker="false"
@@ -36,6 +36,10 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    teleport: {
+      type: String,
+      default: '.v-form',
+    },
   },
 });
 </script>

package/components/Input/FormInput.vue

@@ -29,8 +29,12 @@
     @update:modelValue="$emit('update:modelValue', $event)"
   >
     <template v-if="appendInnerIcon && appendInnerIcon.length" v-slot:append-inner>
-      <v-icon v-if="appendInnerIcon !== 'mdi mdi-calendar-blank-outline'" :icon="appendInnerIcon" @click="!props.readonly && $emit('append')"></v-icon>
-      <base-datepicker v-else :model-value="modelValue" @update:modelValue="$emit('update:modelValue', $event)"></base-datepicker>
+      <v-icon
+        v-if="appendInnerIcon !== 'mdi mdi-calendar-blank-outline'"
+        :icon="appendInnerIcon"
+        @click="appendInnerIcon.includes('mdi-magnify') ? $emit('append') : !props.readonly && $emit('append')"
+      ></v-icon>
+      <base-datepicker v-else :model-value="modelValue" @update:modelValue="$emit('update:modelValue', $event)" :teleport="teleport"></base-datepicker>
     </template>
     <template v-if="loading" #loader>
       <v-progress-linear :active="loading" :color="color" absolute height="1" indeterminate></v-progress-linear>
@@ -116,6 +120,9 @@ export default defineComponent({
     appendInnerIcon: {
       type: String,
     },
+    teleport: {
+      type: String,
+    },
     bgColor: {
       type: String,
     },

package/components/Layout/SettingsPanel.vue

@@ -64,7 +64,7 @@ const hasHistory = computed(() => {
 });
 
 const openHistory = async () => {
-  dataStore.sendToParent(constants.postActions.toStatementHistory, dataStore.product);
+  dataStore.sendToParent(constants.postActions.toStatementHistory, dataStore.isBridge ? '' : dataStore.product);
 };
 
 const changeBridge = async (toBridge: 'efo' | 'lka') => {

package/components/Menu/MenuNav.vue

@@ -32,7 +32,7 @@
       <slot name="end"></slot>
       <slot name="actions"></slot>
       <base-fade-transition>
-        <div v-if="$dataStore.buttons && $dataStore.buttons.length" class="flex flex-col gap-[10px] justify-self-end absolute bottom-5 lg:bottom-[30%] w-full pr-4">
+        <div v-if="$dataStore.buttons && $dataStore.buttons.length" class="flex flex-col gap-[10px] justify-self-end absolute bottom-5 lg:bottom-[10%] w-full pr-4">
           <div v-for="(item, index) of $dataStore.buttons" :key="index">
             <transition enter-active-class="animate__animated animate__fadeIn animate__faster" leave-active-class="animate__animated animate__fadeOut animate__faster">
               <base-btn

package/components/Pages/Anketa.vue

@@ -71,22 +71,22 @@
       </v-form>
       <base-btn class="my-[14px] self-center" :loading="isButtonLoading" :disabled="formStore.isDisabled[whichSurvey]" @click="submitForm" :text="$t('buttons.save')"></base-btn>
     </section>
+    <v-btn
+      v-if="secondQuestionList && secondQuestionList.length && firstPanel"
+      icon="mdi mdi-close"
+      class="ml-3 !absolute z-10"
+      @click="
+        firstPanel = false;
+        secondPanel = false;
+      "
+    ></v-btn>
     <section
       ref="firstPanelSection"
       v-if="secondQuestionList && secondQuestionList.length && firstPanel"
-      class="flex flex-col px-[10px] py-[14px]"
+      class="flex flex-col px-[10px] pb-[14px]"
       :class="[$libStyles.scrollPage]"
     >
-      <v-btn
-        icon="mdi mdi-close"
-        variant="text"
-        size="large"
-        @click="
-          firstPanel = false;
-          secondPanel = false;
-        "
-      ></v-btn>
-      <section v-if="currentQuestion" :class="[$libStyles.blueBgLight, $libStyles.rounded]" class="mx-[10px] my-[14px] p-4 flex flex-col gap-4">
+      <section v-if="currentQuestion" :class="[$libStyles.blueBgLight, $libStyles.rounded]" class="mx-[10px] mt-[14px] p-4 flex flex-col gap-4">
         <base-form-text-section v-for="question in currentQuestion.second" :title="question.name" :key="question.name">
           <base-form-input
             v-if="question.definedAnswers === 'N'"

package/components/Pages/MemberForm.vue

@@ -2,16 +2,6 @@
   <section class="flex flex-col gap-4 px-[10px]">
     <v-form v-if="member" ref="vForm" @submit="submitForm" class="max-h-[82svh] overflow-y-scroll">
       <base-form-section :title="$t('form.personalData')">
-        <base-form-input
-          v-model="member.iin"
-          :label="$t('form.iin')"
-          :maska="$maska.iin"
-          :readonly="isDisabled || isIinPhoneDisabled"
-          :clearable="!isDisabled"
-          :append-inner-icon="showSaveButton ? 'mdi mdi-magnify' : ''"
-          @append="searchMember"
-          :rules="$rules.required.concat($rules.iinRight)"
-        ></base-form-input>
         <base-form-input
           v-model="member.phoneNumber"
           :label="$t('form.phoneNumber')"
@@ -23,6 +13,16 @@
           @keyup.enter.prevent="otpCondition ? openCustomPanel('otp') : null"
           :rules="phoneRule"
         ></base-form-input>
+        <base-form-input
+          v-model="member.iin"
+          :label="$t('form.iin')"
+          :maska="$maska.iin"
+          :readonly="isDisabled || isIinPhoneDisabled"
+          :clearable="!isDisabled"
+          :append-inner-icon="showSaveButton ? 'mdi mdi-magnify' : ''"
+          @append="searchMember"
+          :rules="$rules.required.concat($rules.iinRight)"
+        ></base-form-input>
         <base-form-input
           v-model="member.lastName"
           :readonly="isDisabled || isFromGBD"
@@ -543,7 +543,7 @@ export default {
     const hasOtp = computed(() => member.value.otpCode && member.value.otpCode.length === useMask().otp.length);
     const isDisabled = computed(() => !memberStore.isStatementEditible(whichForm.value as string));
     const isTask = computed(() => route.params.taskId === '0' || dataStore.isTask());
-    const isIinPhoneDisabled = computed(() => formStore.applicationData && 'regNumber' in formStore.applicationData && whichForm.value === formStore.policyholderFormKey);
+    const isIinPhoneDisabled = computed(() => member.value.hasAgreement);
     const isFromGBD = computed(() => !!member.value.gosPersonData);
     const showSaveButton = computed(() => {
       const generalCondition = !isDisabled.value && !!isTask.value && !!dataStore.isInitiator();

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"
@@ -207,9 +207,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 +261,10 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    product: {
+      type: String,
+      default: false,
+    },
   },
   setup(props) {
     const vForm = ref<any>();
@@ -270,6 +274,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,7 +296,7 @@ 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());
@@ -299,65 +304,65 @@ export default defineComponent({
     const requestedSumInsured = computed(() => (!!productConditionsForm.requestedSumInsured ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
     const hasCalculated = computed(() => !!productConditionsForm.requestedSumInsured && !!productConditionsForm.insurancePremiumPerMonth);
     const hasProcessIndexRate = computed(() => {
-      if (dataStore.isGons || dataStore.isKazyna) {
+      if (whichProduct.value === 'gons' || whichProduct.value === 'halykkazyna') {
         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 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;
@@ -593,8 +598,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 +626,7 @@ export default defineComponent({
       if (!!productConditionsForm.requestedSumInsured) {
         whichSum.value = 'requestedSumInsured';
       }
-      if (dataStore.isKazyna) {
+      if (whichProduct.value === 'halykkazyna') {
         const kazynaPaymentPeriod = dataStore.processPaymentPeriod.find(i => i.code === 'single');
         if (kazynaPaymentPeriod) productConditionsForm.paymentPeriod = kazynaPaymentPeriod;
         await dataStore.getCurrencies();
@@ -666,6 +676,7 @@ export default defineComponent({
       // State
       formStore,
       vForm,
+      whichProduct,
       productConditionsForm,
       additionalTerms,
       isCalculating,

package/composables/classes.ts

@@ -828,6 +828,7 @@ export class DataStoreClass {
     beneficialOwnerApp: MemberSettings;
     spokesmanApp: MemberSettings;
   };
+  iframeLoading: boolean;
   hasLayoutMargins: boolean;
   readonly product: string | null;
   showNav: boolean;
@@ -952,6 +953,7 @@ export class DataStoreClass {
       hasAttachment: true,
       hasAffiliation: true,
     };
+    this.iframeLoading = false;
     this.hasLayoutMargins = true;
     this.processIndexRate = [];
     this.processPaymentPeriod = [];

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',
@@ -68,6 +69,7 @@ export const constants = Object.freeze({
     DOMevent: 'DOMevent',
     Error401: 'Error401',
     Error500: 'Error500',
+    iframeLoaded: 'iframeLoaded',
   },
   currencySymbols: {
     kzt: '₸',

package/composables/index.ts

@@ -165,7 +165,11 @@ export const ErrorHandler = (err: unknown, errorText?: string) => {
   console.log(err);
   if (err instanceof AxiosError) {
     if ('response' in err && err.response && err.response.data) {
-      useDataStore().showToaster('error', errorText ? errorText : err.response.data, 10000);
+      if ('status' in err.response && err.response.status === 403) {
+        useDataStore().showToaster('error', useDataStore().t('toaster.noPermission'), 10000);
+      } else if (err.response.data) {
+        useDataStore().showToaster('error', errorText ? errorText : err.response.data, 10000);
+      }
     }
   }
   return false;

package/locales/en.json

@@ -95,9 +95,11 @@
     "insured": "застрахованный",
     "beneficiary": "выгодоприобретатель",
     "beneficialOwner": "бенефициарный собственник",
-    "spokesman": "представитель страхователя"
+    "spokesman": "представитель страхователя",
+    "noPermission": "You have no permission on {text}"
   },
   "buttons": {
+    "dataInput": "Input",
     "createStatement": "Create Statement",
     "add": "Add",
     "userLogin": "Login",
@@ -261,7 +263,7 @@
     "riskGroup": "Risk Group",
     "requestedProductConditions": "Requested Insurance Conditions",
     "coverPeriodFrom3to20": "Insurance Period (from 3 to 20 years)",
-    "insurancePremiumAmount": "Insurance Premium Amount",
+    "insurancePremiumAmount": "Insurance Premium Amount in tenge",
     "insurancePremiumAmountInDollar": "Amount of the Insurance premium (insurance fee) in dollars",
     "coverPeriodFrom2to22": "Cover Period (from 2y to 20y)",
     "dollarExchangeRateNBRK": "NBRK dollar exchange rate",

package/locales/kz.json

@@ -95,9 +95,11 @@
     "insured": "застрахованный",
     "beneficiary": "выгодоприобретатель",
     "beneficialOwner": "бенефициарный собственник",
-    "spokesman": "представитель страхователя"
+    "spokesman": "представитель страхователя",
+    "noPermission": "Сұрау салуға рұқсатыңыз жоқ {text}"
   },
   "buttons": {
+    "dataInput": "Енгізу",
     "createStatement": "Заявка жасау",
     "add": "Қосу",
     "userLogin": "Кіру",
@@ -262,7 +264,7 @@
     "requestedProductConditions": "Талап етілетін сақтандыру шарттары",
     "coverPeriodFrom3to20": "Страховық мерзім (3-тен 20 жылға дейін)",
     "coverPeriodFrom2to20": "Страховық мерзім (2-тен 20 жылға дейін)",
-    "insurancePremiumAmount": "Сақтандыру сыйлықақысы өлшемі (страховой взнос)",
+    "insurancePremiumAmount": "Сақтандыру сыйлықақысы өлшемі (страховой взнос) в тенге",
     "insurancePremiumAmountInDollar": "Сақтандыру сыйлықақысы өлшемі доллармен (страховой взнос)",
     "dollarExchangeRateNBRK": "Доллардың НБРК айырымы",
     "contractDate": "Контракт күні"

package/locales/ru.json

@@ -95,9 +95,11 @@
     "insured": "застрахованный",
     "beneficiary": "выгодоприобретатель",
     "beneficialOwner": "бенефициарный собственник",
-    "spokesman": "представитель страхователя"
+    "spokesman": "представитель страхователя",
+    "noPermission": "У вас нет привилегии на запрос {text}"
   },
   "buttons": {
+    "dataInput": "Ввод данных",
     "createStatement": "Создать заявку",
     "add": "Добавить",
     "userLogin": "Логин",
@@ -262,7 +264,7 @@
     "requestedProductConditions": "Запрашиваемые условия страхования",
     "coverPeriodFrom3to20": "Срок страхования (от 3-х до 20 лет)",
     "coverPeriodFrom2to22": "Срок страхования (от 2-х до 20 лет)",
-    "insurancePremiumAmount": "Размер Страховой премии (страховой взнос)",
+    "insurancePremiumAmount": "Размер Страховой премии (страховой взнос) в тенге",
     "insurancePremiumAmountInDollar": "Размер Страховой премии (страховой взнос) в долларах",
     "dollarExchangeRateNBRK": "Курс доллара НБРК",
     "contractDate": "Дата контракта"
@@ -504,7 +506,7 @@
     "firstName": "Имя",
     "middleName": "Отчество",
     "birthDate": "Дата рождения",
-    "signDate": "Дата расчета",
+    "signDate": "Дата",
     "age": "Возраст",
     "gender": "Пол",
     "familyStatus": "Семейное положение",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.8-beta.20",
+  "version": "0.0.8-beta.22",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",
@@ -50,6 +50,6 @@
     "vue-json-pretty": "^2.2.4",
     "vue-toastification": "^2.0.0-rc.5",
     "vue-uuid": "^3.0.0",
-    "vuetify": "^3.3.1"
+    "vuetify": "^3.3.4"
   }
 }

package/plugins/vuetifyPlugin.ts

@@ -8,7 +8,9 @@ import * as directives from 'vuetify/directives';
 export default defineNuxtPlugin(nuxtApp => {
   const vuetify = createVuetify({
     ssr: false,
-    components,
+    components: {
+      ...components,
+    },
     directives,
     defaults: {
       VForm: {

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),
   },
@@ -168,6 +169,9 @@ export const useDataStore = defineStore('data', {
         }
       }
     },
+    getUserData() {
+      return this.accessToken ? jwtDecode(this.accessToken) : null;
+    },
     isRole(whichRole) {
       if (this.user.roles.length === 0) {
         this.getUserRoles();
@@ -1328,10 +1332,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);
@@ -1339,7 +1343,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 = {
@@ -1356,16 +1360,16 @@ 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);
+        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);
         }
@@ -1860,7 +1864,7 @@ export const useDataStore = defineStore('data', {
         const data = {
           processInstanceId: this.formStore.applicationData.processInstanceId,
           regNumber: this.formStore.finCenterData.regNumber,
-          date: this.formStore.finCenterData.date,
+          date: formatDate(this.formStore.finCenterData.date),
         };
         const result = await this.api.registerNumber(data);
         return result;