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

package/components/Form/FormBlock.vue

@@ -61,7 +61,7 @@
     <div
       v-if="isMultiple && more && !isShort"
       :class="[$libStyles.blueBg, $libStyles.whiteText, $libStyles.textSimple, disabled ? $libStyles.disabled : 'cursor-pointer']"
-      class="rounded-b-lg h-[36px] flex items-center font-medium justify-center"
+      class="transition-all rounded-b-lg h-[36px] flex items-center font-medium justify-center opacity-50 hover:opacity-90"
       @click="!disabled && memberStore.addMember(whichForm)"
     >
       {{ $t('buttons.add') }}

package/components/Input/PanelInput.vue

@@ -21,6 +21,7 @@
     :prepend-inner-icon="prependInnerIcon ? prependInnerIcon : ''"
     :append-inner-icon="appendInnerIcon ? appendInnerIcon : ''"
     :bg-color="bgColor ? bgColor : ''"
+    :suffix="suffix"
     @keyup.enter.prevent="submitted"
     @click:control="!props.readonly && $emit('append')"
     @click:clear="(props.readonly ? false : clearable) && $emit('update:modelValue', new Value())"
@@ -115,6 +116,10 @@ export default defineComponent({
     bgColor: {
       type: String,
     },
+    suffix: {
+      type: String,
+      default: '',
+    },
   },
   emits: ['update:modelValue', 'submitted', 'prepend', 'append', 'prepend-out', 'append-out', 'clear'],
 

package/components/Layout/Header.vue

@@ -1,8 +1,14 @@
 <template>
   <header class="relative w-full h-[70px] text-center font-medium align-middle flex items-center border-b-[1px]" :class="[$libStyles.blueBgLight, $libStyles.textSimple]">
-    <i v-if="hasBack" @click="$emit('onBack')" class="absolute left-5 mdi text-xl cursor-pointer" :class="[backIcon]"></i>
+    <i v-if="hasBack" @click="$emit('onBack')" class="absolute left-5 mdi text-xl cursor-pointer transition-all" :class="[backIcon, backIconAnim]"></i>
     <span class="mx-10">{{ title }}</span>
-    <i v-if="hasMore" @click="$emit('onMore')" class="mdi absolute right-5 text-xl cursor-pointer" :class="[moreIcon, hideMoreOnLg ? 'lg:!hidden' : '']"> </i>
+    <i
+      v-if="hasMore"
+      @click="$emit('onMore')"
+      class="mdi absolute right-5 text-xl cursor-pointer transition-all"
+      :class="[moreIcon, hideMoreOnLg ? 'lg:!hidden' : '', moreIconAnim]"
+    >
+    </i>
   </header>
 </template>
 
@@ -35,14 +41,44 @@ export default defineComponent({
     },
   },
   emits: ['onBack', 'onMore'],
-  setup() {
+  setup(props) {
     const dataStore = useDataStore();
 
     const onClickOutside = () => {
       dataStore.settings.open = false;
     };
 
-    return { onClickOutside };
+    const backIconAnim = computed(() => {
+      const icon = props.backIcon;
+      switch (icon) {
+        case 'mdi-arrow-left':
+        case 'mdi-account-arrow-left':
+          return 'hover:-translate-x-[2px]';
+        case 'mdi-close':
+          return 'hover:scale-110';
+        default:
+          return '';
+      }
+    });
+
+    const moreIconAnim = computed(() => {
+      const icon = props.moreIcon;
+      switch (icon) {
+        case 'mdi-cog-outline':
+          return 'hover:rotate-[30deg]';
+        default:
+          return '';
+      }
+    });
+
+    return {
+      // Computed
+      backIconAnim,
+      moreIconAnim,
+
+      // Functions
+      onClickOutside,
+    };
   },
 });
 </script>

package/components/Pages/Anketa.vue

@@ -45,7 +45,11 @@
             <span :class="[$libStyles.textTitle]" class="border-b-[1px] border-b-[#F3F6FC] p-6 flex items-center justify-between">
               {{ question.first.name }}
               <base-fade-transition>
