hl-core 0.0.8-beta.26 → 0.0.8-beta.28

package/composables/index.ts

@@ -141,10 +141,11 @@ export const parseXML = (xml: boolean | string = true, withTag = false, tag: str
 };
 
 export const ESBDMessage = (ESBDObject: any, initialPoint: any) => {
+  return ESBDObject.errorMsg;
   let result;
   if (ESBDObject.errorCode === 2) {
     if (ESBDObject.errorMsg.indexOf('EMSG') === -1) {
-      result = 'Клиент не является резидентом РК!';
+      result = 'Контрагент не является резидентом РК!';
     } else {
       result = ESBDObject.errorMsg.substring(ESBDObject.errorMsg.indexOf('EMSG') + 6, ESBDObject.errorMsg.lastIndexOf('EWS-100')).replace(initialPoint, '');
     }
@@ -174,3 +175,54 @@ export const ErrorHandler = (err: unknown, errorText?: string) => {
   }
   return false;
 };
+
+export const setAddressBeneficiary = (whichIndex: number, sameAddress: boolean) => {
+  const formStore = useFormStore();
+  const dataStore = useDataStore();
+  const beneficiary = formStore.beneficiaryForm[Number(whichIndex)];
+  const policyholder = formStore.policyholderForm;
+  if (sameAddress === true) {
+    beneficiary.registrationCity = policyholder.registrationCity;
+    beneficiary.registrationCountry = policyholder.registrationCountry;
+    beneficiary.birthPlace = policyholder.birthPlace;
+    beneficiary.registrationMicroDistrict = policyholder.registrationMicroDistrict;
+    beneficiary.registrationNumberApartment = policyholder.registrationNumberApartment;
+    beneficiary.registrationNumberApartment = policyholder.registrationNumberApartment;
+    beneficiary.registrationNumberHouse = policyholder.registrationNumberHouse;
+    beneficiary.registrationProvince = policyholder.registrationProvince;
+    beneficiary.registrationQuarter = policyholder.registrationQuarter;
+    beneficiary.registrationRegion = policyholder.registrationRegion;
+    beneficiary.registrationRegionType = policyholder.registrationRegionType;
+    beneficiary.registrationStreet = policyholder.registrationStreet;
+  } else {
+    if (beneficiary.id === 0) {
+      beneficiary.registrationCity = new Value();
+      beneficiary.registrationCountry = new Value();
+      beneficiary.registrationMicroDistrict = '';
+      beneficiary.registrationNumberApartment = '';
+      beneficiary.registrationNumberApartment = '';
+      beneficiary.registrationNumberHouse = '';
+      beneficiary.registrationProvince = new Value();
+      beneficiary.registrationQuarter = '';
+      beneficiary.registrationRegion = new Value();
+      beneficiary.registrationRegionType = new Value();
+      beneficiary.registrationStreet = '';
+    } else {
+      const country = dataStore.countries.find(i => (i.nameRu as string).match(new RegExp(beneficiary.response?.addresses[0].countryName, 'i')));
+      const city = dataStore.cities.find(i => i.nameRu === beneficiary.response?.addresses[0].cityName.replace('г.', ''));
+      const province = dataStore.states.find(i => i.ids === beneficiary.response?.addresses[0].stateCode);
+      const localityType = dataStore.localityTypes.find(i => i.nameRu === beneficiary.response?.addresses[0].cityTypeName);
+      const region = dataStore.regions.find(i => i.ids == beneficiary.response?.addresses[0].regionCode);
+      beneficiary.registrationCountry = country ?? new Value();
+      beneficiary.registrationCity = city ?? new Value();
+      beneficiary.registrationMicroDistrict = beneficiary.response?.addresses[0].microRaion ?? '';
+      beneficiary.registrationNumberApartment = beneficiary.response?.addresses[0].apartmentNumber ?? '';
+      beneficiary.registrationNumberHouse = beneficiary.response?.addresses[0].blockNumber ?? '';
+      beneficiary.registrationProvince = province ?? new Value();
+      beneficiary.registrationQuarter = beneficiary.response?.addresses[0].kvartal ?? '';
+      beneficiary.registrationRegion = region ?? new Value();
+      beneficiary.registrationRegionType = localityType ?? new Value();
+      beneficiary.registrationStreet = beneficiary.response?.addresses[0].streetName ?? '';
+    }
+  }
+};

package/locales/en.json

@@ -21,9 +21,11 @@
     "memberSave": "Error while saving members"
   },
   "toaster": {
+    "membersLimit": "The number of these members has been exceeded. The limit is: {text}",
+    "hasAlreadyMember": "Member with such IIN is already in statement",
     "noIinOrPhone": "Missing data to send SMS",
     "ESBDErrorMessage": "Incorrect data entered for this IIN",
-    "phoneNotFoundInBMG": "Enter a number registered in BMG or register the client in BMG",
+    "phoneNotFoundInBMG": "Enter a number registered in BMG or register the contragent in BMG",
     "errorSumOrPercentage": "The percentage of payout amount cannot be less than or greater than 100",
     "fileWasDeleted": "File successfully deleted",
     "attachManagerError": "Attach the request to the manager",
@@ -55,7 +57,7 @@
     "fillOneFieldError": "You need to fill in at least one of the {text} fields",
     "notSavedMember": "You need to save the current {text} data",
     "copied": "Copied",
-    "clientNotFound": "Client with this IIN not found",
+    "clientNotFound": "Contragent with this IIN not found",
     "needCalculate": "You need to calculate the insurance premium",
     "incorrectInput": "The value entered is incorrect",
     "error": "An error occurred",
@@ -74,15 +76,15 @@
     "reloadEverySeconds": "Refresh can be done every {text} seconds",
     "successReload": "Refreshed",
     "sendEverySeconds": "SMS can be sent every {text} seconds",
-    "waitForClient": "Awaiting client confirmation",
+    "waitForClient": "Awaiting contragent confirmation",
     "noSuchProduct": "Error when navigating: incorrect link",
     "affiliationDocumentNotUploaded": "File not attached in the underwriting board decision",
     "documentNumberWasNotFilled": "Document number and date were not filled",
     "valueShouldBeHigher": "The value should be higher than {text} percent",
     "valueShouldBeBetween": "The value should be between {floor} and {ceil} percent",
-    "needAgreement": "You need to obtain client's consent",
+    "needAgreement": "You need to obtain contragent's consent",
     "successOtp": "Confirmation code sent successfully",
-    "hasSuccessOtp": "Client has already provided consent",
+    "hasSuccessOtp": "Contragent has already provided consent",
     "tokenExpire": "Waiting time has expired",
     "requiredBeneficiary": "You need to specify beneficiary's data",
     "requiredInsured": "You need to specify insured person's data",
@@ -221,20 +223,20 @@
   "isMemberIPDL": "Indication of belonging to and/or connections to a public official, their spouse, and close relatives?",
   "isPolicyholderBeneficiary": "Is the policyholder also the beneficiary?",
   "hasRepresentative": "Is the contract signed by a representative?",
-  "isActOwnBehalf": "Is the client acting on their own behalf and in their own interests?",
+  "isActOwnBehalf": "Is the contragent acting on their own behalf and in their own interests?",
   "coverPeriod": "Coverage Period",
   "requestedSumInsured": "Requested Sum Insured",
   "insurancePremiumPerMonth": "Insurance Premium per Month",
   "noStatementCalculator": "Cost calculator without entering data",
   "calculator": "Calculator",
   "agreement": "Agreement",
-  "clientsStatement": "Client's Statement",
+  "clientsStatement": "Contragent's Statement",
   "document": "Document",
   "documents": "Documents",
   "invoiceData": "Payment info",
   "statementAndSurvey": "Statement and Questionnaire",
   "underwriterDecisionDocument": "",
-  "clientsCard": "Client Card",
+  "clientsCard": "Contragent Card",
   "insuranceProduct": "Insurance Product",
   "historyStatementsAndStatuses": "Application History and Statuses",
   "applicationNumber": "Application Number: ",
@@ -282,6 +284,7 @@
     "number": "Application Number",
     "iin": "IIN",
     "client": "Client",
+    "contragent": "Contrangent",
     "product": "Product",
     "status": "Application Status",
     "assignee": "Assignee",
@@ -375,6 +378,7 @@
     "new": "Подать заявление"
   },
   "labels": {
+    "newVersion": "New",
     "code": "Code",
     "codes": "Codes",
     "listType": "List type",
@@ -463,7 +467,7 @@
     "numbers": "Field should contain only numbers",
     "numbersSymbols": "Field should contain numbers",
     "ageExceeds": "Year cannot exceed 50 years",
-    "age18": "Client should be adult",
+    "age18": "Contragent should be adult",
     "sums": "Field should contain only numbers",
     "iinRight": "IIN must consist of 12 digits",
     "onlySymbols": "Field should not contain numbers",

package/locales/kz.json

@@ -21,9 +21,11 @@
     "memberSave": "Қатысушы мәліметтерін сақтау кезіндегі қате"
   },
   "toaster": {
+    "membersLimit": "Количество этих участников превышено. Лимит составляет: {text}",
+    "hasAlreadyMember": "Участник с таким ИИН уже есть в заявке",
     "noIinOrPhone": "SMS жіберу үшін дереккөз мәліметтер жоқ",
     "ESBDErrorMessage": "Бұл ЖСН бойынша дұрыс мәліметтер енгізілмеді",
-    "phoneNotFoundInBMG": "БМГ-де тіркелген нөмірді енгізіңіз немесе клиентті БМГ-де тіркеу",
+    "phoneNotFoundInBMG": "БМГ-де тіркелген нөмірді енгізіңіз немесе контрагентті БМГ-де тіркеу",
     "errorSumOrPercentage": "Төлемдің пайызы 100-ден аз немесе асушыдан көп болмауы керек",
     "fileWasDeleted": "Файл сәтті өшірілді",
     "attachManagerError": "Менеджерге өтініші байланыстырыңыз",
@@ -55,7 +57,7 @@
     "fillOneFieldError": "{text} деректерін бірін толтыру қажет",
     "notSavedMember": "{text} мәліметтерін сақтау қажет",
     "copied": "Көшірілді",
-    "clientNotFound": "Бұл ЖСН-ге қойылатын клиент табылмады",
+    "clientNotFound": "Бұл ЖСН-ге қойылатын контрагент табылмады",
     "needCalculate": "Сақтандыру сыйлықақысысын қайта есептеу қажет",
     "incorrectInput": "Енгізілген мән дұрыс емес",
     "error": "Қате пайда болды",
@@ -74,15 +76,15 @@
     "reloadEverySeconds": "Көшірме еткілеу үшін {text} секунд күту мүмкін",
     "successReload": "Жаңартылды",
     "sendEverySeconds": "SMS жіберу үшін {text} секунд күту мүмкін",
-    "waitForClient": "Клиенттің растауын күтіңіз",
+    "waitForClient": "Контрагенттің растауын күтіңіз",
     "noSuchProduct": "Жолды өту кезінде қате: дұрыссыз сілтеме",
     "affiliationDocumentNotUploaded": "Төлем туралы кеңес сізбен бірге берілген файл жоқ",
     "documentNumberWasNotFilled": "Документ нөмірі және күні толтырылмаған",
     "valueShouldBeHigher": "Мән {text} пайыздан асуы керек",
     "valueShouldBeBetween": "Мән {floor} және {ceil} пайыз аралығында болуы керек",
-    "needAgreement": "Мүмкіндікті клиентпен келісу керек",
+    "needAgreement": "Мүмкіндікті контрагентпен келісу керек",
     "successOtp": "Растау коды сәтті жіберілді",
-    "hasSuccessOtp": "Клиенттің келісімі бар",
+    "hasSuccessOtp": "Контрагенттің келісімі бар",
     "tokenExpire": "Күту уақыты аяқталды",
     "requiredBeneficiary": "Бенефициар деректері керек",
     "requiredInsured": "Зақыпталу қажет",
@@ -221,20 +223,20 @@
   "isMemberIPDL": "Социальдық тұлғалар мен олардың отбасының арасындағы өзара байланыстықты және байланысты екендігі туралы белгіленіш болатыны",
   "isPolicyholderBeneficiary": "Сақтанушы азаматтарға арналғаны екенін ма?",
   "hasRepresentative": "Шарттың имзаға алушысы - представитель екеніні білдіреді ме?",
-  "isActOwnBehalf": "Клиент өзінің атымен және өз мүлкіншілігімен өзі жасайды ма?",
+  "isActOwnBehalf": "Контрагент өзінің атымен және өз мүлкіншілігімен өзі жасайды ма?",
   "coverPeriod": "Мөлшер",
   "requestedSumInsured": "Сұраулы сақталған сомасы",
   "insurancePremiumPerMonth": "Айына шығыру",
   "noStatementCalculator": "Деректерді енгізбей калғанда бағасыны таңдамау калькуляторы",
   "calculator": "Калькулятор",
   "agreement": "Келісім",
-  "clientsStatement": "Клиенттің заявы",
+  "clientsStatement": "Контрагенттің заявы",
   "document": "Деректер",
   "documents": "Деректер",
   "invoiceData": "Төлем туралы ақпарат",
   "statementAndSurvey": "Заявление және сауалнама",
   "underwriterDecisionDocument": "",
-  "clientsCard": "Клиенттің картасы",
+  "clientsCard": "Контрагенттің картасы",
   "insuranceProduct": "Страховой продукт",
   "historyStatementsAndStatuses": "Тарихи заявкалар және статустар",
   "applicationNumber": "Өтініш нөмірі: ",
@@ -282,6 +284,7 @@
     "number": "Өтінім нөмірі",
     "iin": "ЖСН",
     "client": "Клиент",
+    "contragent": "Контрагент",
     "product": "Өнім",
     "status": "Өтінім статусы",
     "assignee": "Орындаушы",
@@ -375,6 +378,7 @@
     "new": "Өтінім жасау"
   },
   "labels": {
+    "newVersion": "Жаңа версия",
     "code": "Код",
     "codes": "Коды",
     "listType": "Тип списка",
@@ -463,7 +467,7 @@
     "numbers": "Тек сандарды енгізіңіз",
     "numbersSymbols": "Сандарды енгізіңіз",
     "ageExceeds": "Жылдың 50-ден асапауы керек",
-    "age18": "Клиент 18 жас болуы керек",
+    "age18": "Контрагент 18 жас болуы керек",
     "sums": "Тек сандарды енгізіңіз",
     "iinRight": "ЖСН/БИН 12 сандан тұруы керек",
     "onlySymbols": "Өрісте сан болмауы керек",

package/locales/ru.json

@@ -21,9 +21,11 @@
     "memberSave": "Ошибка при сохранении данных участников"
   },
   "toaster": {
+    "membersLimit": "Количество этих участников превышено. Лимит составляет: {text}",
+    "hasAlreadyMember": "Участник с таким ИИН уже есть в заявке",
     "noIinOrPhone": "Отсутствуют данные для отправки СМС",
     "ESBDErrorMessage": "Введены не  корректные данные по этому ИИН",
-    "phoneNotFoundInBMG": "Введите номер зарегистрированный в БМГ или зарегистрируйте клиента в БМГ",
+    "phoneNotFoundInBMG": "Введите номер зарегистрированный в БМГ или зарегистрируйте контрагента в БМГ",
     "errorSumOrPercentage": "Процент от суммы выплат не может быть меньше или больше 100",
     "fileWasDeleted": "Файл успешно удален",
     "attachManagerError": "Прикрепите заявку менеджеру",
@@ -55,7 +57,7 @@
     "fillOneFieldError": "Нужно заполнить одно из полей {text}",
     "notSavedMember": "Нужно сохранить актуальные данные {text}",
     "copied": "Скопировано",
-    "clientNotFound": "Клиент с таким ИИН не обнаружен",
+    "clientNotFound": "Контрагент с таким ИИН не обнаружен",
     "needCalculate": "Нужно рассчитать страховую премию",
     "incorrectInput": "Значение введено некорректно",
     "error": "Произошла ошибка ",
@@ -74,15 +76,15 @@
     "reloadEverySeconds": "Обновление можно делать каждые {text} секунд",
     "successReload": "Обновлено",
     "sendEverySeconds": "СМС можно отправлять каждые {text} секунд ",
-    "waitForClient": "Ожидайте подтверждения клиента",
+    "waitForClient": "Ожидайте подтверждения контрагента",
     "noSuchProduct": "Ошибка при переходе: неправильная ссылка",
     "affiliationDocumentNotUploaded": "Не прикреплен файл в решении андеррайтингового совета",
     "documentNumberWasNotFilled": "Номер документа и дата не были заполнены",
     "valueShouldBeHigher": "Значение должно быть больше {text} процентов",
     "valueShouldBeBetween": "Значение должно быть в промежутке от {floor} до {ceil} процентов",
-    "needAgreement": "Нужно получить согласие клиента",
+    "needAgreement": "Нужно получить согласие контрагента",
     "successOtp": "Код подтверждения отправлен успешно",
-    "hasSuccessOtp": "По клиенту уже имеется согласие",
+    "hasSuccessOtp": "По контрагенту уже имеется согласие",
     "tokenExpire": "Истекло время ожидания",
     "requiredBeneficiary": "Необходимо указать данные выгодоприобретателя",
     "requiredInsured": "Необходимо указать данные застрахованного",
@@ -142,7 +144,7 @@
     "fromGBDFL": "Государственная база данных физических лиц",
     "fromGKB": "Государственное кредитное бюро",
     "sendSMS": "Отправить СМС",
-    "sendOtp": "Отправить OTP",
+    "sendOtp": "Отправить код подтверждения",
     "check": "Проверить",
     "toPayment": "Перейти к оплате",
     "calcSum": "Рассчитать сумму",
@@ -221,20 +223,20 @@
   "isMemberIPDL": "Отметка о принадлежности и/или причастности к публичному должностному лицу, его супруге (супругу) и близким родственникам?",
   "isPolicyholderBeneficiary": "Является ли страхователь выгодоприобретателем?",
   "hasRepresentative": "Подписантом договора выступает представитель? ",
-  "isActOwnBehalf": " Клиент действует от своего имени и в своих интересах?",
+  "isActOwnBehalf": " Контрагент действует от своего имени и в своих интересах?",
   "coverPeriod": "Срок",
   "requestedSumInsured": "Запрашиваемая сумма",
   "insurancePremiumPerMonth": "Премия в месяц",
   "noStatementCalculator": "Калькулятор стоимости без ввода данных",
   "calculator": "Калькулятор",
   "agreement": "Согласие",
-  "clientsStatement": "Заявление клиента",
+  "clientsStatement": "Заявление контрагента",
   "document": "Документ",
   "documents": "Документы",
   "invoiceData": "Данные об оплате",
   "statementAndSurvey": "Заявление и анкета",
   "underwriterDecisionDocument": "",
-  "clientsCard": "Карта клиента",
+  "clientsCard": "Карта контрагента",
   "insuranceProduct": "Страховой продукт",
   "historyStatementsAndStatuses": "История заявок и статусы",
   "applicationNumber": "Номер заявки: ",
@@ -282,6 +284,7 @@
     "number": "Номер заявки",
     "iin": "ИИН",
     "client": "Клиент",
+    "contragent": "Контрагент",
     "product": "Продукт",
     "status": "Статус заявки",
     "assignee": "Исполнитель",
@@ -375,6 +378,7 @@
     "new": "Подать заявление"
   },
   "labels": {
+    "newVersion": "Новая версия",
     "code": "Код",
     "codes": "Коды",
     "listType": "Тип списка",
@@ -463,7 +467,7 @@
     "numbers": "Поле должно содержать только цифры",
     "numbersSymbols": "Поле должно содержать цифры",
     "ageExceeds": "Год не может превышать больше 50 лет",
-    "age18": "Клиент должен быть совершеннолетним",
+    "age18": "Контрагент должен быть совершеннолетним",
     "sums": "Поле должно содержать только цифры",
     "iinRight": "ИИН/БИН должен состоять из 12 цифр",
     "onlySymbols": "Поле не должно содержать число",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.8-beta.26",
+  "version": "0.0.8-beta.28",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",
@@ -44,11 +44,13 @@
     "jwt-decode": "^3.1.2",
     "maska": "1.5.0",
     "pinia": "^2.1.4",
+    "typedoc": "^0.24.8",
+    "typescript": "5.0.4",
     "v-idle-3": "^0.3.14",
     "vue-i18n": "^9.2.2",
     "vue-json-pretty": "^2.2.4",
     "vue-toastification": "^2.0.0-rc.5",
     "vue-uuid": "^3.0.0",
-    "vuetify": "^3.3.4"
+    "vuetify": "^3.3.6"
   }
 }

