hl-core 0.0.9-beta.44 → 0.0.9-beta.45

package/api/base.api.ts

@@ -604,11 +604,12 @@ export class ApiClass {
     });
   }
 
-  async getKgd(data: { iinBin: string }) {
+  async getKgd(data: { iinBin: string }, timeout: number = 30000) {
     return await this.axiosCall<KGDResponse>({
       method: Methods.POST,
       url: '/externalservices/api/ExternalServices/GetKgd',
       data: data,
+      timeout: timeout,
     });
   }
 

package/components/Form/FormData.vue

@@ -9,12 +9,12 @@
         <div class="flex items-center justify-between">
           <p :class="[$styles.textTitle, $styles.greenText]">{{ block.title }}</p>
           <div
-            v-if="typeof block.headerBtn === 'object'"
+            v-if="typeof block.headerBtn === 'object' ? (typeof block.headerBtn.showBtn === 'boolean' ? block.headerBtn.showBtn === true : true) : false"
             :class="[$styles.blueBg, $styles.whiteText, $styles.textSimple, block.disabled ? $styles.disabled : 'cursor-pointer']"
             class="hidden lg:flex transition-all rounded-lg h-[36px] items-center font-medium justify-center opacity-50 hover:opacity-90 w-[120px]"
-            @click="!block.disabled && block.headerBtn.action()"
+            @click="!block.disabled && block.headerBtn!.action()"
           >
-            {{ block.headerBtn.text }}
+            {{ block.headerBtn!.text }}
           </div>
         </div>
         <p v-if="block.subtitle" :class="[$styles.greyText, $styles.textSimple]">{{ block.subtitle }}</p>
@@ -27,16 +27,12 @@
         </v-row>
         <div v-if="hasBlockData(block.data)">
           <v-row v-for="(row, index) in getBlockDataValue(block.data)" :key="index" class="min-h-[65px] max-w-[97%]">
-            <v-col
-              v-if="row.every((i: any) => !!i)"
-              v-for="each of row.filter((_: any, i: number) => $display().lgAndUp.value ? true : block.labels[i].hideOnMobile === false)"
-              :key="each"
-            >
+            <v-col v-if="row.every((i: any) => !i)" :class="[$styles.textSimple, $styles.blueText]">{{ block.noValueText ?? $dataStore.t('clients.necessaryFillForm') }}</v-col>
+            <v-col v-else v-for="each of row.filter((_: any, i: number) => $display().lgAndUp.value ? true : block.labels[i].hideOnMobile === false)" :key="each">
               <p :class="[$styles.textSimple]">
                 {{ each }}
               </p>
             </v-col>
-            <v-col v-else :class="[$styles.textSimple, $styles.blueText]">{{ block.noValueText ?? $dataStore.t('clients.necessaryFillForm') }}</v-col>
             <base-animation type="fade">
               <div
                 v-if="block.btn && !!block.btn.showBtn === true"

package/components/Pages/MemberForm.vue

@@ -1,21 +1,17 @@
 <template>
   <section class="flex flex-col gap-4 px-[10px]">
     <v-form v-if="member" ref="vForm" @submit="submitForm" class="max-h-[80svh] overflow-y-scroll">
-      <div
-        v-if="memberSetting && memberSetting.has === true && whichForm !== 'policyholderForm' && whichForm !== 'policyholdersRepresentativeForm'"
-        class="flex items-center mt-[14px] min-h-[54px]"
-      >
-        <div :class="[$styles.blueBgLight]" class="flex flex-wrap items-center gap-2 p-2 rounded-t-[8px] h-full">
+      <div v-if="memberSetting && memberSetting.has === true && memberSetting.isMultiple === true" class="flex items-center mt-[14px] min-h-[54px]">
+        <div :class="[$styles.blueBgLight]" class="flex flex-wrap items-center gap-2 p-1 rounded-t-[8px] h-full">
           <div
             v-for="(each, index) of formStore[whichForm]"
             :key="index"
-            class="rounded-[8px] cursor-pointer flex items-center"
-            :class="[Number(whichIndex) === index ? `${$styles.blueBg} ${$styles.whiteText}` : '', $styles.textSimple, isDisabled ? 'py-2 px-3' : 'py-1 pr-1 pl-3']"
+            class="pl-3 pr-1 py-1 rounded-[8px] cursor-pointer flex items-center"
+            :class="[Number(whichIndex) === index ? `${$styles.blueBg} ${$styles.whiteText}` : '', $styles.textSimple]"
             @click.self="index !== Number(whichIndex) ? selectMember(index) : null"
           >
             {{ `${$dataStore.menu.selectedItem.title} ${index + 1}` }}
             <v-btn
-              v-if="!isDisabled"
               icon="mdi-close !text-[20px]"
               size="x-small"
               :disabled="!memberStore.canMemberDeleted(whichForm, index) && !memberStore.canMemberCleared(whichForm, index)"
@@ -25,23 +21,11 @@
             />
           </div>
         </div>
-        <v-btn
-          v-if="!isDisabled && memberSetting.isMultiple === true"
-          class="ml-2"
-          icon="mdi-plus !text-[24px]"
-          @click="memberStore.addMember(whichForm)"
-          size="small"
-          color="#A0B3D8"
-          variant="tonal"
-        />
+        <v-btn class="ml-2" icon="mdi-plus !text-[24px]" @click="memberStore.addMember(whichForm)" size="small" color="#A0B3D8" variant="tonal" />
       </div>
       <base-form-section
         :title="$dataStore.t('form.personalData')"
-        :class="[
-          memberSetting && memberSetting.has === true && whichForm !== 'policyholderForm' && whichForm !== 'policyholdersRepresentativeForm'
-            ? 'rounded-t-0 !mt-[-5px]'
-            : 'mt-[14px]',
-        ]"
+        :class="[memberSetting && memberSetting.has === true && memberSetting.isMultiple === true ? 'rounded-t-0 !mt-[-5px]' : 'mt-[14px]']"
       >
         <base-panel-input
           v-if="$dataStore.isLifetrip"

package/components/Pages/ProductConditions.vue

@@ -32,7 +32,10 @@
         <base-form-input v-model="formStore.policyholderForm.age" :label="$dataStore.t('form.age')" :readonly="true" />
         <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'" :title="$dataStore.t('insuredForm')">
+      <base-form-section
+        v-if="isUnderwriterRole && $dataStore.members.insuredApp.has === true && whichProduct !== 'lifebusiness' && whichProduct !== 'gns'"
+        :title="$dataStore.t('insuredForm')"
+      >
         <div v-for="(insured, index) of formStore.insuredForm" :key="index">
           <base-form-input v-model="insured.longName" :label="$dataStore.t('labels.insurerLongName')" :readonly="true" />
           <base-form-input v-model="insured.job" :label="$dataStore.t('form.job')" :readonly="true" />
