hl-core 0.0.8-beta.1 → 0.0.8-beta.3

package/api/index.ts

@@ -165,7 +165,7 @@ export class ApiClass {
     });
   }
 
-  async setSurvey(surveyData: AnketaFirst) {
+  async setSurvey(surveyData: AnketaFirst): Promise<string> {
     return this.axiosCall({
       method: Methods.POST,
       data: surveyData,

package/components/Input/Datepicker.vue

@@ -0,0 +1,41 @@
+<template>
+  <vue-date-picker
+    :model-value="modelValue"
+    :clearable="false"
+    :disabled="disabled"
+    :reaonly="readonly"
+    @update:modelValue="$emit('update:modelValue', $event)"
+    locale="ru"
+    model-type="dd.MM.yyyy"
+    position="left"
+    menu-class-name="!left-[30vw] md:!left-[70vw] lg:!left-[75vw]"
+    teleport=".v-form"
+    :offset="-50"
+    :close-on-scroll="true"
+    :enable-time-picker="false"
+    cancel-text="Отменить"
+    select-text="Выбрать"
+  >
+    <template #trigger>
+      <v-icon icon="mdi mdi-calendar-blank-outline cursor-pointer"></v-icon>
+    </template>
+  </vue-date-picker>
+</template>
+
+<script lang="ts">
+export default defineComponent({
+  props: {
+    modelValue: {
+      required: false,
+    },
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    readonly: {
+      type: Boolean,
+      default: false,
+    },
+  },
+});
+</script>

package/components/Input/FormInput.vue

@@ -19,7 +19,6 @@
     :prepend-icon="prependIcon ? prependIcon : ''"
     :append-icon="appendIcon ? appendIcon : ''"
     :prepend-inner-icon="prependInnerIcon ? prependInnerIcon : ''"
-    :append-inner-icon="appendInnerIcon ? appendInnerIcon : ''"
     :bg-color="bgColor ? bgColor : ''"
     @keyup.enter.prevent="submitted"
     @click:append="!props.readonly && $emit('append-out')"
@@ -28,6 +27,10 @@
     @click:prepend-inner="!props.readonly && $emit('prepend')"
     @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"></v-icon>
+      <base-datepicker v-else :model-value="modelValue" @update:modelValue="$emit('update:modelValue', $event)"></base-datepicker>
+    </template>
     <template v-if="loading" #loader>
       <v-progress-linear :active="loading" :color="color" absolute height="1" indeterminate></v-progress-linear>
     </template>

package/components/Menu/MenuNav.vue

@@ -35,7 +35,7 @@
         <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-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 v-if="typeof item.show === 'boolean' ? item.show : true" :text="item.title!" :btn="item.color" :disabled="item.disabled" @click="item.action"> </base-btn>
+              <base-btn v-if="typeof item.show === 'boolean' ? item.show : true" :text="item.title!" :btn="item.color" :disabled="item.disabled" :loading="$dataStore.isButtonsLoading" @click="item.action"> </base-btn>
             </transition>
           </div></div
       ></base-fade-transition>

package/components/Pages/Anketa.vue

@@ -2,7 +2,13 @@
   <base-fade-transition>
     <section v-if="firstQuestionList && firstQuestionList.length && !firstPanel && !secondPanel" class="flex flex-col">
       <section :class="[$libStyles.blueBgLight, $libStyles.rounded]" class="mx-[10px] my-[14px] p-4 flex flex-col gap-4">
-        <base-form-toggle v-model="answerToAll" :title="$t('questionnaireType.answerAllNo')" :disabled="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()" :has-border="false" @clicked="handleToggler"></base-form-toggle>
+        <base-form-toggle
+          v-model="answerToAll"
+          :title="$t('questionnaireType.answerAllNo')"
+          :disabled="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+          :has-border="false"
+          @clicked="handleToggler"
+        ></base-form-toggle>
       </section>
       <v-form ref="vForm" class="max-h-[70vh] overflow-y-scroll" @submit="submitForm">
         <section
@@ -154,7 +160,9 @@ export default defineComponent({
           });
           formStore[whichSurvey.value]!.type = surveyType.value;
           const anketaToken = await dataStore.setSurvey(formStore[whichSurvey.value]);
-          formStore[whichSurvey.value]!.id = anketaToken;
+          if (typeof anketaToken === 'string') {
+            formStore[whichSurvey.value]!.id = anketaToken;
+          }
           isButtonLoading.value = false;
         } else {
           const errors = document.querySelector('.v-input--error');

package/components/Pages/Documents.vue

@@ -1,6 +1,6 @@
 <template>
   <section class="w-full px-[10px] pt-[14px] flex flex-col gap-2" :class="[$libStyles.scrollPage]" v-if="formStore.signedDocumentList && formStore.signedDocumentList.length">
-    <base-content-block v-for="document of formStore.signedDocumentList as DocumentItem[]" :key="document.id" :class="[$libStyles.textSimple]">
+    <base-content-block v-for="document of formStore.signedDocumentList" :key="document.id" :class="[$libStyles.textSimple]">
       <h5 class="text-center font-medium mb-4">
         {{ document.fileTypeName }}
       </h5>

package/components/Pages/MemberForm.vue

@@ -379,7 +379,7 @@
           :label="$t('form.signOfResidency')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
-          :rules="$rules.objectRequired"
+          :rules="residencyRule"
           append-inner-icon="mdi mdi-chevron-right"
           @append="openPanel($t('form.signOfResidency'), [], 'signOfResidency', $dataStore.getResidents)"
         ></base-panel-input>
@@ -459,7 +459,7 @@
           <base-panel-select-item
             v-for="(item, index) of panelList.filter(i => i.nameRu && (i.nameRu as string).match(new RegExp(searchQuery, 'i')))"
             :key="index"
-            :text="item.nameRu as string"
+            :text="(item.nameRu as string)"
             :selected="item.nameRu === panelValue.nameRu"
             @click="pickPanelValue(item)"
           ></base-panel-select-item>
@@ -603,6 +603,18 @@ export default {
       return byMemberAndProductRule();
     });
 
+    const residencyRule = computed(() => {
+      switch (whichForm.value) {
+        case formStore.policyholderFormKey: {
+          if (dataStore.isBolashak || dataStore.isBaiterek) {
+            return dataStore.rules.objectRequired.concat(dataStore.rules.noResident);
+          }
+        }
+        default:
+          return dataStore.rules.objectRequired;
+      }
+    });
+
     const getOtpConditionByMember = () => {
       switch (whichForm.value) {
         case formStore.policyholderFormKey:
@@ -933,7 +945,7 @@ export default {
             const initialPoint = `${member.value.iin!.replaceAll('-', '')}.`;
             const RESPONSE = ESBDMessage(ESBDResponse, initialPoint);
             let errorMessage = RESPONSE !== false ? RESPONSE : 'Что-то произошло не так';
-            if (ESBDResponse.errorCode === 0) {
+            if (typeof ESBDResponse === 'object' && ESBDResponse.errorCode === 0) {
               member.value.verifyType = 'ESBD';
               member.value.verifyDate = ESBDResponse.verifiedDate;
               const hasMemberSaved = await saveMember();
@@ -1108,9 +1120,11 @@ export default {
       hasGBDFL,
       hasInsis,
       hasGKB,
+
       // Rules
       ageRule,
       phoneRule,
+      residencyRule,
 
       // Functions
       searchMember,

package/components/Pages/ProductConditions.vue

@@ -13,6 +13,66 @@
           subtitle="Если несовершеннолетний не достиг возраста 14 лет - законному представителю в соответствии с законодательством Республики Казахстан"
         ></base-form-text-section>
       </base-form-section>
+      <base-form-section v-if="isUnderwriterRole" :title="$t('recalculationInfo')">
+        <base-form-input
+          v-model="productConditionsForm.lifeMultiply"
+          :maska="$maska.numbers"
+          :clearable="isRecalculationDisabled === false"
+          :label="$t('percent') + `Life Multiply`"
+          :readonly="isRecalculationDisabled"
+          :rules="$dataStore.rules.recalculationMultiply"
+        ></base-form-input>
+        <base-form-input
+          v-model="productConditionsForm.lifeAdditive"
+          :maska="$maska.numbers"
+          :clearable="isRecalculationDisabled === false"
+          :label="$t('percent') + `Life Additive`"
+          :readonly="isRecalculationDisabled"
+          :rules="$dataStore.rules.recalculationAdditive"
+        ></base-form-input>
+        <base-form-input
+          v-model="productConditionsForm.adbMultiply"
+          :maska="$maska.numbers"
+          :clearable="isRecalculationDisabled === false"
+          :label="$t('percent') + `Adb Multiply`"
+          :readonly="isRecalculationDisabled"
+          :rules="$dataStore.rules.recalculationMultiply"
+        ></base-form-input>
+        <base-form-input
+          v-model="productConditionsForm.adbAdditive"
+          :maska="$maska.numbers"
+          :clearable="isRecalculationDisabled === false"
+          :label="$t('percent') + `Adb Additive`"
+          :readonly="isRecalculationDisabled"
+          :rules="$dataStore.rules.recalculationAdditive"
+        ></base-form-input>
+        <base-form-input
+          v-model="productConditionsForm.disabilityMultiply"
+          :maska="$maska.numbers"
+          :clearable="isRecalculationDisabled === false"
+          :label="$t('percent') + `Disability Multiply`"
+          :readonly="isRecalculationDisabled"
+          :rules="$dataStore.rules.recalculationMultiply"
+        ></base-form-input>
+        <base-form-input
+          v-model="productConditionsForm.disabilityAdditive"
+          :maska="$maska.numbers"
+          :clearable="isRecalculationDisabled === false"
+          :label="$t('percent') + `Disability Additive`"
+          :readonly="isRecalculationDisabled"
+          :rules="$dataStore.rules.recalculationAdditive"
+        >
+        </base-form-input>
+        <base-panel-input
+          v-model="productConditionsForm.riskGroup"
+          :value="productConditionsForm.riskGroup.nameRu"
+          :label="$t('productConditionsForm.riskGroup')"
+          :clearable="isRecalculationDisabled === false"
+          :readonly="isRecalculationDisabled"
+          append-inner-icon="mdi mdi-chevron-right"
+          @append="openPanel($t('productConditionsForm.riskGroup'), $dataStore.riskGroup, 'riskGroup')"
+        ></base-panel-input>
+      </base-form-section>
       <base-form-section :title="$t('generalConditions')">
         <div v-if="isRecalculation && $route.params.taskId === '0'">
           <base-form-input
@@ -83,6 +143,10 @@
       :text="$t('buttons.calculate')"
       @click="submitForm"
     ></base-btn>
+    <div v-if="$dataStore.isTask() && $dataStore.isUnderwriter() && !isRecalculationDisabled" class="flex gap-3">
+      <base-btn :text="$t('buttons.calcSum')" type="submit" @click.prevent="underwriterCalculate('sum')" :loading="isCalculating" />
+      <base-btn :text="$t('buttons.calcPremium')" type="submit" @click.prevent="underwriterCalculate('premium')" :loading="isCalculating" />
+    </div>
     <Teleport v-if="isPanelOpen" to="#panel-actions">
       <div :class="[$libStyles.scrollPage]" class="flex flex-col items-center">
         <base-rounded-input v-model="searchQuery" :label="$t('labels.search')" class="w-full p-2" :hide-details="true"></base-rounded-input>
@@ -91,7 +155,7 @@
           <base-panel-select-item
             v-for="(item, index) of panelList.filter(i => i.nameRu && (i.nameRu as string).match(new RegExp(searchQuery, 'i')))"
             :key="index"
-            :text="item.nameRu as string"
+            :text="(item.nameRu as string)"
             :selected="item.nameRu === panelValue.nameRu"
             @click="pickPanelValue(item)"
           ></base-panel-select-item>
@@ -139,22 +203,20 @@ export default defineComponent({
     });
     const isDisabled = computed(() => !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 pickPanelValue = (item: Value) => {
-      if (!isDisabled.value) {
-        dataStore.panel.open = false;
-        isPanelOpen.value = false;
-        // @ts-ignore
-        productConditionsForm[currentPanel.value] = item.nameRu === null ? new Value() : item;
-      } else {
-        dataStore.showToaster('error', dataStore.t('toaster.viewErrorText'));
-      }
+      dataStore.panel.open = false;
+      isPanelOpen.value = false;
+      // @ts-ignore
+      productConditionsForm[currentPanel.value] = item.nameRu === null ? new Value() : item;
     };
 
     const openPanel = async (title: string, list: Value[], key: string, asyncFunction?: Function, filterKey?: string) => {
-      if (!isDisabled.value) {
+      if (!isDisabled.value || (key === 'riskGroup' && !isRecalculationDisabled.value)) {
         searchQuery.value = '';
         currentPanel.value = key as keyof typeof productConditionsForm;
         isPanelOpen.value = true;
@@ -176,6 +238,17 @@ export default defineComponent({
       }
     };
 
+    const underwriterCalculate = async (type: 'sum' | 'premium') => {
+      if (!type) return;
+      if (type === 'sum') {
+        whichSum.value = 'insurancePremiumPerMonth';
+      }
+      if (type === 'premium') {
+        whichSum.value = 'requestedSumInsured';
+      }
+      await submitForm();
+    };
+
     const pickCalculation = async (type: 'insurancePremiumPerMonth' | 'requestedSumInsured') => {
       if (!type) return false;
       whichSum.value = type;
@@ -348,12 +421,15 @@ export default defineComponent({
       isUnderwriterForm,
       insurancePremiumPerMonth,
       requestedSumInsured,
+      isRecalculationDisabled,
+      isUnderwriterRole,
 
       // Functions
       submitForm,
       pickPanelValue,
       openPanel,
       pickCalculation,
+      underwriterCalculate,
     };
   },
 });

package/components/Panel/PanelHandler.vue

@@ -77,7 +77,7 @@
             <v-form ref="vForm">
               <base-rounded-input
                 v-model="phoneNumber"
-                v-maska="'+7 (7##) ### ## ##'"
+                :maska="$maska.phone"
                 :rules="$rules.required.concat($rules.phoneFormat)"
                 :label="$t('form.phoneNumber')"
                 placeholder="+7 7"
@@ -104,16 +104,6 @@ export default defineComponent({
     const phoneNumber = ref<string | null>(formStore.policyholderForm.phoneNumber ?? '');
     const selectedClient = ref<SignUrlType>();
 
-    watch(
-      () => dataStore.panelAction,
-      val => {
-        if (!!val) {
-          dataStore.panel.title = buttonText.value!;
-          dataStore.panel.open = true;
-        }
-      },
-    );
-
     const openSmsPanel = (signInfo: SignUrlType) => {
       if (signInfo) {
         isSendNumberOpen.value = true;
@@ -170,6 +160,16 @@ export default defineComponent({
       }
     });
 
+    watch(
+      () => dataStore.panelAction,
+      val => {
+        if (!!val) {
+          dataStore.panel.title = buttonText.value!;
+          dataStore.panel.open = true;
+        }
+      },
+      { immediate: true },
+    );
     const sendingActions = computed(
       () => dataStore.panelAction === constants.actions.reject || dataStore.panelAction === constants.actions.return || dataStore.panelAction === constants.actions.rejectclient,
     );

package/composables/classes.ts

@@ -801,6 +801,7 @@ export class DataStoreClass {
     items: MenuItem[];
   };
   buttons: MenuItem[];
+  isButtonsLoading: boolean;
   panelAction: string | null;
   panel: {
     open: boolean;
@@ -891,6 +892,7 @@ export class DataStoreClass {
       items: [],
     };
     this.buttons = [];
+    this.isButtonsLoading = false;
     this.panel = {
       open: false,
       overlay: false,

package/composables/constants.ts

@@ -31,6 +31,7 @@ export const constants = Object.freeze({
     support: 'Support',
     managerHalykBank: 'ManagerHalykBank',
     serviceManager: 'ServiceManager',
+    drn: 'DRNSJ',
   },
   actions: {
     accept: 'accept',

package/composables/styles.ts

@@ -23,6 +23,8 @@ export class Styles {
 
   // Yellow
   yellowText: string = 'text-[#FAB31C]';
+  yellowBg: string = 'bg-[#FAB31C]';
+  yellowBgHover: string = 'hover:bg-[#FAB31C]';
 
   // Grey
   greyBg: string = 'bg-[#B8B8B8]';
@@ -56,6 +58,7 @@ export class Styles {
   greenBtn: string;
   blueBtn: string;
   redBtn: string;
+  yellowBtn: string;
   whiteBtn: string;
   blueLightBtn: string;
 
@@ -71,6 +74,7 @@ export class Styles {
     // Button
     this.greenBtn = `${this.greenBg} ${this.whiteText} ${this.textTitle} ${this.rounded} w-full ${this.greenBgHover}`;
     this.redBtn = `${this.redBg} ${this.whiteText} ${this.textTitle} ${this.rounded} w-full ${this.redBgHover}`;
+    this.yellowBtn = `${this.yellowBg} ${this.whiteText} ${this.textTitle} ${this.rounded} w-full ${this.yellowBgHover}`;
     this.blueBtn = `${this.blueBg} ${this.whiteText} ${this.textTitle} ${this.rounded} w-full ${this.blueBgHover}`;
     this.whiteBtn = ` ${this.blackText} ${this.textTitle} ${this.rounded} w-full ${this.blueLightBgHover}`;
     this.blueLightBtn = `${this.blueBgLight} ${this.greyTextLight} ${this.textTitle} ${this.rounded} w-full ${this.blueBgLightHover}`;

package/nuxt.config.ts

@@ -9,6 +9,10 @@ export default defineNuxtConfig({
     dirs: ['store', 'composables'],
   },
 
+  build: {
+    transpile: ['@vuepic/vue-datepicker'],
+  },
+
   vite: {
     build: {
       minify: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.8-beta.1",
+  "version": "0.0.8-beta.3",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",
@@ -21,7 +21,8 @@
     "build": "nuxt build",
     "dev": "nuxt clean && nuxt dev",
     "generate": "nuxt generate",
-    "preview": "nuxt preview"
+    "preview": "nuxt preview",
+    "typecheck": "nuxt typecheck"
   },
   "devDependencies": {
     "@nuxt/devtools": "^0.4.5",
@@ -34,6 +35,7 @@
     "@mdi/font": "^7.2.96",
     "@nuxtjs/tailwindcss": "^6.6.7",
     "@pinia/nuxt": "^0.4.9",
+    "@vuepic/vue-datepicker": "^5.0.1",
     "animate.css": "^4.1.1",
     "axios": "^1.4.0",
     "fast-xml-parser": "4.0.12",
@@ -43,6 +45,6 @@
     "v-idle-3": "^0.3.14",
     "vue-toastification": "^2.0.0-rc.5",
     "vue-uuid": "^3.0.0",
-    "vuetify": "^3.2.1"
+    "vuetify": "^3.2.2"
   }
 }

package/plugins/helperFunctionsPlugins.ts

@@ -1,12 +1,15 @@
 import { capitalize, getFullNameShorted, reformatIin, Masks } from '../composables';
 import { constants } from '../composables/constants';
 import { Styles } from '../composables/styles';
+import VueDatePicker from '@vuepic/vue-datepicker';
+import '@vuepic/vue-datepicker/dist/main.css';
 import Vidle from 'v-idle-3';
 import Maska from 'maska';
 
 export default defineNuxtPlugin(nuxtApp => {
   nuxtApp.vueApp.use(Vidle, {});
   nuxtApp.vueApp.use(Maska);
+  nuxtApp.vueApp.component('VueDatePicker', VueDatePicker);
 
   return {
     provide: {

package/store/data.store.js

@@ -190,6 +190,9 @@ export const useDataStore = defineStore('data', {
     isUpk() {
       return this.isRole(constants.roles.upk);
     },
+    isDrn() {
+      return this.isRole(constants.roles.drn);
+    },
     isSupport() {
       return this.isRole(constants.roles.support);
     },
@@ -221,6 +224,7 @@ export const useDataStore = defineStore('data', {
         const token = localStorage.getItem('accessToken') || null;
         if (token) {
           this.$reset();
+          this.formStore.$reset();
           localStorage.clear();
 
           if (whichProduct === 'efo') {
@@ -1390,7 +1394,6 @@ export const useDataStore = defineStore('data', {
           paymentPeriodId: this.formStore.productConditionsForm.paymentPeriod.id,
           addCovers: this.formStore.additionalInsuranceTermsWithout,
         };
-        console.log(calculationData);
         const calculationResponse = await this.api.calculateWithoutApplication(calculationData);
         this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(calculationResponse.amount);
         this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(calculationResponse.premium);
@@ -1446,7 +1449,7 @@ export const useDataStore = defineStore('data', {
           try {
             result = await this.api.getCalculation(id);
           } catch (err) {
-            this.showToaster('error', err?.response?.data, 5000);
+            ErrorHandler(err);
           }
 
           const applicationData = await this.api.getApplicationData(taskId);
@@ -1459,11 +1462,10 @@ export const useDataStore = defineStore('data', {
           }
           this.showToaster('success', this.t('toaster.calculated'), 1000);
         } catch (err) {
-          console.log(err);
+          ErrorHandler(err);
         }
       } catch (err) {
         ErrorHandler(err);
-        console.log(err, 'error');
       }
       this.isLoading = false;
     },
@@ -1714,6 +1716,7 @@ export const useDataStore = defineStore('data', {
     },
     async handleTask(action, taskId, comment) {
       if (action && Object.keys(constants.actions).includes(action)) {
+        this.isButtonsLoading = true;
         switch (action) {
           case constants.actions.claim: {
             try {
@@ -1743,6 +1746,7 @@ export const useDataStore = defineStore('data', {
             }
           }
         }
+        this.isButtonsLoading = false;
       } else {
         console.error('No handleTask action');
       }

package/store/messages.ts

@@ -95,7 +95,7 @@ export const messages = {
       affiliationDocumentNotUploaded: 'Не прикреплен файл в решении андеррайтингового совета',
       documentNumberWasNotFilled: 'Номер документа и дата не были заполнены',
       valueShouldBeHigher: `Значение должно быть больше {text} процентов`,
-      valueShouldBeBetween: `Значение должно быть в промежутке от { floor } до { ceil } процентов`,
+      valueShouldBeBetween: `Значение должно быть в промежутке от {floor} до {ceil} процентов`,
       needAgreement: 'Нужно получить согласие клиента',
       successOtp: 'Код подтверждения отправлен успешно',
       hasSuccessOtp: 'По клиенту уже имеется согласие',
@@ -128,6 +128,7 @@ export const messages = {
       editApplication: 'Редактировать заявку',
       cancel: 'Отменить',
       cancelApplication: 'Отменить заявку',
+      viewApplication: 'Просмотреть заявку',
       approve: 'Согласовать',
       rejectStatement: 'Отклонить',
       returnStatement: 'Вернуть на доработку',

package/store/rules.js

@@ -3,14 +3,7 @@ import { formatDate } from '../composables';
 
 export const rules = {
   recalculationMultiply: [v => (v !== null && v !== '' && v >= 100) || t('toaster.valueShouldBeHigher').replace('{text}', '100')],
-  recalculationAdditive: [
-    v =>
-      (v !== null && v !== '' && v <= 100 && v >= 0) ||
-      t('toaster.valueShouldBeBetween', {
-        floor: 0,
-        ceil: 100,
-      }),
-  ],
+  recalculationAdditive: [v => (v !== null && v !== '' && v <= 100 && v >= 0) || t('toaster.valueShouldBeBetween').replace('{floor}', '0').replace('{ceil}', '100')],
   required: [v => !!v || t('rules.required')],
   objectRequired: [
     v => {
@@ -22,10 +15,10 @@ export const rules = {
   ],
   noResident: [
     v => {
-      if (!!v && 'nameRu' in v && v.nameRu == 'Нерезидент') {
+      if (!!v && 'nameRu' in v && v.nameRu === 'Нерезидент') {
         return t('rules.noResident');
       }
-      if (!!v && 'nameRu' in v && v.nameRu != null) {
+      if (!!v && 'nameRu' in v && !!v.nameRu) {
         return true;
       }
       return t('rules.required');