hl-core 0.0.9-beta.16 → 0.0.9-beta.17

package/api/base.api.ts

@@ -1,6 +1,6 @@
 import { MemberCodes, Methods } from '../types/enum';
 import { useAxiosInstance } from '../composables/axios';
-import { Value, IDocument } from '../composables/classes';
+import { Value, IDocument, CountryValue } from '../composables/classes';
 
 export class ApiClass {
   private readonly baseURL: string = import.meta.env.VITE_BASE_URL as string;
@@ -128,6 +128,13 @@ export class ApiClass {
     });
   }
 
+  async getBanks() {
+    return await this.axiosCall<Value[]>({
+      method: Methods.GET,
+      url: '/Ekk/api/Contragentinsis/DictionaryItems/Bank',
+    });
+  }
+
   async getDicAnnuityTypeList() {
     return await this.axiosCall<Value[]>({
       method: Methods.GET,
@@ -394,7 +401,7 @@ export class ApiClass {
     });
   }
 
-  async setApplication(data: { policyAppDto: PolicyAppDto; addCoversDto: AddCover[] }) {
+  async setApplication(data: SetApplicationRequest) {
     return await this.axiosCall<void>({
       method: Methods.POST,
       url: `/${this.productUrl}/api/Application/SetApplicationData`,
@@ -543,6 +550,13 @@ export class ApiClass {
     });
   }
 
+  async checkIIN(iin: number) {
+    return await this.axiosCall<boolean>({
+      method: Methods.GET,
+      url: `/Arm/api/Bpm/CheckIIN?iin=${iin}`,
+    });
+  }
+
   async getContragentFromGBDFL(data: { iin: string; phoneNumber: string }) {
     return await this.axiosCall<GBDFLResponse>({
       method: Methods.POST,
@@ -559,6 +573,22 @@ export class ApiClass {
     });
   }
 
+  async getKgd(data: { iinBin: string }) {
+    return await this.axiosCall<KGDResponse>({
+      method: Methods.POST,
+      url: '/externalservices/api/ExternalServices/GetKgd',
+      data: data,
+    });
+  }
+
+  async getGbdUl(data: { userName: string; branchName: string; bin: string }) {
+    return await this.axiosCall({
+      method: Methods.POST,
+      url: '/integration/api/External/GetGbdUl',
+      data: data,
+    });
+  }
+
   async getProcessTariff(code: number | string = 5) {
     return await this.axiosCall({ method: Methods.GET, url: `/Arm/api/Dictionary/ProcessTariff/${code}` });
   }
@@ -621,4 +651,34 @@ export class ApiClass {
       url: `/${this.productUrl}/api/Application/IsCourseChanged?processInstanceId=${processInstanceId}`,
     });
   }
+
+  async getArmDicts<T>(dict: string) {
+    return await this.axiosCall<T>({
+      method: Methods.GET,
+      url: `/Arm/api/Dictionary/GetDictionaryItems/${dict}`,
+    });
+  }
+
+  async getTripInsuranceDaysOptions() {
+    return await this.axiosCall<TripInsuranceDaysOptions>({
+      method: Methods.GET,
+      url: `/${this.productUrl}/api/Application/TripInsuranceDaysOptions`,
+    });
+  }
+
+  async getTripInsuredAmount(data: getTripInsuredAmountRequest) {
+    return this.axiosCall<TripInsuranceAmount>({
+      method: Methods.POST,
+      url: `/${this.productUrl}/api/Application/InsuranceAmountOptions`,
+      data: data,
+    });
+  }
+
+  async getCalculator(data: SetApplicationRequest) {
+    return await this.axiosCall<number>({
+      method: Methods.POST,
+      url: `/${this.productUrl}/api/Application/Calculator`,
+      data: data,
+    });
+  }
 }

package/api/index.ts

@@ -1,4 +1,3 @@
 import { ApiClass } from './base.api';
-import { EfoApiClass } from './efo.api';
 
-export { ApiClass, EfoApiClass };
+export { ApiClass };

package/api/interceptors.ts

@@ -7,6 +7,35 @@ export default function (axios: AxiosInstance) {
       if (dataStore.accessToken) {
         request.headers.Authorization = `Bearer ${dataStore.accessToken}`;
       }
+      if (request.url && request.baseURL) {
+        const host = window.location.hostname;
+        if (import.meta.env.VITE_MODE === 'production') {
+          if (host.startsWith('bpmsrv02') && request.baseURL !== 'http://bpmsrv02.halyklife.nb') {
+            request.baseURL = 'http://bpmsrv02.halyklife.nb';
+          }
+        } else {
+          if (host.startsWith('vega') && request.baseURL !== 'http://vega:84') {
+            request.baseURL = 'http://vega:84';
+          }
+        }
+        if (import.meta.env.VITE_ON_NEW_API === 'true') {
+          if (request.url.includes('api/Application')) {
+            if (request.baseURL === 'http://vega:84') {
+              request.baseURL = 'http://efo-dev.halyklife.nb/api';
+            }
+            if (request.baseURL === 'http://bpmsrv02.halyklife.nb') {
+              request.baseURL = 'http://efo-prod.halyklife.nb/api';
+            }
+            request.url = request.url.replace('/api/Application', '');
+            if (request.baseURL.includes('api/v1/insis')) {
+              request.baseURL = request.baseURL.replace('api/v1/insis', 'efo/api');
+            }
+            if (request.baseURL.includes('api/v1/test/insis')) {
+              request.baseURL = request.baseURL.replace('api/v1/test/insis', 'dev/efo/api');
+            }
+          }
+        }
+      }
       return request;
     },
     (error: AxiosError) => {

package/components/Form/ProductConditionsBlock.vue

@@ -6,23 +6,48 @@
       </p>
       <p v-if="!!subtitle" :class="[$styles.greyText, $styles.textSimple]">{{ subtitle }}</p>
     </div>
-    <div class="mt-6 grid grid-cols-3 lg:grid-cols-5 auto-rows-fr items-center">
+    <div v-if="hasDefault" class="mt-6 grid grid-cols-3 lg:grid-cols-5 auto-rows-fr items-center">
       <span v-if="hasSum" :class="[$styles.textSimple]" class="font-medium">{{ $dataStore.t('productConditionsForm.requestedSumInsured') }}</span>
       <span v-if="hasPremium" :class="[$styles.textSimple]" class="font-medium">{{ $dataStore.t('productConditionsForm.insurancePremiumPerMonth') }}</span>
-      <span v-if="hasPolicyNumber" :class="[$styles.textSimple]" class="font-medium hidden lg:block">{{ $dataStore.t('buttons.InsuranceContract') }}</span>
+
       <span v-if="hasContractDate" :class="[$styles.textSimple]" class="font-medium hidden lg:block">{{ $dataStore.t('productConditionsForm.contractDate') }}</span>
       <span v-if="hasCoverPeriod" :class="[$styles.textSimple]" class="font-medium hidden lg:block">{{ $dataStore.t('productConditionsForm.coverPeriod') }}</span>
       <span v-if="hasPayPeriod" :class="[$styles.textSimple]" class="font-medium hidden lg:block">{{ $dataStore.t('productConditionsForm.payPeriod') }}</span>
     </div>
-    <div class="grid grid-cols-3 lg:grid-cols-5 auto-rows-fr items-center">
+    <div v-if="hasDefault" class="grid grid-cols-3 lg:grid-cols-5 auto-rows-fr items-center">
       <span v-if="hasSum" :class="[amount === null && $styles.emptyBlockCol]">{{ amount }} </span>
       <span v-if="hasPremium" :class="[premium === null && $styles.emptyBlockCol]"> {{ premium }}</span>
       <span v-if="hasPolicyNumber" :class="[policyNumber === null && $styles.emptyBlockCol]" class="hidden lg:block"> {{ policyNumber }}</span>
       <span v-if="hasContractDate" :class="[policyNumber === null && $styles.emptyBlockCol]" class="hidden lg:block"> {{ contractDate }}</span>
       <span v-if="hasCoverPeriod" :class="[coverPeriod === null && $styles.emptyBlockCol]" class="hidden lg:block">{{ coverPeriod }} </span>
-      <span v-if="hasPayPeriod" :class="[paymentPeriod === null && $styles.emptyBlockCol]" class="hidden lg:block">
-        {{ paymentPeriod }}
+      <span v-if="hasPayPeriod" :class="[paymentPeriod === null && $styles.emptyBlockCol]" class="hidden lg:block"> {{ paymentPeriod }}</span>
+      <div
+        class="rounded-br-lg transition-all h-[70px] w-[60px] relative place-self-end"
+        :class="[$styles.blueBgLight, $styles.blueBgLightHover, disabled ? $styles.disabled : 'cursor-pointer']"
+        @click="!disabled && $emit('onMore', { whichForm: 'productConditions' })"
+      >
+        <i class="mdi mdi-dots-vertical text-xl absolute top-[20px] right-[20px]"></i>
+      </div>
+    </div>
+    <div v-if="$dataStore.isLifetrip" class="mt-6 grid grid-cols-3 lg:grid-cols-5 auto-rows-fr items-center">
+      <span :class="[$styles.textSimple]" class="font-medium hidden lg:block">{{ $dataStore.t('calculatorForm.type') }}</span>
+      <span :class="[$styles.textSimple]" class="font-medium">{{ $dataStore.t('calculatorForm.country') }}</span>
+      <span :class="[$styles.textSimple]" class="font-medium hidden lg:block">{{ $dataStore.t('calculatorForm.purpose') }}</span>
+      <span :class="[$styles.textSimple]" class="font-medium">{{ $dataStore.t('calculatorForm.amount') }}</span>
+      <span v-if="hasPolicyNumber" :class="[$styles.textSimple]" class="font-medium hidden lg:block">{{ $dataStore.t('buttons.InsuranceContract') }}</span>
+    </div>
+    <div v-if="$dataStore.isLifetrip" class="grid grid-cols-3 lg:grid-cols-5 auto-rows-fr items-center">
+      <span :class="[calculatorForm.type.nameRu === null && $styles.emptyBlockCol]" class="hidden lg:block">
+        {{ calculatorForm.type.nameRu }}
       </span>
+      <span :class="[calculatorForm.price === null && $styles.emptyBlockCol]"> {{ calculatorForm.countries?.length ? countriesComputed : '' }}</span>
+      <span :class="[calculatorForm.purpose.nameRu === null && $styles.emptyBlockCol]" class="hidden lg:block">
+        {{ calculatorForm.purpose && calculatorForm.purpose.nameRu ? calculatorForm.purpose.nameRu : $dataStore.t('calculatorForm.purpose') }}</span
+      >
+      <span :class="[calculatorForm.amount && calculatorForm.amount.nameRu ? calculatorForm.amount.nameRu : $dataStore.t('calculatorForm.amount') && $styles.emptyBlockCol]"
+        >{{ calculatorForm.amount?.nameRu }}
+      </span>
+
       <div
         class="rounded-br-lg transition-all h-[70px] w-[60px] relative place-self-end"
         :class="[$styles.blueBgLight, $styles.blueBgLightHover, disabled ? $styles.disabled : 'cursor-pointer']"
@@ -68,11 +93,17 @@ export default defineComponent({
         ? formStore.productConditionsForm.paymentPeriod.nameRu
         : null,
     );
-
+    const calculatorForm = formStore.productConditionsForm.calculatorForm;
     const hasSum = computed(() => {
+      if (dataStore.isLifetrip) {
+        return false;
+      }
       return true;
     });
     const hasPremium = computed(() => {
+      if (dataStore.isLifetrip) {
+        return false;
+      }
       return true;
     });
     const hasPolicyNumber = computed(() => {
@@ -88,20 +119,40 @@ export default defineComponent({
       return false;
     });
     const hasCoverPeriod = computed(() => {
+      if (dataStore.isLifetrip) {
+        return false;
+      }
       if (dataStore.isFinCenter()) {
         return false;
       }
       return true;
     });
     const hasPayPeriod = computed(() => {
+      if (dataStore.isLifetrip) {
+        return false;
+      }
       if (dataStore.isFinCenter()) {
         return false;
       }
       return true;
     });
+    const countriesComputed = computed(() => {
+      let message = '';
+      for (let country in calculatorForm.countries) {
+        message += calculatorForm.countries[country as any].nameRu + ', ';
+      }
+      return message.slice(0, -2);
+    });
+    const hasDefault = computed(() => {
+      if (dataStore.isLifetrip) {
+        return false;
+      }
+      return true;
+    });
     return {
       // State
       formStore,
+      calculatorForm,
 
       // Computed
       amount,
@@ -116,6 +167,8 @@ export default defineComponent({
       hasContractDate,
       hasPayPeriod,
       hasCoverPeriod,
+      countriesComputed,
+      hasDefault,
     };
   },
 });

package/components/Input/PanelInput.vue

@@ -24,7 +24,7 @@
     :suffix="suffix"
     @keyup.enter.prevent="submitted"
     @click:control="!props.readonly && $emit('append')"
-    @click:clear="(props.readonly ? false : clearable) && $emit('update:modelValue', new Value())"
+    @click:clear="(props.readonly ? false : clearable) && $emit('update:modelValue', clearValue)"
     @click:append="!props.readonly && $emit('append-out')"
     @click:prepend="!props.readonly && $emit('prepend-out')"
     @click:append-inner="!props.readonly && $emit('append')"
@@ -50,6 +50,10 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    clearValue: {
+      type: Object,
+      default: new Value(),
+    },
     clearable: {
       type: Boolean,
       default: true,

package/components/Pages/MemberForm.vue

@@ -27,6 +27,23 @@
         :title="$dataStore.t('form.personalData')"
         :class="[memberSetting && memberSetting.has === true && memberSetting.isMultiple === true ? 'rounded-t-0 !mt-[-5px]' : 'mt-[14px]']"
       >
+        <base-panel-input
+          v-if="$dataStore.isLifetrip"
+          v-model="member.signOfResidency"
+          :value="member.signOfResidency?.nameRu"
+          :label="$dataStore.t('form.signOfResidency')"
+          :readonly="isDisabled"
+          :clearable="!isDisabled"
+          :rules="residencyRule"
+          append-inner-icon="mdi mdi-chevron-right"
+          @append="openPanel($dataStore.t('form.signOfResidency'), [], 'signOfResidency', $dataStore.getResidents)"
+        />
+        <base-form-toggle
+          v-if="$dataStore.isLifetrip && whichForm === 'insuredForm'"
+          v-model="member.isInsuredUnderage"
+          :title="$dataStore.t('isInsuredUnderage')"
+          :has-border="false"
+        />
         <base-form-input
           v-model="member.phoneNumber"
           :label="$dataStore.t('form.phoneNumber')"
@@ -64,12 +81,31 @@
           :rules="$rules.required.concat($rules.cyrillic)"
         />
         <base-form-input
+          v-if="hasMiddleName"
           v-model.trim="member.middleName"
           :readonly="isDisabled || isFromGBD"
           :clearable="!isDisabled"
           :label="$dataStore.t('form.middleName')"
           :rules="$rules.cyrillicNonRequired"
         />
+        <base-form-input
+          v-if="$dataStore.isLifetrip"
+          v-model.trim="member.lastNameLat"
+          :readonly="isDisabled || isFromGBD"
+          :clearable="!isDisabled"
+          :label="$dataStore.t('form.lastNameLat')"
+          :rules="$rules.required.concat($rules.latin)"
+          :hint="$dataStore.t('labels.checkWithDoc')"
+        />
+        <base-form-input
+          v-if="$dataStore.isLifetrip"
+          v-model.trim="member.firstNameLat"
+          :readonly="isDisabled || isFromGBD"
+          :clearable="!isDisabled"
+          :label="$dataStore.t('form.firstNameLat')"
+          :rules="$rules.required.concat($rules.latin)"
+          :hint="$dataStore.t('labels.checkWithDoc')"
+        />
         <base-form-input
           v-model="member.birthDate"
           :readonly="isDisabled || isFromGBD"
@@ -102,7 +138,7 @@
           @append="openPanel($dataStore.t('form.familyStatus'), [], 'familyStatus', $dataStore.getFamilyStatuses)"
         />
         <base-panel-input
-          v-if="(whichForm === formStore.beneficiaryFormKey || whichForm === formStore.insuredFormKey) && member.iin !== formStore.policyholderForm.iin"
+          v-if="hasRelationDegree"
           v-model="member.relationDegree"
           :value="member.relationDegree?.nameRu"
           :readonly="isDisabled"
@@ -231,7 +267,7 @@
           append-inner-icon="mdi mdi-calendar-blank-outline"
         />
       </base-form-section>
-      <base-form-section :title="$dataStore.t('form.jobData')" v-if="$dataStore.hasJobSection(whichForm)">
+      <base-form-section v-if="$dataStore.hasJobSection(whichForm)" :title="$dataStore.t('form.jobData')">
         <base-form-input v-model.trim="member.job" :label="$dataStore.t('form.job')" :readonly="isDisabled" :clearable="!isDisabled" :rules="$rules.required" />
         <base-form-input v-model.trim="member.jobPosition" :label="$dataStore.t('form.jobPosition')" :readonly="isDisabled" :clearable="!isDisabled" :rules="$rules.required" />
         <base-form-input v-model.trim="member.jobPlace" :label="$dataStore.t('form.jobPlace')" :readonly="isDisabled" :clearable="!isDisabled" :rules="$rules.required" />
@@ -244,7 +280,7 @@
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :label="$dataStore.t('form.Country')"
-          :rules="$rules.objectRequired"
+          :rules="member.isInsuredUnderage ? [] : $rules.objectRequired"
           append-inner-icon="mdi mdi-chevron-right"
           @append="openPanel($dataStore.t('form.Country'), [], 'registrationCountry', $dataStore.getCountries)"
         />
@@ -256,7 +292,7 @@
               :label="$dataStore.t('form.Province')"
               :readonly="isDisabled"
               :clearable="!isDisabled"
-              :rules="$rules.objectRequired"
+              :rules="member.isInsuredUnderage ? [] : $rules.objectRequired"
               append-inner-icon="mdi mdi-chevron-right"
               @append="openPanel($dataStore.t('form.Province'), [], 'registrationProvince', $dataStore.getStates, 'registrationCountry')"
             />
@@ -266,7 +302,7 @@
               :label="$dataStore.t('form.RegionType')"
               :readonly="isDisabled"
               :clearable="!isDisabled"
-              :rules="$rules.objectRequired"
+              :rules="member.isInsuredUnderage ? [] : $rules.objectRequired"
               append-inner-icon="mdi mdi-chevron-right"
               @append="openPanel($dataStore.t('form.RegionType'), [], 'registrationRegionType', $dataStore.getLocalityTypes)"
             />
@@ -277,7 +313,7 @@
               :label="$dataStore.t('form.Region')"
               :readonly="isDisabled"
               :clearable="!isDisabled"
-              :rules="$rules.objectRequired"
+              :rules="member.isInsuredUnderage ? [] : $rules.objectRequired"
               append-inner-icon="mdi mdi-chevron-right"
               @append="openPanel($dataStore.t('form.Region'), [], 'registrationRegion', $dataStore.getRegions, 'registrationProvince')"
             />
@@ -287,7 +323,7 @@
               :label="$dataStore.t('form.City')"
               :readonly="isDisabled"
               :clearable="!isDisabled"
-              :rules="$rules.objectRequired"
+              :rules="member.isInsuredUnderage ? [] : $rules.objectRequired"
               append-inner-icon="mdi mdi-chevron-right"
               @append="openPanel($dataStore.t('form.City'), [], 'registrationCity', $dataStore.getCities, 'registrationProvince')"
             />
@@ -297,14 +333,14 @@
             <base-form-input v-model.trim="member.registrationMicroDistrict" :readonly="isDisabled" :clearable="!isDisabled" :label="$dataStore.t('form.MicroDistrict')" />
             <base-form-input
               v-model.trim="member.registrationStreet"
-              :rules="$rules.required"
+              :rules="member.isInsuredUnderage ? [] : $rules.required"
               :readonly="isDisabled"
               :clearable="!isDisabled"
               :label="$dataStore.t('form.Street')"
             />
             <base-form-input
               v-model.trim="member.registrationNumberHouse"
-              :rules="$rules.required"
+              :rules="member.isInsuredUnderage ? [] : $rules.required"
               :readonly="isDisabled"
               :clearable="!isDisabled"
               :label="$dataStore.t('form.NumberHouse')"
@@ -391,6 +427,7 @@
           />
         </base-fade-transition>
         <base-panel-input
+          v-if="!$dataStore.isLifetrip"
           v-model="member.signOfResidency"
           :value="member.signOfResidency?.nameRu"
           :label="$dataStore.t('form.signOfResidency')"
@@ -474,7 +511,7 @@
           :label="$dataStore.t('form.homePhone')"
           :readonly="isDisabled"
           :clearable="!isDisabled"
-          :rules="whichForm === formStore.beneficiaryFormKey ? [] : $rules.phoneFormat"
+          :rules="whichForm === formStore.beneficiaryFormKey || member.isInsuredUnderage ? [] : $rules.phoneFormat"
         />
         <base-form-input v-model.trim="member.email" :label="$dataStore.t('form.email')" :rules="$rules.email" />
       </base-form-section>
@@ -615,7 +652,12 @@ export default {
             }
             return true;
           }
-          case formStore.insuredFormKey:
+          case formStore.insuredFormKey: {
+            if (dataStore.isLifetrip && member.value.isInsuredUnderage) {
+              return false;
+            }
+            return true;
+          }
           case formStore.beneficialOwnerFormKey:
           case formStore.policyholdersRepresentativeFormKey:
             return true;
@@ -647,7 +689,25 @@ export default {
       return dataStore.controls.hasGKB && !!dataStore.isTask() && perMemberCondition();
     });
     const hasMemberSearch = computed(() => showSaveButton.value && (hasGBDFL.value || hasGKB.value || hasInsis.value));
+    const hasMiddleName = computed(() => {
+      if (dataStore.isLifetrip) {
+        return false;
+      }
+      return true;
+    });
+    const hasRelationDegree = computed(() => {
+      if (dataStore.isLifetrip) {
+        return false;
+      }
+      if ((whichForm.value === formStore.beneficiaryFormKey || whichForm.value === formStore.insuredFormKey) && member.value.iin !== formStore.policyholderForm.iin) {
+        return true;
+      }
+      return false;
+    });
     const hasFamilyStatus = computed(() => {
+      if (dataStore.isLifetrip) {
+        return false;
+      }
       if (whichForm.value === formStore.beneficiaryFormKey) {
         if (dataStore.isBolashak) {
           return false;
@@ -664,7 +724,7 @@ export default {
       return false;
     });
     const hasSignOfIPDL = computed(() => {
-      if (dataStore.isGons) {
+      if (dataStore.isGons || dataStore.isLifetrip) {
         return false;
       }
       return true;
@@ -683,6 +743,9 @@ export default {
           if (dataStore.isBolashak || dataStore.isBaiterek) {
             return dataStore.rules.age18ByDate;
           }
+          if (dataStore.isLifetrip) {
+            return dataStore.rules.ageExceeds80ByDate;
+          }
         }
         return [];
       };
@@ -714,10 +777,16 @@ export default {
     const phoneRule = computed(() => {
       const basePhoneRule = dataStore.rules.required.concat(dataStore.rules.phoneFormat);
       if (whichForm.value === formStore.beneficiaryFormKey) {
+        if (dataStore.isGons || dataStore.isBolashak) {
+          return [];
+        }
         if (member.value.age !== null && Number(member.value.age) < 18) {
           return [];
         }
       }
+      if (member.value.isInsuredUnderage) {
+        return [];
+      }
       return basePhoneRule;
     });
 
@@ -728,6 +797,9 @@ export default {
           return baseResidencyRule.concat(dataStore.rules.noResident);
         }
       }
+      if (dataStore.isLifetrip) {
+        return baseResidencyRule.concat(dataStore.rules.noResidentOffline);
+      }
       return baseResidencyRule;
     });
 
@@ -746,6 +818,7 @@ export default {
       // Add conditions by product
       if (member.value.hasAgreement) return false;
       if (whichForm.value === formStore.beneficiaryFormKey && member.value.age !== null && Number(member.value.age) < 18) return false;
+      if (dataStore.isLifetrip && whichForm.value === formStore.insuredFormKey && member.value.isInsuredUnderage) return false;
       if (!member.value.phoneNumber || (member.value.phoneNumber && member.value.phoneNumber.length !== useMask().phone.length)) return false;
       return getOtpConditionByMember();
     });
@@ -1040,14 +1113,17 @@ export default {
       if (!isSaved) 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)!,
-            memberStore.getMemberFromApplication(formStore.insuredFormKey, formStore.insuredFormIndex),
-          );
-          if (!isInsuredSaved) return false;
-          wasInsuredAction.value = true;
+          const insuredFormIndex = remoteIsInsured.value === true ? 0 : isInsured === true ? formStore.insuredForm.findIndex(i => i.iin === formStore.policyholderForm.iin) : -1;
+          if (insuredFormIndex !== -1) {
+            formStore.insuredForm[insuredFormIndex] = formStore.policyholderForm;
+            const isInsuredSaved = await dataStore.saveMember(
+              member.value,
+              memberStore.getMemberCode(formStore.insuredFormKey)!,
+              memberStore.getMemberFromApplication(formStore.insuredFormKey, insuredFormIndex),
+            );
+            if (!isInsuredSaved) return false;
+            wasInsuredAction.value = true;
+          }
         }
       }
       if (whichForm.value === formStore.insuredFormKey) {
@@ -1080,6 +1156,11 @@ export default {
           return true;
         }
       }
+      if (whichForm.value === formStore.insuredFormKey) {
+        if (dataStore.isLifetrip && member.value.isInsuredUnderage) {
+          return true;
+        }
+      }
       if (member.value.hasAgreement !== true) {
         dataStore.showToaster('error', dataStore.t('toaster.needAgreement'));
         return false;
@@ -1094,9 +1175,14 @@ export default {
         if (v.valid) {
           isSubmittingForm.value = true;
           const docType = member.value.documentType.ids;
-          if (member.value.gotFromInsis === true && (docType === '1UDL' || docType === 'SBI')) {
+          if (member.value.gotFromInsis === true && (docType === '1UDL' || docType === 'SBI' || docType === 'PS')) {
             dataStore.isLoading = true;
-            const ESBDResponse = await validateESBD(docType === '1UDL' ? 1 : 3);
+            const docTypeCodes = {
+              '1UDL': 1,
+              PS: 2,
+              SBI: 3,
+            };
+            const ESBDResponse = await validateESBD(docTypeCodes[docType]);
             if (!ESBDResponse) {
               dataStore.isLoading = false;
               return;
@@ -1175,6 +1261,15 @@ export default {
       if (setDefaults.percentage) {
         setPercentage();
       }
+      if (setDefaults.signOfResidency) {
+        setSignOfResidency();
+      }
+      if (setDefaults.countryOfTaxResidency) {
+        setCountryOfTaxResidency();
+      }
+      if (setDefaults.countryOfCitizenship) {
+        setCountryOfCitizenship();
+      }
     };
 
     const setSectorCode = async () => {
@@ -1184,7 +1279,27 @@ export default {
         member.value.economySectorCode = defaultValue ? defaultValue : new Value();
       }
     };
-
+    const setSignOfResidency = async () => {
+      if (member.value.id === 0 && route.query.id === '0') {
+        const residents = await dataStore.getResidents();
+        const defaultValue = residents.find(item => String(item.nameRu).match(new RegExp('Резидент', 'i'))) as Value;
+        member.value.signOfResidency = defaultValue ? defaultValue : new Value();
+      }
+    };
+    const setCountryOfTaxResidency = async () => {
+      if (member.value.id === 0 && route.query.id === '0') {
+        const taxCountries = await dataStore.getTaxCountries();
+        const defaultValue = taxCountries.find(item => String(item.nameRu).match(new RegExp('Казахстан', 'i'))) as Value;
+        member.value.countryOfTaxResidency = defaultValue ? defaultValue : new Value();
+      }
+    };
+    const setCountryOfCitizenship = async () => {
+      if (member.value.id === 0 && route.query.id === '0') {
+        const citizenshipCountries = await dataStore.getCitizenshipCountries();
+        const defaultValue = citizenshipCountries.find(item => String(item.nameRu).match(new RegExp('Казахстан', 'i'))) as Value;
+        member.value.countryOfCitizenship = 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) {
@@ -1324,6 +1439,30 @@ export default {
         searchQuery.value = '';
       }
     });
+    if (dataStore.isLifetrip) {
+      watch(
+        () => member.value.age,
+        val => {
+          if (val && Number(val) >= 18) {
+            if (member.value.hasAgreement !== true) {
+              member.value.hasAgreement = false;
+            }
+          } else {
+            member.value.hasAgreement = true;
+          }
+          member.value.isInsuredUnderage = Number(val) >= 18 ? false : true;
+        },
+      );
+      watch(
+        () => member.value.isInsuredUnderage,
+        val => {
+          if (val === true && Number(member.value.age) >= 18) {
+            member.value.isInsuredUnderage = false;
+            return dataStore.showToaster('error', dataStore.t('toaster.underageShouldBeLess18'), 3000);
+          }
+        },
+      );
+    }
 
     return {
       // State
@@ -1365,6 +1504,8 @@ export default {
       hasGBDFL,
       hasInsis,
       hasGKB,
+      hasMiddleName,
+      hasRelationDegree,
       hasFamilyStatus,
       hasInsurancePay,
       hasSignOfIPDL,