hl-core 0.0.10-beta.28 → 0.0.10-beta.29

package/api/base.api.ts

@@ -643,6 +643,13 @@ export class ApiClass {
     });
   }
 
+  async getBankByAccountNumber(accountNumber: string) {
+    return await this.axiosCall<Value>({
+      method: Methods.GET,
+      url: `/Ekk/api/ContragentInsis/GetBankByAccountNumber?accountNumber=${accountNumber}`,
+    });
+  }
+
   async searchAgentByName(name: string, branchCode?: string) {
     return await this.axiosCall<Types.AgentData[]>({
       method: Methods.GET,

package/components/Form/ProductConditionsBlock.vue

@@ -75,12 +75,18 @@ export default defineComponent({
     const dataStore = useDataStore();
     const formStore = useFormStore();
 
-    const amount = computed(() =>
-      formStore.productConditionsForm && formStore.productConditionsForm.requestedSumInsured ? formStore.productConditionsForm.requestedSumInsured : null,
-    );
-    const premium = computed(() =>
-      formStore.productConditionsForm && formStore.productConditionsForm.insurancePremiumPerMonth ? formStore.productConditionsForm.insurancePremiumPerMonth : null,
-    );
+    const amount = computed(() => {
+      if (dataStore.isGons && formStore.productConditionsForm && formStore.productConditionsForm.currency.code === 'USD') {
+        return formStore.productConditionsForm.requestedSumInsuredInDollar;
+      }
+      return formStore.productConditionsForm && formStore.productConditionsForm.requestedSumInsured ? formStore.productConditionsForm.requestedSumInsured : null;
+    });
+    const premium = computed(() => {
+      if (dataStore.isGons && formStore.productConditionsForm && formStore.productConditionsForm.currency.code === 'USD') {
+        return formStore.productConditionsForm.insurancePremiumPerMonthInDollar;
+      }
+      return formStore.productConditionsForm && formStore.productConditionsForm.insurancePremiumPerMonth ? formStore.productConditionsForm.insurancePremiumPerMonth : null;
+    });
     const policyNumber = computed(() => (formStore.applicationData && formStore.applicationData.policyAppDto ? formStore.applicationData.policyAppDto.policyNumber : null));
     const contractDate = computed(() =>
       formStore.applicationData && formStore.applicationData.policyAppDto && formStore.applicationData.policyAppDto.contractDate

package/components/Pages/MemberForm.vue

@@ -52,8 +52,8 @@
           v-model="member.signOfResidency"
           :value="member.signOfResidency?.nameRu"
           :label="$dataStore.t('form.signOfResidency')"
-          :readonly="isDisabled || isDataFromGov"
-          :clearable="!isDisabled && !isDataFromGov"
+          :readonly="isDisabled"
+          :clearable="!isDisabled"
           :rules="residencyRule"
           append-inner-icon="mdi mdi-chevron-right"
           @append="openPanel($dataStore.t('form.signOfResidency'), [], 'signOfResidency', $dataStore.getResidents)"
@@ -517,8 +517,8 @@
           v-model="member.signOfResidency"
           :value="member.signOfResidency?.nameRu"
           :label="$dataStore.t('form.signOfResidency')"
-          :readonly="isDisabled || isDataFromGov"
-          :clearable="!isDisabled && !isDataFromGov"
+          :readonly="isDisabled"
+          :clearable="!isDisabled"
           :rules="residencyRule"
           append-inner-icon="mdi mdi-chevron-right"
           @append="openPanel($dataStore.t('form.signOfResidency'), [], 'signOfResidency', $dataStore.getResidents)"
@@ -932,7 +932,7 @@ export default {
       };
       return dataStore.isAULETTI || dataStore.isAulettiParent ? false : dataStore.controls.hasGBDFL && perMemberCondition();
     });
-    const hasGBDFLDocSelection = dataStore.isLifetrip && whichForm.value === formStore.policyholderFormKey;
+    const hasGBDFLDocSelection = dataStore.isLifetrip;
     const hasInsis = computed(() => dataStore.controls.hasInsis);
     const hasGKB = computed(() => {
       const perMemberCondition = () => {
@@ -1082,7 +1082,6 @@ 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:

package/components/Pages/ProductConditions.vue

@@ -152,6 +152,17 @@
             @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"
@@ -185,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"
@@ -256,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
@@ -819,7 +830,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;
@@ -829,7 +842,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))
@@ -872,18 +887,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(() => {
@@ -986,6 +1010,12 @@ 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;
@@ -1080,6 +1110,18 @@ 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,
@@ -1381,7 +1423,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 {
@@ -1409,7 +1451,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 {
@@ -1549,13 +1591,13 @@ export default defineComponent({
           } 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;
               }
             }
@@ -1669,6 +1711,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) &&
@@ -1712,10 +1758,12 @@ 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(
@@ -1771,6 +1819,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,
@@ -1886,6 +1951,9 @@ export default defineComponent({
       isDisabled,
       isTermsDisabled,
       isUnderwriterForm,
+      hasCurrencySymbols,
+      currencySymbolsLabel,
+      isDisabledPaymentPeriod,
       insurancePremiumPerMonthRule,
       insurancePremiumPerMonthDisabled,
       requestedSumInsuredRule,

package/components/Panel/PanelHandler.vue

@@ -11,10 +11,10 @@
     <div :class="[$styles.flexColNav]">
       <base-content-block v-if="hasConditionsInfo" class="flex flex-col gap-3">
         <span
-          >{{ `Сумма страховой премии ${paymentPeriod}:` }} <b>{{ `${insurancePremiumPerMonth}₸` }}</b></span
+          >{{ `Сумма страховой премии ${paymentPeriod}:` }} <b>{{ `${insurancePremiumPerMonth}` }}</b></span
         >
         <span
-          >{{ `Запрашиваемая страховая сумма: ` }} <b>{{ `${requestedSumInsured}₸` }}</b>
+          >{{ `Запрашиваемая страховая сумма: ` }} <b>{{ `${requestedSumInsured}` }}</b>
         </span>
       </base-content-block>
       <base-content-block v-if="$dataStore.isLifetrip" class="flex flex-col gap-3">
@@ -574,14 +574,22 @@ export default defineComponent({
     const affiliateActions = computed(() => dataStore.panelAction === constants.actions.affiliate);
     const chooseSignActions = computed(() => dataStore.controls.hasChooseSign && dataStore.panelAction === constants.actions.chooseSign);
     const choosePayActions = computed(() => dataStore.controls.hasChoosePay && dataStore.panelAction === constants.actions.choosePay);
-    const isNewSign = computed(() => (dataStore.isPension || dataStore.isGons) && !useEnv().isProduction);
+    const isNewSign = computed(() => (dataStore.isPension && !useEnv().isProduction) || dataStore.isGons);
     const paymentPeriod = computed(() => formStore.productConditionsForm.paymentPeriod.nameRu);
-    const insurancePremiumPerMonth = computed(() => dataStore.getNumberWithSpaces(formStore.productConditionsForm.insurancePremiumPerMonth));
+    const insurancePremiumPerMonth = computed(() => {
+      if (dataStore.isGons && formStore.productConditionsForm.currency.code === 'USD') {
+        return `${formStore.productConditionsForm.insurancePremiumPerMonthInDollar}$`;
+      }
+      return `${formStore.productConditionsForm.insurancePremiumPerMonth}₸`;
+    });
     const requestedSumInsured = computed(() => {
       if ((dataStore.isLifeBusiness || dataStore.isGns) && formStore.productConditionsForm.requestedSumInsured === null) {
         return dataStore.getNumberWithSpaces(formStore.applicationData.policyAppDto!.mainInsSum);
       }
-      return dataStore.getNumberWithSpaces(formStore.productConditionsForm.requestedSumInsured);
+      if (dataStore.isGons && formStore.productConditionsForm.currency.code === 'USD') {
+        return `${formStore.productConditionsForm.requestedSumInsuredInDollar}$`;
+      }
+      return `${formStore.productConditionsForm.requestedSumInsured}₸`;
     });
     const price = computed(() => dataStore.getNumberWithSpaces(formStore.productConditionsForm.calculatorForm.price));
     const insuredAmount = computed(() => formStore.productConditionsForm.calculatorForm.amount!.nameRu! + dataStore.currency);

package/composables/classes.ts

@@ -825,6 +825,7 @@ export class ProductConditions {
   fixInsSum: number | string | null;
   calcDate: string | null;
   contractEndDate: string | null;
+  currency: Value;
 
   constructor(
     insuranceCase = null,
@@ -873,6 +874,7 @@ export class ProductConditions {
     fixInsSum = null,
     calcDate = null,
     contractEndDate = null,
+    currency = new Value(),
   ) {
     this.requestedSumInsuredInDollar = null;
     this.insurancePremiumPerMonthInDollar = null;
@@ -925,6 +927,7 @@ export class ProductConditions {
     this.fixInsSum = fixInsSum;
     this.calcDate = calcDate;
     this.contractEndDate = contractEndDate;
+    this.currency = currency;
   }
 
   getSingleTripDays() {

package/composables/constants.ts

@@ -163,4 +163,20 @@ export const constants = Object.freeze({
       ids: '',
     },
   ],
+  currencyList: [
+    {
+      code: 'KZT',
+      id: '1',
+      nameKz: 'Тенге',
+      nameRu: 'Тенге',
+      ids: '',
+    },
+    {
+      code: 'USD',
+      id: '2',
+      nameKz: 'С индексацией на курс USD',
+      nameRu: 'С индексацией на курс USD',
+      ids: '',
+    },
+  ],
 });

package/locales/ru.json

@@ -395,6 +395,7 @@
     "insurancePremiumAmount": "Размер Страховой премии (страховой взнос) в тенге",
     "insurancePremiumAmountInDollar": "Размер Страховой премии (страховой взнос) в долларах",
     "dollarExchangeRateNBRK": "Курс доллара НБРК",
+    "exchangeRateSettlementDate": "Курс на дату расчета (USD/KZT)",
     "contractDate": "Дата контракта",
     "guaranteedTermAnnuityPayments": "Гарантированный срок аннуитетных выплат",
     "guaranteedPeriod": "Укажите период гарантированного срока",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.10-beta.28",
+  "version": "0.0.10-beta.29",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",

package/store/data.store.ts

@@ -1024,6 +1024,14 @@ export const useDataStore = defineStore('data', {
         conditionsData.policyAppDto.amountInCurrency = getNumber(String(this.formStore.productConditionsForm.requestedSumInsuredInDollar));
         conditionsData.policyAppDto.currencyExchangeRate = this.currencies.usd;
       }
+      if (this.isGons) {
+        conditionsData.policyAppDto.premiumInCurrency =
+          this.formStore.productConditionsForm.currency.code === 'KZT' ? null : getNumber(String(this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar));
+        conditionsData.policyAppDto.amountInCurrency =
+          this.formStore.productConditionsForm.currency.code === 'KZT' ? null : getNumber(String(this.formStore.productConditionsForm.requestedSumInsuredInDollar));
+        conditionsData.policyAppDto.currencyExchangeRate = this.formStore.productConditionsForm.currency.code === 'KZT' ? null : this.currencies.usd;
+        conditionsData.policyAppDto.currency = this.formStore.productConditionsForm.currency.code as string;
+      }
       if (this.isLiferenta) {
         conditionsData.policyAppDto.guaranteedPaymentPeriod = this.formStore.productConditionsForm.guaranteedPeriod || 0;
         conditionsData.policyAppDto.annuityTypeId = (this.formStore.productConditionsForm.typeAnnuityInsurance.id as string) ?? undefined;
@@ -1792,6 +1800,15 @@ export const useDataStore = defineStore('data', {
           calculationData.amountInCurrency = getNumber(String(this.formStore.productConditionsForm.requestedSumInsuredInDollar));
           calculationData.currencyExchangeRate = this.currencies.usd;
         }
+        if (this.isGons || product === 'gons') {
+          calculationData.premiumInCurrency =
+            this.formStore.productConditionsForm.currency.code === 'KZT' ? null : getNumber(String(this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar));
+          calculationData.amountInCurrency =
+            this.formStore.productConditionsForm.currency.code === 'KZT' ? null : getNumber(String(this.formStore.productConditionsForm.requestedSumInsuredInDollar));
+          calculationData.currencyExchangeRate = this.formStore.productConditionsForm.currency.code === 'KZT' ? null : this.currencies.usd;
+
+          calculationData.currency = this.formStore.productConditionsForm.currency.code as string;
+        }
         if (this.isLiferenta || product === 'liferenta') {
           calculationData.guaranteedPaymentPeriod = this.formStore.productConditionsForm.guaranteedPeriod || 0;
           calculationData.annuityTypeId = (this.formStore.productConditionsForm.typeAnnuityInsurance.id as string) ?? undefined;
@@ -1810,10 +1827,15 @@ export const useDataStore = defineStore('data', {
           calculationData.calcDate = formatDate(this.formStore.productConditionsForm.calcDate as string)!.toISOString();
         }
         const calculationResponse = await this.api.calculateWithoutApplication(calculationData, this.isCalculator ? product : undefined);
-        if (calculationResponse.amount) this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(calculationResponse.amount);
-        if (calculationResponse.premium) this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(calculationResponse.premium);
+        if (calculationResponse.amount)
+          this.formStore.productConditionsForm.requestedSumInsured =
+            this.isGons || product === 'gons' ? this.getNumberWithSpacesAfterComma(calculationResponse.amount) : this.getNumberWithSpaces(calculationResponse.amount);
+        if (calculationResponse.premium)
+          this.formStore.productConditionsForm.insurancePremiumPerMonth =
+            this.isGons || product === 'gons' ? this.getNumberWithSpacesAfterComma(calculationResponse.premium) : this.getNumberWithSpaces(calculationResponse.premium);
+
         this.formStore.additionalInsuranceTermsWithout = calculationResponse.addCovers;
-        if (this.isKazyna || product === 'halykkazyna') {
+        if (this.isKazyna || product === 'halykkazyna' || this.isGons || product === 'gons') {
           if (this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar != null) {
             this.formStore.productConditionsForm.requestedSumInsuredInDollar = this.getNumberWithSpaces(calculationResponse.amountInCurrency);
           } else {
@@ -1860,7 +1882,7 @@ export const useDataStore = defineStore('data', {
         const applicationData = await this.api.getApplicationData(taskId);
         this.formStore.applicationData = applicationData;
         if (this.formStore.applicationData.addCoverDto) this.formStore.additionalInsuranceTerms = this.formStore.applicationData.addCoverDto;
-        if (this.isKazyna && this.currencies.usd) {
+        if ((this.isKazyna || this.isGons) && this.currencies.usd) {
           if (this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar != null) {
             this.formStore.productConditionsForm.requestedSumInsuredInDollar = this.getNumberWithSpaces(result.value / this.currencies.usd);
           } else {
@@ -1868,11 +1890,15 @@ export const useDataStore = defineStore('data', {
           }
         }
         if (this.formStore.productConditionsForm.insurancePremiumPerMonth != null) {
-          this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(result.value);
-          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(applicationData.policyAppDto.premium);
+          this.formStore.productConditionsForm.requestedSumInsured = this.isGons ? this.getNumberWithSpacesAfterComma(result.value) : this.getNumberWithSpaces(result.value);
+          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.isGons
+            ? this.getNumberWithSpacesAfterComma(applicationData.policyAppDto.premium)
+            : this.getNumberWithSpaces(applicationData.policyAppDto.premium);
         } else {
-          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(result.value);
-          this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(applicationData.policyAppDto.amount);
+          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.isGons ? this.getNumberWithSpacesAfterComma(result.value) : this.getNumberWithSpaces(result.value);
+          this.formStore.productConditionsForm.requestedSumInsured = this.isGons
+            ? this.getNumberWithSpacesAfterComma(applicationData.policyAppDto.amount)
+            : this.getNumberWithSpaces(applicationData.policyAppDto.amount);
         }
         if (this.isLiferenta) {
           this.formStore.productConditionsForm.amountAnnuityPayments = this.getNumberWithSpaces(applicationData.policyAppDto.annuityMonthPay);
@@ -2216,16 +2242,21 @@ export const useDataStore = defineStore('data', {
           const paymentPeriod = this.processPaymentPeriod.find(item => item.id == applicationData.policyAppDto.paymentPeriodId);
           this.formStore.productConditionsForm.paymentPeriod = paymentPeriod ? paymentPeriod : new Value();
 
-          this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(
-            applicationData.policyAppDto.amount === null ? null : applicationData.policyAppDto.amount,
-          );
-          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(
-            applicationData.policyAppDto.premium === null ? null : applicationData.policyAppDto.premium,
-          );
-          if (this.isKazyna) {
+          this.formStore.productConditionsForm.requestedSumInsured = this.isGons
+            ? this.getNumberWithSpacesAfterComma(applicationData.policyAppDto.amount === null ? null : applicationData.policyAppDto.amount)
+            : this.getNumberWithSpaces(applicationData.policyAppDto.amount === null ? null : applicationData.policyAppDto.amount);
+          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.isGons
+            ? this.getNumberWithSpacesAfterComma(applicationData.policyAppDto.premium === null ? null : applicationData.policyAppDto.premium)
+            : this.getNumberWithSpaces(applicationData.policyAppDto.premium === null ? null : applicationData.policyAppDto.premium);
+
+          if (this.isKazyna || this.isGons) {
             this.formStore.productConditionsForm.requestedSumInsuredInDollar = this.getNumberWithSpaces(applicationData.policyAppDto.amountInCurrency);
             this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar = this.getNumberWithSpaces(applicationData.policyAppDto.premiumInCurrency);
           }
+          if (this.isGons) {
+            const currency = constants.currencyList.find(item => item.code === applicationData.policyAppDto.currency);
+            this.formStore.productConditionsForm.currency = currency ? currency : new Value();
+          }
           const riskGroup = this.riskGroup.find(item => {
             if (applicationData.policyAppDto.riskGroup == 0) {
               return true;
@@ -3310,10 +3341,12 @@ export const useDataStore = defineStore('data', {
 
       if (Array.isArray(person.documents.document)) {
         const filteredDocuments = person.documents.document.filter(i => new Date(i.endDate) > new Date(Date.now()) && i.status.code === '00');
-        const validDocument =
-          filteredDocuments.find(i => i.type.code === CoreEnums.GBD.DocTypes['1UDL']) ??
-          filteredDocuments.find(i => i.type.code === CoreEnums.GBD.DocTypes.VNZ) ??
-          filteredDocuments.find(i => i.type.code === CoreEnums.GBD.DocTypes.PS);
+
+        const validDocument = this.isLifetrip
+          ? filteredDocuments.find(i => i.type.code === CoreEnums.GBD.DocTypes.PS)
+          : filteredDocuments.find(i => i.type.code === CoreEnums.GBD.DocTypes['1UDL']) ??
+            filteredDocuments.find(i => i.type.code === CoreEnums.GBD.DocTypes.VNZ) ??
+            filteredDocuments.find(i => i.type.code === CoreEnums.GBD.DocTypes.PS);
         if (validDocument) {
           const documentType = this.documentTypes.find(
             (i: Value) => i.ids === Object.keys(CoreEnums.GBD.DocTypes)[Object.values(CoreEnums.GBD.DocTypes).indexOf(validDocument.type.code)],
@@ -3759,6 +3792,14 @@ export const useDataStore = defineStore('data', {
         return ErrorHandler(err);
       }
     },
+    async getBankByAccountNumber(accountNumber: string) {
+      try {
+        const bank = await this.api.getBankByAccountNumber(accountNumber);
+        return bank;
+      } catch (err) {
+        return ErrorHandler(err);
+      }
+    },
     async isCourseChanged(processInstanceId: string) {
       try {
         const response = await this.api.isCourseChanged(processInstanceId);