hl-core 0.0.8-beta.17 → 0.0.8-beta.18

package/components/Pages/MemberForm.vue

@@ -19,20 +19,10 @@
           :readonly="isDisabled || isIinPhoneDisabled"
           :clearable="!isDisabled"
           :append-inner-icon="otpCondition ? 'mdi mdi-phone-message' : ''"
-          @append="sendOtp(false)"
-          @keyup.enter.prevent="otpCondition ? sendOtp(false) : null"
+          @append="openCustomPanel('otp')"
+          @keyup.enter.prevent="otpCondition ? openCustomPanel('otp') : null"
           :rules="phoneRule"
         ></base-form-input>
-        <base-fade-transition>
-          <base-form-input
-            v-if="otpCondition && member.otpTokenId"
-            v-model="member.otpCode"
-            :label="$t('form.otpCode')"
-            :maska="$maska.otp"
-            :append-inner-icon="hasOtp ? 'mdi mdi-check' : ''"
-            @keyup.enter.prevent="hasOtp ? checkOtp() : null"
-          ></base-form-input>
-        </base-fade-transition>
         <base-form-input
           v-model="member.lastName"
           :readonly="isDisabled || isFromGBD"
@@ -487,6 +477,23 @@
         <base-btn :disabled="documentLoading" :loading="documentLoading" text="Скачать" @click="getFile('download')"></base-btn>
       </div>
     </Teleport>
+    <Teleport v-if="isOtpPanelOpen && !member.hasAgreement" to="#panel-actions">
+      <div :class="[$libStyles.flexColNav]">
+        <base-fade-transition>
+          <base-rounded-input
+            v-if="otpCondition && member.otpTokenId"
+            v-model="member.otpCode"
+            :label="$t('form.otpCode')"
+            :maska="$maska.otp"
+            :append-inner-icon="hasOtp ? 'mdi-cellphone-message text-[17px]' : ''"
+            hide-details
+            @keyup.enter.prevent="hasOtp ? checkOtp() : null"
+          ></base-rounded-input>
+        </base-fade-transition>
+        <base-btn v-if="!member.otpTokenId" :disabled="otpSending" :loading="otpSending" :text="$t('buttons.sendOtp')" @click="sendOtp(false)"></base-btn>
+        <base-btn v-if="member.otpTokenId" :disabled="otpSending" :loading="otpSending" :text="$t('buttons.check')" @click="checkOtp()"></base-btn>
+      </div>
+    </Teleport>
     <base-dialog v-model="familyDialog" :title="$t('dialog.familyMember')" actions="familyDialog">
       <template #actions>
         <base-family-dialog :selected="selectedFamilyMember" @selectFamilyMember="selectFamilyMember" @reset="closeFamilyDialog(true)"></base-family-dialog>