-                <i v-if="question.first.answerName === 'Да' && secondQuestionList" class="mdi mdi-chevron-right text-2xl cursor-pointer" @click="openFirstPanel(question)"></i>
+                <i
+                  v-if="question.first.answerName === 'Да' && secondQuestionList && secondQuestionList.length"
+                  class="mdi mdi-chevron-right text-2xl cursor-pointer"
+                  @click="openFirstPanel(question)"
+                ></i>
               </base-fade-transition>
             </span>
             <div class="flex items-center justify-start gap-5 px-4 pt-4" :class="[$libStyles.textSimple]">

package/components/Pages/Auth.vue

@@ -17,7 +17,7 @@
     </aside>
     <section v-if="isLogin" class="w-full lg:w-3/4 flex flex-col justify-center">
       <img :class="{ '!block': !$display().lgAndUp.value }" draggable="false" class="hidden w-2/4 sm:w-1/3 mb-10 self-center" src="~/assets/auth-logo.svg" />
-      <div class="flex flex-col items-center mb-8">
+      <div class="flex flex-col items-center mb-8 text-center">
         <h1 class="text-[28px] font-medium mb-1">{{ $t('labels.welcomeHL') }}</h1>
         <span :class="[$libStyles.greyTextDark]" class="text-[16px]">{{ $t('labels.needAuth') }}</span>
       </div>
@@ -53,8 +53,8 @@
         <h1 class="text-[28px] font-medium mb-1">{{ $t('labels.resetPassword') }}</h1>
         <span :class="[$libStyles.greyTextDark]" class="text-[16px]">{{ $t('labels.resetType') }}</span>
       </div>
-      <div class="p-[2px] mb-8 rounded-[12px] border-[1px]" :class="[$libStyles.whiteBg]">
-        <v-tabs v-model="resetPasswordType" density="compact" slider-color="#009c73" class="base-reset-password rounded-[12px] w-2/3 lg:w-[25vw]" :class="[$libStyles.whiteBg]">
+      <div class="p-[2px] mb-8 rounded-[12px] border-[1px] w-2/3 lg:w-[25vw]" :class="[$libStyles.whiteBg]">
+        <v-tabs v-model="resetPasswordType" density="compact" slider-color="#009c73" class="w-full base-reset-password rounded-[12px]" :class="[$libStyles.whiteBg]">
           <v-tab :ripple="false" value="phone"> {{ $t('form.phoneNumber') }} </v-tab>
           <v-tab :ripple="false" value="email"> {{ $t('form.email') }} </v-tab>
         </v-tabs>

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;
@@ -968,6 +991,9 @@ export default {
         }
       }
       const memberFromApplicaiton = memberStore.getMemberFromApplication(whichForm.value as MemberKeys, whichIndex.value ? Number(whichIndex.value) : undefined);
+      if (typeof member.value.id !== 'number' || (typeof member.value.id === 'number' && member.value.id > 0 === false)) {
+        return false;
+      }
       const isSaved = await dataStore.saveMember(member.value, memberStore.getMemberCode(whichForm.value as MemberKeys), memberFromApplicaiton);
       if (!isSaved) return false;
       if (whichForm.value === formStore.policyholderFormKey) {
@@ -985,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) => {
@@ -1009,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;
       }
@@ -1073,16 +1099,59 @@ 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 () => {
+      const setDefaults = dataStore.controls.setDefaults;
+      if (setDefaults.sectorCode) {
+        await setSectorCode();
+      }
+      if (setDefaults.percentage) {
+        setPercentage();
+      }
+    };
+
+    const setSectorCode = async () => {
+      if (member.value.id === 0 && route.query.id === '0') {
+        const sectorList = await dataStore.getSectorCodeList();
+        const defaultValue = sectorList.find(item => item.ids === '500003.9') as Value;
+        member.value.economySectorCode = defaultValue ? defaultValue : new Value();
+      }
+    };
+
+    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;
+        }
       }
     };
 
@@ -1108,6 +1177,7 @@ export default {
         const filteredDocuments: DocumentItem[] = dataStore.getFilesByIIN(member.value.iin!.replace(/-/g, '')) as DocumentItem[];
         if (filteredDocuments && filteredDocuments.length) memberDocument.value = filteredDocuments[0];
       }
