hl-core 0.0.8-beta.21 → 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/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"
@@ -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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.8-beta.21",
+  "version": "0.0.8-beta.22",
   "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),
   },
@@ -1331,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);
@@ -1342,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 = {
@@ -1359,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);
         }