package/plugins/helperFunctionsPlugins.ts

@@ -8,6 +8,7 @@ import Maska from 'maska';
 import i18n from '@/configs/i18n';
 
 export default defineNuxtPlugin(nuxtApp => {
+  //@ts-ignore
   nuxtApp.vueApp.use(Vidle, {});
   nuxtApp.vueApp.use(Maska);
   nuxtApp.vueApp.use(i18n);

package/store/data.store.js

@@ -828,12 +828,15 @@ export const useDataStore = defineStore('data', {
           if (
             this.formStore.applicationData &&
             this.formStore.applicationData.insuredApp &&
-            this.formStore.applicationData.insuredApp.length &&
-            this.formStore.applicationData.insuredApp.every(i => i.iin !== data.iin) &&
-            data.id !== null
+            this.formStore.applicationData.insuredApp.length 
           ) {
-            await this.api.deleteMember('Insured', data.id);
-            delete data.id;
+            await this.deleteInsuredLogic();
+            if(
+              this.formStore.applicationData.insuredApp.every(i => i.iin !== data.iin) &&
+              data.id !== null) {
+              await this.api.deleteMember('Insured', data.id);
+              delete data.id;
+            }
           }
           data.isDisability = this.formStore.isPolicyholderInsured ? false : member.isDisability.nameRu == 'Да';
           data.disabilityGroupId = data.isDisability ? member.disabilityGroupId.id : null;
@@ -1331,6 +1334,83 @@ export const useDataStore = defineStore('data', {
       }
       return this.formStore.definedAnswersId[whichSurvey];
     },
+    getConditionsData() {
+      const conditionsData = {
+        policyAppDto: {
+          id: this.formStore.applicationData.policyAppDto.id,
+          processInstanceId: this.formStore.applicationData.policyAppDto.processInstanceId,
+          policyId: null,
+          policyNumber: null,
+          contractDate: this.currentDate(),
+          amount: this.formStore.productConditionsForm.requestedSumInsured != null ? Number(this.formStore.productConditionsForm.requestedSumInsured.replace(/\s/g, '')) : null,
+          premium:
+            this.formStore.productConditionsForm.insurancePremiumPerMonth != null ? Number(this.formStore.productConditionsForm.insurancePremiumPerMonth.replace(/\s/g, '')) : null,
+          isSpokesman: this.formStore.hasRepresentative,
+          coverPeriod: this.formStore.productConditionsForm.coverPeriod,
+          payPeriod: this.formStore.productConditionsForm.coverPeriod,
+          annualIncome: this.formStore.productConditionsForm.annualIncome ? Number(this.formStore.productConditionsForm.annualIncome.replace(/\s/g, '')) : null,
+          indexRateId: this.formStore.productConditionsForm.processIndexRate?.id
+            ? this.formStore.productConditionsForm.processIndexRate.id
+            : this.processIndexRate.find(i => i.code === '0')?.id,
+          paymentPeriodId: this.formStore.productConditionsForm.paymentPeriod.id,
+          lifeMultiply: formatProcents(this.formStore.productConditionsForm.lifeMultiply),
+          lifeAdditive: formatProcents(this.formStore.productConditionsForm.lifeAdditive),
+          adbMultiply: formatProcents(this.formStore.productConditionsForm.adbMultiply),
+          adbAdditive: formatProcents(this.formStore.productConditionsForm.adbAdditive),
+          disabilityMultiply: formatProcents(this.formStore.productConditionsForm.disabilityMultiply),
+          disabilityAdditive: formatProcents(this.formStore.productConditionsForm.adbAdditive),
+          riskGroup: this.formStore.productConditionsForm.riskGroup?.id ? this.formStore.productConditionsForm.riskGroup.id : 1,
+        },
+        addCoversDto: this.formStore.additionalInsuranceTerms,
+      };
+      if (this.isKazyna) {
+        conditionsData.policyAppDto.premiumInCurrency = getNumber(this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar);
+        conditionsData.policyAppDto.amountInCurrency = getNumber(this.formStore.productConditionsForm.requestedSumInsuredInDollar);
+        conditionsData.policyAppDto.currencyExchangeRate = this.currencies.usd;
+      }
+      if (this.isLiferenta) {
+        conditionsData.policyAppDto.guaranteedPaymentPeriod = this.formStore.productConditionsForm.guaranteedPeriod || 0;
+        conditionsData.policyAppDto.annuityTypeId = this.formStore.productConditionsForm.typeAnnuityInsurance.id;
+        conditionsData.policyAppDto.paymentPeriod = this.formStore.productConditionsForm.termAnnuityPayments;
+        conditionsData.policyAppDto.annuityPaymentPeriodId = this.formStore.productConditionsForm.periodAnnuityPayment.id;
+      }
+      return conditionsData;
+    },
+    async clearAddCovers(coverCode, coverValue) {
+      if (!coverCode || !coverValue) return;
+      const termCoverIndex = applicationData.addCoversDto.findIndex(i => i.coverTypeCode === coverCode);
+      if (termCoverIndex !== -1) {
+        const answers = await this.getAdditionalInsuranceTermsAnswers(applicationData.addCoversDto[termCoverIndex].coverTypeId);
+        if (answers.length) {
+          const newCover = answers.find(i => i.code === coverValue);
+          if (newCover) {
+            applicationData.addCoversDto[termCoverIndex].coverSumId = newCover.id;
+            applicationData.addCoversDto[termCoverIndex].coverSumName = newCover.nameRu;
+          }
+        }
+      }
+    },
+    async deleteInsuredLogic() {
+      const applicationData = this.getConditionsData();
+      const clearCovers = [{ code: 10, value: 'excluded' }];
+      await Promise.allSettled(
+        clearCovers.map(async cover => {
+          await this.clearAddCovers(cover.code, cover.value);
+        }),
+      );
+      if (!!this.formStore.productConditionsForm.insurancePremiumPerMonth) {
+        applicationData.policyAppDto.premium = null;
+      }
+      if (!!this.formStore.productConditionsForm.requestedSumInsured) {
+        applicationData.policyAppDto.amount = null;
+      }
+      try {
+        await this.api.setApplication(applicationData);
+        this.showToaster('info', this.t('toaster.needToRecalculate'));
+      } catch (err) {
+        ErrorHandler(err);
+      }
+    },
     async getPaymentTable(id) {
       try {
         const paymentResultTable = await this.api.calculatePremuim(id);
@@ -1407,80 +1487,29 @@ export const useDataStore = defineStore('data', {
     async calculate(taskId) {
       this.isLoading = true;
       try {
-        let form1 = {
-          policyAppDto: {
-            id: this.formStore.applicationData.policyAppDto.id,
-            processInstanceId: this.formStore.applicationData.policyAppDto.processInstanceId,
-            policyId: null,
-            policyNumber: null,
-            contractDate: this.currentDate(),
-            amount: this.formStore.productConditionsForm.requestedSumInsured != null ? Number(this.formStore.productConditionsForm.requestedSumInsured.replace(/\s/g, '')) : null,
-            premium:
-              this.formStore.productConditionsForm.insurancePremiumPerMonth != null
-                ? Number(this.formStore.productConditionsForm.insurancePremiumPerMonth.replace(/\s/g, ''))
-                : null,
-            isSpokesman: this.formStore.hasRepresentative,
-            coverPeriod: this.formStore.productConditionsForm.coverPeriod,
-            payPeriod: this.formStore.productConditionsForm.coverPeriod,
-            annualIncome: this.formStore.productConditionsForm.annualIncome ? Number(this.formStore.productConditionsForm.annualIncome.replace(/\s/g, '')) : null,
-            indexRateId: this.formStore.productConditionsForm.processIndexRate?.id
-              ? this.formStore.productConditionsForm.processIndexRate.id
-              : this.processIndexRate.find(i => i.code === '0')?.id,
-            paymentPeriodId: this.formStore.productConditionsForm.paymentPeriod.id,
-            lifeMultiply: formatProcents(this.formStore.productConditionsForm.lifeMultiply),
-            lifeAdditive: formatProcents(this.formStore.productConditionsForm.lifeAdditive),
-            adbMultiply: formatProcents(this.formStore.productConditionsForm.adbMultiply),
-            adbAdditive: formatProcents(this.formStore.productConditionsForm.adbAdditive),
-            disabilityMultiply: formatProcents(this.formStore.productConditionsForm.disabilityMultiply),
-            disabilityAdditive: formatProcents(this.formStore.productConditionsForm.adbAdditive),
-            riskGroup: this.formStore.productConditionsForm.riskGroup?.id ? this.formStore.productConditionsForm.riskGroup.id : 1,
-          },
-          addCoversDto: this.formStore.additionalInsuranceTerms,
-        };
+        const id = this.formStore.applicationData.processInstanceId;
+        await this.api.setApplication(this.getConditionsData());
+        const result = ref();
+        result.value = await this.api.getCalculation(id);
+        const applicationData = await this.api.getApplicationData(taskId);
+        this.formStore.applicationData = applicationData;
+        this.formStore.additionalInsuranceTerms = this.formStore.applicationData.addCoverDto;
         if (this.isKazyna) {
-          form1.policyAppDto.premiumInCurrency = getNumber(this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar);
-          form1.policyAppDto.amountInCurrency = getNumber(this.formStore.productConditionsForm.requestedSumInsuredInDollar);
-          form1.policyAppDto.currencyExchangeRate = this.currencies.usd;
-        }
-        if (this.isLiferenta) {
-          form1.policyAppDto.guaranteedPaymentPeriod = this.formStore.productConditionsForm.guaranteedPeriod || 0;
-          form1.policyAppDto.annuityTypeId = this.formStore.productConditionsForm.typeAnnuityInsurance.id;
-          form1.policyAppDto.paymentPeriod = this.formStore.productConditionsForm.termAnnuityPayments;
-          form1.policyAppDto.annuityPaymentPeriodId = this.formStore.productConditionsForm.periodAnnuityPayment.id;
-        }
-        try {
-          let id = this.formStore.applicationData.processInstanceId;
-
-          await this.api.setApplication(form1);
-          let result;
-          try {
-            result = await this.api.getCalculation(id);
-          } catch (err) {
-            ErrorHandler(err);
-          }
-
-          const applicationData = await this.api.getApplicationData(taskId);
-          this.formStore.applicationData = applicationData;
-          this.formStore.additionalInsuranceTerms = this.formStore.applicationData.addCoverDto;
-          if (this.isKazyna) {
-            if (this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar != null) {
-              this.formStore.productConditionsForm.requestedSumInsuredInDollar = this.getNumberWithSpaces(result / this.currencies.usd);
-            } else {
-              this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar = this.getNumberWithSpaces(result / this.currencies.usd);
-            }
-          }
-          if (this.formStore.productConditionsForm.insurancePremiumPerMonth != null) {
-            this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(result);
+          if (this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar != null) {
+            this.formStore.productConditionsForm.requestedSumInsuredInDollar = this.getNumberWithSpaces(result.value / this.currencies.usd);
           } else {
-            this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(result);
-          }
-          if (this.isLiferenta) {
-            this.formStore.productConditionsForm.amountAnnuityPayments = this.getNumberWithSpaces(applicationData.policyAppDto.annuityMonthPay);
+            this.formStore.productConditionsForm.insurancePremiumPerMonthInDollar = this.getNumberWithSpaces(result.value / this.currencies.usd);
           }
-          this.showToaster('success', this.t('toaster.calculated'), 1000);
-        } catch (err) {
-          ErrorHandler(err);
         }
+        if (this.formStore.productConditionsForm.insurancePremiumPerMonth != null) {
+          this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(result.value);
+        } else {
+          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(result.value);
+        }
+        if (this.isLiferenta) {
+          this.formStore.productConditionsForm.amountAnnuityPayments = this.getNumberWithSpaces(applicationData.policyAppDto.annuityMonthPay);
+        }
+        this.showToaster('success', this.t('toaster.calculated'), 1000);
       } catch (err) {
         ErrorHandler(err);
       }
@@ -1615,9 +1644,9 @@ export const useDataStore = defineStore('data', {
           this.setMembersField(this.formStore.policyholderFormKey, 'clientApp');
           if (insuredData && insuredData.length) {
             insuredData.forEach((each, index) => {
+              this.setMembersFieldIndex(this.formStore.insuredFormKey, 'insuredApp', index);
               const relationDegree = this.relations.find(i => i.ids == each.relationId);
               this.formStore.insuredForm[index].relationDegree = relationDegree ? relationDegree : new Value();
-              this.setMembersFieldIndex(this.formStore.insuredFormKey, 'insuredApp', index);
             });
           }
 
@@ -1727,13 +1756,6 @@ export const useDataStore = defineStore('data', {
         ErrorHandler(err);
       }
     },
-    async setApplication() {
-      try {
-        await this.api.setApplication(this.formStore.applicationData);
-      } catch (err) {
-        console.log(err);
-      }
-    },
     async deleteTask(taskId) {
       this.isLoading = true;
       try {
@@ -1774,7 +1796,7 @@ export const useDataStore = defineStore('data', {
             try {
               this.isLoading = true;
               await this.api.claimTask(this.formStore.applicationTaskId);
-              await this.getApplicationData(taskId, false, false, false);
+              await this.getApplicationData(taskId, false, false, false, false);
               this.showToaster('success', this.t('toaster.successOperation'), 3000);
             } catch (err) {
               ErrorHandler(err);
@@ -1883,10 +1905,6 @@ export const useDataStore = defineStore('data', {
         this.formStore[whichForm][index].jobPlace = this.formStore.applicationData[whichMember][index].jobName;
       }
     },
-    findObject(from, key, searchKey) {
-      const found = this[from].find(i => i[key] == searchKey);
-      return found || new Value();
-    },
     async signDocument() {
       try {
         if (this.formStore.signUrls.length) {
@@ -1979,7 +1997,7 @@ export const useDataStore = defineStore('data', {
         };
         const recalculatedValue = await this.api.reCalculate(data);
         if (!!recalculatedValue) {
-          await this.getApplicationData(taskId, false, false, false);
+          await this.getApplicationData(taskId, false, false, false, true);
           this.showToaster(
             'success',
             `${this.t('toaster.successRecalculation')}. ${whichSum == 'insurancePremiumPerMonth' ? 'Страховая премия' : 'Страховая сумма'}: ${this.getNumberWithSpaces(