+      await setDefaultValues();
     };
 
     onMounted(async () => {
@@ -1153,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,
@@ -1169,6 +1239,7 @@ export default {
           isPanelOpen.value = false;
           isDocumentOpen.value = false;
           isSearchOpen.value = false;
+          isOtpPanelOpen.value = false;
           dataStore.panelAction = null;
         }
       },
@@ -1190,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,6 +198,7 @@
             :clearable="!isDisabled"
             :label="term.coverTypeName"
             append-inner-icon="mdi mdi-chevron-right"
+            :suffix="!!term.amount ? `${$dataStore.getNumberWithSpaces(term.amount)} ${currencySymbolsAddTerm}` : ''"
             @append="openTermPanel(term.coverTypeName, $dataStore.getAdditionalInsuranceTermsAnswers, term.coverTypeId, index)"
           ></base-panel-input>
         </div>
@@ -334,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');
@@ -665,6 +672,7 @@ export default defineComponent({
       hasInsurancePremiumPerMonthInDollar,
       hasCurrency,
       hasCalculated,
+      currencySymbolsAddTerm,
 
       // Rules
       coverPeriodRule,

package/composables/classes.ts

@@ -780,10 +780,16 @@ export class ProductConditions {
 export class MemberSettings {
   has?: boolean;
   isMultiple?: boolean;
-  constructor(options?: { has?: boolean; isMultiple?: boolean }) {
+  required?: boolean;
+  constructor(options?: { has?: boolean; isMultiple?: boolean; required?: boolean }) {
     if (options) {
       this.has = options.has;
       this.isMultiple = options.isMultiple;
+      if (this.has === true) {
+        this.required = options.required;
+      } else {
+        this.required = false;
+      }
     }
   }
 }
@@ -791,6 +797,11 @@ export class MemberSettings {
 export class DataStoreClass {
   // IMP Контроллер фич
   controls: {
+    // Cтавит значения по дефолту полям
+    setDefaults: {
+      sectorCode: boolean;
+      percentage: boolean;
+    };
     // Проверка на роль при авторизации
     onAuth: boolean;
     // Согласие на главной странице
@@ -926,6 +937,10 @@ export class DataStoreClass {
       spokesmanApp: new MemberSettings(),
     };
     this.controls = {
+      setDefaults: {
+        sectorCode: true,
+        percentage: true,
+      },
       onAuth: false,
       hasAnketa: true,
       hasAgreement: true,

package/locales/en.json

@@ -89,7 +89,13 @@
     "needToRecalculate": "You need to recalculate the product conditions",
     "noUrl": "No link available",
     "pickFamilyMember": "Pick a family member",
-    "numberRegistered": "Регистрационный номер успешно записан в реестр"
+    "numberRegistered": "Регистрационный номер успешно записан в реестр",
+    "requiredMember": "В заявке должен присутствовать {text}",
+    "client": "страхователь",
+    "insured": "застрахованный",
+    "beneficiary": "выгодоприобретатель",
+    "beneficialOwner": "бенефициарный собственник",
+    "spokesman": "представитель страхователя"
   },
   "buttons": {
     "createStatement": "Create Statement",
@@ -132,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",
@@ -531,7 +539,7 @@
     "otpCode": "Confirmation Code",
     "salesChanell": "Sales Channel",
     "manager": "Manager",
-    "attachManager": "Attach to Manager",
+    "attachManager": "Manager",
     "agent": "Agent"
   },
   "agreementBlock": {

package/locales/kz.json

@@ -89,7 +89,13 @@
     "needToRecalculate": "Необходимо пересчитать условия продукта",
     "noUrl": "Отсутствует ссылка",
     "pickFamilyMember": "Выберите члена семьи",
-    "numberRegistered": "Регистрационный номер успешно записан в реестр"
+    "numberRegistered": "Регистрационный номер успешно записан в реестр",
+    "requiredMember": "В заявке должен присутствовать {text}",
+    "client": "страхователь",
+    "insured": "застрахованный",
+    "beneficiary": "выгодоприобретатель",
+    "beneficialOwner": "бенефициарный собственник",
+    "spokesman": "представитель страхователя"
   },
   "buttons": {
     "createStatement": "Создать заявку",
@@ -132,6 +138,8 @@
     "fromGBDFL": "Государственная база данных физических лиц",
     "fromGKB": "Государственное кредитное бюро",
     "sendSMS": "Отправить СМС",
+    "sendOtp": "Отправить OTP",
+    "check": "Проверить",
     "toPayment": "Перейти к оплате",
     "calcSum": "Рассчитать сумму",
     "calcPremium": "Рассчитать премию",
@@ -531,7 +539,7 @@
     "otpCode": "Код подтверждения",
     "salesChanell": " Канал продаж",
     "manager": "Менеджер",
-    "attachManager": "Прикрепление к менеджеру",
+    "attachManager": "Менеджер",
     "agent": "Агент"
   },
   "agreementBlock": {

package/locales/ru.json

@@ -89,7 +89,13 @@
     "needToRecalculate": "Необходимо пересчитать условия продукта",
     "noUrl": "Отсутствует ссылка",
     "pickFamilyMember": "Выберите члена семьи",
-    "numberRegistered": "Регистрационный номер успешно записан в реестр"
+    "numberRegistered": "Регистрационный номер успешно записан в реестр",
+    "requiredMember": "В заявке должен присутствовать {text}",
+    "client": "страхователь",
+    "insured": "застрахованный",
+    "beneficiary": "выгодоприобретатель",
+    "beneficialOwner": "бенефициарный собственник",
+    "spokesman": "представитель страхователя"
   },
   "buttons": {
     "createStatement": "Создать заявку",
@@ -132,6 +138,8 @@
     "fromGBDFL": "Государственная база данных физических лиц",
     "fromGKB": "Государственное кредитное бюро",
     "sendSMS": "Отправить СМС",
+    "sendOtp": "Отправить OTP",
+    "check": "Проверить",
     "toPayment": "Перейти к оплате",
     "calcSum": "Рассчитать сумму",
     "calcPremium": "Рассчитать премию",
@@ -531,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.16",
+  "version": "0.0.8-beta.18",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",

package/store/data.store.js

@@ -712,8 +712,8 @@ export const useDataStore = defineStore('data', {
         addressData.push({
           id: 'response' in user && user.response && 'addresses' in user.response ? user.response.addresses[0].id : 0,
           contragentId: user.id,
-          countryCode: user.birthPlace.ids,
-          countryName: user.birthPlace.nameRu,
+          countryCode: user.registrationCountry.ids,
+          countryName: user.registrationCountry.nameRu,
           stateCode: user.registrationProvince.ids,
           stateName: user.registrationProvince.nameRu,
           cityCode: user.registrationCity.code,
@@ -727,9 +727,9 @@ export const useDataStore = defineStore('data', {
           cityTypeName: user.registrationRegionType.nameRu,
           blockNumber: user.registrationNumberHouse,
           apartmentNumber: user.registrationNumberApartment,
-          address: `${checkForNull(user.birthPlace.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',
         });
 
@@ -742,9 +742,11 @@ export const useDataStore = defineStore('data', {
         };
 
         const personId = await this.api.saveContragent(data);
-        if (personId) {
+        if (personId > 0) {
           await this.getContragentById(personId, whichForm, false, whichIndex);
           user.otpTokenId = null;
+        } else {
+          return false;
         }
       } catch (err) {
         this.isLoading = false;
@@ -1344,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);
@@ -1397,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;
@@ -1972,22 +1976,45 @@ export const useDataStore = defineStore('data', {
         this.showToaster('error', this.t('toaster.notSavedMember', { text: 'страхователя' }), 3000);
         return false;
       }
-      if (!this.isGons) {
+      if (this.members.insuredApp.has) {
         if (this.validateMultipleMembers(this.formStore.insuredFormKey, 'insuredApp', 'застрахованных') === false) {
           return false;
         }
+        if (this.members.insuredApp.required) {
+          const inStatement = this.formStore.insuredForm.every(i => i.id > 0);
+          if (inStatement === false) {
+            this.showToaster('error', this.t('toaster.requiredMember', { text: this.t('toaster.insured') }));
+            return false;
+          }
+        }
       }
-      if (this.validateMultipleMembers(this.formStore.beneficiaryFormKey, 'beneficiaryApp', 'выгодоприобретателей') === false) {
-        return false;
+      if (this.members.beneficiaryApp.has) {
+        if (this.validateMultipleMembers(this.formStore.beneficiaryFormKey, 'beneficiaryApp', 'выгодоприобретателей') === false) {
+          return false;
+        }
+        if (this.members.beneficiaryApp.required) {
+          const inStatement = this.formStore.beneficiaryForm.every(i => i.id > 0);
+          if (inStatement === false) {
+            this.showToaster('error', this.t('toaster.requiredMember', { text: this.t('toaster.beneficiary') }));
+            return false;
+          }
+        }
       }
-      if (!this.isGons) {
+      if (this.members.beneficialOwnerApp.has) {
         if (this.formStore.isActOwnBehalf === false) {
           if (this.validateMultipleMembers(this.formStore.beneficialOwnerFormKey, 'beneficialOwnerApp', 'бенефициарных собственников') === false) {
             return false;
           }
         }
+        if (this.members.beneficialOwnerApp.required) {
+          const inStatement = this.formStore.beneficialOwnerForm.every(i => i.id > 0);
+          if (inStatement === false) {
+            this.showToaster('error', this.t('toaster.requiredMember', { text: this.t('toaster.beneficialOwner') }));
+            return false;
+          }
+        }
       }
-      if (!this.isGons) {
+      if (this.members.spokesmanApp.has) {
         if (this.formStore.hasRepresentative) {
           if (this.formStore.applicationData.spokesmanApp && this.formStore.policyholdersRepresentativeForm.id !== this.formStore.applicationData.spokesmanApp.insisId) {
             this.showToaster(
@@ -2000,6 +2027,13 @@ export const useDataStore = defineStore('data', {
             return false;
           }
         }
+        if (this.members.spokesmanApp.required) {
+          const inStatement = this.formStore.policyholdersRepresentativeForm.id > 0;
+          if (inStatement === false) {
+            this.showToaster('error', this.t('toaster.requiredMember', { text: this.t('toaster.spokesman') }));
+            return false;
+          }
+        }
       }
       if (this.controls.hasAttachment) {
         const areValid = this.formStore.SaleChanellPolicy.nameRu && this.formStore.RegionPolicy.nameRu && this.formStore.ManagerPolicy.nameRu && this.formStore.AgentData.fullName;
@@ -2167,6 +2201,9 @@ export const useDataStore = defineStore('data', {
       }
     },
     async getContragentFromGBDFL(member) {
+      // null - ожидание
+      // false - ошибка или неправильно
+      // true - успешно и данные получены
       this.isLoading = true;
       try {
         const data = {
@@ -2177,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');
@@ -2203,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) {
@@ -159,8 +164,9 @@ export const useMemberStore = defineStore('members', {
         } else {
           if (memberData) await this.dataStore.api.deleteMember(memberCode, memberData.id as number);
         }
+        const cleared = this.clearMember(whichForm, whichIndex);
         if (memberData && refetch) await this.dataStore.getApplicationData(taskId, true, true, true, false);
-        return this.clearMember(whichForm, whichIndex);
+        return cleared;
       } catch (err) {
         console.log(err);
         return ErrorHandler(err);
@@ -202,6 +208,12 @@ export const useMemberStore = defineStore('members', {
 
       if (successTranser.value === true) {
         if (toIndex.value !== null && taskId !== '0' && this.formStore.applicationData.processInstanceId !== 0) {
+          if (
+            typeof this.formStore[to][toIndex.value].id !== 'number' ||
+            (typeof this.formStore[to][toIndex.value].id === 'number' && this.formStore[to][toIndex.value].id > 0 === false)
+          ) {
+            return false;
+          }
           const hasSaved = await this.dataStore.saveMember(this.formStore[to][toIndex.value], this.getMemberCode(to), this.getMemberFromApplication(to, toIndex.value));
           if (hasSaved) {
             await this.dataStore.getApplicationData(taskId, false, true, true, false);
@@ -288,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;
@@ -303,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) {
@@ -331,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 {