@@ -518,8 +525,10 @@ export default {
     const isButtonLoading = ref<boolean>(false);
     const isSubmittingForm = ref<boolean>(false);
     const documentLoading = ref<boolean>(false);
+    const otpSending = ref<boolean>(false);
     const isSearchOpen = ref<boolean>(false);
     const isDocumentOpen = ref<boolean>(false);
+    const isOtpPanelOpen = ref<boolean>(false);
     const isPanelLoading = ref<boolean>(false);
     const familyDialog = ref<boolean>(false);
     const sameAddress = ref<boolean>(false);
@@ -659,6 +668,7 @@ export default {
         dataStore.panel.open = true;
         isSearchOpen.value = true;
         isDocumentOpen.value = false;
+        isOtpPanelOpen.value = false;
         isPanelOpen.value = false;
       } else {
         dataStore.showToaster('error', dataStore.t('toaster.viewErrorText'));
@@ -669,13 +679,21 @@ export default {
       vForm.value.scrollTo({ top: direction === 'up' ? 0 : screen.height * 10, behavior: 'smooth' });
     };
 
-    const openCustomPanel = (type: 'document' = 'document') => {
+    const openCustomPanel = (type: 'document' | 'otp' = 'document') => {
       dataStore.panelAction = null;
       if (type === 'document' && memberDocument.value) {
         dataStore.panel.title = memberDocument.value.fileTypeName!;
         isDocumentOpen.value = true;
         isSearchOpen.value = false;
         isPanelOpen.value = false;
+        isOtpPanelOpen.value = false;
+      }
+      if (type === 'otp') {
+        dataStore.panel.title = dataStore.t('form.otpCode');
+        isOtpPanelOpen.value = true;
+        isDocumentOpen.value = false;
+        isSearchOpen.value = false;
+        isPanelOpen.value = false;
       }
       dataStore.panel.open = true;
     };
@@ -684,6 +702,7 @@ export default {
       if (!isDisabled.value) {
         isSearchOpen.value = false;
         isDocumentOpen.value = false;
+        isOtpPanelOpen.value = false;
         // Feature
         // const notAllowedToChange = ['gender', 'documentType', 'documentIssuers'];
         // if (member.value.gotFromInsis === false && notAllowedToChange.includes(key)) {
@@ -870,7 +889,7 @@ export default {
     };
 
     const getContragentFromGBDFL = async () => {
-      if (member.value.hasAgreement === false) {
+      if (member.value.hasAgreement !== true) {
         dataStore.showToaster('error', dataStore.t('toaster.needAgreement'), 3000);
         dataStore.panel.open = false;
         isSearchOpen.value = false;
@@ -883,15 +902,19 @@ export default {
         return;
       }
       isButtonLoading.value = true;
-      await dataStore.getContragentFromGBDFL(member.value);
-      member.value.gotFromInsis = true;
+      const response = await dataStore.getContragentFromGBDFL(member.value);
+      if (typeof response === 'boolean') {
+        if (response === true) {
+          member.value.gotFromInsis = true;
+        }
+        dataStore.panel.open = false;
+        isSearchOpen.value = false;
+      }
       isButtonLoading.value = false;
-      dataStore.panel.open = false;
-      isSearchOpen.value = false;
     };
 
     const getContragent = async () => {
-      if (member.value.hasAgreement === false) {
+      if (member.value.hasAgreement !== true) {
         dataStore.showToaster('error', dataStore.t('toaster.needAgreement'), 3000);
         dataStore.panel.open = false;
         isSearchOpen.value = false;
@@ -988,7 +1011,7 @@ export default {
         name: route.name!,
         query: { ...route.query, id: member.value.id },
       });
-      await dataStore.getApplicationData(route.params.taskId, false, true, true, false);
+      await dataStore.getApplicationData(route.params.taskId, false, false, true, false);
       if (dataStore.controls.hasCalculator) {
         if (formStore.additionalInsuranceTermsWithout && formStore.additionalInsuranceTermsWithout.length !== 0) {
           formStore.additionalInsuranceTerms.forEach((term: any) => {
@@ -1012,7 +1035,7 @@ export default {
           return true;
         }
       }
-      if (member.value.hasAgreement === false) {
+      if (member.value.hasAgreement !== true) {
         dataStore.showToaster('error', dataStore.t('toaster.needAgreement'));
         return false;
       }
@@ -1076,17 +1099,27 @@ export default {
         dataStore.showToaster('error', dataStore.t('toaster.errorFormField', { text: dataStore.t('form.otpCode') }), 3000);
         return;
       }
+      otpSending.value = true;
       const checked = await memberStore.checkOtp(member.value);
       if (typeof checked !== 'undefined') {
         member.value.hasAgreement = checked;
       }
+      otpSending.value = false;
+      if (checked === true) {
+        dataStore.panel.open = false;
+      }
     };
 
     const sendOtp = async (onInit = false) => {
+      otpSending.value = true;
       const response = await memberStore.sendOtp(member.value, formStore.applicationData.processInstanceId, onInit);
       if (response) {
         if (member.value.hasAgreement === null) member.value.hasAgreement = response.otpStatus;
+        if (response.otpStatus === true) {
+          dataStore.panel.open = false;
+        }
       }
+      otpSending.value = false;
     };
 
     const setDefaultValues = async () => {
@@ -1094,6 +1127,9 @@ export default {
       if (setDefaults.sectorCode) {
         await setSectorCode();
       }
+      if (setDefaults.percentage) {
+        setPercentage();
+      }
     };
 
     const setSectorCode = async () => {
@@ -1104,6 +1140,21 @@ export default {
       }
     };
 
+    const setPercentage = () => {
+      if (whichForm.value === formStore.beneficiaryFormKey && member.value.id === 0 && route.query.id === '0' && member.value.percentageOfPayoutAmount === null) {
+        if (dataStore.members.beneficiaryApp.isMultiple) {
+          const availablePercentage =
+            100 -
+            formStore.beneficiaryForm.reduce((sum, member) => {
+              return sum + Number(member.percentageOfPayoutAmount);
+            }, 0);
+          if (availablePercentage >= 0 && availablePercentage <= 100) member.value.percentageOfPayoutAmount = availablePercentage;
+        } else {
+          member.value.percentageOfPayoutAmount = 100;
+        }
+      }
+    };
+
     const onInit = async () => {
       if (route.params.taskId === '0' || (route.params.taskId !== '0' && dataStore.isProcessEditable(formStore.applicationData.statusCode))) {
         await dataStore.getSignedDocList(formStore.applicationData.processInstanceId);
@@ -1172,14 +1223,14 @@ export default {
       },
     );
 
-    watch(
-      () => member.value.otpCode,
-      async () => {
-        if (member.value.otpCode && member.value.otpCode.length === useMask().otp.length) {
-          await checkOtp();
-        }
-      },
-    );
+    // watch(
+    //   () => member.value.otpCode,
+    //   async () => {
+    //     if (member.value.otpCode && member.value.otpCode.length === useMask().otp.length) {
+    //       await checkOtp();
+    //     }
+    //   },
+    // );
 
     watch(
       () => dataStore.panel.open,
@@ -1188,6 +1239,7 @@ export default {
           isPanelOpen.value = false;
           isDocumentOpen.value = false;
           isSearchOpen.value = false;
+          isOtpPanelOpen.value = false;
           dataStore.panelAction = null;
         }
       },
@@ -1209,10 +1261,12 @@ export default {
       isPanelOpen,
       isSearchOpen,
       isDocumentOpen,
+      isOtpPanelOpen,
       isPanelLoading,
       isButtonLoading,
       isSubmittingForm,
       documentLoading,
+      otpSending,
       panelValue,
       panelList,
       searchQuery,

package/components/Pages/ProductConditions.vue

@@ -178,7 +178,7 @@
           :clearable="!isDisabled"
           :rules="insurancePremiumPerMonth"
           :label="$t('productConditionsForm.insurancePremiumAmountInDollar')"
-          :suffix="constants.currencySymbols.usd"
+          :suffix="$constants.currencySymbols.usd"
           @input="onInputInsurancePremiumPerMonthInDollar"
         ></base-form-input>
         <base-form-input
@@ -198,7 +198,7 @@
             :clearable="!isDisabled"
             :label="term.coverTypeName"
             append-inner-icon="mdi mdi-chevron-right"
-            :suffix="!!term.amount ? `${$dataStore.getNumberWithSpaces(term.amount)} ${$constants.currencySymbols.kzt}` : ''"
+            :suffix="!!term.amount ? `${$dataStore.getNumberWithSpaces(term.amount)} ${currencySymbolsAddTerm}` : ''"
             @append="openTermPanel(term.coverTypeName, $dataStore.getAdditionalInsuranceTermsAnswers, term.coverTypeId, index)"
           ></base-panel-input>
         </div>
@@ -335,6 +335,12 @@ export default defineComponent({
       }
       return baseCondition;
     });
+    const currencySymbolsAddTerm = computed(() => {
+      if (dataStore.isKazyna) {
+        return constants.currencySymbols.usd
+      }
+      return constants.currencySymbols.kzt
+    });
 
     const toStatement = async () => {
       const statementItem = dataStore.menuItems.find(i => i.id === 'statement');
@@ -666,6 +672,7 @@ export default defineComponent({
       hasInsurancePremiumPerMonthInDollar,
       hasCurrency,
       hasCalculated,
+      currencySymbolsAddTerm,
 
       // Rules
       coverPeriodRule,

package/composables/classes.ts

@@ -800,6 +800,7 @@ export class DataStoreClass {
     // Cтавит значения по дефолту полям
     setDefaults: {
       sectorCode: boolean;
+      percentage: boolean;
     };
     // Проверка на роль при авторизации
     onAuth: boolean;
@@ -938,6 +939,7 @@ export class DataStoreClass {
     this.controls = {
       setDefaults: {
         sectorCode: true,
+        percentage: true,
       },
       onAuth: false,
       hasAnketa: true,

package/locales/en.json

@@ -138,6 +138,8 @@
     "fromGBDFL": "From State Database of Individuals",
     "fromGKB": "From State Credit Bureau",
     "sendSMS": "Send SMS",
+    "sendOtp": "Send OTP",
+    "check": "Check",
     "toPayment": "Go to Payment",
     "calcSum": "Calculate Sum",
     "calcPremium": "Calculate Premium",
@@ -537,7 +539,7 @@
     "otpCode": "Confirmation Code",
     "salesChanell": "Sales Channel",
     "manager": "Manager",
-    "attachManager": "Attach to Manager",
+    "attachManager": "Manager",
     "agent": "Agent"
   },
   "agreementBlock": {

package/locales/kz.json

@@ -138,6 +138,8 @@
     "fromGBDFL": "Государственная база данных физических лиц",
     "fromGKB": "Государственное кредитное бюро",
     "sendSMS": "Отправить СМС",
+    "sendOtp": "Отправить OTP",
+    "check": "Проверить",
     "toPayment": "Перейти к оплате",
     "calcSum": "Рассчитать сумму",
     "calcPremium": "Рассчитать премию",
@@ -537,7 +539,7 @@
     "otpCode": "Код подтверждения",
     "salesChanell": " Канал продаж",
     "manager": "Менеджер",
-    "attachManager": "Прикрепление к менеджеру",
+    "attachManager": "Менеджер",
     "agent": "Агент"
   },
   "agreementBlock": {

package/locales/ru.json

@@ -138,6 +138,8 @@
     "fromGBDFL": "Государственная база данных физических лиц",
     "fromGKB": "Государственное кредитное бюро",
     "sendSMS": "Отправить СМС",
+    "sendOtp": "Отправить OTP",
+    "check": "Проверить",
     "toPayment": "Перейти к оплате",
     "calcSum": "Рассчитать сумму",
     "calcPremium": "Рассчитать премию",
@@ -537,7 +539,7 @@
     "otpCode": "Код подтверждения",
     "salesChanell": " Канал продаж",
     "manager": "Менеджер",
-    "attachManager": "Прикрепление к менеджеру",
+    "attachManager": "Менеджер",
     "agent": "Агент"
   },
   "agreementBlock": {

package/package.json

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

package/store/data.store.js

@@ -727,9 +727,9 @@ export const useDataStore = defineStore('data', {
           cityTypeName: user.registrationRegionType.nameRu,
           blockNumber: user.registrationNumberHouse,
           apartmentNumber: user.registrationNumberApartment,
-          address: `${checkForNull(user.registrationCountry.nameRu)}, ${checkForNull(user.registrationRegionType.nameRu)} ${checkForNull(user.registrationCity.nameRu)}, ул. ${checkForNull(
-            user.registrationStreet,
-          )}, д. ${checkForNull(user.registrationNumberHouse)} кв. ${checkForNull(user.registrationNumberApartment)}`,
+          address: `${checkForNull(user.registrationCountry.nameRu)}, ${checkForNull(user.registrationRegionType.nameRu)} ${checkForNull(
+            user.registrationCity.nameRu,
+          )}, ул. ${checkForNull(user.registrationStreet)}, д. ${checkForNull(user.registrationNumberHouse)} кв. ${checkForNull(user.registrationNumberApartment)}`,
           type: 'H',
         });
 
@@ -1346,6 +1346,7 @@ export const useDataStore = defineStore('data', {
         if (this.isKazyna) {
           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);
         this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(calculationResponse.amount);
@@ -1399,6 +1400,7 @@ export const useDataStore = defineStore('data', {
         if (this.isKazyna) {
           form1.policyAppDto.premiumInCurrency = getNumber(this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar);
           form1.policyAppDto.amountInCurrency = getNumber(this.formStore.productConditionsForm.requestedSumInsuredInDollar);
+          form1.policyAppDto.currencyExchangeRate = this.currencies.usd;
         }
         try {
           let id = this.formStore.applicationData.processInstanceId;
@@ -2199,6 +2201,9 @@ export const useDataStore = defineStore('data', {
       }
     },
     async getContragentFromGBDFL(member) {
+      // null - ожидание
+      // false - ошибка или неправильно
+      // true - успешно и данные получены
       this.isLoading = true;
       try {
         const data = {
@@ -2209,21 +2214,22 @@ export const useDataStore = defineStore('data', {
         if (gbdResponse.status === 'soap:Server') {
           this.showToaster('error', `${gbdResponse.statusName}. Отправьте запрос через некоторое время`, 5000);
           this.isLoading = false;
-          return;
+          return false;
         }
         if (gbdResponse.status === 'PENDING') {
-          this.showToaster('success', this.t('toaster.waitForClient'), 5000);
+          this.showToaster('info', this.t('toaster.waitForClient'), 5000);
           this.isLoading = false;
-          return;
+          return null;
         }
         if (constants.gbdErrors.find(i => i === gbdResponse.status)) {
           if (gbdResponse.status === 'TIMEOUT') {
-            this.showToaster('success', `${gbdResponse.statusName}. Отправьте запрос еще раз`, 5000);
+            this.showToaster('error', `${gbdResponse.statusName}. Отправьте запрос еще раз`, 5000);
+            return null;
           } else {
-            this.showToaster('success', gbdResponse.statusName, 5000);
+            this.showToaster('error', gbdResponse.statusName, 5000);
           }
           this.isLoading = false;
-          return;
+          return false;
         }
         const { person } = parseXML(gbdResponse.content, true, 'person');
         const { responseInfo } = parseXML(gbdResponse.content, true, 'responseInfo');
@@ -2235,10 +2241,12 @@ export const useDataStore = defineStore('data', {
         member.verifyDate = responseInfo.responseDate;
         member.verifyType = 'GBDFL';
         await this.saveInStoreUserGBDFL(person, member);
+        return true;
       } catch (err) {
-        ErrorHandler(err);
+        return ErrorHandler(err);
+      } finally {
+        this.isLoading = false;
       }
-      this.isLoading = false;
     },
     async saveInStoreUserGBDFL(person, member) {
       member.firstName = person.name;

package/store/member.store.ts

@@ -35,8 +35,13 @@ export const useMemberStore = defineStore('members', {
       if (!whichForm) return false;
       if (!this.isStatementEditible(whichForm)) return false;
       if (!this.validateInitiator(false)) return false;
-      if (typeof whichIndex === 'number' && whichIndex > 0) {
-        return true;
+      if (typeof whichIndex === 'number') {
+        if (whichIndex > 0) {
+          return true;
+        }
+        if (whichIndex === 0) {
+          return this.hasMemberData(whichForm, whichIndex);
+        }
       }
       if (this.dataStore.isTask() && this.dataStore.isProcessEditable(this.formStore.applicationData.statusCode)) {
         if (whichForm !== this.formStore.policyholderFormKey) {
@@ -295,8 +300,14 @@ 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;
               return true;
             }
+            if (otpResponse.status === 4 || otpResponse.status === 5) {
+              member.otpCode = null;
+              member.otpTokenId = null;
+              return false;
+            }
           }
         }
         return false;
@@ -310,7 +321,7 @@ export const useMemberStore = defineStore('members', {
     async sendOtp(member: Member, processInstanceId: string | number | null = null, onInit: boolean = false) {
       if (!this.validateInitiator()) return null;
       this.dataStore.isLoading = true;
-      let otpStatus: boolean = false;
+      let otpStatus: boolean | null = null;
       let otpResponse: SendOtpResponse = {};
       try {
         if (member.iin && member.phoneNumber && member.iin.length === useMask().iin.length && member.phoneNumber.length === useMask().phone.length) {
@@ -338,25 +349,22 @@ export const useMemberStore = defineStore('members', {
             if (!!otpResponse) {
               if ('errMessage' in otpResponse && otpResponse.errMessage !== null) {
                 this.dataStore.showToaster('error', otpResponse.errMessage, 3000);
-                return { otpStatus };
+                return { otpStatus: false };
               }
               if ('result' in otpResponse && otpResponse.result === null) {
                 if ('statusName' in otpResponse && !!otpResponse.statusName) {
                   this.dataStore.showToaster('error', otpResponse.statusName, 3000);
-                  return { otpStatus };
+                  return { otpStatus: false };
                 }
                 if ('status' in otpResponse && !!otpResponse.status) {
                   this.dataStore.showToaster('error', otpResponse.status, 3000);
-                  return { otpStatus };
+                  return { otpStatus: false };
                 }
               }
               if ('tokenId' in otpResponse && otpResponse.tokenId) {
                 member.otpTokenId = otpResponse.tokenId;
                 this.dataStore.showToaster('success', this.dataStore.t('toaster.successOtp'), 3000);
               }
-            } else {
-              this.dataStore.showToaster('error', this.dataStore.t('error.noOtpResponse'), 3000);
-              return { otpStatus };
             }
           }
         } else {