hl-core 0.0.10-beta.16 → 0.0.10-beta.18

package/api/base.api.ts

@@ -999,12 +999,13 @@ export class ApiClass {
     });
   }
 
-  async checkOsns(bin: string) {
+  async checkOsns(bin: string, date: string) {
     return await this.axiosCall<boolean>({
       method: Methods.GET,
       url: `/${this.productUrl}/api/Application/CheckOSNS`,
       params: {
         bin,
+        date,
       },
     });
   }

package/components/Input/OtpInput.vue

@@ -0,0 +1,25 @@
+<template>
+  <v-otp-input v-model="modelValue" class="base-otp-input" base-color="#A0B3D8" color="#FFF" />
+</template>
+
+<script setup lang="ts">
+const modelValue = defineModel<string>();
+</script>
+
+<style>
+.base-otp-input .v-otp-input__field {
+  font-size: 16px;
+}
+.base-otp-input .v-field {
+  width: 50px;
+  height: 60px;
+  border-radius: 8px;
+}
+.base-otp-input .v-otp-input__content {
+  gap: 24px;
+}
+.base-otp-input .v-otp-input__divider {
+  margin: 0 4px;
+  color: #b8b8b8;
+}
+</style>

package/components/Pages/MemberForm.vue

@@ -702,18 +702,16 @@
     </Teleport>
     <Teleport v-if="isOtpPanelOpen && !member.hasAgreement" to="#right-panel-actions">
       <div :class="[$styles.flexColNav]">
-        <base-fade-transition>
-          <base-rounded-input
-            v-if="otpCondition && member.otpTokenId"
-            v-model="member.otpCode"
-            :label="$dataStore.t('form.otpCode')"
-            :maska="$maska.otp"
-            :append-inner-icon="hasOtp ? 'mdi-cellphone-message text-[17px]' : ''"
-            hide-details
-            @keyup.enter.prevent="hasOtp ? checkOtp() : null"
-            @input="onOtpCodeInput"
-          />
-        </base-fade-transition>
+        <base-animation>
+          <div v-if="otpCondition && member.otpTokenId" class="flex flex-col">
+            <base-form-section class="mt-0 py-2">
+              <base-otp-input v-model="member.otpCode" :length="4" @keyup.enter.prevent="hasOtp && checkOtp()" @input="onOtpCodeInput" />
+            </base-form-section>
+            <span class="text-center cursor-pointer mt-2" :class="[$styles.mutedText]" @click="sendOtp(false)"
+              >Не получили код? <span class="underline underline-offset-2">Отправить код заново</span></span
+            >
+          </div>
+        </base-animation>
         <base-btn v-if="!member.otpTokenId" :disabled="otpSending" :loading="otpSending" :text="$dataStore.t('buttons.sendOtp')" @click="sendOtp(false)" />
         <base-btn v-if="member.otpTokenId" :disabled="otpSending" :loading="otpSending" :text="$dataStore.t('buttons.check')" @click="checkOtp()" />
       </div>
@@ -721,12 +719,12 @@
     <Teleport v-if="isPositionPanelOpen" to="#right-panel-actions">
       <div :class="[$styles.scrollPage]" class="flex flex-col items-center">
         <base-rounded-input
-          v-model="searchQuery"
-          :label="$dataStore.t('labels.search')"
+          v-model.trim="searchQuery"
+          label="Выполните поиск должностей"
           class="w-full p-2"
           :hide-details="searchQuery.length >= 4"
-          :rules="[searchQuery.length < 4 ? $dataStore.t('rules.searchQueryLen', { len: '4' }) : true]"
-          :append-inner-icon="searchQuery.length < 4 ? '' : 'mdi mdi-magnify'"
+          :rules="[searchQuery.length < 4 ? $dataStore.t('rules.searchQueryLen') : true]"
+          append-inner-icon="mdi mdi-magnify"
           @append="searchPositions"
         />
         <base-animation>
@@ -973,7 +971,7 @@ export default {
         (whichForm.value === formStore.beneficiaryFormKey && member.value.iin !== formStore.policyholderForm.iin) ||
         (dataStore.isLifetrip && whichForm.value === formStore.insuredFormKey && member.value.isInsuredUnderage),
     );
-    const hasWorkPositionDict = !useEnv().isProduction && dataStore.isBaiterek && dataStore.isEfoParent;
+    const hasWorkPositionDict = dataStore.isBaiterek && dataStore.isEfoParent;
 
     const birthDateRule = computed(() => {
       const baseDateRule = dataStore.rules.required.concat(dataStore.rules.birthDate);
@@ -1085,6 +1083,10 @@ export default {
     };
 
     const searchPositions = async () => {
+      if (searchQuery.value.length < 4) {
+        dataStore.showToaster('error', dataStore.t('rules.searchQueryLen'));
+        return;
+      }
       if (!isDisabled.value) {
         isPanelLoading.value = true;
         positionsList.value = await dataStore.getWorkPosition(searchQuery.value);
@@ -1123,6 +1125,7 @@ export default {
         isPositionPanelOpen.value = false;
       }
       if (type === 'workPosition') {
+        dataStore.rightPanel.title = dataStore.t('form.jobPosition');
         isPositionPanelOpen.value = true;
         isOtpPanelOpen.value = false;
         isDocumentOpen.value = false;

package/components/Pages/ProductConditions.vue

@@ -1445,7 +1445,7 @@ export default defineComponent({
             if (calculatorForm.type.code === 'Single' && calculatorForm.startDate && calculatorForm.endDate) {
               const formattedStartDate = formatDate(calculatorForm.startDate);
               const formattedEndDate = formatDate(calculatorForm.endDate);
-              if (formattedStartDate && formattedEndDate && formattedStartDate.getTime() > formattedEndDate.getTime()) {
+              if (formattedStartDate && formattedEndDate && formattedStartDate.getTime() >= formattedEndDate.getTime()) {
                 return dataStore.showToaster('error', dataStore.t('toaster.startMoreEnd'));
               }
             }

package/composables/classes.ts

@@ -474,7 +474,7 @@ export class Member extends Person {
   parsedDocument: any;
   hasAgreement: boolean | null;
   otpTokenId: string | null;
-  otpCode: string | null;
+  otpCode: string;
   documentsList: Types.ContragentDocuments[];
   isInsuredUnderage?: boolean = false;
   bankInfo: BankInfoClass;
@@ -605,7 +605,7 @@ export class Member extends Person {
     this.homePhone = homePhone;
     this.email = email;
     this.otpTokenId = null;
-    this.otpCode = null;
+    this.otpCode = '';
     this.address = address;
     this.familyStatus = familyStatus;
     this.isTerror = isTerror;

package/composables/index.ts

@@ -3,7 +3,7 @@ import { jwtDecode as jwt_decode } from 'jwt-decode';
 import { XMLParser } from 'fast-xml-parser';
 import { AxiosError } from 'axios';
 import { DocumentReaderApi, Scenario, TextFieldType, LCID } from '@regulaforensics/document-reader-webclient';
-import { PolicyholderClass } from '../composables/classes';
+import { PolicyholderClass, Value } from '../composables/classes';
 import type { EnvModes, NestedKeyOf, ResponseStructure, Utils } from '../types';
 
 export const useEnv = () => {
@@ -17,7 +17,7 @@ export const useEnv = () => {
 
 export class Masks {
   numbers: string = '#*';
-  otp: string = '# # # #';
+  otp: string = '####';
   spacedNumbers: string = '### ### ### ### ### ### ###';
   iin: string = '###-###-###-###';
   phone: string = '+7 (7##) ### ## ##';
@@ -275,6 +275,7 @@ export const setAddressBeneficiary = (whichIndex: number, sameAddress: boolean)
     if (beneficiary.id === 0) {
       beneficiary.registrationCity = new Value();
       beneficiary.registrationCountry = new Value();
+      beneficiary.birthPlace = new Value();
       beneficiary.registrationMicroDistrict = '';
       beneficiary.registrationNumberApartment = '';
       beneficiary.registrationNumberApartment = '';
@@ -297,6 +298,13 @@ export const setAddressBeneficiary = (whichIndex: number, sameAddress: boolean)
           const city = dataStore.cities.find(i => i.nameRu === cityName.replace('г.', ''));
           beneficiary.registrationCity = city ?? new Value();
         }
+        const contragentData = beneficiary.response.contragent;
+        if (contragentData) {
+          const country = dataStore.countries.find((i: Value) => i.nameRu?.match(new RegExp(contragentData.birthPlace, 'i')));
+          beneficiary.birthPlace = country ?? new Value();
+        } else {
+          beneficiary.birthPlace = new Value();
+        }
         const province = dataStore.states.find(i => i.ids === benAddress[0].stateCode);
         const localityType = dataStore.localityTypes.find(i => i.nameRu === benAddress[0].cityTypeName);
         const region = dataStore.regions.find(i => i.ids == benAddress[0].regionCode);
@@ -334,6 +342,7 @@ export const setAddressInsured = (whichIndex: number, sameAddress: boolean) => {
     if (insured.id === 0) {
       insured.registrationCity = new Value();
       insured.registrationCountry = new Value();
+      insured.birthPlace = new Value();
       insured.registrationMicroDistrict = '';
       insured.registrationNumberApartment = '';
       insured.registrationNumberApartment = '';
@@ -356,6 +365,13 @@ export const setAddressInsured = (whichIndex: number, sameAddress: boolean) => {
           const city = dataStore.cities.find(i => i.nameRu === cityName.replace('г.', ''));
           insured.registrationCity = city ?? new Value();
         }
+        const contragentData = insured.response.contragent;
+        if (contragentData) {
+          const country = dataStore.countries.find((i: Value) => i.nameRu?.match(new RegExp(contragentData.birthPlace, 'i')));
+          insured.birthPlace = country ?? new Value();
+        } else {
+          insured.birthPlace = new Value();
+        }
         const province = dataStore.states.find(i => i.ids === benAddress[0].stateCode);
         const localityType = dataStore.localityTypes.find(i => i.nameRu === benAddress[0].cityTypeName);
         const region = dataStore.regions.find(i => i.ids == benAddress[0].regionCode);

package/composables/styles.ts

@@ -15,24 +15,13 @@ export class Styles {
   blueTextLight: string = 'text-[#F3F6FC]';
 
   // Green
-  greenBg: string =
-    import.meta.env.VITE_PRODUCT === 'auletti' || import.meta.env.VITE_PARENT_PRODUCT === 'auletti' || import.meta.env.VITE_PRODUCT === 'lka-auletti'
-      ? 'bg-[#DEBE8C]'
-      : 'bg-[#009C73]';
-  greenBgHover: string =
-    import.meta.env.VITE_PRODUCT === 'auletti' || import.meta.env.VITE_PARENT_PRODUCT === 'auletti' || import.meta.env.VITE_PRODUCT === 'lka-auletti'
-      ? 'bg-[#C19B5F]'
-      : 'hover:bg-[#00a277]';
-  greenBgLight: string =
-    import.meta.env.VITE_PRODUCT === 'auletti' || import.meta.env.VITE_PARENT_PRODUCT === 'auletti' || import.meta.env.VITE_PRODUCT === 'lka-auletti'
-      ? 'bg-[#e8d2af]'
-      : 'bg-[#EAF6EF]';
+  greenBg: string = String(import.meta.env.VITE_PRODUCT).includes('auletti') || import.meta.env.VITE_PARENT_PRODUCT === 'auletti' ? 'bg-[#DEBE8C]' : 'bg-[#009C73]';
+  greenBgHover: string = String(import.meta.env.VITE_PRODUCT).includes('auletti') || import.meta.env.VITE_PARENT_PRODUCT === 'auletti' ? 'bg-[#C19B5F]' : 'hover:bg-[#00a277]';
+  greenBgLight: string = String(import.meta.env.VITE_PRODUCT).includes('auletti') || import.meta.env.VITE_PARENT_PRODUCT === 'auletti' ? 'bg-[#e8d2af]' : 'bg-[#EAF6EF]';
   greenText: string = '!text-[#009C73]';
   greenTextHover: string = 'hover:text-[#009C73]';
   greenBgLightHover: string =
-    import.meta.env.VITE_PRODUCT === 'auletti' || import.meta.env.VITE_PARENT_PRODUCT === 'auletti' || import.meta.env.VITE_PRODUCT === 'lka-auletti'
-      ? 'hover:bg-[#efdfc6]'
-      : 'hover:bg-[#dbf0e4]';
+    String(import.meta.env.VITE_PRODUCT).includes('auletti') || import.meta.env.VITE_PARENT_PRODUCT === 'auletti' ? 'hover:bg-[#efdfc6]' : 'hover:bg-[#dbf0e4]';
 
   // Yellow
   yellowText: string = '!text-[#FAB31C]';
@@ -65,7 +54,7 @@ export class Styles {
   blueBorder: string = 'border-[1px] border-[#A0B3D8]';
   blueLightBorder: string = 'border-[1px] border-[#F3F6FC]';
   greenBorder: string =
-    import.meta.env.VITE_PRODUCT === 'auletti' || import.meta.env.VITE_PARENT_PRODUCT === 'auletti' || import.meta.env.VITE_PRODUCT === 'lka-auletti'
+    String(import.meta.env.VITE_PRODUCT).includes('auletti') || import.meta.env.VITE_PARENT_PRODUCT === 'auletti'
       ? 'border-[1px] border-[#DEBE8C]'
       : 'border-[1px] border-[#009C73]';
   redBorder: string = 'border-[1px] border-[#FD2D39]';

package/locales/ru.json

@@ -119,7 +119,7 @@
     "courseChanged": "Изменился курс НБ РК, необходимо вернуть на доработку и сделать перерасчет",
     "noAmountBeforeTypeAndCountries": "Страховая сумма вычисляется после выбора полей типа поездки и страны поездки",
     "noMaxDaysBeforePeriod": "Количество дней пребывания вычисляется после выбора поля периода",
-    "startMoreEnd": "Дата начала не должна превышать дату окончания поездки",
+    "startMoreEnd": "Дата начала не должна равняться или превышать дату окончания поездки",
     "passportNotFound": "Паспорт не найден",
     "wrongInn": "Неправильный ИНН",
     "underageShouldBeLess18": "Несовершеннолетний не может быть старше 18 лет",
@@ -863,7 +863,7 @@
     "agentCommission": "Агентская комиссия не должно превышать 50",
     "agePrePensionInsured": "Пороговое значение по возрасту с 55 по 63",
     "checkDate": "Укажите корректную дату",
-    "searchQueryLen": "Поиск должности должен осуществляться по запросу не менее чем из {len} символов",
+    "searchQueryLen": "Поиск должности должен осуществляться по запросу не менее чем из 4 символов",
     "fixInsSumLimit": "Фиксированная сумма не должна превышать {sum}тг"
   },
   "code": "КСЭ",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.10-beta.16",
+  "version": "0.0.10-beta.18",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",

package/plugins/head.ts

@@ -5,7 +5,7 @@ export default defineNuxtPlugin(() => {
       {
         rel: 'icon',
         type: 'image/x-icon',
-        href: import.meta.env.VITE_PARENT_PRODUCT === 'auletti' || import.meta.env.VITE_PRODUCT === 'auletti' ? '/logo-auletti.svg' : '/logo.svg',
+        href: import.meta.env.VITE_PARENT_PRODUCT === 'auletti' || String(import.meta.env.VITE_PRODUCT).includes('auletti') ? '/logo-auletti.svg' : '/logo.svg',
       },
       { rel: 'preconnect', href: 'https://fonts.googleapis.com' },
       { rel: 'preconnect', href: 'https://fonts.gstatic.com' },

package/store/data.store.ts

@@ -3938,7 +3938,7 @@ export const useDataStore = defineStore('data', {
       const baseAccessRoles = this.isAdmin() || this.isSupport() || this.isAnalyst() || this.isDrn();
       return {
         invoiceInfo: this.isAdmin(),
-        toLKA: this.isAgent() || baseAccessRoles,
+        toLKA: this.isAgent() || this.isManagerHalykBank() || baseAccessRoles,
         toAML: this.isCompliance() || baseAccessRoles,
         toAULETTI: this.isAgentAuletti() || baseAccessRoles,
         toLKA_A: this.isAgentAuletti() || baseAccessRoles,

package/store/member.store.ts

@@ -308,11 +308,11 @@ export const useMemberStore = defineStore('members', {
             // TODO Доработать и менять значение hasAgreement.value => true
             this.dataStore.showToaster(otpResponse.status !== 2 ? 'error' : 'success', otpResponse.statusName, 3000);
             if (otpResponse.status === 2) {
-              member.otpCode = null;
+              member.otpCode = '';
               return true;
             }
             if (otpResponse.status === 4 || otpResponse.status === 5) {
-              member.otpCode = null;
+              member.otpCode = '';
               member.otpTokenId = null;
               return false;
             }

package/types/enum.ts

@@ -60,6 +60,7 @@ export enum PostActions {
   applicationCreated = 'applicationCreated',
   clipboard = 'clipboard',
   toHomePage = 'toHomePage',
+  toHistory = 'toHistory',
   toStatementHistory = 'toStatementHistory',
   toAuth = 'toAuth',
   DOMevent = 'DOMevent',