hl-core 0.0.8-beta.2 → 0.0.8-beta.20

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"
@@ -59,7 +49,7 @@
           :readonly="isDisabled || isFromGBD"
           :clearable="!isDisabled"
           :label="$t('form.birthDate')"
-          :rules="$rules.required.concat($rules.birthDate)"
+          :rules="birthDateRule"
           :maska="$maska.date"
           append-inner-icon="mdi mdi-calendar-blank-outline"
         ></base-form-input>
@@ -221,6 +211,13 @@
         <base-form-input v-model="member.jobPlace" :label="$t('form.jobPlace')" :readonly="isDisabled" :clearable="!isDisabled" :rules="$rules.required"></base-form-input>
       </base-form-section>
       <base-form-section :title="$t('form.placeRegistration')" v-if="$dataStore.hasPlaceSection(whichForm)">
+        <base-form-toggle
+          v-if="whichForm === formStore.beneficiaryFormKey"
+          v-model="sameAddress"
+          :disabled="isDisabled"
+          :has-border="false"
+          :title="$t('form.sameAddress')"
+        ></base-form-toggle>
         <base-panel-input
           v-model="member.registrationCountry"
           :value="member.registrationCountry.nameRu"
@@ -480,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>
@@ -511,10 +525,13 @@ 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);
     const panelValue = ref<Value>(new Value());
     const panelList = ref<Value[]>([]);
     const currentPanel = ref<keyof typeof member.value>();
@@ -546,14 +563,39 @@ export default {
       return generalCondition && perMemberCondtion();
     });
 
