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

package/components/Input/FormInput.vue

@@ -26,6 +26,7 @@
     @click:append="!props.readonly && $emit('append-out')"
     @click:prepend="!props.readonly && $emit('prepend-out')"
     @click:prepend-inner="!props.readonly && $emit('prepend')"
+    @click:clear="!props.readonly && $emit('on-clear')"
     @update:modelValue="$emit('update:modelValue', $event)"
   >
     <template v-if="appendInnerIcon && appendInnerIcon.length" v-slot:append-inner>
@@ -127,7 +128,7 @@ export default defineComponent({
       type: String,
     },
   },
-  emits: ['update:modelValue', 'submitted', 'prepend', 'append', 'prepend-out', 'append-out', 'input'],
+  emits: ['update:modelValue', 'submitted', 'prepend', 'append', 'prepend-out', 'append-out', 'input', 'on-clear'],
 
   setup(props, { emit }) {
     const submitted = (event: any) => {

package/components/Input/RoundedSelect.vue

@@ -0,0 +1,137 @@
+<template>
+  <v-select
+    class="rounded-select"
+    :model-value="modelValue"
+    :rules="rules"
+    :loading="loading"
+    :placeholder="placeholder"
+    :label="label"
+    :variant="variant"
+    :clear-icon="clearIcon"
+    :color="color"
+    :hint="hint"
+    :clearable="props.readonly ? false : clearable"
+    :disabled="disabled"
+    :readonly="props.readonly"
+    :prepend-icon="prependIcon ? prependIcon : ''"
+    :append-icon="appendIcon ? appendIcon : ''"
+    :prepend-inner-icon="prependInnerIcon ? prependInnerIcon : ''"
+    :append-inner-icon="appendInnerIcon ? appendInnerIcon : ''"
+    :bg-color="bgColor ? bgColor : ''"
+    :items="items"
+    @click:append="!props.readonly && $emit('append-out')"
+    @click:prepend="!props.readonly && $emit('prepend-out')"
+    @click:append-inner="!props.readonly && $emit('append')"
+    @click:prepend-inner="!props.readonly && $emit('prepend')"
+    @update:modelValue="$emit('update:modelValue', $event)"
+  >
+    <template v-if="loading" #loader>
+      <v-progress-linear :active="loading" :color="color" absolute height="1" indeterminate></v-progress-linear>
+    </template>
+  </v-select>
+</template>
+
+<script lang="ts">
+export default defineComponent({
+  name: 'BaseRoundedSelect',
+  props: {
+    modelValue: {
+      required: false,
+    },
+    loading: {
+      type: Boolean,
+      default: false,
+    },
+    items: {
+      type: Array<any>,
+      default: [],
+    },
+    clearable: {
+      type: Boolean,
+      default: true,
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    readonly: {
+      type: Boolean,
+      default: false,
+    },
+    placeholder: {
+      type: String,
+      default: '',
+    },
+    label: {
+      type: String,
+      default: '',
+    },
+    hint: {
+      type: String,
+      default: '',
+    },
+    rules: {
+      type: Array<any>,
+      default: [],
+    },
+    variant: {
+      type: String as PropType<InputVariants>,
+      default: 'solo',
+    },
+    color: {
+      type: String,
+      default: '#009c73',
+    },
+    clearIcon: {
+      type: String,
+      default: 'mdi-close',
+    },
+    prependIcon: {
+      type: String,
+    },
+    appendIcon: {
+      type: String,
+    },
+    prependInnerIcon: {
+      type: String,
+    },
+    appendInnerIcon: {
+      type: String,
+    },
+    bgColor: {
+      type: String,
+    },
+  },
+  emits: ['update:modelValue', 'submitted', 'prepend', 'append', 'prepend-out', 'append-out'],
+
+  setup(props, { emit }) {
+    const submitted = (event: any) => {
+      emit('submitted', event);
+    };
+
+    return {
+      submitted,
+      props,
+    };
+  },
+});
+</script>
+
+<style>
+.rounded-select input:focus {
+  border: none !important;
+  outline: none !important;
+}
+.rounded-select .v-label.v-field-label {
+  top: 20px;
+}
+.rounded-select .v-field {
+  border-radius: 8px;
+  /* border: 1px solid #dadada; */
+  box-shadow: none;
+  font-size: 14px;
+}
+.rounded-select .v-field--error {
+  border-color: #ff5449;
+}
+</style>

package/components/Layout/SettingsPanel.vue

@@ -34,13 +34,16 @@
       {{ $t('buttons.logout') }}
       <i class="mdi mdi-logout text-xl"></i>
     </base-panel-item>
-
+    <div class="absolute bottom-2 w-full flex items-center justify-center opacity-30 text-sm">
+      <p>{{ pkg.version }}</p>
+    </div>
     <base-dialog v-model="dialogSignOut" :title="$t('dialog.exit')" :subtitle="$t('dialog.dataWillClear')" actions="default" @yes="logoutUser" @no="dialogSignOut = false">
     </base-dialog
   ></base-drawer>
 </template>
 
 <script lang="ts" setup>
+import pkg from '@/package.json';
 const dialogSignOut = ref(false);
 const dataStore = useDataStore();
 

package/components/Pages/ProductConditions.vue

@@ -151,9 +151,10 @@
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :rules="requestedSumInsured"
-          :label="$t('productConditionsForm.requestedSumInsured')"
+          :label="requestedSumInsuredLabel"
           :suffix="$constants.currencySymbols.kzt"
           @input="onInputSum"
+          @onClear="onClearSum"
         ></base-form-input>
         <base-form-input
           v-if="hasRequestedSumInsuredInDollar"
@@ -164,6 +165,7 @@
           :label="$t('productConditionsForm.requestedSumInsuredInDollar')"
           :suffix="$constants.currencySymbols.usd"
           @input="onInputSumDollar"
+          @onClear="onClearSumDollar"
         ></base-form-input>
         <base-form-input
           v-model="productConditionsForm.insurancePremiumPerMonth"
@@ -173,6 +175,7 @@
           :label="$t('productConditionsForm.insurancePremiumAmount')"
           :suffix="$constants.currencySymbols.kzt"
           @input="onInputInsurancePremiumPerMonth"
+          @onClear="onClearPremium"
         ></base-form-input>
         <base-form-input
           v-if="hasInsurancePremiumPerMonthInDollar"
@@ -183,6 +186,7 @@
           :label="$t('productConditionsForm.insurancePremiumAmountInDollar')"
           :suffix="$constants.currencySymbols.usd"
           @input="onInputInsurancePremiumPerMonthInDollar"
+          @onClear="onClearPremiumDollar"
         ></base-form-input>
         <base-form-input
           v-if="hasCurrency && $dataStore.currencies.usd"
@@ -198,7 +202,6 @@
           :title="$t('productConditionsForm.guaranteedTermAnnuityPayments')"
           :disabled="isDisabled"
           :has-border="false"
-          @clicked="handleToggler"
         ></base-form-toggle>
         <base-form-input
           v-if="productConditionsForm.additionalConditionAnnuityPayments"
@@ -253,7 +256,7 @@
             :clearable="!isDisabled"
             :label="term.coverTypeName"
             append-inner-icon="mdi mdi-chevron-right"
-            :suffix="!!term.amount ? `${$dataStore.getNumberWithSpaces(term.amount)} ${currencySymbolsAddTerm}` : ''"
+            :suffix="!!term.amount ? `${formatTermValue(term.amount)} ${currencySymbolsAddTerm}` : ''"
             @append="openTermPanel(term.coverTypeName, $dataStore.getAdditionalInsuranceTermsAnswers, term.coverTypeId, index)"
           ></base-panel-input>
         </div>
@@ -426,6 +429,19 @@ export default defineComponent({
       }
       return constants.currencySymbols.kzt;
     });
+    const requestedSumInsuredLabel = computed(() => {
+      if (whichProduct.value === 'halykkazyna') {
+        return dataStore.t('productConditionsForm.requestedSumInsuredInTenge');
+      }
+      return dataStore.t('productConditionsForm.requestedSumInsured');
+    });
+
+    const formatTermValue = (term: number) => {
+      if (term !== null) {
+        return Number.isInteger(term) ? dataStore.getNumberWithSpaces(term) : dataStore.getNumberWithDot(term);
+      }
+      return null;
+    };
 
     const toStatement = async () => {
       const statementItem = dataStore.menuItems.find(i => i.id === 'statement');
@@ -571,6 +587,34 @@ export default defineComponent({
       }
     };
 
+    const onClearSum = () => {
+      productConditionsForm.requestedSumInsuredInDollar = null;
+    };
+
+    const onClearSumDollar = () => {
+      productConditionsForm.requestedSumInsured = null;
+    };
+
+    const onClearPremium = () => {
+      productConditionsForm.insurancePremiumPerMonthInDollar = null;
+    };
+
+    const onClearPremiumDollar = () => {
+      productConditionsForm.insurancePremiumPerMonth = null;
+    };
+
+    const clearFields = () => {
+      productConditionsForm.coverPeriod = null;
+      productConditionsForm.birthDate = null;
+      productConditionsForm.gender = new Value();
+      productConditionsForm.paymentPeriod = new Value();
+      productConditionsForm.processIndexRate = new Value();
+      productConditionsForm.requestedSumInsured = null;
+      productConditionsForm.requestedSumInsuredInDollar = null;
+      productConditionsForm.insurancePremiumPerMonth = null;
+      productConditionsForm.insurancePremiumPerMonthInDollar = null;
+    };
+
     const submitForm = async () => {
       vForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
         if (v.valid) {
@@ -627,9 +671,11 @@ export default defineComponent({
           isCalculating.value = true;
           if (props.isRecalculation) {
             await dataStore.calculateWithoutApplication(true, whichProduct.value);
+            additionalTerms.value = formStore.additionalInsuranceTermsWithout;
           } else {
             if (dataStore.isProcessEditable(formStore.applicationData.statusCode)) {
               await dataStore.calculate(route.params.taskId);
+              additionalTerms.value = formStore.additionalInsuranceTerms;
             }
           }
           isCalculating.value = false;
@@ -657,6 +703,9 @@ export default defineComponent({
 
     onMounted(async () => {
       if (props.isRecalculation === true) {
+        if (dataStore.isCalculator) {
+          clearFields();
+        }
         if (
           (dataStore.isCalculator || route.params.taskId === '0') &&
           productConditionsForm.requestedSumInsured === null &&
@@ -685,7 +734,7 @@ export default defineComponent({
       if (!!productConditionsForm.requestedSumInsured) {
         whichSum.value = 'requestedSumInsured';
       }
-      if(dataStore.isCalculator) {
+      if (dataStore.isCalculator) {
         dataStore.processCode = constants.products[whichProduct.value];
         await dataStore.getProcessPaymentPeriod();
       }
@@ -734,7 +783,6 @@ export default defineComponent({
         if (val.code === 'Lifelong') formStore.productConditionsForm.termAnnuityPayments = null;
       },
     );
-
     watch(
       () => dataStore.panel.open,
       () => {
@@ -785,6 +833,7 @@ export default defineComponent({
       hasAnnuityPayments,
       currencySymbolsAddTerm,
       amountAnnuityPayments,
+      requestedSumInsuredLabel,
 
       // Rules
       coverPeriodRule,
@@ -802,6 +851,12 @@ export default defineComponent({
       onInputSum,
       onInputSumDollar,
       toStatement,
+      onClearSum,
+      onClearSumDollar,
+      onClearPremium,
+      onClearPremiumDollar,
+      clearFields,
+      formatTermValue,
     };
   },
 });

package/locales/en.json

@@ -209,7 +209,7 @@
   "policyholderAndInsured": "Insured / Policyholder",
   "policyholderAndInsuredSame": "Insured / Policyholder are the same person",
   "insuredForm": "Insured",
-"beneficiaryForm": "Beneficiary",
+  "beneficiaryForm": "Beneficiary",
   "beneficialOwnerForm": "Beneficial Owner",
   "policyholdersRepresentativeForm": "Policyholder's Representative",
   "productConditions": "Product Conditions and Calculations",
@@ -253,6 +253,7 @@
     "processIndexRate": "Requested indexation rate (from 3% to 7%)",
     "processPaymentPeriod": "Frequency of insurance premium payment:",
     "requestedSumInsured": "Insurance Amount",
+    "requestedSumInsuredInTenge": "Insurance Amount in tenge",
     "requestedSumInsuredInDollar": "Insurance Amount in dollars",
     "sumInsured": "Insurance Amount",
     "insurancePremiumPerMonth": "Insurance Premium",
@@ -266,7 +267,7 @@
     "coverPeriodFrom3to20": "Insurance Period (from 3 to 20 years)",
     "insurancePremiumAmount": "Insurance Premium Amount in tenge",
     "insurancePremiumAmountInDollar": "Amount of the Insurance premium (insurance fee) in dollars",
-    "coverPeriodFrom2to22": "Cover Period (from 2y to 20y)",
+    "coverPeriodFrom2to20": "Cover Period (from 2y to 20y)",
     "dollarExchangeRateNBRK": "NBRK dollar exchange rate",
     "contractDate": "Contract date",
     "guaranteedTermAnnuityPayments": "Guaranteed term of annuity payments",

package/locales/kz.json

@@ -253,6 +253,7 @@
     "processIndexRate": "Индексацияның қалпынан тапсырыс берілген өлшемі (3% - 7%)",
     "processPaymentPeriod": "Cақтандыру сыйлықақысы төлемінің кестелігі:",
     "requestedSumInsured": "Сақтандыру сомасы",
+    "requestedSumInsuredInTenge": "Сақтандыру сомасы тенгемен",
     "requestedSumInsuredInDollar": "Сақтандыру сома доллармен",
     "sumInsured": "Страховая сумма",
     "insurancePremiumPerMonth": "Сақтандыру сыйлықақысы айына",

package/locales/ru.json

@@ -253,6 +253,7 @@
     "processIndexRate": "Запрашиваемый размер коэффициента индексации (от 3% до 7%)",
     "processPaymentPeriod": "Периодичность оплаты страховой премии:",
     "requestedSumInsured": "Страховая сумма",
+    "requestedSumInsuredInTenge": "Страховая сумма в тенге",
     "requestedSumInsuredInDollar": "Страховая сумма в долларах",
     "sumInsured": "Страховая сумма",
     "insurancePremiumPerMonth": "Страховая премия",
@@ -264,7 +265,7 @@
     "riskGroup": "Группа риска",
     "requestedProductConditions": "Запрашиваемые условия страхования",
     "coverPeriodFrom3to20": "Срок страхования (от 3-х до 20 лет)",
-    "coverPeriodFrom2to22": "Срок страхования (от 2-х до 20 лет)",
+    "coverPeriodFrom2to20": "Срок страхования (от 2-х до 20 лет)",
     "insurancePremiumAmount": "Размер Страховой премии (страховой взнос) в тенге",
     "insurancePremiumAmountInDollar": "Размер Страховой премии (страховой взнос) в долларах",
     "dollarExchangeRateNBRK": "Курс доллара НБРК",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.8-beta.23",
+  "version": "0.0.8-beta.25",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",
@@ -29,22 +29,21 @@
   "devDependencies": {
     "@nuxt/devtools": "^0.4.5",
     "@nuxt/types": "^2.16.3",
-    "nuxt": "^3.4.3",
-    "prettier": "^2.8.4",
-    "typescript": "^4.9.5"
+    "nuxt": "^3.5.3",
+    "prettier": "^2.8.8"
   },
   "dependencies": {
-    "@intlify/unplugin-vue-i18n": "^0.10.0",
+    "@intlify/unplugin-vue-i18n": "^0.11.0",
     "@mdi/font": "^7.2.96",
-    "@nuxtjs/tailwindcss": "^6.6.7",
-    "@pinia/nuxt": "^0.4.9",
-    "@vuepic/vue-datepicker": "^5.0.1",
+    "@nuxtjs/tailwindcss": "^6.8.0",
+    "@pinia/nuxt": "^0.4.11",
+    "@vuepic/vue-datepicker": "^5.3.0",
     "animate.css": "^4.1.1",
     "axios": "^1.4.0",
     "fast-xml-parser": "4.0.12",
     "jwt-decode": "^3.1.2",
     "maska": "1.5.0",
-    "pinia": "^2.0.35",
+    "pinia": "^2.1.4",
     "v-idle-3": "^0.3.14",
     "vue-i18n": "^9.2.2",
     "vue-json-pretty": "^2.2.4",

package/store/data.store.js

@@ -1098,6 +1098,9 @@ export const useDataStore = defineStore('data', {
     getNumberWithSpaces(n) {
       return n === null ? null : Number((typeof n === 'string' ? n : n.toFixed().toString()).replace(/[^0-9]+/g, '')).toLocaleString('ru');
     },
+    getNumberWithDot(n) {
+      return n === null ? null : n.toLocaleString('ru', { maximumFractionDigits: 2, minimumFractionDigits: 2 }).replace(/,/g, '.');
+    },
     async getTaskList(search = '', groupCode = 'Work', onlyGet = false, needToReturn = false, key = 'dateCreated', processInstanceId = null, byOneProcess = null) {
       if (onlyGet === false) {
         this.isLoading = true;
@@ -1384,8 +1387,11 @@ export const useDataStore = defineStore('data', {
         this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(calculationResponse.premium);
         this.formStore.additionalInsuranceTermsWithout = calculationResponse.addCovers;
         if (this.isKazyna || product === 'halykkazyna') {
-          this.formStore.productConditionsForm.requestedSumInsuredInDollar = this.getNumberWithSpaces(calculationResponse.amountInCurrency);
-          this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar = this.getNumberWithSpaces(calculationResponse.premiumInCurrency);
+          if (this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar != null) {
+            this.formStore.productConditionsForm.requestedSumInsuredInDollar = this.getNumberWithSpaces(calculationResponse.amountInCurrency);
+          } else {
+            this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar = this.getNumberWithSpaces(calculationResponse.premiumInCurrency);
+          }
         }
         if (this.isLiferenta) {
           this.formStore.productConditionsForm.amountAnnuityPayments = this.getNumberWithSpaces(calculationResponse.annuityMonthPay);
@@ -1457,7 +1463,11 @@ export const useDataStore = defineStore('data', {
           this.formStore.applicationData = applicationData;
           this.formStore.additionalInsuranceTerms = this.formStore.applicationData.addCoverDto;
           if (this.isKazyna) {
-            this.formStore.productConditionsForm.requestedSumInsuredInDollar = this.getNumberWithSpaces(result / this.currencies.usd);
+            if (this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar != null) {
+              this.formStore.productConditionsForm.requestedSumInsuredInDollar = this.getNumberWithSpaces(result / this.currencies.usd);
+            } else {
+              this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar = this.getNumberWithSpaces(result / this.currencies.usd);
+            }
           }
           if (this.formStore.productConditionsForm.insurancePremiumPerMonth != null) {
             this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(result);