@@ -42,7 +45,7 @@
           <base-form-input v-model="insured.gender.nameRu" class="mb-4" :label="$dataStore.t('form.gender')" :readonly="true" />
         </div>
       </base-form-section>
-      <base-form-section v-if="isUnderwriterRole && whichProduct !== 'lifebusiness'" :title="$dataStore.t('recalculationInfo')">
+      <base-form-section v-if="isUnderwriterRole && whichProduct !== 'lifebusiness' && whichProduct !== 'gns'" :title="$dataStore.t('recalculationInfo')">
         <base-form-input
           v-model="productConditionsForm.lifeMultiply"
           :maska="$maska.numbers"
@@ -104,7 +107,7 @@
           @append="openPanel($dataStore.t('productConditionsForm.riskGroup'), $dataStore.riskGroup, 'riskGroup')"
         />
       </base-form-section>
-      <base-form-section v-if="hasDefault" :title="$dataStore.t('generalConditions')">
+      <base-form-section v-if="hasDefault" :title="defaultText">
         <div v-if="isCalculator && ($route.params.taskId === '0' || $dataStore.isCalculator)">
           <base-form-input
             v-model="productConditionsForm.signDate"
@@ -166,6 +169,16 @@
           append-inner-icon="mdi mdi-chevron-right"
           @append="openPanel($dataStore.t('productConditionsForm.processIndexRate'), $dataStore.processIndexRate, 'processIndexRate', $dataStore.getProcessIndexRate)"
         />
+        <base-form-input
+          v-if="hasFixInsSum"
+          v-model="productConditionsForm.fixInsSum"
+          :readonly="isDisabledFixInsSum"
+          :clearable="!isDisabled"
+          :rules="fixInsSumRule"
+          :label="$dataStore.t('productConditionsForm.fixInsSum')"
+          :suffix="$constants.currencySymbols.kzt"
+          @input="onInputFixInsSum"
+        />
         <base-form-input
           v-model="productConditionsForm.requestedSumInsured"
           :readonly="isDisabledSum"
@@ -446,6 +459,9 @@
         />
         <base-form-input v-model="calculatorForm.price" :readonly="true" :label="isCalculator ? $dataStore.t('calculatorForm.premium') : $dataStore.t('calculatorForm.price')" />
       </base-form-section>
+      <base-form-section v-if="hasDeathInsFromNS" :title="$dataStore.t('generalConditions')">
+        <base-form-input v-model="deathInsFromNS" :readonly="true" :clearable="false" :label="$dataStore.t('form.deathInsFromNS')" />
+      </base-form-section>
       <base-form-section v-if="isShownAdditionalTerms && additionalTerms && additionalTerms.length" :title="$dataStore.t('productConditionsForm.additional')">
         <div v-for="(term, index) of additionalTerms" :key="index">
           <base-panel-input
@@ -457,7 +473,7 @@
             :label="coverTypeName(term)"
             append-inner-icon="mdi mdi-chevron-right"
             :suffix="
-              whichProduct === 'lifebusiness' && term.coverTypeCode === 6
+              (whichProduct === 'lifebusiness' || whichProduct === 'gns') && term.coverTypeCode === 6
                 ? String(term.coverPeriodName ?? '')
                 : !!term.amount
                 ? `${formatTermValue(term.amount)} ${currencySymbolsAddTerm}`
@@ -523,7 +539,7 @@
         <base-rounded-input v-model.trim="searchQuery" :label="$dataStore.t('labels.search')" class="w-full p-2" :hide-details="true" />
         <div v-if="panelList && isPanelLoading === false" class="w-full flex flex-col gap-2 p-2">
           <div v-for="(item, index) of panelList.filter(i => i.nameRu && (i.nameRu as string).match(new RegExp(searchQuery, 'i')))">
-            <v-expansion-panels v-if="panelCodeList.includes(String(item.code)) && whichProduct === 'lifebusiness'" variant="accordion">
+            <v-expansion-panels v-if="panelCodeList.includes(String(item.code)) && (whichProduct === 'lifebusiness' || whichProduct === 'gns')" variant="accordion">
               <v-expansion-panel class="hover:bg-[#f5f8fd]" elevation="0" bg-color="#F3F6FC">
                 <v-expansion-panel-title @click="pickTermValue(item)">
                   {{ item.nameRu }}