-    const hasGBDFL = computed(() => dataStore.controls.hasGBDFL && !hasGKB.value);
+    const hasGBDFL = computed(() => {
+      const perMemberCondition = () => {
+        switch (whichForm.value) {
+          case formStore.beneficiaryFormKey: {
+            if (dataStore.isKazyna || dataStore.isLiferenta) {
+              return !!member.value.iin;
+            }
+            if (dataStore.isBolashak || dataStore.isGons) {
+              return false;
+            }
+            return true;
+          }
+          case formStore.insuredFormKey:
+          case formStore.beneficiaryFormKey:
+          case formStore.beneficialOwnerFormKey:
+          case formStore.policyholdersRepresentativeFormKey:
+            return true;
+          default:
+            return true;
+        }
+      };
+      return dataStore.controls.hasGBDFL && perMemberCondition();
+    });
     const hasInsis = computed(() => dataStore.controls.hasInsis);
     const hasGKB = computed(() => {
-      const byProductCondition = dataStore.isGons || dataStore.isBolashak;
       const perMemberCondition = () => {
         switch (whichForm.value) {
-          case formStore.beneficiaryFormKey:
+          case formStore.beneficiaryFormKey: {
+            if (dataStore.isKazyna || dataStore.isLiferenta) {
+              return !member.value.iin;
+            }
             return member.value.id === 0;
+          }
           case formStore.policyholderFormKey:
           case formStore.insuredFormKey:
           case formStore.beneficialOwnerFormKey:
@@ -563,56 +605,67 @@ export default {
             return false;
         }
       };
-      return dataStore.controls.hasGKB && !!dataStore.isTask() && byProductCondition && perMemberCondition();
+      return dataStore.controls.hasGKB && !!dataStore.isTask() && perMemberCondition();
     });
 
+    const birthDateRule = computed(() => {
+      const baseDateRule = dataStore.rules.required.concat(dataStore.rules.birthDate);
+      const byMemverAndProductRule = () => {
+        if (whichForm.value === formStore.policyholderFormKey) {
+          if (dataStore.isGons || dataStore.isBolashak || dataStore.isBaiterek) {
+            return dataStore.rules.age18ByDate;
+          }
+        }
+        if (whichForm.value === formStore.insuredFormKey) {
+          if (dataStore.isBolashak || dataStore.isBaiterek) {
+            return dataStore.rules.age18ByDate;
+          }
+        }
+        return [];
+      };
+      return baseDateRule.concat(byMemverAndProductRule());
+    });
     const ageRule = computed(() => {
-      const baseAgeRule = dataStore.rules.required.concat(dataStore.rules.numbers);
+      const baseAgeRule = dataStore.rules.numbers;
       const byMemberAndProductRule = () => {
-        switch (whichForm.value) {
-          case formStore.policyholderFormKey: {
-            if (dataStore.isGons || dataStore.isBolashak) {
-              return dataStore.rules.policyholderAgeLimit;
-            }
+        if (whichForm.value === formStore.policyholderFormKey) {
+          if (dataStore.isGons || dataStore.isBolashak || dataStore.isBaiterek) {
+            return dataStore.rules.age18;
           }
-          case formStore.beneficiaryFormKey: {
-            if (dataStore.isBolashak) {
-              return dataStore.rules.beneficiaryAgeLimit;
-            }
+        }
+        if (whichForm.value === formStore.beneficiaryFormKey) {
+          if (dataStore.isBolashak) {
+            return dataStore.rules.beneficiaryAgeLimit;
+          }
+        }
+        if (whichForm.value === formStore.insuredFormKey) {
+          if (dataStore.isBaiterek || dataStore.isBolashak) {
+            return dataStore.rules.age18;
           }
-          default:
-            return [];
         }
+        return [];
       };
       return baseAgeRule.concat(byMemberAndProductRule());
     });
 
     const phoneRule = computed(() => {
       const basePhoneRule = dataStore.rules.required.concat(dataStore.rules.phoneFormat);
-      const byMemberAndProductRule = () => {
-        switch (whichForm.value) {
-          case formStore.beneficiaryFormKey: {
-            if (dataStore.isGons || dataStore.isBolashak) {
-              return [];
-            }
-          }
-          default:
-            return basePhoneRule;
+      if (whichForm.value === formStore.beneficiaryFormKey) {
+        if (dataStore.isGons || dataStore.isBolashak) {
+          return [];
         }
-      };
-      return byMemberAndProductRule();
+      }
+      return basePhoneRule;
     });
 
     const residencyRule = computed(() => {
-      switch (whichForm.value) {
-        case formStore.policyholderFormKey: {
-          if (dataStore.isBolashak || dataStore.isBaiterek) {
-            return dataStore.rules.objectRequired.concat(dataStore.rules.noResident);
-          }
+      const baseResidencyRule = dataStore.rules.objectRequired;
+      if (whichForm.value === formStore.policyholderFormKey) {
+        if (dataStore.isBolashak || dataStore.isBaiterek) {
+          return baseResidencyRule.concat(dataStore.rules.noResident);
         }
-        default:
-          return dataStore.rules.objectRequired;
       }
+      return baseResidencyRule;
     });
 
     const getOtpConditionByMember = () => {
@@ -640,6 +693,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'));
@@ -650,13 +704,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;
     };
@@ -665,6 +727,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)) {
@@ -683,7 +746,7 @@ export default {
           isPanelLoading.value = true;
           newList = await asyncFunction(filterKey, member.value);
         }
-        panelList.value = newList;
+        panelList.value = filterList(newList, key);
         panelValue.value = member.value[currentPanel.value];
         isPanelLoading.value = false;
       } else {
@@ -691,6 +754,22 @@ export default {
       }
     };
 
+    const filterList = (list: Value[], key: string) => {
+      if (dataStore.isBolashak) {
+        if (key === 'relationDegree') {
+          if (whichForm.value === formStore.beneficiaryFormKey) {
+            const beneficiaryRelations = [12, 13, 14, 15, 20, 21, 22, 23];
+            return list.filter(i => beneficiaryRelations.includes(Number(i.ids)));
+          }
+          if (whichForm.value === formStore.insuredFormKey) {
+            const insuredRelations = [6, 7, 10, 11, 12, 13, 14, 15, 20, 21, 22, 23];
+            return list.filter(i => insuredRelations.includes(Number(i.ids)));
+          }
+        }
+      }
+      return list;
+    };
+
     const pickPanelValue = (item: Value) => {
       if (formStore.isDisabled[whichForm.value as keyof typeof formStore.isDisabled] === false) {
         dataStore.panel.open = false;
@@ -702,6 +781,55 @@ export default {
       }
     };
 
+    const setAddress = () => {
+      const beneficiary = formStore.beneficiaryForm[Number(whichIndex.value)];
+      const policyholder = formStore.policyholderForm;
+      if (sameAddress.value === true) {
+        beneficiary.registrationCity = policyholder.registrationCity;
+        beneficiary.registrationCountry = policyholder.registrationCountry;
+        beneficiary.birthPlace = policyholder.birthPlace;
+        beneficiary.registrationMicroDistrict = policyholder.registrationMicroDistrict;
+        beneficiary.registrationNumberApartment = policyholder.registrationNumberApartment;
+        beneficiary.registrationNumberApartment = policyholder.registrationNumberApartment;
+        beneficiary.registrationNumberHouse = policyholder.registrationNumberHouse;
+        beneficiary.registrationProvince = policyholder.registrationProvince;
+        beneficiary.registrationQuarter = policyholder.registrationQuarter;
+        beneficiary.registrationRegion = policyholder.registrationRegion;
+        beneficiary.registrationRegionType = policyholder.registrationRegionType;
+        beneficiary.registrationStreet = policyholder.registrationStreet;
+      } else {
+        if (beneficiary.id === 0) {
+          beneficiary.registrationCity = new Value();
+          beneficiary.registrationCountry = new Value();
+          beneficiary.registrationMicroDistrict = '';
+          beneficiary.registrationNumberApartment = '';
+          beneficiary.registrationNumberApartment = '';
+          beneficiary.registrationNumberHouse = '';
+          beneficiary.registrationProvince = new Value();
+          beneficiary.registrationQuarter = '';
+          beneficiary.registrationRegion = new Value();
+          beneficiary.registrationRegionType = new Value();
+          beneficiary.registrationStreet = '';
+        } else {
+          const country = dataStore.countries.find(i => (i.nameRu as string).match(new RegExp(beneficiary.response?.addresses[0].countryName, 'i')));
+          const city = dataStore.cities.find(i => i.nameRu === beneficiary.response?.addresses[0].cityName.replace('г.', ''));
+          const province = dataStore.states.find(i => i.ids === beneficiary.response?.addresses[0].stateCode);
+          const localityType = dataStore.localityTypes.find(i => i.nameRu === beneficiary.response?.addresses[0].cityTypeName);
+          const region = dataStore.regions.find(i => i.ids == beneficiary.response?.addresses[0].regionCode);
+          beneficiary.registrationCountry = country ?? new Value();
+          beneficiary.registrationCity = city ?? new Value();
+          beneficiary.registrationMicroDistrict = beneficiary.response?.addresses[0].microRaion ?? '';
+          beneficiary.registrationNumberApartment = beneficiary.response?.addresses[0].apartmentNumber ?? '';
+          beneficiary.registrationNumberHouse = beneficiary.response?.addresses[0].blockNumber ?? '';
+          beneficiary.registrationProvince = province ?? new Value();
+          beneficiary.registrationQuarter = beneficiary.response?.addresses[0].kvartal ?? '';
+          beneficiary.registrationRegion = region ?? new Value();
+          beneficiary.registrationRegionType = localityType ?? new Value();
+          beneficiary.registrationStreet = beneficiary.response?.addresses[0].streetName ?? '';
+        }
+      }
+    };
+
     const uploadFile = async (processInstanceId: string | number) => {
       const selectedDocument = dataStore.dicFileTypeList.find((i: Value) => i.nameRu === member.value.documentType.nameRu);
       const formData = new FormData();
@@ -786,41 +914,45 @@ 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;
         return;
       }
       if (!member.value.iin || member.value.iin.length !== useMask().iin.length || !member.value.phoneNumber || member.value.phoneNumber.length !== useMask().phone.length) {
-        dataStore.showToaster('error', dataStore.t('toaster.errorFormField').replace('{text}', 'Номер телефона, ИИН'), 5000);
+        dataStore.showToaster('error', dataStore.t('toaster.errorFormField', { text: 'Номер телефона, ИИН' }), 5000);
         dataStore.panel.open = false;
         isSearchOpen.value = false;
         return;
       }
       isButtonLoading.value = true;
-      await dataStore.getContragentFromGBDFL(member.value.iin, member.value.phoneNumber, whichForm.value, whichIndex.value ? Number(whichIndex.value) : null);
-      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;
         return;
       }
       if (!member.value.iin || member.value.iin.length !== useMask().iin.length) {
-        dataStore.showToaster('error', dataStore.t('toaster.errorFormField').replace('{text}', 'ИИН'), 5000);
+        dataStore.showToaster('error', dataStore.t('toaster.errorFormField', { text: 'ИИН' }), 5000);
         dataStore.panel.open = false;
         isSearchOpen.value = false;
         return;
       }
       isButtonLoading.value = true;
-      await dataStore.getContragent(member.value, whichForm.value, whichIndex.value, false);
+      await dataStore.getContragent(member.value, false);
       isButtonLoading.value = false;
       dataStore.panel.open = false;
       isSearchOpen.value = false;
@@ -854,12 +986,14 @@ export default {
         return false;
       }
       const isInsured = formStore.isPolicyholderInsured;
+      const remoteIsInsured = ref<boolean | null>(null);
       if (whichForm.value == formStore.policyholderFormKey) {
         if (route.params.taskId === '0') {
           try {
             const taskId = await dataStore.startApplication(member.value);
             if (taskId) {
               await dataStore.getApplicationData(taskId, false, false, false, false);
+              remoteIsInsured.value = formStore.applicationData.clientApp.isInsured;
               await router.replace({
                 name: route.name!,
                 params: { taskId: taskId as string },
@@ -882,22 +1016,27 @@ 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 && isInsured === true) {
-        formStore.insuredForm[0] = formStore.policyholderForm;
-        const isInsuredSaved = await dataStore.saveMember(
-          member.value,
-          memberStore.getMemberCode(formStore.insuredFormKey as MemberKeys),
-          memberStore.getMemberFromApplication(formStore.insuredFormKey as MemberKeys, formStore.insuredFormIndex),
-        );
-        if (!isInsuredSaved) return false;
+      if (whichForm.value === formStore.policyholderFormKey) {
+        if (isInsured === true || remoteIsInsured.value === true) {
+          formStore.insuredForm[0] = formStore.policyholderForm;
+          const isInsuredSaved = await dataStore.saveMember(
+            member.value,
+            memberStore.getMemberCode(formStore.insuredFormKey as MemberKeys),
+            memberStore.getMemberFromApplication(formStore.insuredFormKey as MemberKeys, formStore.insuredFormIndex),
+          );
+          if (!isInsuredSaved) return false;
+        }
       }
       await router.replace({
         name: route.name!,
         query: { ...route.query, id: member.value.id },
       });
-      await dataStore.getApplicationData(route.params.taskId, false, false, false, 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) => {
@@ -921,7 +1060,7 @@ export default {
           return true;
         }
       }
-      if (member.value.hasAgreement === false) {
+      if (member.value.hasAgreement !== true) {
         dataStore.showToaster('error', dataStore.t('toaster.needAgreement'));
         return false;
       }
@@ -963,11 +1102,11 @@ export default {
           if (errors) {
             const errorText = errors.querySelector('.v-label.v-field-label');
             if (errorText) {
-              dataStore.showToaster('error', dataStore.t('toaster.errorFormField').replace('{text}', errorText.innerHTML?.replace(/[-<>!//.]/g, '')));
+              dataStore.showToaster('error', dataStore.t('toaster.errorFormField', { text: errorText.innerHTML?.replace(/[-<>!//.]/g, '') }));
             } else {
               const errorFieldText = errors.querySelector('.v-input__control');
               if (errorFieldText) {
-                dataStore.showToaster('error', dataStore.t('toaster.errorFormField').replace('{text}', errorFieldText.innerHTML?.replace(/[-<>!//.]/g, '')));
+                dataStore.showToaster('error', dataStore.t('toaster.errorFormField', { text: errorFieldText.innerHTML?.replace(/[-<>!//.]/g, '') }));
               }
             }
             errors.scrollIntoView({
@@ -982,19 +1121,62 @@ export default {
 
     const checkOtp = async () => {
       if (!member.value.otpCode || member.value.iin?.length !== useMask().iin.length || member.value.phoneNumber?.length !== useMask().phone.length) {
-        dataStore.showToaster('error', dataStore.t('toaster.errorFormField').replace('{text}', dataStore.t('form.otpCode')), 3000);
+        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;
+        }
       }
     };
 
@@ -1020,6 +1202,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 () => {
@@ -1032,6 +1215,13 @@ export default {
       }
     });
 
+    watch(
+      () => sameAddress.value,
+      () => {
+        if (whichForm.value === formStore.beneficiaryFormKey) setAddress();
+      },
+    );
+
     watch(
       () => member.value.percentageOfPayoutAmount,
       val => {
@@ -1058,14 +1248,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,
@@ -1074,6 +1264,7 @@ export default {
           isPanelOpen.value = false;
           isDocumentOpen.value = false;
           isSearchOpen.value = false;
+          isOtpPanelOpen.value = false;
           dataStore.panelAction = null;
         }
       },
@@ -1095,10 +1286,12 @@ export default {
       isPanelOpen,
       isSearchOpen,
       isDocumentOpen,
+      isOtpPanelOpen,
       isPanelLoading,
       isButtonLoading,
       isSubmittingForm,
       documentLoading,
+      otpSending,
       panelValue,
       panelList,
       searchQuery,
@@ -1106,6 +1299,7 @@ export default {
       memberDocument,
       familyDialog,
       selectedFamilyMember,
+      sameAddress,
 
       // Computed
       whichForm,
@@ -1125,6 +1319,7 @@ export default {
       ageRule,
       phoneRule,
       residencyRule,
+      birthDateRule,
 
       // Functions
       searchMember,