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

package/api/base.api.ts

@@ -456,7 +456,12 @@ export class ApiClass {
       url: `/${this.productUrl}/api/Application/CheckBeneficiariesInActualPolicy?iin=${iin}`,
     });
   }
-
+  async checkBeneficiariesActualPolicy(id: string) {
+    return await this.axiosCall<boolean>({
+      method: Methods.GET,
+      url: `/${this.productUrl}/api/Application/checkBeneficiariesActualPolicy?processInstanceId=${id}`,
+    });
+  }
   async setMember(whichMember: keyof typeof MemberCodes, data: any) {
     return await this.axiosCall({
       method: Methods.POST,
@@ -992,6 +997,27 @@ export class ApiClass {
     });
   }
 
+  async getContractByBin(bin: string) {
+    return await this.axiosCall<Types.GetContractByBinResponse>({
+      method: Methods.GET,
+      url: `/${this.productUrl}/api/Application/getContractByBin`,
+      params: {
+        bin,
+      },
+    });
+  }
+
+  async checkProActiveService(processInstanceId: string | number, iin: string) {
+    return await this.axiosCall({
+      method: Methods.GET,
+      url: `/${this.productUrl}/api/Application/CheckProActiveService`,
+      params: {
+        processInstanceId,
+        iin,
+      },
+    });
+  }
+
   pensionannuityNew = {
     base: '/pensionannuityNew',
     getEnpfRedirectUrl: async (id: string) => {

package/api/interceptors.ts

@@ -68,6 +68,9 @@ export default function (axios: AxiosInstance) {
           if (error.response.status === 403 && error.response.config.url) {
             dataStore.showToaster('error', `Нет доступа на запрос: ${error.response.config.url.substring(error.response.config.url.lastIndexOf('/') + 1)}`, 5000);
           }
+          if (error.response.status === 413) {
+            dataStore.showToaster('error', dataStore.t('error.exceedUploadLimitFile'), 5000);
+          }
         }
       }
       return Promise.reject(error);

package/components/Pages/MemberForm.vue

@@ -75,17 +75,20 @@
           @keyup.enter.prevent="otpCondition ? openCustomPanel('otp') : null"
           :rules="phoneRule"
         />
-        <base-form-input
-          v-model="member.iin"
-          :label="$dataStore.t('form.iin')"
-          :maska="$maska.iin"
-          :readonly="!!isDisabled || !!isIinPhoneDisabled || !!member.parsedDocument?.iin || !!isDataFromGov"
-          :clearable="!isDisabled && !isIinPhoneDisabled && !member.parsedDocument?.iin && !isDataFromGov"
-          :append-inner-icon="hasMemberSearch || !isNonResident ? (hasDocumentReader ? 'mdi mdi-credit-card-scan-outline' : 'mdi mdi-magnify') : ''"
-          @append="searchMember"
-          @input="onIinInput"
-          :rules="isNonResident ? [] : $rules.required.concat($rules.iinRight)"
-        />
+        <base-animation>
+          <base-form-input
+            v-if="!isNonResident"
+            v-model="member.iin"
+            :label="$dataStore.t('form.iin')"
+            :maska="$maska.iin"
+            :readonly="!!isDisabled || !!isIinPhoneDisabled || !!member.parsedDocument?.iin || !!isDataFromGov"
+            :clearable="!isDisabled && !isIinPhoneDisabled && !member.parsedDocument?.iin && !isDataFromGov"
+            :append-inner-icon="hasMemberSearch || !isNonResident ? (hasDocumentReader ? 'mdi mdi-credit-card-scan-outline' : 'mdi mdi-magnify') : ''"
+            @append="searchMember"
+            @input="onIinInput"
+            :rules="isNonResident ? [] : $rules.required.concat($rules.iinRight)"
+          />
+        </base-animation>
         <base-form-input
           v-model.trim="member.lastName"
           :readonly="isDisabled || isDataFromGov || !!member.parsedDocument?.lastName"
@@ -100,7 +103,7 @@
           :label="$dataStore.t('form.firstName')"
           :rules="$rules.required.concat($rules.cyrillic)"
           :append-inner-icon="isNonResident ? 'mdi mdi-magnify' : ''"
-          @append="isNonResident && searchMember"
+          @append="searchMember"
         />
         <base-form-input
           v-if="hasMiddleName"
@@ -491,6 +494,31 @@
           append-inner-icon="mdi mdi-chevron-right"
           @append="openPanel($dataStore.t('form.documentIssuers'), [], 'documentIssuers', $dataStore.getDocumentIssuers)"
         />
+        <base-animation>
+          <div v-if="hasIssuerOther" class="flex flex-col gap-[1px]">
+            <base-form-input
+              v-model="member.documentIssuers.issuerOtherName"
+              :label="$dataStore.t('form.issuerOtherName')"
+              :readonly="isDisabled"
+              :clearable="!isDisabled"
+              :rules="$rules.required.concat($rules.onlySymbols)"
+            />
+            <base-form-input
+              v-model="member.documentIssuers.issuerOtherNameOrig"
+              :label="$dataStore.t('form.issuerOtherNameOrig')"
+              :readonly="isDisabled"
+              :clearable="!isDisabled"
+              :rules="$rules.required"
+            />
+            <base-form-input
+              v-model="member.documentIssuers.issuerOtherNameRu"
+              :label="$dataStore.t('form.issuerOtherNameRu')"
+              :readonly="isDisabled"
+              :clearable="!isDisabled"
+              :rules="$rules.required.concat($rules.cyrillic)"
+            />
+          </div>
+        </base-animation>
         <base-form-input
           v-model="member.documentDate"
           :label="$dataStore.t('form.documentDate')"
@@ -1004,6 +1032,7 @@ export default {
         (dataStore.isLifetrip && whichForm.value === formStore.insuredFormKey && member.value.isInsuredUnderage),
     );
     const hasWorkPositionDict = dataStore.isBaiterek;
+    const hasIssuerOther = computed(() => !useEnv().isProduction && member.value.documentIssuers && member.value.documentIssuers.nameRu === 'Другое');
 
     const birthDateRule = computed(() => {
       const baseDateRule = dataStore.rules.required.concat(dataStore.rules.birthDate);
@@ -1681,7 +1710,9 @@ export default {
           };
           const isApplicationSaved = await dataStore.setApplication(data);
           if (isApplicationSaved === false) return;
-          dataStore.showToaster('info', dataStore.t('toaster.needToRecalculate'), 5000);
+          if (formStore.applicationData.pensionApp.amount && formStore.applicationData.pensionApp.amount !== 0)
+            dataStore.showToaster('info', dataStore.t('toaster.needToRecalculate'), 5000);
+          await dataStore.saveMember(member.value, 'Client', memberFromApplicaiton);
         }
       }
       await router.replace({
@@ -1735,6 +1766,7 @@ export default {
           isSubmittingForm.value = true;
           const docType = member.value.documentType.ids;
           if (
+            !isNonResident.value &&
             member.value.gotFromInsis === true &&
             (docType === CoreEnums.Insis.DocTypes['1UDL'] ||
               docType === CoreEnums.Insis.DocTypes.SBI ||
@@ -2167,6 +2199,7 @@ export default {
       hasInsurancePay,
       hasSignOfIPDL,
       hasSameAddressToggle,
+      hasIssuerOther,
       hasMemberSearch,
       hasWorkPositionDict,
       gbdDocuments,

package/components/Pages/ProductConditions.vue

@@ -161,16 +161,16 @@
           :label="$dataStore.t('agent.currency')"
           :rules="$rules.objectRequired"
           append-inner-icon="mdi mdi-chevron-right"
-          @append="openPanel($dataStore.t('agent.currency'), $constants.currencyList, 'currency')"
+          @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
@@ -307,7 +307,7 @@
           :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'">
@@ -359,7 +359,7 @@
             :label="$dataStore.t('pension.ownFundsRaisAmount')"
           />
         </base-form-section>
-        <base-form-section v-if="formStore.applicationData.processCode !== 2" :title="$dataStore.t('pension.companyName')">
+        <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
@@ -821,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;
       }
@@ -875,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(() => {
@@ -993,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');
       }
@@ -1005,6 +1014,9 @@ 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');
       }
@@ -1063,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;
@@ -1075,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;
@@ -1122,6 +1143,12 @@ export default defineComponent({
       }
       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,
@@ -1157,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') {
@@ -1765,7 +1792,7 @@ export default defineComponent({
         const kazynaPaymentPeriod = dataStore.processPaymentPeriod.find(i => i.code === 'single');
         if (kazynaPaymentPeriod) productConditionsForm.paymentPeriod = kazynaPaymentPeriod;
       }
-      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);
@@ -1952,6 +1979,7 @@ export default defineComponent({
       isTermsDisabled,
       isUnderwriterForm,
       hasCurrencySymbols,
+      currencyListFiltered,
       currencySymbolsLabel,
       isDisabledPaymentPeriod,
       insurancePremiumPerMonthRule,
@@ -1987,6 +2015,7 @@ export default defineComponent({
       hasDefault,
       isShownAdditionalTerms,
       hasCalcSum,
+      isDisabledInsStartDate,
       isDisabledAgentCommission,
       hasFixInsSum,
       isDisabledFixInsSum,

package/components/Panel/PanelHandler.vue

@@ -184,13 +184,7 @@
             <base-btn :loading="loading" :text="$dataStore.t('payment.copyUrl')" @click="$dataStore.copyToClipboard(formStore.epayLink)" />
             <base-btn :loading="loading" :text="$dataStore.t('payment.recipientNumber')" @click="openEpayPanel" />
             <base-btn :loading="loading" :text="$dataStore.t('sign.convertQr')" @click="convertQr(formStore.epayLink)" />
-            <base-btn
-              v-if="!useEnv().isProduction"
-              :loading="loading"
-              :btn="$styles.greenBtn"
-              :text="$dataStore.t('payment.halykLink')"
-              @click="convertQr(formStore.epayLink, 'halyk_pay_link_template')"
-            />
+            <base-btn :loading="loading" :btn="$styles.greenBtn" :text="$dataStore.t('payment.halykLink')" @click="convertQr(formStore.epayLink, 'halyk_pay_link_template')" />
           </div>
         </base-form-section>
         <div v-if="isSendNumberOpen" :class="[$styles.flexColNav]">
@@ -905,7 +899,7 @@ export default defineComponent({
           }
         }
         if (message.length) {
-          dataStore.showToaster('info', 'Подписано: ' + message.join(', '), 5000);
+          // dataStore.showToaster('info', 'Подписывается: ' + message.join(', '), 5000);
           await checkIfAllSigned();
         }
         currentFilePanel.value = [];

package/composables/classes.ts

@@ -460,7 +460,7 @@ export class Member extends Person {
   birthRegion: Value;
   documentType: Value;
   documentNumber: string | null;
-  documentIssuers: Value;
+  documentIssuers: Types.Base.Document.IssuerOther;
   documentDate: string | null;
   documentExpire: string | null;
   signOfResidency: Value;
@@ -927,7 +927,13 @@ export class ProductConditions {
     this.fixInsSum = fixInsSum;
     this.calcDate = calcDate;
     this.contractEndDate = contractEndDate;
-    this.currency = currency;
+    this.currency = {
+      code: 'KZT',
+      id: '1',
+      nameKz: 'Тенге',
+      nameRu: 'Тенге',
+      ids: '',
+    };
   }
 
   getSingleTripDays() {
@@ -1347,6 +1353,8 @@ export class FormStoreClass {
     clientId: string | null;
     insuredFile: any;
     isPanelInside: boolean;
+    typeChange: string;
+    add: boolean;
   };
   additionalInsuranceTerms: Types.AddCover[];
   additionalInsuranceTermsWithout: Types.AddCover[];
@@ -1418,6 +1426,7 @@ export class FormStoreClass {
     isTask?: boolean | null;
     createDate?: string | null;
     policyAppDto?: Types.PolicyAppDto;
+    parentPolicyDto?: Types.ParentPolicyDto | null;
     insisWorkDataApp?: Types.InsisWorkDataApp;
     addCoverDto?: Types.AddCover[];
   };
@@ -1461,6 +1470,8 @@ export class FormStoreClass {
       clientId: null,
       insuredFile: null,
       isPanelInside: false,
+      typeChange: 'calculation',
+      add: false,
     };
     this.additionalInsuranceTerms = [];
     this.additionalInsuranceTermsWithout = [];

package/composables/constants.ts

@@ -18,7 +18,9 @@ export const constants = Object.freeze({
     gns: 16,
     prepensionannuity: 18,
     pensionannuitynew: 19,
+    halykkazynaap: 20,
     balam: 21,
+    halykkazynaapsms: 23,
   },
   amlProducts: {
     checkcontragent: 1,
@@ -75,6 +77,20 @@ export const constants = Object.freeze({
     kzt: '₸',
     usd: '$',
   },
+  pensionAge: {
+    man: 63,
+    woman: 61,
+  },
+  genderByIIN: {
+    '0': 'Ж',
+    '3': 'М',
+    '4': 'Ж',
+    '5': 'М',
+    '6': 'Ж',
+    '7': 'М',
+    '8': 'Ж',
+    '9': 'М',
+  },
   documentTypes: {
     statement: 5,
     contract: 6,

package/composables/index.ts

@@ -4,7 +4,7 @@ import { XMLParser } from 'fast-xml-parser';
 import { AxiosError } from 'axios';
 import { DocumentReaderApi, Scenario, TextFieldType, LCID } from '@regulaforensics/document-reader-webclient';
 import { PolicyholderClass, Value, User } from '../composables/classes';
-import type { EnvModes, NestedKeyOf, ResponseStructure, Utils } from '../types';
+import type { EnvModes, NestedKeyOf, Projects, ResponseStructure, Utils } from '../types';
 import { Roles, Statuses } from '../types/enum';
 
 export const useEnv = () => {
@@ -702,8 +702,15 @@ export class RoleController {
     }
     return !!this.user.roles.find(i => i === whichRole);
   };
-  isInitiator = () => {
-    return this.isManager() || this.isAgent() || this.isAgentMycar() || this.isManagerHalykBank() || this.isServiceManager() || this.isAgentAuletti();
+  isInitiator = (productFromExternal?: string) => {
+    const env = useEnv();
+    const dataStore = useDataStore();
+    const hasAccessByProduct = (() => {
+      const product = productFromExternal as Projects;
+      if (dataStore.isLifetrip || product === 'lifetrip' || (!env.isProduction && (dataStore.isPension || product === 'pensionannuitynew'))) return this.isBranchDirector();
+      return false;
+    })();
+    return this.isManager() || this.isAgent() || this.isAgentMycar() || this.isManagerHalykBank() || this.isServiceManager() || this.isAgentAuletti() || hasAccessByProduct;
   };
   isManager = () => {
     return this.isRole(constants.roles.Manager);

package/locales/ru.json

@@ -28,7 +28,8 @@
     "noOtpCode": "Заполните поля: ИИН, Номер телефона, Код подтверждения",
     "memberCopy": "Ошибка при копировании данных участников",
     "memberSave": "Ошибка при сохранении данных участников",
-    "notValidIik": "Некорректный ИИК"
+    "notValidIik": "Некорректный ИИК",
+    "exceedUploadLimitFile": "Размер файла превышает определенный лимит"
   },
   "toaster": {
     "wrongFormatOf": "Некорректный формат \"{text}\"",
@@ -241,7 +242,8 @@
     "sendDosie": "Отправить досье",
     "downloadPaymentInvoice": "Скачать счет на оплату",
     "copyToClient": "Скопировать ссылку для клиента",
-    "searchByFio": "Поиск по ФИО"
+    "searchByFio": "Поиск по ФИО",
+    "conclude": "Заключить"
   },
   "dialog": {
     "title": "Подтверждение",
@@ -280,7 +282,9 @@
     "choosePay": "Вы действительно хотите выбрать метод оплаты?",
     "searchBeneficiary": "Выполните поиск договоров по ИИН Выгодоприобретателя",
     "searchFoundBeneficiary": "По данному ИИН уже имеется договор. Создание заявки по продукту “ГОНС” - невозможно.",
-    "searchNotFoundBeneficiary": "По данному ИИН договор не найден. Нажмите “Создать” для создания новой заявки по продукту “ГОНС”"
+    "searchNotFoundBeneficiary": "По данному ИИН договор не найден. Нажмите “Создать” для создания новой заявки по продукту “ГОНС”",
+    "searchFoundPolicyholder": "Выполните поиск договоров по БИН Страхователя",
+    "searchNotFoundPolicyholder": "По данному БИНу не найден договор {product}.\nПроверьте правильность ввода БИН."
   },
   "sign": {
     "chooseDoc": "Выберите документы для подписание",
@@ -368,6 +372,7 @@
   "downloadTemplate": "Скачать шаблон",
   "countriesLength": "Число выбранных стран",
   "isPolicyholderLegalEntity": "Является ли Страхователь Юридическим лицом?",
+  "additionalAgreement": "Заключить дополнительное соглашение",
   "productConditionsForm": {
     "coverPeriod": "Срок страхования",
     "payPeriod": "Период оплаты страховой премии",
@@ -418,7 +423,9 @@
     "alfa": "Расходы от премии, в %",
     "gamma": "Расходы от выплат, в %",
     "mrpPayment": "Выплата на погребение (в тенге)",
-    "fixInsSum": "Фиксированная сумма"
+    "fixInsSum": "Фиксированная сумма",
+    "amountRefunded": "Сумма к возврату",
+    "amountPaid": "Сумма к доплате"
   },
   "calculatorForm": {
     "selectedCountries": "Выбранные страны",
@@ -455,7 +462,8 @@
     "factEndDate": "Дата завершения",
     "decision": "Статус",
     "userFullName": "Исполнитель",
-    "stage": "Этап"
+    "stage": "Этап",
+    "policyNumber": "№ Полиса"
   },
   "aml": {
     "contractSignDate": "Дата заключение контракта",
@@ -794,6 +802,7 @@
     "resetPassword": "Забыли пароль?",
     "search": "Поиск",
     "searchByIIN": "Поиск по ИИН",
+    "searchByBIN": "Поиск по БИН",
     "chooseScannedDoc": "Выбрать отсканированный документ",
     "inputText": "Введите текст",
     "waitingStatus": "Ожидание",
@@ -955,6 +964,9 @@
     "documentNumber": "Номер документа",
     "date": "Дата",
     "documentIssuers": "Кем выдан",
+    "issuerOtherName": "Название органа выдачи на казахском",
+    "issuerOtherNameRu": "Название органа выдачи на русском",
+    "issuerOtherNameOrig": "Оригинальное название органа выдачи",
     "documentDate": "Дата выдачи",
     "documentExpire": "Действует до",
     "signOfResidency": "Признак резиденства",
@@ -1002,7 +1014,8 @@
     "recipientDocs": "Документы Получателя",
     "recipientData": "Сведения о Получателе",
     "deathInsFromNS": "Страхование от смерти от НС",
-    "deathInsAnyReason": "Смерть Застрахованного по любой причине"
+    "deathInsAnyReason": "Смерть Застрахованного по любой причине",
+    "mark": "Признак"
   },
   "bankDetailsForm": {
     "title": "Банковские реквизиты",

package/package.json

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

package/plugins/head.ts

@@ -22,5 +22,6 @@ export default defineNuxtPlugin(() => {
         href: 'https://cdn.jsdelivr.net/npm/animate.css@4.1.1/animate.min.css',
       },
     ],
+    script: [{ children: 'if (!Object.hasOwn) {Object.hasOwn = function(obj, prop) {return Object.prototype.hasOwnProperty.call(obj, prop);};}' }],
   });
 });

package/store/data.store.ts

@@ -341,14 +341,18 @@ export const useDataStore = defineStore('data', {
     async getContragent(member: Member, load: boolean = true, showToaster: boolean = true) {
       this.isLoading = load;
       const isNonResident = this.isPension && member.signOfResidency.ids === '500011.2';
-      if (!member.iin || (isNonResident && (!member.firstName || !member.lastName))) return;
+      if (isNonResident) {
+        if (!member.firstName || !member.lastName) return;
+      } else {
+        if (!member.iin) return;
+      }
       try {
         const queryData = isNonResident
           ? {
               firstName: member.firstName ?? '',
               lastName: member.lastName ?? '',
               middleName: member.middleName ?? '',
-              iin: member.iin ? member.iin.replace(/-/g, '') : '',
+              iin: '',
               birthDate: member.birthDate ? formatDate(member.birthDate)?.toISOString() ?? '' : '',
             }
           : {
@@ -462,6 +466,11 @@ export const useDataStore = defineStore('data', {
         member.documentType = documentType ? documentType : new Value();
         member.documentNumber = userDocument.number;
         member.documentIssuers = documentIssuer ? documentIssuer : new Value();
+        if (userDocument.issuerNameRu === 'Другое') {
+          member.documentIssuers.issuerOtherNameRu = userDocument.issuerOtherNameRu;
+          member.documentIssuers.issuerOtherNameOrig = userDocument.issuerOtherNameOrig;
+          member.documentIssuers.issuerOtherName = userDocument.issuerOtherName;
+        }
         member.documentDate = reformatDate(userDocument.issueDate);
         member.documentExpire = reformatDate(userDocument.expireDate);
       }
@@ -542,10 +551,14 @@ export const useDataStore = defineStore('data', {
     },
     async alreadyInInsis(member: Member) {
       const isNonResident = this.isPension && member.signOfResidency.ids === '500011.2';
-      if (!member.iin || (isNonResident && (!member.firstName || !member.lastName))) return;
+      if (isNonResident) {
+        if (!member.firstName || !member.lastName) return;
+      } else {
+        if (!member.iin) return;
+      }
       try {
         const queryData = {
-          iin: !!member.iin ? member.iin.replaceAll('-', '') : '',
+          iin: !!member.iin && !isNonResident ? member.iin.replaceAll('-', '') : '',
           firstName: !!member.firstName ? member.firstName : '',
           lastName: !!member.lastName ? member.lastName : '',
           middleName: !!member.middleName ? member.middleName : '',
@@ -556,6 +569,7 @@ export const useDataStore = defineStore('data', {
           if (contragent.items.length === 1) {
             return contragent.items[0];
           } else {
+            if (this.isPension && queryData.iin === '') return contragent.items.find(i => i.id === member.id);
             const sortedByRegistrationDate = contragent.items.sort(
               (left, right) => new Date(right.registrationDate).getMilliseconds() - new Date(left.registrationDate).getMilliseconds(),
             );
@@ -589,8 +603,8 @@ export const useDataStore = defineStore('data', {
       }
     },
     async saveContragent(user: Member, whichForm: keyof typeof StoreMembers | 'contragent', whichIndex: number | null, onlySaveAction: boolean = true) {
-      if (this.isGons && user.iin && whichForm === 'beneficiaryForm' && useEnv().isProduction) {
-        const doesHaveActiveContract = await this.api.checkBeneficiariesInActualPolicy(user.iin.replace(/-/g, ''));
+      if (this.isGons && user.iin && whichForm === 'beneficiaryForm') {
+        const doesHaveActiveContract = await this.api.checkBeneficiariesActualPolicy(String(this.formStore.applicationData.processInstanceId));
         if (doesHaveActiveContract) {
           this.showToaster('error', this.t('toaster.doesHaveActiveContract'), 6000);
           return false;
@@ -627,7 +641,7 @@ export const useDataStore = defineStore('data', {
         const contragentData: Types.ContragentType = {
           id: Number(user.id),
           type: Number(user.type),
-          iin: user.iin!.replace(/-/g, ''),
+          iin: user.iin ? user.iin.replace(/-/g, '') : '',
           longName: user.longName !== null ? user.longName : (user.lastName ?? '') + (user.firstName ?? '') + (user.middleName ?? ''),
           lastName: user.lastName ?? '',
           firstName: user.firstName ?? '',
@@ -781,6 +795,11 @@ export const useDataStore = defineStore('data', {
           verifyType: user.verifyType,
           verifyDate: user.verifyDate,
         };
+        if (user.documentIssuers.ids === '1') {
+          userDocument.issuerOtherName = user.documentIssuers.issuerOtherName;
+          userDocument.issuerOtherNameOrig = user.documentIssuers.issuerOtherNameOrig;
+          userDocument.issuerOtherNameRu = user.documentIssuers.issuerOtherNameRu;
+        }
         if (hasAlreadyDocument !== -1) {
           documentsData[hasAlreadyDocument] = userDocument;
         } else {
@@ -1024,7 +1043,7 @@ export const useDataStore = defineStore('data', {
         conditionsData.policyAppDto.amountInCurrency = getNumber(String(this.formStore.productConditionsForm.requestedSumInsuredInDollar));
         conditionsData.policyAppDto.currencyExchangeRate = this.currencies.usd;
       }
-      if (this.isGons) {
+      if (this.isGons && !useEnv().isProduction) {
         conditionsData.policyAppDto.premiumInCurrency =
           this.formStore.productConditionsForm.currency.code === 'KZT' ? null : getNumber(String(this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar));
         conditionsData.policyAppDto.amountInCurrency =
@@ -1800,7 +1819,7 @@ export const useDataStore = defineStore('data', {
           calculationData.amountInCurrency = getNumber(String(this.formStore.productConditionsForm.requestedSumInsuredInDollar));
           calculationData.currencyExchangeRate = this.currencies.usd;
         }
-        if (this.isGons || product === 'gons') {
+        if (!useEnv().isProduction && (this.isGons || product === 'gons')) {
           calculationData.premiumInCurrency =
             this.formStore.productConditionsForm.currency.code === 'KZT' ? null : getNumber(String(this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar));
           calculationData.amountInCurrency =
@@ -1835,7 +1854,7 @@ export const useDataStore = defineStore('data', {
             this.isGons || product === 'gons' ? this.getNumberWithSpacesAfterComma(calculationResponse.premium) : this.getNumberWithSpaces(calculationResponse.premium);
 
         this.formStore.additionalInsuranceTermsWithout = calculationResponse.addCovers;
-        if (this.isKazyna || product === 'halykkazyna' || this.isGons || product === 'gons') {
+        if (this.isKazyna || product === 'halykkazyna' || ((this.isGons || product === 'gons') && !useEnv().isProduction)) {
           if (this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar != null) {
             this.formStore.productConditionsForm.requestedSumInsuredInDollar = this.getNumberWithSpaces(calculationResponse.amountInCurrency);
           } else {
@@ -1876,7 +1895,7 @@ export const useDataStore = defineStore('data', {
       this.isLoading = true;
       try {
         const id = this.formStore.applicationData.processInstanceId;
-        if (!this.isPension) await this.api.setApplication(this.getConditionsData());
+        if (!this.isPension && !(this.formStore.lfb.add && (this.isLifeBusiness || this.isGns))) await this.api.setApplication(this.getConditionsData());
         const result = ref();
         result.value = await this.api.getCalculation(String(id));
         const applicationData = await this.api.getApplicationData(taskId);
@@ -1916,6 +1935,15 @@ export const useDataStore = defineStore('data', {
             const res = await this.newInsuredList(applicationData.insuredApp);
             this.formStore.lfb.clients = res;
           }
+          if (this.formStore.lfb.add) {
+            if (result.value > 0) {
+              this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(result.value);
+              this.formStore.productConditionsForm.requestedSumInsured = null;
+            } else {
+              this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(result.value);
+              this.formStore.productConditionsForm.insurancePremiumPerMonth = null;
+            }
+          }
         }
 
         this.showToaster('success', this.t('toaster.calculated'), 1000);
@@ -2010,11 +2038,6 @@ export const useDataStore = defineStore('data', {
       this.isLoading = onlyGet;
       try {
         const applicationData = await this.api.getApplicationData(taskId);
-        if (this.processCode !== applicationData.processCode && !this.isPension) {
-          this.isLoading = false;
-          this.sendToParent(constants.postActions.toHomePage, this.t('toaster.noSuchProduct'));
-          return;
-        }
         this.formStore.regNumber = applicationData.regNumber;
         this.formStore.applicationData = applicationData;
         this.formStore.additionalInsuranceTerms = applicationData.addCoverDto;
@@ -2249,11 +2272,19 @@ export const useDataStore = defineStore('data', {
             ? this.getNumberWithSpacesAfterComma(applicationData.policyAppDto.premium === null ? null : applicationData.policyAppDto.premium)
             : this.getNumberWithSpaces(applicationData.policyAppDto.premium === null ? null : applicationData.policyAppDto.premium);
 
+          if (this.isGons) {
+            const govPremiums = await this.api.getGovernmentPremiums(String(this.formStore.applicationData.processInstanceId));
+            this.formStore.productConditionsForm.totalAmount5 = this.getNumberWithSpaces(govPremiums.totalAmount5 === null ? null : govPremiums.totalAmount5);
+            this.formStore.productConditionsForm.totalAmount7 = this.getNumberWithSpaces(govPremiums.totalAmount7 === null ? null : govPremiums.totalAmount7);
+            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.isKazyna || this.isGons) {
             this.formStore.productConditionsForm.requestedSumInsuredInDollar = this.getNumberWithSpaces(applicationData.policyAppDto.amountInCurrency);
             this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar = this.getNumberWithSpaces(applicationData.policyAppDto.premiumInCurrency);
           }
-          if (this.isGons) {
+          if (this.isGons && !useEnv().isProduction) {
             const currency = constants.currencyList.find(item => item.code === applicationData.policyAppDto.currency);
             this.formStore.productConditionsForm.currency = currency ? currency : new Value();
           }
@@ -2389,9 +2420,11 @@ export const useDataStore = defineStore('data', {
       }
     },
     async createInvoice() {
-      if (!this.formStore.applicationData.policyAppDto?.premium) return;
+      const premium =
+        this.isLifeBusiness || this.isGns ? this.formStore.applicationData.policyAppDto?.mainPremiumWithCommission : this.formStore.applicationData.policyAppDto?.premium;
+      if (!premium) return;
       try {
-        const created = await this.api.createInvoice(this.formStore.applicationData.processInstanceId, this.formStore.applicationData.policyAppDto.premium);
+        const created = await this.api.createInvoice(this.formStore.applicationData.processInstanceId, premium);
         return !!created;
       } catch (err) {
         this.isLoading = false;
@@ -3341,7 +3374,6 @@ 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 = this.isLifetrip
           ? filteredDocuments.find(i => i.type.code === CoreEnums.GBD.DocTypes.PS)
           : filteredDocuments.find(i => i.type.code === CoreEnums.GBD.DocTypes['1UDL']) ??
@@ -3414,11 +3446,14 @@ export const useDataStore = defineStore('data', {
         'clientData.authoritedPerson.bankInfo',
         'clientData.authoritedPerson.economySectorCode',
         'clientData.authoritedPerson.legalAddress',
-        'clientData.authoritedPerson.placeOfBirth',
         'clientData.authoritedPerson.taxResidentCountry',
         'clientData.authoritedPerson.addTaxResidency',
       ]);
       policyholder.clientData.authoritedPerson.gender = policyholder.clientData.authoritedPerson.gender.nameRu === 'Мужской' ? 1 : 2;
+      if (this.formStore.lfb.add) {
+        policyholder.parentContractNumber = localStorage.getItem('policyNo');
+        policyholder.parentContractId = localStorage.getItem('policyId');
+      }
       try {
         const response = await this.api.startApplication(policyholder);
         this.sendToParent(constants.postActions.applicationCreated, response.processInstanceId);
@@ -3451,6 +3486,11 @@ export const useDataStore = defineStore('data', {
         this.formStore.regNumber = applicationData.regNumber;
         this.formStore.additionalInsuranceTerms = applicationData.addCoverDto;
 
+        if (localStorage.getItem('add') === 'true' || this.formStore.applicationData.parentPolicyDto !== null) {
+          this.formStore.lfb.add = true;
+          this.formStore.lfb.policyholder.clientData.iin = localStorage.getItem('bin') as string;
+        }
+
         this.formStore.canBeClaimed = await this.api.isClaimTask(taskId);
         this.formStore.applicationTaskId = taskId;
         this.formStore.RegionPolicy.nameRu = applicationData.insisWorkDataApp.regionPolicyName;
@@ -3527,6 +3567,20 @@ export const useDataStore = defineStore('data', {
         this.formStore.productConditionsForm.paymentPeriod = paymentPeriod ? paymentPeriod : new Value();
         const processGfot = this.processGfot.find(item => item.id == applicationData.policyAppDto.processDefinitionFgotId);
         this.formStore.productConditionsForm.processGfot = processGfot ? processGfot : new Value();
+
+        if (applicationData.parentPolicyDto !== null) {
+          this.formStore.productConditionsForm.calcDate = reformatDate(applicationData.parentPolicyDto.contractInsrBegin);
+          this.formStore.productConditionsForm.contractEndDate = reformatDate(applicationData.parentPolicyDto.contractInsrEnd);
+        }
+        if (this.formStore.lfb.add) {
+          if (applicationData.policyAppDto.mainPremiumWithCommission > 0) {
+            this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(applicationData.policyAppDto.mainPremiumWithCommission);
+            this.formStore.productConditionsForm.requestedSumInsured = null;
+          } else {
+            this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(applicationData.policyAppDto.mainPremiumWithCommission);
+            this.formStore.productConditionsForm.insurancePremiumPerMonth = null;
+          }
+        }
       } catch (err) {
         ErrorHandler(err);
         if (err instanceof AxiosError) {
@@ -3635,6 +3689,8 @@ export const useDataStore = defineStore('data', {
           premium: client.insuredPolicyData.premium,
           premiumWithLoad: client.insuredPolicyData.premiumWithLoad,
           hasAttachedFile: client.hasAttachedFile,
+          insrBeginDate: client.insuredPolicyData.insrBeginDate ?? 'no',
+          insrEndDate: client.insuredPolicyData.insrEndDate ?? 'no',
         };
       });
       return clients;
@@ -3683,7 +3739,7 @@ export const useDataStore = defineStore('data', {
         return false;
       }
 
-      if (this.formStore.lfb.beneficialOwners) {
+      if (!this.formStore.lfb.add && this.formStore.lfb.beneficialOwners) {
         if (this.validateMultipleMembersV2('beneficialOwners', 'beneficialOwnerApp', 'бенефициарных собственников') === false) {
           return false;
         }
@@ -3694,7 +3750,7 @@ export const useDataStore = defineStore('data', {
         }
       }
 
-      if (this.formStore.applicationData.clientApp.clientData.activityTypes === null) {
+      if (!this.formStore.lfb.add && this.formStore.applicationData.clientApp.clientData.activityTypes === null) {
         this.showToaster('error', this.t('toaster.notSavedMember', { text: 'деятельности Страхователя' }), 3000);
         return false;
       }
@@ -3710,7 +3766,7 @@ export const useDataStore = defineStore('data', {
         }
       }
 
-      if (this.formStore.lfb.clients && this.formStore.lfb.clients.length <= 10) {
+      if (!this.formStore.lfb.add && this.formStore.lfb.clients && this.formStore.lfb.clients.length <= 10) {
         for (const client of this.formStore.lfb.clients) {
           if (client.hasAttachedFile === false) {
             this.showToaster('error', this.t('toaster.needAttachQuestionnaire'), 3000);
@@ -3719,12 +3775,12 @@ export const useDataStore = defineStore('data', {
         }
       }
 
-      if (this.formStore.productConditionsForm.insurancePremiumPerMonth === null) {
+      if (!this.formStore.lfb.add && this.formStore.productConditionsForm.insurancePremiumPerMonth === null) {
         this.showToaster('error', this.t('toaster.emptyProductConditions'), 3000);
         return false;
       }
 
-      if (this.formStore.productConditionsForm.insurancePremiumPerMonth === '0') {
+      if (!this.formStore.lfb.add && this.formStore.productConditionsForm.insurancePremiumPerMonth === '0') {
         this.showToaster('error', this.t('toaster.notZeroPremium'), 3000);
         return false;
       }
@@ -3797,7 +3853,17 @@ export const useDataStore = defineStore('data', {
         const bank = await this.api.getBankByAccountNumber(accountNumber);
         return bank;
       } catch (err) {
-        return ErrorHandler(err);
+        ErrorHandler(err);
+      }
+    },
+    async getContractByBin(bin: string) {
+      try {
+        const contract = await this.api.getContractByBin(bin);
+        contract.insrBegin = reformatDate(contract.insrBegin) ?? '';
+        contract.insrEnd = reformatDate(contract.insrEnd) ?? '';
+        return contract;
+      } catch (err) {
+        ErrorHandler(err);
       }
     },
     async isCourseChanged(processInstanceId: string) {

package/store/rules.ts

@@ -272,6 +272,18 @@ export const rules = {
       }
     },
   ],
+  checkPastDate: [
+    (v: any) => {
+      let today = new Date();
+      const yourDate = new Date(formatDate(v)!);
+      today.setHours(0, 0, 0, 0);
+      if (yourDate >= today) {
+        return true;
+      } else {
+        return t('rules.checkDate');
+      }
+    },
+  ],
   fileRequired: [(v: any) => !!v || t('rules.fileRequired'), (v: any) => (v && v.length > 0) || t('rules.fileRequired')],
   guaranteedPeriodLimit(v: any, termAnnuityPayments: any) {
     if (Number(v) > Number(termAnnuityPayments)) {

package/types/index.ts

@@ -257,6 +257,8 @@ export interface ClientV2 {
   criticalMultiply?: string;
   criticalAdditive?: string;
   hasAttachedFile?: boolean;
+  insrBeginDate?: string;
+  insrEndDate?: string;
 }
 
 export type RecalculationResponseType = {
@@ -436,6 +438,9 @@ export interface ContragentDocuments {
   issuerId: number;
   issuerName: string | null;
   issuerNameRu: string | null;
+  issuerOtherName?: string;
+  issuerOtherNameOrig?: string;
+  issuerOtherNameRu?: string;
   description: string | null;
   note: string | null;
   verifyType: string;
@@ -557,6 +562,7 @@ export type PolicyAppDto = {
   mainInsSum?: number | null;
   agentCommission?: number | null;
   calcDate?: string;
+  mainPremiumWithCommission?: number;
 };
 
 export type InsisWorkDataApp = {
@@ -727,9 +733,31 @@ export type SignedState = {
   code: string;
 };
 
+export type GetContractByBinResponse = {
+  bin: string;
+  fullName: string;
+  insrBegin: string;
+  insrEnd: string;
+  policyNo: string;
+  policyId: string;
+  status: string;
+};
+
+export type ParentPolicyDto = {
+  contractId: number;
+  contractInsrBegin: string;
+  contractInsrEnd: string;
+  contractNumber: string;
+};
+
 export namespace Base {
   export namespace Document {
     export type Digital = { iin: string; longName: string; digitalDocument: IDocument | null };
+    export type IssuerOther = Value & {
+      issuerOtherName?: string;
+      issuerOtherNameOrig?: string;
+      issuerOtherNameRu?: string;
+    };
   }
 }