@@ -580,6 +596,7 @@ export default defineComponent({
     const searchQuery = ref<string>('');
     const whichSum = ref<'insurancePremiumPerMonth' | 'requestedSumInsured' | ''>('');
     const panelCodeList = ['processcovertypesum', 'fixedinssum'];
+    const deathInsFromNS = 'Включено';
 
     const additionalTerms = ref<AddCover[]>([]);
 
@@ -608,7 +625,7 @@ export default defineComponent({
       if (whichProduct.value === 'gons') {
         return true;
       }
-      if (whichProduct.value === 'lifebusiness' && dataStore.isUnderwriter()) {
+      if ((whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') && dataStore.isUnderwriter()) {
         return false;
       }
       return isDisabled.value;
@@ -618,7 +635,7 @@ export default defineComponent({
     const isUnderwriterRole = computed(() => dataStore.isUnderwriter() || dataStore.isAdmin() || dataStore.isSupport());
     const insurancePremiumPerMonthRule = computed(() => (!!productConditionsForm.insurancePremiumPerMonth ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
     const insurancePremiumPerMonthDisabled = computed(() => {
-      if (whichProduct.value === 'lifebusiness') {
+      if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
         return true;
       }
       if (dataStore.isUnderwriter() && !isRecalculationDisabled.value) {
@@ -627,9 +644,10 @@ export default defineComponent({
       return isDisabled.value;
     });
     const requestedSumInsuredRule = computed(() => (!!productConditionsForm.requestedSumInsured ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
+    const fixInsSumRule = computed(() => (!!productConditionsForm.fixInsSum ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
     const amountAnnuityPayments = computed(() => (!!productConditionsForm.amountAnnuityPayments ? dataStore.rules.required.concat(dataStore.rules.sums) : []));
     const hasCalculated = computed(() => {
-      if (whichProduct.value === 'lifebusiness' && productConditionsForm.requestedSumInsured === null) {
+      if ((whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') && productConditionsForm.requestedSumInsured === null) {
         return !!productConditionsForm.insurancePremiumPerMonth;
       }
       return !!productConditionsForm.requestedSumInsured && !!productConditionsForm.insurancePremiumPerMonth;
@@ -640,7 +658,8 @@ export default defineComponent({
         whichProduct.value === 'halykkazyna' ||
         whichProduct.value === 'liferenta' ||
         whichProduct.value === 'lifebusiness' ||
-        whichProduct.value === 'amuletlife'
+        whichProduct.value === 'amuletlife' ||
+        whichProduct.value === 'gns'
       ) {
         return false;
       }
@@ -713,25 +732,25 @@ export default defineComponent({
       return false;
     });
     const hasBirthDate = computed(() => {
-      if (whichProduct.value === 'lifebusiness') {
+      if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
         return false;
       }
       return true;
     });
     const hasGender = computed(() => {
-      if (whichProduct.value === 'lifebusiness') {
+      if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
         return false;
       }
       return true;
     });
     const hasAgencyPart = computed(() => {
-      if (whichProduct.value === 'lifebusiness') {
+      if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
         return true;
       }
       return false;
     });
     const hasProcessGfot = computed(() => {
-      if (whichProduct.value === 'lifebusiness') {
+      if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
         return true;
       }
       return false;
@@ -756,7 +775,7 @@ export default defineComponent({
       if (whichProduct.value === 'halykkazyna') {
         return dataStore.t('productConditionsForm.requestedSumInsuredInTenge');
       }
-      if (whichProduct.value === 'lifebusiness') {
+      if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
         return dataStore.t('productConditionsForm.totalRequestedSumInsured');
       }
       return dataStore.t('productConditionsForm.requestedSumInsured');
@@ -765,22 +784,31 @@ export default defineComponent({
       if (whichProduct.value === 'gons') {
         return dataStore.t('productConditionsForm.coverPeriodFrom3to20');
       }
-      if (whichProduct.value === 'lifebusiness') {
+      if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
         return dataStore.t('productConditionsForm.coverPeriodMonth');
       }
       return dataStore.t('productConditionsForm.coverPeriod');
     });
     const insurancePremiumPerMonthLabel = computed(() => {
-      if (whichProduct.value === 'lifebusiness') {
-        return dataStore.t('productConditionsForm.totalInsurancePremiumAmount');
+      if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
+        return dataStore.t('productConditionsForm.totalInsurancePremiumAmountWithCommission');
       }
       return dataStore.t('productConditionsForm.insurancePremiumAmount');
     });
+    const isDisabledFixInsSum = computed(() => {
+      if ((whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') && productConditionsForm.processGfot.id !== null) {
+        return true;
+      }
+      if (dataStore.isUnderwriter() && !isRecalculationDisabled.value) {
+        return false;
+      }
+      return isDisabled.value;
+    });
     const isDisabledSum = computed(() => {
       if (whichProduct.value === 'halykkazyna') {
         return true;
       }
-      if (whichProduct.value === 'lifebusiness' && productConditionsForm.processGfot.id !== null) {
+      if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
         return true;
       }
       if (dataStore.isUnderwriter() && !isRecalculationDisabled.value) {
@@ -805,7 +833,7 @@ export default defineComponent({
       return message.slice(0, -2);
     });
     const isDisabledCoverPeriod = computed(() => {
-      if (whichProduct.value === 'lifebusiness') {
+      if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
         return true;
       }
       return isDisabled.value;
@@ -817,7 +845,7 @@ export default defineComponent({
       return true;
     });
     const isDisabledProcessGfot = computed(() => {
-      if (whichProduct.value === 'lifebusiness' && !!productConditionsForm.requestedSumInsured) {
+      if ((whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') && !!productConditionsForm.fixInsSum) {
         return true;
       }
       if (dataStore.isUnderwriter()) {
@@ -826,17 +854,36 @@ export default defineComponent({
       return isDisabled.value;
     });
     const isDisabledAgentCommission = computed(() => {
-      if (whichProduct.value === 'lifebusiness' || dataStore.isUnderwriter()) {
+      if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns' || dataStore.isUnderwriter()) {
         return false;
       }
       return isDisabled.value;
     });
     const hasCalcSum = computed(() => {
-      if (whichProduct.value === 'lifebusiness') {
+      if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
         return false;
       }
       return true;
     });
+    const hasFixInsSum = computed(() => {
+      if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
+        return true;
+      }
+      return false;
+    });
+    const hasDeathInsFromNS = computed(() => {
+      if (whichProduct.value === 'gns') {
+        return true;
+      }
+      return false;
+    });
+    const defaultText = computed(() => {
+      if (whichProduct.value === 'gns') {
+        return dataStore.t('clients.form.calculation');
+      }
+      return dataStore.t('generalConditions');
+    });
+
     const formatTermValue = (term: number) => {
       if (term !== null) {
         const termNumber = Number(term);
@@ -847,7 +894,7 @@ export default defineComponent({
 
     const toStatement = async () => {
       const statementItem = dataStore.menuItems.find(i => i.id === 'statement');
-      if (whichProduct.value === 'lifebusiness') {
+      if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
         await router.push({ name: 'taskId-NewApp', params: route.params, query: { tab: 'statement' } });
         return;
       }
@@ -911,7 +958,7 @@ export default defineComponent({
       }
       if (typeof currentIndex.value !== 'number') return;
 
-      if (whichProduct.value === 'lifebusiness' && item.code === 'processcovertypesum') {
+      if ((whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') && item.code === 'processcovertypesum') {
         if (item.id !== additionalTerms.value[currentIndex.value].coverSumId) {
           additionalTerms.value[currentIndex.value].coverPeriodCode = null;
           additionalTerms.value[currentIndex.value].coverPeriodId = null;
@@ -922,9 +969,13 @@ export default defineComponent({
       additionalTerms.value[currentIndex.value].coverSumId = item.id as string;
       additionalTerms.value[currentIndex.value].coverSumName = item.nameRu as string;
 
-      if (whichProduct.value === 'lifebusiness') {
+      if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
         if (termValue.value && item.code === 'fixedinssum') {
-          subPanelList.value = constants.fixInsAmount;
+          if (termValue.value.coverTypeCode === 11) {
+            subPanelList.value = constants.fixInsAmount.slice(0, 5);
+          } else {
+            subPanelList.value = constants.fixInsAmount;
+          }
           subTermValue.value = String(termValue.value.amount);
         } else {
           additionalTerms.value[currentIndex.value].amount = 0;
@@ -1029,7 +1080,7 @@ export default defineComponent({
     };
 
     const openTermPanel = async (title: string, asyncFunction: Function, questionId: string, index: number) => {
-      if (!isDisabled.value || (whichProduct.value === 'lifebusiness' && dataStore.isUnderwriter())) {
+      if (!isDisabled.value || ((whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') && dataStore.isUnderwriter())) {
         searchQuery.value = '';
         currentIndex.value = index;
         isPanelOpen.value = false;
@@ -1132,6 +1183,15 @@ export default defineComponent({
       }
     };
 
+    const onInputFixInsSum = (event: Event) => {
+      if (event.target && 'value' in event.target && event.target.value) {
+        const calculatedFixInsSum = getNumber(event.target.value as string);
+        if (calculatedFixInsSum) {
+          productConditionsForm.fixInsSum = dataStore.getNumberWithSpaces(productConditionsForm.fixInsSum);
+        }
+      }
+    };
+
     const onInputSumDollar = (event: Event) => {
       if (event.target && 'value' in event.target && event.target.value && dataStore.currencies.usd) {
         whichSum.value = 'requestedSumInsured';
@@ -1185,7 +1245,7 @@ export default defineComponent({
     };
 
     const coverTypeName = (term: AddCover) => {
-      if (whichProduct.value === 'lifebusiness') {
+      if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
         return String(term.coverTypeNameRu);
       }
       return term.coverTypeName;
@@ -1281,7 +1341,7 @@ export default defineComponent({
               recalculationData.premium = Number((productConditionsForm.insurancePremiumPerMonth as string)?.replace(/\s/g, ''));
               recalculationData.riskGroup = productConditionsForm.riskGroup?.id ? productConditionsForm.riskGroup.id : 1;
               isCalculating.value = true;
-              if (whichProduct.value === 'lifebusiness') {
+              if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
                 await dataStore.calculate(route.params.taskId as string);
                 additionalTerms.value = formStore.additionalInsuranceTerms;
               } else {
@@ -1351,9 +1411,8 @@ export default defineComponent({
             if (defaultData.signDate) {
               productConditionsForm.signDate = reformatDate(defaultData.signDate);
             }
-            if (whichProduct.value === 'lifebusiness') {
+            if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
               productConditionsForm.coverPeriod = defaultData.insTermInMonth ?? null;
-              productConditionsForm.requestedSumInsured = null;
               productConditionsForm.insurancePremiumPerMonth = null;
             }
           }
@@ -1366,7 +1425,7 @@ export default defineComponent({
       if (!!productConditionsForm.requestedSumInsured) {
         whichSum.value = 'requestedSumInsured';
       }
-      if (whichProduct.value === 'lifebusiness' && !productConditionsForm.requestedSumInsured) {
+      if ((whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') && !productConditionsForm.requestedSumInsured) {
         whichSum.value = 'requestedSumInsured';
       }
       if (dataStore.isCalculator) {
@@ -1378,6 +1437,13 @@ export default defineComponent({
         if (kazynaPaymentPeriod) productConditionsForm.paymentPeriod = kazynaPaymentPeriod;
         await dataStore.getCurrencies();
       }
+      if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
+        productConditionsForm.requestedSumInsured = dataStore.getNumberWithSpaces(
+          formStore.lfb.clients.reduce((sum: number, i: any) => {
+            return sum + Number(i.insSum);
+          }, 0),
+        );
+      }
     });
 
     watch(
@@ -1485,6 +1551,7 @@ export default defineComponent({
       subPanelList,
       subTermValue,
       panelCodeList,
+      deathInsFromNS,
 
       // Computed
       isTask,
@@ -1527,9 +1594,14 @@ export default defineComponent({
       isShownAdditionalTerms,
       hasCalcSum,
       isDisabledAgentCommission,
+      hasFixInsSum,
+      isDisabledFixInsSum,
+      defaultText,
+      hasDeathInsFromNS,
 
       // Rules
       coverPeriodRule,
+      fixInsSumRule,
 
       // Functions
       submitForm,
@@ -1555,6 +1627,7 @@ export default defineComponent({
       selectOption,
       coverTypeName,
       pickSubTermValue,
+      onInputFixInsSum,
     };
   },
 });

package/components/Panel/PanelHandler.vue

@@ -61,6 +61,12 @@
       </base-form-section>
     </div>
   </section>
+  <section v-if="choosePayActions">
+    <div v-if="!isEpayPay" :class="[$styles.flexColNav]">
+      <base-btn :text="$dataStore.t('buttons.payEpay')" :loading="loading" @click="handlePayAction('epay')" />
+      <base-btn :text="$dataStore.t('buttons.payOffline')" :loading="loading" @click="handlePayAction('offline')" />
+    </div>
+  </section>
   <section v-if="signingActions" class="relative">
     <base-fade-transition>
       <div v-if="!isSendNumberOpen" :class="[$styles.flexColNav]">
@@ -171,6 +177,7 @@ export default defineComponent({
     const connection = ref<any>(null);
     const isQrLoading = ref<boolean>(false);
     const urlCopy = ref<string>('');
+    const isEpayPay = ref<boolean>(false);
 
     const vForm = ref<any>();
     const isSendNumberOpen = ref<boolean>(false);
@@ -325,7 +332,7 @@ export default defineComponent({
 
     const onInit = async () => {
       if (dataStore.controls.hasChooseSign) {
-        if (dataStore.isGons || dataStore.isLifeBusiness) {
+        if (dataStore.isGons || dataStore.isLifeBusiness || dataStore.isGns) {
           isElectronicContract.value = false;
         }
       }
@@ -383,11 +390,12 @@ export default defineComponent({
     const payingActions = computed(() => dataStore.panelAction === constants.actions.pay);
     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 paymentPeriod = computed(() => formStore.productConditionsForm.paymentPeriod.nameRu);
     const insurancePremiumPerMonth = computed(() => dataStore.getNumberWithSpaces(formStore.productConditionsForm.insurancePremiumPerMonth));
     const requestedSumInsured = computed(() => {
-      if (dataStore.isLifeBusiness && formStore.productConditionsForm.requestedSumInsured === null) {
+      if ((dataStore.isLifeBusiness || dataStore.isGns) && formStore.productConditionsForm.requestedSumInsured === null) {
         return dataStore.getNumberWithSpaces(formStore.applicationData.policyAppDto!.mainInsSum);
       }
       return dataStore.getNumberWithSpaces(formStore.productConditionsForm.requestedSumInsured);
@@ -422,7 +430,7 @@ export default defineComponent({
       return false;
     });
     const isQrDisabled = computed(() => {
-      if (dataStore.isLifeBusiness) {
+      if (dataStore.isLifeBusiness || dataStore.isGns) {
         return false;
       }
       return true;
@@ -455,13 +463,20 @@ export default defineComponent({
       loading.value = false;
     };
 
+    const handlePayAction = async (type: 'epay' | 'offline') => {
+      loading.value = true;
+      if (type === 'epay') {
+        await payEpay();
+      }
+    };
+
     // TODO Рефактор QR c npm
     const generateQR = async (groupId: string) => {
       const uuidV4 = uuid.v4();
       const qrValue = `${getValuePerEnv('qrGenUrl')}/${uuidV4}/${groupId}`;
       qrUrl.value = `https://api.qrserver.com/v1/create-qr-code/?size=135x135&data=${qrValue}`;
 
-      if (dataStore.isLifeBusiness) {
+      if (dataStore.isLifeBusiness || dataStore.isGns) {
         //для юр лиц
         urlCopy.value = `https://egovbusiness.page.link/?link=${qrValue}?mgovSign&amp;apn=kz.mobile.mgov.business&amp;isi=1597880144&amp;ibi=kz.mobile.mgov.business`;
       } else {
@@ -515,6 +530,38 @@ export default defineComponent({
       await dataStore.generateDocument();
     };
 
+    const payEpay = async () => {
+      const invoiceData = await dataStore.getInvoiceData(formStore.applicationData.processInstanceId);
+      if (invoiceData === false || invoiceData.status === 3 || invoiceData.status === 0) {
+        if (invoiceData === false || invoiceData.status === 3) {
+          const created = await dataStore.createInvoice();
+          if (created) {
+            const ePayData = await dataStore.sendToEpay();
+            if (!ePayData) return;
+            formStore.epayLink = dataStore.sanitize(ePayData.link);
+          }
+        }
+        if (!!invoiceData && invoiceData.status === 0) {
+          const ePayData = await dataStore.sendToEpay();
+          if (!ePayData) return;
+          formStore.epayLink = dataStore.sanitize(ePayData.link);
+        }
+      } else {
+        if (invoiceData.paymentLink) {
+          formStore.epayLink = dataStore.sanitize(invoiceData.paymentLink);
+        } else {
+          dataStore.showToaster('error', dataStore.t('toaster.noUrl'));
+        }
+      }
+      if (!formStore.epayLink) {
+        dataStore.showToaster('error', dataStore.t('toaster.noUrl'));
+        return;
+      }
+      loading.value = false;
+      isEpayPay.value = true;
+      dataStore.panelAction = constants.actions.pay;
+    };
+
     return {
       // State
       formStore,
@@ -531,6 +578,7 @@ export default defineComponent({
       scansFiles,
       isQrLoading,
       urlCopy,
+      isEpayPay,
 
       // Functions
       closePanel,
@@ -544,6 +592,8 @@ export default defineComponent({
       sendFiles,
       onClearFile,
       closeQrPanel,
+      handlePayAction,
+      payEpay,
 
       // Computed
       buttonText,
@@ -567,6 +617,7 @@ export default defineComponent({
       isElectronicDisabled,
       isScansDisabled,
       isQrDisabled,
+      choosePayActions,
     };
   },
 });

package/components/Transitions/Animation.vue

@@ -9,7 +9,7 @@
 defineProps({
   type: {
     type: String as PropType<VuetifyAnimations>,
-    required: false,
+    default: 'expand',
   },
 });
 

package/composables/classes.ts

@@ -755,6 +755,8 @@ export class ProductConditions {
   statePremium7: number | string | null;
   calculatorForm: CalculatorForm;
   agentCommission: number | null;
+  fixInsSum: number | string | null;
+
   constructor(
     insuranceCase = null,
     coverPeriod = null,
@@ -798,6 +800,7 @@ export class ProductConditions {
     statePremium7 = null,
     calculatorForm = new CalculatorForm(),
     agentCommission = null,
+    fixInsSum = null,
   ) {
     this.requestedSumInsuredInDollar = null;
     this.insurancePremiumPerMonthInDollar = null;
@@ -846,6 +849,7 @@ export class ProductConditions {
     this.statePremium7 = statePremium7;
     this.calculatorForm = calculatorForm;
     this.agentCommission = agentCommission;
+    this.fixInsSum = fixInsSum;
   }
   getSingleTripDays() {
     if (this.calculatorForm.startDate && this.calculatorForm.endDate) {
@@ -914,6 +918,8 @@ export class DataStoreClass {
     hasAffiliation: boolean;
     // Выбор метода подписания
     hasChooseSign: boolean;
+    // Выбор метода оплаты
+    hasChoosePay: boolean;
   };
   members: {
     clientApp: MemberSettings;
@@ -1078,6 +1084,7 @@ export class DataStoreClass {
       hasAttachment: true,
       hasAffiliation: true,
       hasChooseSign: false,
+      hasChoosePay: false,
     };
     this.iframeLoading = false;
     this.hasLayoutMargins = true;

package/composables/constants.ts

@@ -14,6 +14,7 @@ export const constants = Object.freeze({
     daskamkorlyk: 13,
     lifebusiness: 14,
     amuletlife: 15,
+    gns: 16,
   },
   amlProducts: {
     checkcontragent: 1,
@@ -104,5 +105,40 @@ export const constants = Object.freeze({
       nameRu: '2 500 000',
       ids: '',
     },
+    {
+      code: '3000000',
+      id: '6',
+      nameKz: '3 000 000',
+      nameRu: '3 000 000',
+      ids: '',
+    },
+    {
+      code: '3500000',
+      id: '7',
+      nameKz: '3 500 000',
+      nameRu: '3 500 000',
+      ids: '',
+    },
+    {
+      code: '4000000',
+      id: '8',
+      nameKz: '4 000 000',
+      nameRu: '4 000 000',
+      ids: '',
+    },
+    {
+      code: '4500000',
+      id: '8',
+      nameKz: '4 500 000',
+      nameRu: '4 500 000',
+      ids: '',
+    },
+    {
+      code: '5000000',
+      id: '9',
+      nameKz: '5 000 000',
+      nameRu: '5 000 000',
+      ids: '',
+    },
   ],
 });

package/composables/fields.ts

@@ -221,6 +221,7 @@ export class FormBlock {
   headerBtn?: {
     text: string;
     action: () => void;
+    showBtn?: ComputedRef;
   };
   labels: FormBlockLabel[];
   data: ComputedRefWithControl<any> | string[][];
@@ -236,7 +237,7 @@ export class FormBlock {
     title: string;
     subtitle?: string;
     noValueText?: string;
-    headerBtn?: { text: string; action: () => void };
+    headerBtn?: { text: string; action: () => void; showBtn?: ComputedRef };
     labels: FormBlockLabel[];
     data: ComputedRefWithControl<any> | string[][];
     shrinkLabels?: boolean;
@@ -289,3 +290,39 @@ export const getFormDataFrom = <T>(
     () => getData(),
   );
 };
+
+export const getFormDataDefaults = () => {
+  const dataStore = useDataStore();
+  const baseFormData = {
+    membersLabels: [
+      new FormBlockLabel({
+        text: dataStore.t('form.fullName'),
+      }),
+      new FormBlockLabel({
+        text: dataStore.t('form.iin'),
+      }),
+      new FormBlockLabel({
+        text: dataStore.t('form.birthDate'),
+      }),
+      new FormBlockLabel({
+        text: dataStore.t('form.gender'),
+        hideOnMobile: true,
+      }),
+      new FormBlockLabel({
+        text: dataStore.t('form.Country'),
+        hideOnMobile: true,
+      }),
+      new FormBlockLabel({
+        text: dataStore.t('code'),
+        hideOnMobile: true,
+      }),
+    ],
+    modifiers: {
+      longName: (longName: any) => getFullNameShorted(longName),
+      gender: (gender: any) => gender[0],
+      birthPlace: (birthPlace: any) => birthPlace.substring(0, 3),
+      economySectorCode: (economySectorCode: any) => economySectorCode[0],
+    },
+  };
+  return { ...baseFormData };
+};

package/composables/index.ts

@@ -30,7 +30,7 @@ export class Masks {
   date: string = '##.##.####';
   post: string = '######';
   threeDigit: string = '###';
-  iik: string = 'KZ##################';
+  iik: string = 'KZXXXXXXXXXXXXXXXXXX';
 }
 
 export const useMask = () => new Masks();
@@ -184,13 +184,15 @@ export const ESBDMessage = (ESBDObject: any, initialPoint: any) => {
 
 export const ErrorHandler = (err: unknown, errorText?: string) => {
   console.log(err);
-  const dataStore = useDataStore();
-  if (err instanceof AxiosError) {
-    if ('response' in err && err.response && err.response.data) {
-      if ('status' in err.response && err.response.status === 403) {
-        dataStore.showToaster('error', dataStore.t('toaster.noPermission'), 10000);
-      } else if (err.response.data) {
-        dataStore.showToaster('error', errorText ? errorText : err.response.data, 10000);
+  if (useDataStore) {
+    const dataStore = useDataStore();
+    if (err instanceof AxiosError) {
+      if ('response' in err && err.response && err.response.data) {
+        if ('status' in err.response && err.response.status === 403) {
+          dataStore.showToaster('error', dataStore.t('toaster.noPermission'), 10000);
+        } else if (err.response.data) {
+          dataStore.showToaster('error', errorText ? errorText : err.response.data, 10000);
+        }
       }
     }
   }
@@ -317,3 +319,21 @@ export const getMainPageRoute = () => {
   }
   return 'index';
 };
+
+export const keyDeleter = <T extends object>(data: T, keys: Array<NestedKeyOf<T>>) => {
+  if (typeof data === 'object' && !!data && keys && Array.isArray(keys) && keys.length) {
+    keys.forEach(key => {
+      if (key) {
+        if (String(key).includes('.')) {
+          const childKey = String(key).substring(0, String(key).indexOf('.'));
+          const keyChain = [String(key).substring(String(key).indexOf('.') + 1)];
+          // @ts-ignore
+          keyDeleter(data[childKey], keyChain);
+        } else {
+          //@ts-ignore
+          delete data[key];
+        }
+      }
+    });
+  }
+};

package/locales/ru.json

@@ -217,7 +217,10 @@
     "downloadStatement": "Скачать заявление",
     "downloadApplication": "Скачать приложение №1",
     "downloadPowerOfAttorney": "Скачать доверенность",
-    "sendEgovMob": "Отправить на подпись через Egov Mobile"
+    "sendEgovMob": "Отправить на подпись через Egov Mobile",
+    "sendToPay": "Отправить на оплату",
+    "payEpay": "Оплатить через EPAY",
+    "payOffline": "Оплатить офлайн"
   },
   "dialog": {
     "title": "Подтверждение",
@@ -252,7 +255,8 @@
     "familyMember": "Выберите члена семьи",
     "register": "Вы действительно хотите добавить в реестр данного ребенка?",
     "toApprove": "Вы действительно хотите отправить на согласование?",
-    "affiliate": "Вы действительно хотите добавить решение андеррайтингового совета?"
+    "affiliate": "Вы действительно хотите добавить решение андеррайтингового совета?",
+    "choosePay": "Вы действительно хотите выбрать метод оплаты?"
   },
   "sign": {
     "chooseDoc": "Выберите документы для подписание",
@@ -375,6 +379,7 @@
     "coverPeriodMonth": "Срок страхования (в месяцах)",
     "totalRequestedSumInsured": "Общая страховая сумма",
     "totalInsurancePremiumAmount": "Общая страховая премия",
+    "totalInsurancePremiumAmountWithCommission": "Общая страховая премия с комиссией",
     "agencyPart": "Агентская переменная часть, %",
     "processGfot": "Кратность страховой суммы к ГФОТ-у",
     "annuiteStartDate": "Дата расчета",
@@ -384,7 +389,8 @@
     "factorCurrentValueGP": "Фактор текущей стоимости с учетом гарантированных выплат",
     "alfa": "Расходы от премии, в %",
     "gamma": "Расходы от выплат, в %",
-    "mrpPayment": "Выплата на погребение (в тенге)"
+    "mrpPayment": "Выплата на погребение (в тенге)",
+    "fixInsSum": "Фиксированная сумма"
   },
   "calculatorForm": {
     "selectedCountries": "Выбранные страны",
@@ -886,7 +892,8 @@
     "registrationPlaceOfContactPerson": "Место жительства или регистрации Контактного лица Застрахованного",
     "identityCardOfContactPerson": "Документ удостоверяющий личность Контактного лица Застрахованного",
     "recipientDocs": "Документы Получателя",
-    "recipientData": "Сведения о Получателе"
+    "recipientData": "Сведения о Получателе",
+    "deathInsFromNS": "Страхование от смерти от НС"
   },
   "bankDetailsForm": {
     "title": "Банковские реквизиты",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.9-beta.44",
+  "version": "0.0.9-beta.45",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",
@@ -28,8 +28,8 @@
     "dev": "nuxt dev",
     "generate": "nuxt generate",
     "preview": "nuxt preview",
-    "tk:all": "cd .. && cd amuletlife && yarn typecheck && cd .. && cd baiterek && yarn typecheck && cd .. && cd bolashak && yarn typecheck && cd .. && cd calculator && yarn typecheck && cd .. && cd daskamkorlyk && yarn typecheck && cd .. && cd efo && yarn typecheck && cd .. && cd gons && yarn typecheck && cd .. && cd kazyna && yarn typecheck && cd .. && cd lifebusiness && yarn typecheck && cd .. && cd liferenta && yarn typecheck && cd .. && cd lifetrip && yarn typecheck && cd .. && cd pensionannuity && yarn typecheck && cd .. && cd core",
-    "i:all": "cd .. && cd amuletlife && yarn && cd .. && cd baiterek && yarn && cd .. && cd bolashak && yarn && cd .. && cd calculator && yarn && cd .. && cd daskamkorlyk && yarn && cd .. && cd efo && yarn && cd .. && cd gons && yarn && cd .. && cd kazyna && yarn && cd .. && cd lifebusiness && yarn && cd .. && cd liferenta && yarn && cd .. && cd lifetrip && yarn && cd .. && cd pensionannuity && yarn && cd .. && cd core",
+    "tk:all": "cd .. && cd amuletlife && yarn typecheck && cd .. && cd baiterek && yarn typecheck && cd .. && cd bolashak && yarn typecheck && cd .. && cd calc && yarn typecheck && cd .. && cd daskamkorlyk && yarn typecheck && cd .. && cd efo && yarn typecheck && cd .. && cd gons && yarn typecheck && cd .. && cd halykkazyna && yarn typecheck && cd .. && cd lifebusiness && yarn typecheck && cd .. && cd gns && yarn typecheck && cd .. && cd liferenta && yarn typecheck && cd .. && cd lifetrip && yarn typecheck && cd .. && cd pensionannuity && yarn typecheck && cd .. && cd core",
+    "i:all": "cd .. && cd amuletlife && yarn && cd .. && cd baiterek && yarn && cd .. && cd bolashak && yarn && cd .. && cd calc && yarn && cd .. && cd daskamkorlyk && yarn && cd .. && cd efo && yarn && cd .. && cd gons && yarn && cd .. && cd halykkazyna && yarn && cd .. && cd lifebusiness && yarn && cd .. && cd gns && yarn && cd .. && cd liferenta && yarn && cd .. && cd lifetrip && yarn && cd .. && cd pensionannuity && yarn && cd .. && cd core",
     "update:core": "git checkout -b %npm_package_version% && git add . && git commit -m \"%npm_package_version%\" && git push && git checkout main",
     "update:aml": "cd ../../aml/aml && yarn && cd ../checkcontract && yarn && cd ../checkcontragent && yarn && cd.. && git checkout -b %npm_package_version% && git add . && git commit -m \"%npm_package_version%\" && git push && git checkout main && cd ../efo/core",
     "update:lka": "cd .. && cd lka && yarn && git checkout -b %npm_package_version% && git add . && git commit -m \"%npm_package_version%\" && git push && git checkout main && cd .. && cd core",

package/store/data.store.ts

@@ -59,6 +59,7 @@ export const useDataStore = defineStore('data', {
     isDas: state => state.product === 'daskamkorlyk',
     isPension: state => state.product === 'pensionannuity',
     isAmulet: state => state.product === 'amuletlife',
+    isGns: state => state.product === 'gns',
     isCalculator: state => state.product === 'calculator',
     isCheckContract: state => state.product === 'checkcontract',
     isCheckContragent: state => state.product === 'checkcontragent',
@@ -394,7 +395,7 @@ export const useDataStore = defineStore('data', {
         this.isLoading = false;
       }
     },
-    async getContragent(member: Member, load: boolean = true) {
+    async getContragent(member: Member, load: boolean = true, showToaster: boolean = true) {
       this.isLoading = load;
       if (!member.iin) return;
       try {
@@ -416,7 +417,7 @@ export const useDataStore = defineStore('data', {
           }
           member.gotFromInsis = true;
         } else {
-          this.showToaster('error', this.t('toaster.notFoundUser'));
+          if (showToaster) this.showToaster('error', this.t('toaster.notFoundUser'));
         }
       } catch (err) {
         ErrorHandler(err);
@@ -1046,9 +1047,10 @@ export const useDataStore = defineStore('data', {
         conditionsData.policyAppDto.paymentPeriod = Number(this.formStore.productConditionsForm.termAnnuityPayments);
         conditionsData.policyAppDto.annuityPaymentPeriodId = (this.formStore.productConditionsForm.periodAnnuityPayment.id as string) ?? undefined;
       }
-      if (this.isLifeBusiness) {
+      if (this.isLifeBusiness || this.isGns) {
         conditionsData.policyAppDto.insTermInMonth = Number(this.formStore.productConditionsForm.coverPeriod);
-        conditionsData.policyAppDto.fixInsSum = getNumber(String(this.formStore.productConditionsForm.requestedSumInsured));
+        conditionsData.policyAppDto.fixInsSum = getNumber(String(this.formStore.productConditionsForm.fixInsSum));
+        conditionsData.policyAppDto.mainInsSum = getNumber(String(this.formStore.productConditionsForm.requestedSumInsured));
         conditionsData.policyAppDto.agentCommission = Number(this.formStore.productConditionsForm.agentCommission);
         conditionsData.policyAppDto.processDefinitionFgotId = (this.formStore.productConditionsForm.processGfot.id as string) ?? undefined;
       }
@@ -1332,7 +1334,7 @@ export const useDataStore = defineStore('data', {
       return this.cities;
     },
     async getCitiesEfo(key?: string, member?: any, parentKey?: string) {
-      if (this.isLifeBusiness) {
+      if (this.isLifeBusiness || this.isGns) {
         await this.getFromApi('cities', 'getCities');
         //@ts-ignore
         if (key && member[parentKey][key] && member[parentKey][key].ids !== null) return this.cities.filter(i => i.code === member[parentKey][key].ids);
@@ -1372,7 +1374,7 @@ export const useDataStore = defineStore('data', {
       return await this.getFromApi('economySectorCode', 'getSectorCode');
     },
     async getEconomicActivityType() {
-      if (this.isLifeBusiness || this.isDas || this.isUU) return await this.getFromApi('economicActivityType', 'getEconomicActivityType');
+      if (this.isLifeBusiness || this.isGns || this.isDas || this.isUU) return await this.getFromApi('economicActivityType', 'getEconomicActivityType');
     },
     async getFamilyStatuses() {
       return await this.getFromApi('familyStatuses', 'getFamilyStatuses');
@@ -1381,7 +1383,7 @@ export const useDataStore = defineStore('data', {
       return await this.getFromApi('relations', 'getRelationTypes');
     },
     async getBanks() {
-      if (this.isLifeBusiness || this.isDas || this.isUU) return await this.getFromApi('banks', 'getBanks');
+      if (this.isLifeBusiness || this.isGns || this.isDas || this.isUU) return await this.getFromApi('banks', 'getBanks');
     },
     async getProcessIndexRate() {
       if (this.processCode) {
@@ -1432,7 +1434,7 @@ export const useDataStore = defineStore('data', {
       return this.gender;
     },
     async getAuthorityBasis() {
-      if (this.isDas || this.isLifeBusiness || this.isUU) return await this.getFromApi('authorityBasis', 'getArmDicts', 'DicAuthorityBasis');
+      if (this.isDas || this.isLifeBusiness || this.isGns || this.isUU) return await this.getFromApi('authorityBasis', 'getArmDicts', 'DicAuthorityBasis');
     },
     async getAllFormsData() {
       await Promise.allSettled([
@@ -1790,11 +1792,12 @@ export const useDataStore = defineStore('data', {
           calculationData.paymentPeriod = Number(this.formStore.productConditionsForm.termAnnuityPayments);
           calculationData.annuityPaymentPeriodId = (this.formStore.productConditionsForm.periodAnnuityPayment.id as string) ?? undefined;
         }
-        if (this.isLifeBusiness || product === 'lifebusiness') {
+        if (this.isLifeBusiness || product === 'lifebusiness' || this.isGns || product === 'gns') {
           calculationData.clients = this.formStore.lfb.clients;
           calculationData.insrCount = this.formStore.lfb.clients.length;
           calculationData.insTermInMonth = Number(this.formStore.productConditionsForm.coverPeriod);
-          calculationData.fixInsSum = getNumber(String(this.formStore.productConditionsForm.requestedSumInsured));
+          calculationData.fixInsSum = getNumber(String(this.formStore.productConditionsForm.fixInsSum));
+          calculationData.mainInsSum = getNumber(String(this.formStore.productConditionsForm.requestedSumInsured));
           calculationData.agentCommission = Number(this.formStore.productConditionsForm.agentCommission);
           calculationData.processDefinitionFgotId = this.formStore.productConditionsForm.processGfot.id;
         }
@@ -1818,9 +1821,9 @@ export const useDataStore = defineStore('data', {
           this.formStore.productConditionsForm.statePremium5 = this.getNumberWithSpaces(calculationResponse.statePremium5);
           this.formStore.productConditionsForm.statePremium7 = this.getNumberWithSpaces(calculationResponse.statePremium7);
         }
-        if (this.isLifeBusiness || product === 'lifebusiness') {
-          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(calculationResponse.mainPremium);
-          this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(calculationResponse.fixInsSum === 0 ? null : calculationResponse.fixInsSum);
+        if (this.isLifeBusiness || product === 'lifebusiness' || this.isGns || product === 'gns') {
+          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(calculationResponse.mainPremiumWithCommission);
+          this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(calculationResponse.mainInsSum === 0 ? null : calculationResponse.mainInsSum);
           this.formStore.additionalInsuranceTermsWithout = calculationResponse.addCovers;
           if (calculationResponse.agentCommission) {
             this.formStore.productConditionsForm.agentCommission = calculationResponse.agentCommission;
@@ -1873,7 +1876,7 @@ export const useDataStore = defineStore('data', {
           this.formStore.productConditionsForm.statePremium5 = this.getNumberWithSpaces(govPremiums.statePremium5 === null ? null : govPremiums.statePremium5);
           this.formStore.productConditionsForm.statePremium7 = this.getNumberWithSpaces(govPremiums.statePremium7 === null ? null : govPremiums.statePremium7);
         }
-        if (this.isLifeBusiness) {
+        if (this.isLifeBusiness || this.isGns) {
           this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(result.value);
           if (applicationData.insuredApp && applicationData.insuredApp.length) {
             const res = await this.newInsuredList(applicationData.insuredApp);
@@ -2976,7 +2979,7 @@ export const useDataStore = defineStore('data', {
           member.resetMember(false);
         }
         member.gosPersonData = person;
-        await this.getContragent(member, false);
+        await this.getContragent(member, false, false);
         member.verifyDate = responseInfo.responseDate;
         member.verifyType = 'GBDFL';
         await this.saveInStoreUserGBDFL(person, member);
@@ -3146,9 +3149,16 @@ export const useDataStore = defineStore('data', {
       this.preparePersonData(policyholder);
       delete policyholder.clientData.beneficalOwnerQuest;
       delete policyholder.clientData.identityDocument;
-      delete policyholder.clientData.authoritedPerson.identityDocument;
       delete policyholder.clientData.activityTypes;
       delete policyholder.clientData.citizenship;
+      delete policyholder.clientData.authoritedPerson.identityDocument;
+      delete policyholder.clientData.authoritedPerson.actualAddress;
+      delete policyholder.clientData.authoritedPerson.bankInfo;
+      delete policyholder.clientData.authoritedPerson.economySectorCode;
+      delete policyholder.clientData.authoritedPerson.legalAddress;
+      delete policyholder.clientData.authoritedPerson.placeOfBirth;
+      delete policyholder.clientData.authoritedPerson.resident;
+      delete policyholder.clientData.authoritedPerson.taxResidentCountry;
       if (!policyholder.clientData.iin) return false;
       try {
         const response = await this.api.startApplication(policyholder);
@@ -3236,10 +3246,11 @@ export const useDataStore = defineStore('data', {
         }
 
         this.formStore.productConditionsForm.agentCommission = applicationData.policyAppDto.agentCommission === 0 ? null : applicationData.policyAppDto.agentCommission;
+        this.formStore.productConditionsForm.fixInsSum = this.getNumberWithSpaces(applicationData.policyAppDto.fixInsSum === 0 ? null : applicationData.policyAppDto.fixInsSum);
         this.formStore.productConditionsForm.coverPeriod = 12;
         this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(applicationData.policyAppDto.amount === 0 ? null : applicationData.policyAppDto.amount);
         this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(
-          applicationData.policyAppDto.mainPremium === 0 ? null : applicationData.policyAppDto.mainPremium,
+          applicationData.policyAppDto.mainPremiumWithCommission === 0 ? null : applicationData.policyAppDto.mainPremiumWithCommission,
         );
         const paymentPeriod = this.processPaymentPeriod.find(item => item.id == applicationData.policyAppDto.paymentPeriodId);
         this.formStore.productConditionsForm.paymentPeriod = paymentPeriod ? paymentPeriod : new Value();

package/types/enum.ts

@@ -42,6 +42,9 @@ export enum Actions {
 
   chooseSign = 'chooseSign',
   chooseSignCustom = 'chooseSignCustom',
+
+  choosePay = 'choosePay',
+  choosePayCustom = 'choosePayCustom',
 }
 
 export enum PostActions {

package/types/index.ts

@@ -24,6 +24,7 @@ declare global {
     | 'checkcontragent'
     | 'daskamkorlyk'
     | 'amuletlife'
+    | 'gns'
     | 'pensionannuity'
     | 'dso'
     | 'uu';
@@ -59,6 +60,14 @@ declare global {
     | 'url'
     | 'week';
 
+  type NestedKeyOf<ObjectType extends object> = {
+    [Key in keyof ObjectType & (string | number)]: ObjectType[Key] extends object ? `${Key}` | `${Key}.${NestedKeyOf<ObjectType[Key]>}` : Key;
+  }[keyof ObjectType & (string | number)];
+
+  type FinalNestedKeyOf<ObjectType extends object> = {
+    [Key in keyof ObjectType & (string | number)]: ObjectType[Key] extends object ? `${Key}.${NestedKeyOf<ObjectType[Key]>}` : Key;
+  }[keyof ObjectType & (string | number)];
+
   interface AxiosRequestLocalConfig extends AxiosRequestConfig {
     method: Methods | keyof typeof Methods;
   }
@@ -308,6 +317,8 @@ declare global {
     clients?: ClientV2[];
     fixInsSum?: number | null;
     agentCommission?: number | null;
+    mainInsSum?: number | null;
+    mainPremiumWithCommission?: number;
   };
 
   interface AddCover {
@@ -573,7 +584,7 @@ declare global {
     tariffId?: string | null;
     mainPremium?: number | string | null;
     processDefinitionFgotId?: string | number;
-    mainInsSum?: number;
+    mainInsSum?: number | null;
     agentCommission?: number | null;
   };