hl-core 0.0.10-beta.3 → 0.0.10-beta.30

package/components/Pages/ProductConditions.vue

@@ -1,6 +1,6 @@
 <template>
-  <section class="flex flex-col gap-4 px-[10px]">
-    <v-form ref="vForm" @submit="submitForm" class="overflow-y-scroll" :class="[!$dataStore.isCalculator && isCalculator && hasCalculated ? 'max-h-[73svh]' : 'max-h-[80svh]']">
+  <section class="flex flex-col gap-4 px-[10px]" :class="[$styles.scrollPage]">
+    <v-form ref="vForm" @submit="submitForm">
       <base-message-block
         v-if="isCalculator"
         class="mt-4"
@@ -36,7 +36,14 @@
         <base-form-input v-model="formStore.policyholderForm.gender.nameRu" class="mb-4" :label="$dataStore.t('form.gender')" :readonly="true" />
       </base-form-section>
       <base-form-section
-        v-if="isUnderwriterRole && $dataStore.members.insuredApp.has === true && whichProduct !== 'lifebusiness' && whichProduct !== 'gns' && whichProduct !== 'pensionannuitynew'"
+        v-if="
+          isUnderwriterRole &&
+          $dataStore.members.insuredApp.has === true &&
+          whichProduct !== 'lifebusiness' &&
+          whichProduct !== 'gns' &&
+          whichProduct !== 'pensionannuitynew' &&
+          whichProduct !== 'lifetrip'
+        "
         :title="$dataStore.t('insuredForm')"
       >
         <div v-for="(insured, index) of formStore.insuredForm" :key="index">
@@ -49,7 +56,7 @@
         </div>
       </base-form-section>
       <base-form-section
-        v-if="isUnderwriterRole && whichProduct !== 'lifebusiness' && whichProduct !== 'gns' && whichProduct !== 'pensionannuitynew'"
+        v-if="isUnderwriterRole && whichProduct !== 'lifebusiness' && whichProduct !== 'gns' && whichProduct !== 'pensionannuitynew' && whichProduct !== 'balam'"
         :title="$dataStore.t('recalculationInfo')"
       >
         <base-form-input
@@ -145,14 +152,25 @@
             @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'), currencyListFiltered, 'currency')"
+        />
         <base-form-input
           v-if="hasInsStartDate"
           v-model="productConditionsForm.calcDate"
           :maska="$maska.date"
-          :readonly="isDisabled"
-          :clearable="!isDisabled"
+          :readonly="isDisabledInsStartDate"
+          :clearable="!isDisabledInsStartDate"
           :label="$dataStore.t('labels.insuranceStartDate')"
-          :rules="$rules.required"
+          :rules="formStore.lfb.add ? $rules.required : $rules.required.concat($rules.checkPastDate)"
           append-inner-icon="mdi mdi-calendar-blank-outline"
         />
         <base-form-input
@@ -178,8 +196,8 @@
           v-if="hasPaymentPeriod"
           v-model="productConditionsForm.paymentPeriod"
           :value="productConditionsForm.paymentPeriod?.nameRu"
-          :readonly="isDisabled"
-          :clearable="!isDisabled"
+          :readonly="isDisabledPaymentPeriod"
+          :clearable="!isDisabledPaymentPeriod"
           :rules="$rules.objectRequired"
           :label="$dataStore.t('productConditionsForm.processPaymentPeriod')"
           append-inner-icon="mdi mdi-chevron-right"
@@ -249,10 +267,10 @@
           @onClear="onClearPremiumDollar"
         />
         <base-form-input
-          v-if="hasCurrency && $dataStore.currencies.usd"
+          v-if="hasCurrencySymbols && $dataStore.currencies.usd"
           v-model="$dataStore.currencies.usd"
           :readonly="true"
-          :label="$dataStore.t('productConditionsForm.dollarExchangeRateNBRK')"
+          :label="currencySymbolsLabel"
           :suffix="$constants.currencySymbols.kzt"
         />
         <base-form-input
@@ -289,11 +307,18 @@
           :label="$dataStore.t('productConditionsForm.agencyPart')"
           :readonly="isDisabledAgentCommission"
           :clearable="!isDisabledAgentCommission"
