hl-core 0.0.10-beta.25 → 0.0.10-beta.26

package/api/base.api.ts

@@ -991,22 +991,6 @@ export class ApiClass {
         url: `${this.pensionannuityNew.base}/SetEnpfSharedId/${sharedId}/${infoId}`,
       });
     },
-    calcParentContractSums: async (data: any) => {
-      return await this.axiosCall<void>({
-        method: Methods.POST,
-        baseURL: getStrValuePerEnv('efoBaseApi'),
-        url: `${this.pensionannuityNew.base}/CalcParentContractSums`,
-        data: data,
-      });
-    },
-    reCalculateRefund: async (data: any) => {
-      return await this.axiosCall<void>({
-        method: Methods.POST,
-        baseURL: getStrValuePerEnv('efoBaseApi'),
-        url: `${this.pensionannuityNew.base}/ReCalculateRefund`,
-        data: data,
-      });
-    },
   };
 
   externalServices = {
@@ -1101,16 +1085,6 @@ export class ApiClass {
         },
       });
     },
-    getFileNew: async (id: string) => {
-      return await this.axiosCall({
-        method: Methods.GET,
-        url: `${this.file.base}/api/GeneralSign/DownloadFile/${id}`,
-        responseType: 'arraybuffer',
-        headers: {
-          'Content-Type': 'application/pdf',
-        },
-      });
-    },
     deleteFile: async (data: any) => {
       return await this.axiosCall<void>({
         method: Methods.POST,
@@ -1157,12 +1131,5 @@ export class ApiClass {
         data: data,
       });
     },
-    setActualEnpf: async (data: { processId: string; isOnlineEnpfAgreement: boolean }) => {
-      return await this.axiosCall<void>({
-        method: Methods.POST,
-        url: `${this.file.base}/api/GeneralSign/SetActualEnpfAgreement`,
-        data: data,
-      });
-    },
   };
 }

package/components/Pages/MemberForm.vue