-          :rules="$rules.required.concat($rules.numbers, $rules.agentCommission)"
+          :rules="formStore.lfb.add ? $rules.required : $rules.required.concat($rules.numbers, $rules.agentCommission)"
         />
       </base-form-section>
       <section v-if="whichProduct === 'pensionannuitynew'">
-        <base-btn v-if="formStore.applicationData.processCode === 19 && !isDisabled" :text="$dataStore.t('buttons.copyToClient')" class="mt-4" @click="copyRedirect" />
+        <base-animation>
+          <base-btn
+            v-if="formStore.applicationData.processCode === 19 && !isDisabled"
+            :text="$dataStore.t('buttons.copyToClient')"
+            class="mt-4 min-h-[60px]"
+            @click="copyRedirect"
+          />
+        </base-animation>
         <base-form-section :title="$dataStore.t('pension.compulsoryAmount&Prof')">
           <base-form-input
             v-model="pensionCalculationParams.compulsoryContractAmount"
@@ -334,48 +359,43 @@
             :label="$dataStore.t('pension.ownFundsRaisAmount')"
           />
         </base-form-section>
-        <base-form-section :title="$dataStore.t('pension.companyName')">
-          <base-panel-input
-            v-model="pensionForm.transferContractCompany"
-            :value="pensionForm.transferContractCompany?.nameRu"
-            :label="$dataStore.t('pension.transferContractCompany')"
-            :readonly="isDisabled"
-            :clearable="!isDisabled"
-            append-inner-icon="mdi mdi-chevron-right"
-            @append="openPanel($dataStore.t('pension.transferContractCompany'), $dataStore.transferContractCompanies, 'transferContractCompany', $dataStore.getInsuranceCompanies)"
-          />
-          <base-form-input
-            v-model="transferContractDate"
-            :maska="$maska.date"
-            :label="$dataStore.t('pension.contractDate')"
-            :readonly="isDisabled"
-            :clearable="!isDisabled"
-            append-inner-icon="mdi mdi-calendar-blank-outline"
-            :rules="pensionForm.transferContractCompany?.ids ? $rules.required.concat($rules.date) : []"
-          />
-          <base-form-input
-            v-model="pensionForm.transferContractNumber"
-            :label="$dataStore.t('pension.globalId')"
-            :readonly="isDisabled"
-            :clearable="!isDisabled"
-            :rules="pensionForm.transferContractCompany?.ids ? $rules.required : []"
-          />
-          <base-form-input
-            v-model="transferContractFirstPaymentDate"
-            :maska="$maska.date"
-            :label="$dataStore.t('pension.transferContractFirstPaymentDate')"
-            append-inner-icon="mdi mdi-calendar-blank-outline"
-            :readonly="isDisabled"
-            :clearable="!isDisabled"
-            :rules="pensionForm.transferContractCompany?.ids ? $rules.required.concat($rules.date) : []"
-          />
-          <base-form-input
-            v-model="pensionCalculationParams.transferContractAmount"
-            :maska="$maska.numbers"
-            :label="$dataStore.t('pension.transferContractAmount')"
-            :rules="pensionForm.transferContractCompany?.ids ? $rules.required : []"
-          />
-          <base-form-toggle v-model="pensionForm.transferContractIsOppv" :disabled="isDisabled" :has-border="false" :title="$dataStore.t('pension.isOPPVTransfer')" />
+        <base-form-section v-if="formStore.applicationData.processCode !== 2 && !isDisabled" :title="$dataStore.t('pension.companyName')">
+          <base-btn :text="$dataStore.t('buttons.add')" size="sm" :btn="$styles.blueBtn" @click="addTransferContract" />
+          <section v-for="(contract, index) in transferContracts" class="py-2">
+            <base-panel-input
+              v-model="contract.transferContractCompany"
+              :value="contract.transferContractCompany?.nameRu"
+              :label="$dataStore.t('pension.transferContractCompany')"
+              :readonly="isDisabled"
+              :clearable="!isDisabled"
+              append-inner-icon="mdi mdi-chevron-right"
+              @append="
+                openPanel($dataStore.t('pension.transferContractCompany'), $dataStore.transferContractCompanies, 'transferContractCompany', $dataStore.getInsuranceCompanies)
+              "
+              @click="contractIndex = index"
+            />
+            <base-form-input
+              v-model="contract.transferContractDate"
+              :maska="$maska.date"
+              :label="$dataStore.t('pension.contractDate')"
+              :readonly="isDisabled"
+              :clearable="!isDisabled"
+              append-inner-icon="mdi mdi-calendar-blank-outline"
+            />
+            <base-form-input v-model="contract.transferContractNumber" :label="$dataStore.t('pension.globalId')" :readonly="isDisabled" :clearable="!isDisabled" />
+            <base-form-input v-model="contract.transferContractRegNumber" :label="$dataStore.t('pension.transferRegNumber')" :readonly="isDisabled" :clearable="!isDisabled" />
+            <base-form-input
+              v-model="contract.transferContractFirstPaymentDate"
+              :maska="$maska.date"
+              :label="$dataStore.t('pension.transferContractFirstPaymentDate')"
+              append-inner-icon="mdi mdi-calendar-blank-outline"
+              :readonly="isDisabled"
+              :clearable="!isDisabled"
+            />
+            <base-form-input v-model="contract.transferContractAmount" :maska="$maska.numbers" :label="$dataStore.t('pension.transferContractAmount')" />
+            <base-form-toggle v-model="contract.transferContractIsOppv" :disabled="isDisabled" :has-border="false" :title="$dataStore.t('pension.isOPPVTransfer')" />
+            <base-btn :text="$dataStore.t('buttons.delete')" size="sm" :btn="$styles.whiteBtn" @click="removeTransferContract(index)" />
+          </section>
         </base-form-section>
         <base-form-section :title="$dataStore.t('pension.paymentTerms')">
           <base-form-input
@@ -619,17 +639,46 @@
         </div>
       </base-form-section>
     </v-form>
-    <base-btn v-if="!$dataStore.isCalculator && isCalculator && hasCalculated" :btn="$styles.greenLightBtn" :text="$dataStore.t('buttons.toStatement')" @click="toStatement" />
-    <base-btn v-if="!isDisabled && $dataStore.isPension && isTask" :text="$dataStore.t('buttons.save')" :loading="$dataStore.isLoading" type="submit" @click="submitForm" />
-    <base-btn
-      v-if="$dataStore.isCalculator ? true : !isDisabled && isTask && ($dataStore.isInitiator() || $dataStore.isUnderwriter()) && !$dataStore.isPension"
-      :loading="isCalculating"
-      :text="$dataStore.t('buttons.calculate')"
-      @click="submitForm"
-    />
+    <base-animation>
+      <base-btn
+        v-if="!$dataStore.isCalculator && isCalculator && hasCalculated"
+        :btn="$styles.greenLightBtn"
+        :text="$dataStore.t('buttons.toStatement')"
+        class="min-h-[60px]"
+        @click="toStatement"
+      />
+    </base-animation>
+    <base-animation>
+      <base-btn
+        v-if="!isDisabled && $dataStore.isPension && isTask"
+        :text="$dataStore.t('buttons.save')"
+        :loading="$dataStore.isLoading"
+        class="min-h-[60px]"
+        type="submit"
+        @click="submitForm"
+      />
+    </base-animation>
+    <base-animation>
+      <base-btn
+        v-if="$dataStore.isCalculator ? true : !isDisabled && isTask && ($dataStore.isInitiator() || $dataStore.isUnderwriter()) && !$dataStore.isPension"
+        :loading="isCalculating"
+        class="min-h-[60px]"
+        :text="$dataStore.t('buttons.calculate')"
+        @click="submitForm"
+      />
+    </base-animation>
     <div v-if="$dataStore.isTask() && $dataStore.isUnderwriter() && !isRecalculationDisabled" class="flex gap-3">
-      <base-btn :text="$dataStore.t('buttons.calcSum')" v-if="hasCalcSum" type="submit" @click.prevent="underwriterCalculate('sum')" :loading="isCalculating" />
-      <base-btn :text="$dataStore.t('buttons.calcPremium')" type="submit" @click.prevent="underwriterCalculate('premium')" :loading="isCalculating" />
+      <base-animation>
+        <base-btn
+          v-if="hasCalcSum"
+          class="min-h-[60px]"
+          :text="$dataStore.t('buttons.calcSum')"
+          type="submit"
+          @click.prevent="underwriterCalculate('sum')"
+          :loading="isCalculating"
+        />
+      </base-animation>
+      <base-btn class="min-h-[60px]" :text="$dataStore.t('buttons.calcPremium')" type="submit" @click.prevent="underwriterCalculate('premium')" :loading="isCalculating" />
     </div>
     <Teleport v-if="isPanelOpen" to="#right-panel-actions">
       <div :class="[$styles.scrollPage]" class="flex flex-col items-center">