@@ -828,8 +828,7 @@ export default {
     const memberStore = useMemberStore();
     const whichForm = computed(() => route.query.tab as keyof typeof StoreMembers);
     const whichIndex = computed(() => route.query.i as string);
-    const getMember = (whichForm: keyof typeof StoreMembers | 'slaveInsuredForm', whichIndex?: string) =>
-      memberStore.getMemberFromStore(whichForm, Number((whichIndex ? whichIndex : '0') as string))!;
+    const getMember = (whichForm: keyof typeof StoreMembers, whichIndex?: string) => memberStore.getMemberFromStore(whichForm, Number((whichIndex ? whichIndex : '0') as string))!;
     const member = ref(getMember(whichForm.value, whichIndex.value));
     const selectedFamilyMember = ref<Api.GKB.BirthInfo>({});
     const isPanelOpen = ref<boolean>(false);
@@ -844,7 +843,7 @@ export default {
     const isPositionPanelOpen = ref<boolean>(false);
     const isPanelLoading = ref<boolean>(false);
     const isChangingMember = ref<boolean>(false);
-    const isNonResident = computed(() => !useEnv().isProduction && dataStore.isPension && member.value.signOfResidency?.ids === '500011.2');
+    const isNonResident = computed(() => !useEnv().isProduction && dataStore.isPension && member.value.signOfResidency.ids === '500011.2');
     const familyDialog = ref<boolean>(false);
     const deletionDialog = ref<boolean>(false);
     const documentChooseDialog = ref<boolean>(false);
@@ -870,9 +869,7 @@ export default {
     const hasOtp = computed(() => member.value.otpCode && member.value.otpCode.length === useMask().otp.length);
     const isDisabled = computed(() => !memberStore.isStatementEditible(whichForm.value));
     const isTask = computed(() => route.params.taskId === '0' || dataStore.isTask());
-    const isIinPhoneDisabled = computed(() =>
-      dataStore.isPension ? !!member.value.hasAgreement && member.value.phoneNumber && member.value.phoneNumber.length == 11 && !!member.value.iin : member.value.hasAgreement,
-    );
+    const isIinPhoneDisabled = computed(() => member.value.hasAgreement);
     const isFromGBD = computed(() => !!member.value.gosPersonData);
     const gbdDocuments = computed(() => {
       if (hasGBDFLDocSelection && !!member.value.gosPersonData && !!member.value.gosPersonData.documents) {
@@ -899,7 +896,6 @@ export default {
           case formStore.policyholdersRepresentativeFormKey:
             return route.params.taskId !== '0';
           default:
-            if (route.query.tab === 'slaveInsuredForm') return true;
             return false;
         }
       };
@@ -1007,7 +1003,7 @@ export default {
         (whichForm.value === formStore.beneficiaryFormKey && member.value.iin !== formStore.policyholderForm.iin) ||
         (dataStore.isLifetrip && whichForm.value === formStore.insuredFormKey && member.value.isInsuredUnderage),
     );
-    const hasWorkPositionDict = dataStore.isBaiterek && dataStore.isEfoParent;
+    const hasWorkPositionDict = dataStore.isBaiterek;
 
     const birthDateRule = computed(() => {
       const baseDateRule = dataStore.rules.required.concat(dataStore.rules.birthDate);
@@ -1086,13 +1082,12 @@ export default {
         case formStore.policyholderFormKey:
           return route.params.taskId === '0';
         case formStore.insuredFormKey:
+          if (dataStore.isPension && formStore.applicationData.processCode === 19) return route.params.taskId === '0';
           return route.query.id === '0';
         case formStore.policyholdersRepresentativeFormKey:
         case formStore.beneficiaryFormKey:
         case formStore.beneficialOwnerFormKey:
           return route.query.id === '0';
-        default:
-          if (dataStore.isPension && formStore.applicationData.processCode === 2 && route.query.tab === 'slaveInsuredForm') return true;
       }
     };
     const otpCondition = computed(() => {
@@ -1527,7 +1522,6 @@ export default {
     };
 
     const getContragentClick = async (contragent: ContragentType) => {
-      isButtonLoading.value = true;
       await dataStore.serializeContragentData(member.value, contragent);
       fioChooseDialog.value = false;
       isButtonLoading.value = false;
@@ -1671,40 +1665,17 @@ export default {
           }
         }
       }
-      if (whichForm.value === formStore.insuredFormKey || memberFromApplicaiton.processInstanceId === formStore.applicationData.slave?.processInstanceId) {
+      if (whichForm.value === formStore.insuredFormKey) {
         wasInsuredAction.value = true;
         if (dataStore.isPension) {
-          if (route.query.tab === 'slaveInsuredForm') {
-            formStore.applicationData.slave.pensionApp = {
-              ...formStore.applicationData.slave.pensionApp,
-              account: member.value.bankInfo.iik,
-              bankBik: member.value.bankInfo.bik,
-              bankBin: member.value.bankInfo.bankName.ids,
-              bankId: member.value.bankInfo.bankName.id,
-              bankName: member.value.bankInfo.bankName.nameRu,
-              guaranteedPeriod: formStore.applicationData.slave.pensionApp.guaranteedPeriod ?? 0,
-              amount: formStore.applicationData.slave.pensionApp.amount ?? 0,
-              compulsoryContractAmount: formStore.applicationData.slave.pensionApp.compulsoryContractAmount ?? 0,
-              voluntaryContractAmount: formStore.applicationData.slave.pensionApp.voluntaryContractAmount ?? 0,
-              ownFundsRaisAmount: formStore.applicationData.slave.pensionApp.ownFundsRaisAmount ?? 0,
-              compulsoryProfContractAmount: formStore.applicationData.slave.pensionApp.compulsoryProfContractAmount ?? 0,
-            };
-          } else {
-            formStore.applicationData.pensionApp = {
-              ...formStore.applicationData.pensionApp,
-              account: member.value.bankInfo.iik,
-              bankBik: member.value.bankInfo.bik,
-              bankBin: member.value.bankInfo.bankName.ids,
-              bankId: member.value.bankInfo.bankName.id,
-              bankName: member.value.bankInfo.bankName.nameRu,
-              guaranteedPeriod: formStore.applicationData.pensionApp.guaranteedPeriod ?? 0,
-              amount: formStore.applicationData.pensionApp.amount ?? 0,
-              compulsoryContractAmount: formStore.applicationData.pensionApp.compulsoryContractAmount ?? 0,
-              voluntaryContractAmount: formStore.applicationData.pensionApp.voluntaryContractAmount ?? 0,
-              ownFundsRaisAmount: formStore.applicationData.pensionApp.ownFundsRaisAmount ?? 0,
-              compulsoryProfContractAmount: formStore.applicationData.pensionApp.compulsoryProfContractAmount ?? 0,
-            };
-          }
+          formStore.applicationData.pensionApp = {
+            ...formStore.applicationData.pensionApp,
+            account: member.value.bankInfo.iik,
+            bankBik: member.value.bankInfo.bik,
+            bankBin: member.value.bankInfo.bankName.ids,
+            bankId: member.value.bankInfo.bankName.id,
+            bankName: member.value.bankInfo.bankName.nameRu,
+          };
           const data = {
             ...formStore.applicationData.pensionApp,
             transferContractCompany: formStore.applicationData.pensionApp.transferContractCompany?.nameRu ?? null,
@@ -1712,7 +1683,6 @@ export default {
           const isApplicationSaved = await dataStore.setApplication(data);
           if (isApplicationSaved === false) return;
           dataStore.showToaster('info', dataStore.t('toaster.needToRecalculate'), 5000);
-          await dataStore.saveMember(member.value, 'Client', memberFromApplicaiton);
         }
       }
       await router.replace({
@@ -1800,7 +1770,7 @@ export default {
                   isSubmittingForm.value = false;
                   return;
                 }
-                if (formStore.applicationData.pensionApp && whichForm.value === 'insuredForm') {
+                if (formStore.applicationData.pensionApp) {
                   formStore.applicationData.pensionApp.account = member.value.bankInfo.iik;
                   formStore.applicationData.pensionApp.bankBik = member.value.bankInfo.bik;
                   formStore.applicationData.pensionApp.bankBin = member.value.bankInfo.bin;
@@ -1821,7 +1791,7 @@ export default {
                 isSubmittingForm.value = false;
                 return;
               }
-              if (formStore.applicationData.pensionApp && whichForm.value === 'insuredForm') {
+              if (formStore.applicationData.pensionApp) {
                 formStore.applicationData.pensionApp.account = member.value.bankInfo.iik;
                 formStore.applicationData.pensionApp.bankBik = member.value.bankInfo.bik;
                 formStore.applicationData.pensionApp.bankBin = member.value.bankInfo.bin;
@@ -2007,10 +1977,12 @@ export default {
           member.value.documentDate = reformatDate(userDocument.issueDate);
           member.value.documentExpire = reformatDate(userDocument.expireDate);
         }
+
         // const filteredDocuments: DocumentItem[] = dataStore.getFilesByIIN(member.value.iin!.replace(/-/g, '')) as DocumentItem[];
         // if (filteredDocuments && filteredDocuments.length) memberDocument.value = filteredDocuments[0];
       }
       await setDefaultValues();
+      if (Number(formStore.applicationData.processCode) === 4) dataStore.members.insuredApp.isMultiple = true;
       if (hasWorkPositionDict && member.value.positionCode === null) member.value.jobPosition = null;
     };
     onMounted(async () => {
@@ -2060,7 +2032,7 @@ export default {
     );
 
     const onIinInput = () => {
-      if (!!member.value.iin && member.value.iin.length === useMask().iin.length && memberSetting.value?.isMultiple === true) {
+      if (!!member.value.iin && member.value.iin.length === useMask().iin.length && memberSetting.value.isMultiple === true) {
         const alreadyInStatement = formStore[whichForm.value as MultipleMember].findIndex((i: Member) => i.iin === member.value.iin);
         if (alreadyInStatement !== -1 && alreadyInStatement !== Number(whichIndex.value)) {
           dataStore.showToaster('error', dataStore.t('toaster.hasAlreadyMember'), 3000);
@@ -2124,17 +2096,15 @@ export default {
       );
     }
     if (dataStore.isPension) {
-      if (member.value.bankInfo) {
-        watch(
-          () => member.value.bankInfo.bankName,
-          val => {
-            if (val) {
-              member.value.bankInfo.bik = val.code as string;
-              member.value.bankInfo.bin = reformatIin(val.ids as string);
-            }
-          },
-        );
-      }
+      watch(
+        () => member.value.bankInfo.bankName,
+        val => {
+          if (val) {
+            member.value.bankInfo.bik = val.code as string;
+            member.value.bankInfo.bin = reformatIin(val.ids as string);
+          }
+        },
+      );
       watch(
         () => member.value.isDisability,
         val => {

package/components/Pages/ProductConditions.vue

@@ -152,17 +152,6 @@
             @append="openPanel($dataStore.t('form.gender'), $dataStore.gender, 'gender')"
           />
         </div>
-        <base-panel-input
-          v-if="hasCurrency"
-          v-model="productConditionsForm.currency"
-          :value="productConditionsForm.currency.nameRu"
-          :readonly="isDisabled"
-          :clearable="!isDisabled"
-          :label="$dataStore.t('agent.currency')"
-          :rules="$rules.objectRequired"
-          append-inner-icon="mdi mdi-chevron-right"
-          @append="openPanel($dataStore.t('agent.currency'), $constants.currencyList, 'currency')"
-        />
         <base-form-input
           v-if="hasInsStartDate"
           v-model="productConditionsForm.calcDate"
@@ -196,8 +185,8 @@
           v-if="hasPaymentPeriod"
           v-model="productConditionsForm.paymentPeriod"
           :value="productConditionsForm.paymentPeriod?.nameRu"
-          :readonly="isDisabledPaymentPeriod"
-          :clearable="!isDisabledPaymentPeriod"
+          :readonly="isDisabled"
+          :clearable="!isDisabled"
           :rules="$rules.objectRequired"
           :label="$dataStore.t('productConditionsForm.processPaymentPeriod')"
           append-inner-icon="mdi mdi-chevron-right"
@@ -267,10 +256,10 @@
           @onClear="onClearPremiumDollar"
         />
         <base-form-input
-          v-if="hasCurrencySymbols && $dataStore.currencies.usd"
+          v-if="hasCurrency && $dataStore.currencies.usd"
           v-model="$dataStore.currencies.usd"
           :readonly="true"
-          :label="currencySymbolsLabel"
+          :label="$dataStore.t('productConditionsForm.dollarExchangeRateNBRK')"
           :suffix="$constants.currencySymbols.kzt"
         />
         <base-form-input
@@ -312,37 +301,14 @@
       </base-form-section>
       <section v-if="whichProduct === 'pensionannuitynew'">
         <base-animation>
-          <div
-            v-if="(formStore.applicationData.processCode === 19 || formStore.applicationData.processCode === 4) && !isDisabled"
-            :class="[$styles.blueBgLight]"
-            class="h-[52px] rounded-lg flex items-center justify-end px-2 gap-2 mt-4"
-          >
-            <base-btn class="max-w-[300px]" :text="$dataStore.t('buttons.copyToClient')" size="sm" @click="copyRedirect" />
-          </div>
+          <base-btn
+            v-if="formStore.applicationData.processCode === 19 && !isDisabled"
+            :text="$dataStore.t('buttons.copyToClient')"
+            class="mt-4 min-h-[60px]"
+            @click="copyRedirect"
+          />
         </base-animation>
-        <div v-if="formStore.applicationData.processCode === 4" class="flex items-center mt-[14px] h-[48px]">
-          <div :class="[$styles.blueBgLight]" class="flex flex-wrap items-center gap-2 p-1 rounded-t-[8px] h-full">
-            <div
-              class="h-full px-4 py-1 rounded-[8px] cursor-pointer flex items-center"
-              :class="[$styles.textSimple, !isSlavePensionForm ? `${$styles.blueBg} ${$styles.whiteText}` : '']"
-              @click="$router.replace({ query: { ...$route.query, which: undefined, upd: 'true' } })"
-            >
-              Страхователь
-            </div>
-            <div
-              class="h-full px-4 py-1 rounded-[8px] cursor-pointer flex items-center"
-              :class="[$styles.textSimple, isSlavePensionForm ? `${$styles.blueBg} ${$styles.whiteText}` : '']"
-              @click="$router.replace({ query: { ...$route.query, which: 'slave', upd: 'true' } })"
-            >
-              Страхователь 1
-            </div>
-          </div>
-        </div>
-        <base-form-section
-          v-if="formStore.applicationData.processCode !== 2"
-          :title="$dataStore.t('pension.compulsoryAmount&Prof')"
-          :class="[formStore.applicationData.processCode === 4 ? 'mt-0 rounded-tl-none' : '']"
-        >
+        <base-form-section :title="$dataStore.t('pension.compulsoryAmount&Prof')">
           <base-form-input
             v-model="pensionCalculationParams.compulsoryContractAmount"
             :maska="$maska.numbers"
@@ -425,7 +391,7 @@
             v-model="contractDate"
             :maska="$maska.date"
             :rules="!isDisabled ? $rules.required.concat($rules.date) : []"
-            :readonly="isDisabled || formStore.applicationData.processCode === 2"
+            :readonly="isDisabled"
             :clearable="!isDisabled"
             :min-date="new Date()"
             :label="$dataStore.t('pension.contractDate')"
@@ -446,13 +412,6 @@
           <base-form-input v-model="pensionForm.frequencyPayments" disabled :label="$dataStore.t('pension.frequencyPayments')" />
           <base-form-input v-model="pensionForm.periodPayments" disabled :label="$dataStore.t('pension.paymentPeriod')" />
           <base-form-input v-model="pensionForm.insuranceProgramType" disabled :label="$dataStore.t('pension.insuranceProgramType')" />
-          <base-form-input
-            v-if="formStore.applicationData.processCode === 4 && formStore.applicationData.slave?.pensionApp?.amount"
-            :value="Number(formStore.applicationData.pensionApp.amount) + Number(formStore.applicationData.slave.pensionApp.amount)"
-            :active="true"
-            label="Общая страховая премия в тенге"
-            readonly
-          />
           <base-form-input v-model="pensionAmount" readonly :maska="$maska.numbers" :label="$dataStore.t('pension.pensionAmount')" />
           <base-form-input v-model="pensionForm.payment" readonly :maska="$maska.numbers" :label="$dataStore.t('pension.pensionPayment')" />
         </base-form-section>
@@ -822,8 +781,7 @@ export default defineComponent({
     const transferContractDate = ref();
     const transferContractFirstPaymentDate = ref();
     const guaranteedPeriodList = Array.from(Array(35), (e, i) => i + 1);
-    const isSlavePensionForm = computed(() => route.query.which === 'slave');
-    const pensionForm = isSlavePensionForm.value ? formStore.applicationData?.slave?.pensionApp : formStore.applicationData?.pensionApp ?? undefined;
+    const pensionForm = formStore.applicationData?.pensionApp ?? undefined;
     const isEnpfSum = (formStore.applicationData?.isEnpfSum ?? false) && useEnv().isProduction;
 
     const transferContracts = ref<TransferContract[]>([]);
@@ -861,9 +819,7 @@ export default defineComponent({
     const isTask = computed(() => (route.params.taskId === '0' && props.isCalculator === true) || dataStore.isTask() || fromIndexPage.value);
     const isRecalculationDisabled = computed(() => formStore.isDisabled.recalculationForm || formStore.canBeClaimed === true);
     const isUnderwriterRole = computed(() => dataStore.isUnderwriter() || dataStore.isAdmin() || dataStore.isSupport());
-    const insurancePremiumPerMonthRule = computed(() =>
-      !!productConditionsForm.insurancePremiumPerMonth ? (whichProduct.value === 'gons' ? dataStore.rules.required : dataStore.rules.required.concat(dataStore.rules.sums)) : [],
-    );
+    const insurancePremiumPerMonthRule = computed(() => (!!productConditionsForm.insurancePremiumPerMonth ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
     const insurancePremiumPerMonthDisabled = computed(() => {
       if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
         return true;
@@ -873,9 +829,7 @@ export default defineComponent({
       }
       return isDisabled.value;
     });
-    const requestedSumInsuredRule = computed(() =>
-      !!productConditionsForm.requestedSumInsured ? (whichProduct.value === 'gons' ? dataStore.rules.required : dataStore.rules.required.concat(dataStore.rules.sums)) : [],
-    );
+    const requestedSumInsuredRule = computed(() => (!!productConditionsForm.requestedSumInsured ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
     const fixInsSumRule = computed(() =>
       !!productConditionsForm.fixInsSum
         ? dataStore.rules.required.concat(dataStore.rules.sums, dataStore.rules.fixInsSumLimit(getNumber(productConditionsForm.fixInsSum as string), minInsSum.value))
@@ -917,27 +871,18 @@ export default defineComponent({
       if (whichProduct.value === 'halykkazyna') {
         return true;
       }
-      if (whichProduct.value === 'gons' && productConditionsForm.currency.code === 'USD') {
-        return true;
-      }
       return false;
     });
     const hasInsurancePremiumPerMonthInDollar = computed(() => {
       if (whichProduct.value === 'halykkazyna') {
         return true;
       }
-      if (whichProduct.value === 'gons' && productConditionsForm.currency.code === 'USD') {
-        return true;
-      }
       return false;
     });
-    const hasCurrencySymbols = computed(() => {
+    const hasCurrency = computed(() => {
       if (whichProduct.value === 'halykkazyna') {
         return true;
       }
-      if (whichProduct.value === 'gons' && productConditionsForm.currency.code === 'USD') {
-        return true;
-      }
       return false;
     });
     const hasAdbMultiply = computed(() => {
@@ -1040,12 +985,6 @@ export default defineComponent({
       }
       return dataStore.t('productConditionsForm.insurancePremiumAmount');
     });
-    const currencySymbolsLabel = computed(() => {
-      if (whichProduct.value === 'gons') {
-        return dataStore.t('productConditionsForm.exchangeRateSettlementDate');
-      }
-      return dataStore.t('productConditionsForm.dollarExchangeRateNBRK');
-    });
     const isDisabledFixInsSum = computed(() => {
       if (dataStore.isUnderwriter() && !isRecalculationDisabled.value) {
         return false;
@@ -1140,18 +1079,6 @@ export default defineComponent({
       }
       return false;
     });
-    const hasCurrency = computed(() => {
-      if (whichProduct.value === 'gons') {
-        return true;
-      }
-      return false;
-    });
-    const isDisabledPaymentPeriod = computed(() => {
-      if (whichProduct.value === 'gons' && productConditionsForm.currency.code === 'USD') {
-        return true;
-      }
-      return isDisabled.value;
-    });
 
     const pensionCalculationParams = ref({
       compulsoryContractAmount: pensionForm && pensionForm.compulsoryContractAmount && pensionForm.compulsoryContractAmount != 0 ? pensionForm.compulsoryContractAmount : null,
@@ -1163,7 +1090,8 @@ export default defineComponent({
       transferContractCompany: pensionForm && pensionForm.transferContractCompany ? pensionForm.transferContractCompany : null,
     });
 
-    const contractsAmount = computed(() => transferContracts.value?.reduce((accumulator, currentValue) => accumulator + Number(currentValue.transferContractAmount), 0));
+    const contractsAmount = computed(() => transferContracts.value?.reduce((accumulator, currentValue) => accumulator + currentValue.transferContractAmount, 0));
+
     const pensionAmount = computed(() =>
       pensionCalculationParams.value
         ? (Number(pensionCalculationParams.value.compulsoryContractAmount) ?? 0) +
@@ -1452,7 +1380,7 @@ export default defineComponent({
         const calculatedPremiumDollar = getNumber(event.target.value as string);
         if (calculatedPremiumDollar) {
           productConditionsForm.insurancePremiumPerMonth = dataStore.getNumberWithSpaces(productConditionsForm.insurancePremiumPerMonth);
-          if (whichProduct.value === 'halykkazyna' || whichProduct.value === 'gons') {
+          if (whichProduct.value === 'halykkazyna') {
             if (typeof dataStore.currencies.usd === 'number') {
               productConditionsForm.insurancePremiumPerMonthInDollar = dataStore.getNumberWithSpaces(calculatedPremiumDollar / dataStore.currencies.usd);
             } else {
@@ -1480,7 +1408,7 @@ export default defineComponent({
         const calculatedSumDollar = getNumber(event.target.value as string);
         if (calculatedSumDollar) {
           productConditionsForm.requestedSumInsured = dataStore.getNumberWithSpaces(productConditionsForm.requestedSumInsured);
-          if (whichProduct.value === 'halykkazyna' || whichProduct.value === 'gons') {
+          if (whichProduct.value === 'halykkazyna') {
             if (typeof dataStore.currencies.usd === 'number') {
               productConditionsForm.requestedSumInsuredInDollar = dataStore.getNumberWithSpaces(calculatedSumDollar / dataStore.currencies.usd);
             } else {
@@ -1546,7 +1474,7 @@ export default defineComponent({
     };
 
     const filterTermConditions = (term: AddCover) => {
-      if (term.coverTypeCode === 10) {
+      if (term.coverTypeCode === 10 && !props.isCalculator) {
         return !!formStore.insuredForm.find((member: Member) => member.iin === formStore.policyholderForm.iin) === false;
       }
       return true;
@@ -1599,7 +1527,6 @@ export default defineComponent({
                   transferContractFirstPaymentDate: formatedFirstPaymentDate?.toISOString() ?? '',
                   // @ts-ignore
                   transferContractCompany: formatedNameRu,
-                  transferContractCompanyId: transferContracts.value[index].transferContractCompany?.ids,
                   id: transferContracts.value[index].id ?? null,
                 });
               });
@@ -1615,23 +1542,19 @@ export default defineComponent({
                 transferContractAmount: Number(pensionCalculationParams.value.transferContractAmount),
                 transferContractCompany: pensionForm?.transferContractCompany?.nameRu ?? '',
               }),
-              amount: pensionAmount.value,
               transferContracts: formatedContracts,
             };
-            await dataStore.setApplication(
-              isSlavePensionForm.value ? { ...formStore.applicationData.pensionApp, slave: data } : { ...data, slave: formStore.applicationData.slave?.pensionApp ?? null },
-              true,
-            );
+            await dataStore.setApplication(data, true);
           } else {
             if (whichSum.value === 'requestedSumInsured') {
               productConditionsForm.insurancePremiumPerMonth = null;
-              if (whichProduct.value === 'halykkazyna' || whichProduct.value === 'gons') {
+              if (whichProduct.value === 'halykkazyna') {
                 productConditionsForm.insurancePremiumPerMonthInDollar = null;
               }
             }
             if (whichSum.value === 'insurancePremiumPerMonth') {
               productConditionsForm.requestedSumInsured = null;
-              if (whichProduct.value === 'halykkazyna' || whichProduct.value === 'gons') {
+              if (whichProduct.value === 'halykkazyna') {
                 productConditionsForm.requestedSumInsuredInDollar = null;
               }
             }
@@ -1745,10 +1668,6 @@ export default defineComponent({
         if (dataStore.isCalculator) {
           clearFields();
         }
-        if (whichProduct.value === 'gons') {
-          formStore.isDisabled.productConditionsForm = false;
-          dataStore.setFormsDisabled(false);
-        }
         if (whichProduct.value !== 'lifetrip' && whichProduct.value !== 'pensionannuitynew') {
           if (
             (dataStore.isCalculator || route.params.taskId === '0' || fromIndexPage.value) &&
@@ -1792,12 +1711,10 @@ export default defineComponent({
         dataStore.processCode = constants.products[whichProduct.value as keyof typeof constants.products];
         await dataStore.getProcessPaymentPeriod();
       }
-      if (whichProduct.value === 'halykkazyna' || whichProduct.value === 'gons') {
-        await dataStore.getCurrencies();
-      }
       if (whichProduct.value === 'halykkazyna') {
         const kazynaPaymentPeriod = dataStore.processPaymentPeriod.find(i => i.code === 'single');
         if (kazynaPaymentPeriod) productConditionsForm.paymentPeriod = kazynaPaymentPeriod;
+        await dataStore.getCurrencies();
       }
       if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
         productConditionsForm.requestedSumInsured = dataStore.getNumberWithSpaces(
@@ -1807,12 +1724,12 @@ export default defineComponent({
         );
       }
       if (whichProduct.value === 'pensionannuitynew') {
-        contractDate.value = reformatDate(pensionForm.contractDate);
-        dateOfBegin.value = reformatDate(pensionForm.dateOfBegin);
-        transferContractDate.value = reformatDate(pensionForm.transferContractDate);
-        transferContractFirstPaymentDate.value = reformatDate(pensionForm.transferContractFirstPaymentDate);
+        contractDate.value = reformatDate(formStore.applicationData.pensionApp.contractDate);
+        dateOfBegin.value = reformatDate(formStore.applicationData.pensionApp.dateOfBegin);
+        transferContractDate.value = reformatDate(formStore.applicationData.pensionApp.transferContractDate);
+        transferContractFirstPaymentDate.value = reformatDate(formStore.applicationData.pensionApp.transferContractFirstPaymentDate);
         maxDate.value = await dataStore.getVariableData(formStore.applicationData.processCode ?? 19);
-        if (pensionForm.transferContracts && pensionForm.transferContracts.length) {
+        if (transferContracts.value && transferContracts.value.length) {
           transferContracts.value = pensionForm.transferContracts?.map((contract: TransferContract) => {
             contract.transferContractDate = reformatDate(contract.transferContractDate)!;
             contract.transferContractFirstPaymentDate = reformatDate(contract.transferContractFirstPaymentDate)!;
@@ -1853,23 +1770,6 @@ export default defineComponent({
       { immediate: true },
     );
 
-    if (hasCurrency.value) {
-      watch(
-        () => productConditionsForm.currency,
-        async val => {
-          if (val.code === 'USD') {
-            if (!dataStore.processPaymentPeriod.length) {
-              await dataStore.getProcessPaymentPeriod();
-            }
-            const paymentPeriod = dataStore.processPaymentPeriod.find(item => item.nameRu === 'единовременно');
-            if (paymentPeriod) {
-              productConditionsForm.paymentPeriod = paymentPeriod;
-            }
-          }
-        },
-      );
-    }
-
     if (hasInsStartDate.value) {
       watch(
         () => productConditionsForm.calcDate,
@@ -1938,25 +1838,8 @@ export default defineComponent({
       );
     }
 
-    if (whichProduct.value === 'pensionannuitynew') {
-      watch(
-        () => pensionForm.guaranteedPeriod,
-        async () => {
-          if (formStore.applicationData.processCode === 2) {
-            await dataStore.reCalculateRefund(
-              pensionForm.parentContractAmount,
-              pensionForm.parentContractMainAmount,
-              pensionForm.guaranteedPeriod,
-              pensionForm.transferContractIsOppv,
-              pensionForm.compulsoryProfMonthCount ?? 0,
-            );
-          }
-        },
-      );
-    }
-
     const copyRedirect = async () => {
-      const url = await dataStore.api.pensionannuityNew.getEnpfRedirectUrl(String(pensionForm.processInstanceId));
+      const url = await dataStore.api.pensionannuityNew.getEnpfRedirectUrl(String(formStore.applicationData.processInstanceId));
       dataStore.copyToClipboard(url.redirectUrl);
     };
 
@@ -2002,9 +1885,6 @@ export default defineComponent({
       isDisabled,
       isTermsDisabled,
       isUnderwriterForm,
-      hasCurrencySymbols,
-      currencySymbolsLabel,
-      isDisabledPaymentPeriod,
       insurancePremiumPerMonthRule,
       insurancePremiumPerMonthDisabled,
       requestedSumInsuredRule,
@@ -2050,7 +1930,6 @@ export default defineComponent({
       hasCoverPeriod,
       hasInsStartDate,
       hasInsEndDate,
-      isSlavePensionForm,
 
       // Rules
       coverPeriodRule,