@@ -695,7 +744,8 @@
 </template>
 
 <script lang="ts">
-import { Member, Value, CountryValue, CalculatorForm } from '../../composables/classes';
+import { Member, Value, CountryValue, CalculatorForm, TransferContract } from '../../composables/classes';
+import type { Projects, AddCover, AddCoverAnswer } from '../../types';
 
 export default defineComponent({
   props: {
@@ -745,6 +795,9 @@ export default defineComponent({
     const pensionForm = formStore.applicationData?.pensionApp ?? undefined;
     const isEnpfSum = (formStore.applicationData?.isEnpfSum ?? false) && useEnv().isProduction;
 
+    const transferContracts = ref<TransferContract[]>([]);
+    const contractsValue = ref<Value[]>([]);
+    const contractIndex = ref<number>(0);
     const isMultiplePanelOpen = ref<boolean>(false);
     const multiplePanelValue = ref<CountryValue>(new CountryValue());
     const multiplePanelList = ref<CountryValue[]>([]);
@@ -768,6 +821,9 @@ export default defineComponent({
       if (whichProduct.value === 'gons') {
         return true;
       }
+      if (formStore.lfb.add && (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns')) {
+        return true;
+      }
       if ((whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') && dataStore.isUnderwriter()) {
         return false;
       }
@@ -777,7 +833,9 @@ 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 ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
+    const insurancePremiumPerMonthRule = computed(() =>
+      !!productConditionsForm.insurancePremiumPerMonth ? (whichProduct.value === 'gons' ? dataStore.rules.required : dataStore.rules.required.concat(dataStore.rules.sums)) : [],
+    );
     const insurancePremiumPerMonthDisabled = computed(() => {
       if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
         return true;
@@ -787,7 +845,9 @@ export default defineComponent({
       }
       return isDisabled.value;
     });
-    const requestedSumInsuredRule = computed(() => (!!productConditionsForm.requestedSumInsured ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
+    const requestedSumInsuredRule = computed(() =>
+      !!productConditionsForm.requestedSumInsured ? (whichProduct.value === 'gons' ? dataStore.rules.required : 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))
@@ -807,7 +867,8 @@ export default defineComponent({
         whichProduct.value === 'liferenta' ||
         whichProduct.value === 'lifebusiness' ||
         whichProduct.value === 'amuletlife' ||
-        whichProduct.value === 'gns'
+        whichProduct.value === 'gns' ||
+        whichProduct.value === 'balam'
       ) {
         return false;
       }
@@ -817,6 +878,9 @@ export default defineComponent({
       if (whichProduct.value === 'halykkazyna') {
         return false;
       }
+      if (formStore.lfb.add && (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns')) {
+        return false;
+      }
       return true;
     });
     const hasCoverPeriod = computed(() => {
@@ -829,18 +893,27 @@ 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 hasCurrency = computed(() => {
+    const hasCurrencySymbols = computed(() => {
       if (whichProduct.value === 'halykkazyna') {
         return true;
       }
+      if (whichProduct.value === 'gons' && productConditionsForm.currency.code === 'USD') {
+        return true;
+      }
       return false;
     });
     const hasAdbMultiply = computed(() => {
@@ -926,6 +999,9 @@ export default defineComponent({
       if (whichProduct.value === 'halykkazyna') {
         return dataStore.t('productConditionsForm.requestedSumInsuredInTenge');
       }
+      if (formStore.lfb.add && (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns')) {
+        return dataStore.t('productConditionsForm.amountRefunded');
+      }
       if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
         return dataStore.t('productConditionsForm.totalRequestedSumInsured');
       }
@@ -938,11 +1014,20 @@ export default defineComponent({
       return dataStore.t('productConditionsForm.coverPeriod');
     });
     const insurancePremiumPerMonthLabel = computed(() => {
+      if (formStore.lfb.add && (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns')) {
+        return dataStore.t('productConditionsForm.amountPaid');
+      }
       if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
         return dataStore.t('productConditionsForm.totalInsurancePremiumAmountWithCommission');
       }
       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;
@@ -990,11 +1075,20 @@ export default defineComponent({
       return true;
     });
     const isDisabledAgentCommission = computed(() => {
+      if (formStore.lfb.add && (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns')) {
+        return true;
+      }
       if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns' || dataStore.isUnderwriter()) {
         return false;
       }
       return isDisabled.value;
     });
+    const isDisabledInsStartDate = computed(() => {
+      if (formStore.lfb.add && (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns')) {
+        return true;
+      }
+      return isDisabled.value;
+    });
     const hasCalcSum = computed(() => {
       if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
         return false;
@@ -1002,7 +1096,7 @@ export default defineComponent({
       return true;
     });
     const hasFixInsSum = computed(() => {
-      if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
+      if (!formStore.lfb.add && (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns')) {
         return true;
       }
       return false;
@@ -1037,6 +1131,24 @@ 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 currencyListFiltered = computed(() => {
+      if (useEnv().isProduction) {
+        return constants.currencyList.filter(i => i.code !== 'USD');
+      }
+      return constants.currencyList;
+    });
 
     const pensionCalculationParams = ref({
       compulsoryContractAmount: pensionForm && pensionForm.compulsoryContractAmount && pensionForm.compulsoryContractAmount != 0 ? pensionForm.compulsoryContractAmount : null,
@@ -1045,15 +1157,19 @@ export default defineComponent({
       compulsoryProfContractAmount:
         pensionForm && pensionForm.compulsoryProfContractAmount && pensionForm.compulsoryProfContractAmount != 0 ? pensionForm.compulsoryProfContractAmount : null,
       transferContractAmount: pensionForm && pensionForm.transferContractAmount && pensionForm.transferContractAmount != 0 ? pensionForm.transferContractAmount : null,
+      transferContractCompany: pensionForm && pensionForm.transferContractCompany ? pensionForm.transferContractCompany : null,
     });
 
+    const contractsAmount = computed(() => transferContracts.value?.reduce((accumulator, currentValue) => accumulator + currentValue.transferContractAmount, 0));
+
     const pensionAmount = computed(() =>
       pensionCalculationParams.value
         ? (Number(pensionCalculationParams.value.compulsoryContractAmount) ?? 0) +
           (Number(pensionCalculationParams.value.voluntaryContractAmount) ?? 0) +
           (Number(pensionCalculationParams.value.ownFundsRaisAmount) ?? 0) +
           (Number(pensionCalculationParams.value.compulsoryProfContractAmount) ?? 0) +
-          (Number(pensionCalculationParams.value.transferContractAmount) ?? 0)
+          (Number(pensionCalculationParams.value.transferContractAmount) ?? 0) +
+          Number(contractsAmount.value)
         : 0,
     );
 
@@ -1068,7 +1184,7 @@ export default defineComponent({
     const toStatement = async () => {
       const statementItem = dataStore.menuItems.find(i => i.id === 'statement');
       if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
-        await router.push({ name: 'taskId-NewApp', params: route.params, query: { tab: 'statement' } });
+        await router.push({ name: 'taskId-NewApp', params: route.params, query: { tab: 'statement', add: 'false' } });
         return;
       }
       if (whichProduct.value === 'gons') {
@@ -1099,8 +1215,12 @@ export default defineComponent({
         // @ts-ignore
         calculatorForm[currentPanel.value] = item.nameRu === null ? new Value() : item;
       } else if (whichProduct.value === 'pensionannuitynew') {
-        // @ts-ignore
-        pensionForm[currentPanel.value] = item.nameRu === null ? new Value() : item;
+        if (currentPanel.value === 'transferContractCompany') {
+          transferContracts.value[contractIndex.value].transferContractCompany = item;
+        } else {
+          // @ts-ignore
+          pensionForm[currentPanel.value] = item.nameRu === null ? new Value() : item;
+        }
       } else {
         // @ts-ignore
         productConditionsForm[currentPanel.value] = item.nameRu === null ? new Value() : item;
@@ -1330,7 +1450,7 @@ export default defineComponent({
         const calculatedPremiumDollar = getNumber(event.target.value as string);
         if (calculatedPremiumDollar) {
           productConditionsForm.insurancePremiumPerMonth = dataStore.getNumberWithSpaces(productConditionsForm.insurancePremiumPerMonth);
-          if (whichProduct.value === 'halykkazyna') {
+          if (whichProduct.value === 'halykkazyna' || whichProduct.value === 'gons') {
             if (typeof dataStore.currencies.usd === 'number') {
               productConditionsForm.insurancePremiumPerMonthInDollar = dataStore.getNumberWithSpaces(calculatedPremiumDollar / dataStore.currencies.usd);
             } else {
@@ -1358,7 +1478,7 @@ export default defineComponent({
         const calculatedSumDollar = getNumber(event.target.value as string);
         if (calculatedSumDollar) {
           productConditionsForm.requestedSumInsured = dataStore.getNumberWithSpaces(productConditionsForm.requestedSumInsured);
-          if (whichProduct.value === 'halykkazyna') {
+          if (whichProduct.value === 'halykkazyna' || whichProduct.value === 'gons') {
             if (typeof dataStore.currencies.usd === 'number') {
               productConditionsForm.requestedSumInsuredInDollar = dataStore.getNumberWithSpaces(calculatedSumDollar / dataStore.currencies.usd);
             } else {
@@ -1424,7 +1544,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;
@@ -1437,6 +1557,14 @@ export default defineComponent({
       return term.coverTypeName;
     };
 
+    const addTransferContract = () => {
+      transferContracts.value.push(new TransferContract());
+    };
+
+    const removeTransferContract = (index: number) => {
+      transferContracts.value.splice(index, 1);
+    };
+
     const submitForm = async () => {
       vForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
         if (v.valid) {
@@ -1444,9 +1572,12 @@ export default defineComponent({
             if (calculatorForm.type.code === 'Single' && calculatorForm.startDate && calculatorForm.endDate) {
               const formattedStartDate = formatDate(calculatorForm.startDate);
               const formattedEndDate = formatDate(calculatorForm.endDate);
-              if (formattedStartDate && formattedEndDate && formattedStartDate.getTime() > formattedEndDate.getTime()) {
+              if (formattedStartDate && formattedEndDate && formattedStartDate.getTime() >= formattedEndDate.getTime()) {
                 return dataStore.showToaster('error', dataStore.t('toaster.startMoreEnd'));
               }
+              if (calculatorForm.days !== productConditionsForm.getSingleTripDays()) {
+                return dataStore.showToaster('error', dataStore.t('toaster.daysPickAgain'));
+              }
             }
             if (dataStore.isTask()) {
               await dataStore.calculatePrice(route.params.taskId as string);
@@ -1454,15 +1585,21 @@ export default defineComponent({
               await dataStore.calculatePrice();
             }
           } else if (whichProduct.value === 'pensionannuitynew') {
-            if (
-              pensionCalculationParams.value &&
-              pensionCalculationParams.value.compulsoryProfContractAmount &&
-              pensionForm &&
-              pensionForm.compulsoryProfContractAmount != 0 &&
-              pensionForm.compulsoryProfMonthCount < 60
-            ) {
-              dataStore.showToaster('error', 'Минимальное число дней уплаты ОППВ должно быть больше 60');
-              return;
+            const formatedContracts: Array<TransferContract> = [];
+            if (transferContracts.value && transferContracts.value.length) {
+              transferContracts.value.forEach((i, index) => {
+                const formatedContractDate = formatDate(transferContracts.value[index].transferContractDate);
+                const formatedFirstPaymentDate = formatDate(transferContracts.value[index].transferContractFirstPaymentDate);
+                const formatedNameRu = String(transferContracts.value[index].transferContractCompany?.nameRu);
+                formatedContracts.push({
+                  ...transferContracts.value[index],
+                  transferContractDate: formatedContractDate?.toISOString() ?? '',
+                  transferContractFirstPaymentDate: formatedFirstPaymentDate?.toISOString() ?? '',
+                  // @ts-ignore
+                  transferContractCompany: formatedNameRu,
+                  id: transferContracts.value[index].id ?? null,
+                });
+              });
             }
             const data = {
               ...pensionForm,
@@ -1473,22 +1610,21 @@ export default defineComponent({
                 ownFundsRaisAmount: Number(pensionCalculationParams.value.ownFundsRaisAmount),
                 compulsoryProfContractAmount: Number(pensionCalculationParams.value.compulsoryProfContractAmount),
                 transferContractAmount: Number(pensionCalculationParams.value.transferContractAmount),
+                transferContractCompany: pensionForm?.transferContractCompany?.nameRu ?? '',
               }),
-              transferContractCompany: pensionForm.transferContractCompany?.nameRu ?? null,
-              transferContractDate: transferContractDate.value ? formatDate(transferContractDate.value) : null,
-              transferContractFirstPaymentDate: transferContractFirstPaymentDate.value ? formatDate(transferContractFirstPaymentDate.value) : null,
+              transferContracts: formatedContracts,
             };
             await dataStore.setApplication(data, true);
           } else {
             if (whichSum.value === 'requestedSumInsured') {
               productConditionsForm.insurancePremiumPerMonth = null;
-              if (whichProduct.value === 'halykkazyna') {
+              if (whichProduct.value === 'halykkazyna' || whichProduct.value === 'gons') {
                 productConditionsForm.insurancePremiumPerMonthInDollar = null;
               }
             }
             if (whichSum.value === 'insurancePremiumPerMonth') {
               productConditionsForm.requestedSumInsured = null;
-              if (whichProduct.value === 'halykkazyna') {
+              if (whichProduct.value === 'halykkazyna' || whichProduct.value === 'gons') {
                 productConditionsForm.requestedSumInsuredInDollar = null;
               }
             }
@@ -1602,6 +1738,10 @@ 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) &&
@@ -1645,12 +1785,14 @@ 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') {
+      if (!formStore.lfb.add && (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns')) {
         productConditionsForm.requestedSumInsured = dataStore.getNumberWithSpaces(
           formStore.lfb.clients.reduce((sum: number, i: any) => {
             return sum + Number(i.insSum);
@@ -1663,6 +1805,14 @@ export default defineComponent({
         transferContractDate.value = reformatDate(formStore.applicationData.pensionApp.transferContractDate);
         transferContractFirstPaymentDate.value = reformatDate(formStore.applicationData.pensionApp.transferContractFirstPaymentDate);
         maxDate.value = await dataStore.getVariableData(formStore.applicationData.processCode ?? 19);
+        if (transferContracts.value && transferContracts.value.length) {
+          transferContracts.value = pensionForm.transferContracts?.map((contract: TransferContract) => {
+            contract.transferContractDate = reformatDate(contract.transferContractDate)!;
+            contract.transferContractFirstPaymentDate = reformatDate(contract.transferContractFirstPaymentDate)!;
+            contract.transferContractCompany = { nameRu: contract.transferContractCompany } as any;
+            return contract;
+          });
+        }
       }
     });
 
@@ -1696,6 +1846,23 @@ 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,
@@ -1729,6 +1896,8 @@ export default defineComponent({
         async val => {
           if (val?.length && val.every(option => option.id != 0) && calculatorForm.type?.nameRu != null) {
             await dataStore.getTripInsuredAmount();
+          } else {
+            calculatorForm.amount = new Value();
           }
         },
         { deep: true },
@@ -1763,7 +1932,7 @@ export default defineComponent({
     }
 
     const copyRedirect = async () => {
-      const url = await dataStore.api.getEnpfRedirectUrl(String(formStore.applicationData.processInstanceId));
+      const url = await dataStore.api.pensionannuityNew.getEnpfRedirectUrl(String(formStore.applicationData.processInstanceId));
       dataStore.copyToClipboard(url.redirectUrl);
     };
 
@@ -1800,12 +1969,19 @@ export default defineComponent({
       maxDate,
       guaranteedPeriodList,
       isEnpfSum,
+      transferContracts,
+      contractsValue,
+      contractIndex,
 
       // Computed
       isTask,
       isDisabled,
       isTermsDisabled,
       isUnderwriterForm,
+      hasCurrencySymbols,
+      currencyListFiltered,
+      currencySymbolsLabel,
+      isDisabledPaymentPeriod,
       insurancePremiumPerMonthRule,
       insurancePremiumPerMonthDisabled,
       requestedSumInsuredRule,
@@ -1839,6 +2015,7 @@ export default defineComponent({
       hasDefault,
       isShownAdditionalTerms,
       hasCalcSum,
+      isDisabledInsStartDate,
       isDisabledAgentCommission,
       hasFixInsSum,
       isDisabledFixInsSum,
@@ -1882,6 +2059,8 @@ export default defineComponent({
       pickSubTermValue,
       onInputFixInsSum,
       copyRedirect,
+      addTransferContract,
+      removeTransferContract,
     };
   },
 });