hl-core 0.0.10-beta.43 → 0.0.10-beta.45

package/api/base.api.ts

@@ -488,6 +488,13 @@ export class ApiClass {
       url: `/${this.productUrl}/api/Application/IsRecalculate?processInstanceId=${id}`,
     });
   }
+  async checkCurrencyDate(id: string | number) {
+    return await this.axiosCall<boolean>({
+      method: Methods.GET,
+      url: '/Arm/api/Bpm/CheckCurrencyDate',
+      params: { processInstanceId: id },
+    });
+  }
   async setMember(whichMember: keyof typeof MemberCodes, data: any) {
     return await this.axiosCall({
       method: Methods.POST,
@@ -1151,7 +1158,7 @@ export class ApiClass {
         data: data,
       });
     },
-    generalGetFile: async (groupId: string, documentSignType: number) => {
+    generalGetDoc: async (groupId: string, documentSignType: number) => {
       return await this.axiosCall<any>({
         method: Methods.GET,
         url: `${this.file.base}/api/GeneralSign/Group/${groupId}/${documentSignType} `,
@@ -1203,7 +1210,7 @@ export class ApiClass {
         data: data,
       });
     },
-    getFile: async (id: string) => {
+    getDoc: async (id: string) => {
       return await this.axiosCall({
         method: Methods.GET,
         url: `${this.file.base}/api/Data/DownloadFile/${id}`,
@@ -1213,7 +1220,7 @@ export class ApiClass {
         },
       });
     },
-    getFileNew: async (id: string) => {
+    getDocNew: async (id: string) => {
       return await this.axiosCall({
         method: Methods.GET,
         url: `${this.file.base}/api/GeneralSign/DownloadFile/${id}`,

package/components/Pages/Anketa.vue

@@ -28,6 +28,17 @@
           :rules="$rules.required"
         />
       </section>
+      <section
+        v-if="surveyType === 'critical' && ($dataStore.isBaiterek || $dataStore.isBolashak || $dataStore.isLiferenta)"
+        :class="[$styles.blueBgLight, $styles.rounded]"
+        class="mx-[10px] p-4 flex flex-col gap-4"
+      >
+        <base-form-text-section>
+          <span :class="[$styles.textTitle]" class="border-b-[1px] border-b-[#F3F6FC] p-6 flex items-center justify-between">
+            1. Келесі аурулармен бұрын ауырдыңыз ба немесе қазіргі кезде ауырып жүрсіз бе?/Болели ли Вы когда-нибудь или болеете в настоящий момент следующими заболеваниями?
+          </span>
+        </base-form-text-section>
+      </section>
       <section
         v-if="firstQuestions.filter(i => i.first.definedAnswers === 'Y').length"
         :class="[$styles.blueBgLight, $styles.rounded]"
@@ -40,7 +51,7 @@
         >
           <base-animation>
             <div
-              v-if="question.first.answerName === 'Да' && question.second"
+              v-if="question.first.answerName?.includes('Да') && question.second"
               :class="[$styles.greenBg, $styles.whiteText, $styles.textSimple]"
               class="rounded-t-lg pl-6 py-1 cursor-pointer"
               @click="openFirstPanel(question)"
@@ -52,7 +63,7 @@
             {{ question.first.name }}
             <base-animation>
               <i
-                v-if="question.first.answerName === 'Да' && question.second && question.second.length"
+                v-if="question.first.answerName?.includes('Да') && question.second && question.second.length"
                 class="mdi mdi-chevron-right text-2xl cursor-pointer"
                 @click="openFirstPanel(question)"
               ></i>
@@ -68,8 +79,8 @@
               :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
               inline
             >
-              <v-radio label="Да" value="Да" />
-              <v-radio label="Нет" value="Нет" />
+              <v-radio label="Иә/Да" value="Иә/Да" :value-comparator="(a: any, b: any) => String(a).includes('Да')" />
+              <v-radio label="Жоқ/Нет" value="Жоқ/Нет" :value-comparator="(a: any, b: any) => String(a).includes('Нет')" />
             </v-radio-group>
           </div>
         </base-form-text-section>
@@ -84,7 +95,26 @@
           :key="index"
           :class="[currentQuestion?.first.id === question.first.id && $dataStore.rightPanel.open ? $styles.greenBorder : '']"
         >
-          <span :class="[$styles.textTitle]" class="border-b-[1px] border-b-[#F3F6FC] p-6 flex items-center justify-between"> {{ question.first.name }} </span>
+          <base-animation>
+            <div
+              v-if="question.first.answerName?.includes('Да') && question.second"
+              :class="[$styles.greenBg, $styles.whiteText, $styles.textSimple]"
+              class="rounded-t-lg pl-6 py-1 cursor-pointer"
+              @click="openFirstPanel(question)"
+            >
+              {{ $dataStore.t('questionnaireType.pleaseAnswer', { text: question.second.length }) }}
+            </div>
+          </base-animation>
+          <span :class="[$styles.textTitle]" class="border-b-[1px] border-b-[#F3F6FC] p-6 flex items-center justify-between">
+            {{ question.first.name }}
+            <base-animation>
+              <i
+                v-if="question.first.answerName?.includes('Да') && question.second && question.second.length"
+                class="mdi mdi-chevron-right text-2xl cursor-pointer"
+                @click="openFirstPanel(question)"
+              ></i>
+            </base-animation>
+          </span>
           <div class="flex items-center justify-start gap-5 px-4 pt-4" :class="[$styles.textSimple]">
             <v-radio-group
               v-model="question.first.answerName"
@@ -95,12 +125,12 @@
               :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
               inline
             >
-              <v-radio label="Да" value="Да" />
-              <v-radio label="Нет" value="Нет" />
+              <v-radio label="Иә/Да" value="Иә/Да" :value-comparator="(a: any, b: any) => String(a).includes('Да')" />
+              <v-radio label="Жоқ/Нет" value="Жоқ/Нет" :value-comparator="(a: any, b: any) => String(a).includes('Нет')" />
             </v-radio-group>
           </div>
           <base-animation>
-            <div v-if="question.first.answerName === 'Да'" :class="[$styles.whiteText, $styles.textSimple]">
+            <div v-if="question.first.answerName?.includes('Да')" :class="[$styles.whiteText, $styles.textSimple]">
               <base-form-input
                 v-model="question.first.answerText"
                 :label="$dataStore.t('labels.inDetails')"
@@ -252,11 +282,11 @@ export default defineComponent({
     const answerToAll = ref<boolean>(false);
     const firstPanel = ref<boolean>(false);
     const secondPanel = ref<boolean>(false);
-    const filterType = ref<'Да' | 'Нет' | null>(null);
+    const filterType = ref<'Иә/Да' | 'Жоқ/Нет' | null>(null);
     const filterItems = [
       { title: 'Все', value: null },
-      { title: 'Только «Да»', value: 'Да' },
-      { title: 'Только «Нет»', value: 'Нет' },
+      { title: 'Только «Да»', value: 'Иә/Да' },
+      { title: 'Только «Нет»', value: 'Жоқ/Нет' },
     ];
     const surveyType = ref<'health' | 'critical'>('tab' in route.query && route.query.tab === 'criticalBase' ? 'critical' : 'health');
     const whichSurvey = computed(() =>
@@ -277,7 +307,9 @@ export default defineComponent({
 
     const whichMember = computed(() => ('member' in route.query && !!route.query.member ? (route.query.member as 'insured' | 'policyholder') : 'insured'));
     const isSecondRequired = computed(() => dataStore.controls.isSecondAnketaRequired);
-    const firstQuestions = computed(() => (filterType.value !== null ? firstQuestionList.value.filter(i => i.first.answerName === filterType.value) : firstQuestionList.value));
+    const firstQuestions = computed(() =>
+      filterType.value !== null ? firstQuestionList.value.filter(i => i.first.answerName?.includes(filterType.value === 'Иә/Да' ? 'Да' : 'Нет')) : firstQuestionList.value,
+    );
     const scrollForm = (direction: 'up' | 'down') => {
       const scrollObject = { top: direction === 'up' ? 0 : screen.height * 10, behavior: 'smooth' };
       if (firstPanel.value) {
@@ -423,12 +455,12 @@ export default defineComponent({
         if (answerToAll.value) {
           firstQuestionList.value.forEach((question: AnketaBody, index: number) => {
             if (question.first.answerType === 'T' || question.first.answerType === 'D') {
-              firstQuestionList.value![index].first.answerName = 'Нет' as AnswerName;
+              firstQuestionList.value![index].first.answerName = 'Жоқ/Нет' as AnswerName;
             }
           });
           for (const question of firstQuestionList.value) {
             const index = firstQuestionList.value.indexOf(question);
-            await getDefinedAnswerId(question.first.id, 'Нет', index);
+            await getDefinedAnswerId(question.first.id, 'Жоқ/Нет', index);
           }
         } else {
           firstQuestionList.value.forEach((question: AnketaBody, index: number) => {
@@ -454,7 +486,7 @@ export default defineComponent({
       );
       firstQuestionList.value = formStore[whichSurvey.value]!.body;
       formStore[whichSurvey.value]!.type = surveyType.value;
-      const negativeAnswer = firstQuestionList.value.every(i => i.first.answerName === 'Нет');
+      const negativeAnswer = firstQuestionList.value.every(i => i.first.answerName?.includes('Нет'));
       if (negativeAnswer) {
         answerToAll.value = true;
       }
@@ -488,7 +520,7 @@ export default defineComponent({
       () => firstQuestionList.value,
       value => {
         if (value) {
-          const hasPositiveAnswer = value.some(i => (i.first.definedAnswers === 'Y' || i.first.definedAnswers === 'D') && i.first.answerName !== 'Нет');
+          const hasPositiveAnswer = value.some(i => (i.first.definedAnswers === 'Y' || i.first.definedAnswers === 'D') && !i.first.answerName?.includes('Нет'));
           answerToAll.value = !hasPositiveAnswer;
         }
       },
@@ -510,6 +542,7 @@ export default defineComponent({
       firstPanel,
       filterType,
       filterItems,
+      surveyType,
       secondPanel,
       currentQuestion,
       currentSecond,

package/components/Pages/Documents.vue

@@ -199,10 +199,10 @@
               :disabled="documentLoading"
               :loading="documentLoading"
               text="Открыть"
-              @click="getFile('view')"
+              @click="getDoc('view')"
             />
           </base-animation>
-          <base-btn :disabled="documentLoading" :loading="documentLoading" text="Скачать" @click="getFile('download')" />
+          <base-btn :disabled="documentLoading" :loading="documentLoading" text="Скачать" @click="getDoc('download')" />
           <base-animation>
             <base-btn v-if="canDeleteFiles" :disabled="documentLoading" :loading="documentLoading" text="Удалить" @click="deletionDialog = true" />
           </base-animation>
@@ -478,11 +478,11 @@ export default defineComponent({
       },
     );
 
-    const getFile = async (type: FileActions) => {
+    const getDoc = async (type: FileActions) => {
       if (currentDocument.value) {
         documentLoading.value = true;
         const fileExtension = currentDocument.value.fileName!.match(/\.([0-9a-z]+)(?:[\?#]|$)/i)![1];
-        await dataStore.getFile(currentDocument.value, type, fileExtension);
+        await dataStore.getDoc(currentDocument.value, type, fileExtension);
         documentLoading.value = false;
       }
     };
@@ -672,7 +672,7 @@ export default defineComponent({
 
       // Functions
       getCode,
-      getFile,
+      getDoc,
       openPanel,
       deleteFile,
       getDigitalDocument,

package/components/Pages/MemberForm.vue

@@ -702,8 +702,8 @@
     </Teleport>
     <Teleport v-if="isDocumentOpen" to="#right-panel-actions">
       <div :class="[$styles.flexColNav]">
-        <base-btn :disabled="documentLoading" :loading="documentLoading" text="Открыть" @click="getFile('view')" />
-        <base-btn :disabled="documentLoading" :loading="documentLoading" text="Скачать" @click="getFile('download')" />
+        <base-btn :disabled="documentLoading" :loading="documentLoading" text="Открыть" @click="getDoc('view')" />
+        <base-btn :disabled="documentLoading" :loading="documentLoading" text="Скачать" @click="getDoc('download')" />
       </div>
     </Teleport>
     <Teleport v-if="isOtpPanelOpen && !member.hasAgreement" to="#right-panel-actions">
@@ -1414,11 +1414,11 @@ export default {
       }
     };
 
-    const getFile = async (type: FileActions) => {
+    const getDoc = async (type: FileActions) => {
       if (memberDocument.value) {
         documentLoading.value = true;
         const fileExtension = memberDocument.value.fileName!.match(/\.([0-9a-z]+)(?:[\?#]|$)/i)![1];
-        await dataStore.getFile(memberDocument.value, type, fileExtension);
+        await dataStore.getDoc(memberDocument.value, type, fileExtension);
         documentLoading.value = false;
       }
     };
@@ -1977,7 +1977,7 @@ export default {
           member.value.documentDate = reformatDate(userDocument.issueDate);
           member.value.documentExpire = reformatDate(userDocument.expireDate);
         }
-        // const filteredDocuments: DocumentItem[] = dataStore.getFilesByIIN(member.value.iin!.replace(/-/g, '')) as DocumentItem[];
+        // const filteredDocuments: DocumentItem[] = dataStore.getDocsByIIN(member.value.iin!.replace(/-/g, '')) as DocumentItem[];
         // if (filteredDocuments && filteredDocuments.length) memberDocument.value = filteredDocuments[0];
       }
       await setDefaultValues();
@@ -2223,7 +2223,7 @@ export default {
       attachFile,
       attachDocumentReader,
       getDocumentReader,
-      getFile,
+      getDoc,
       selectFamilyMember,
       closeFamilyDialog,
       openDeletionDialog,

package/components/Pages/ProductConditions.vue

@@ -55,7 +55,10 @@
           <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 !== 'pensionannuitynew' && whichProduct !== 'balam' && whichProduct !== 'tumar'" :title="$dataStore.t('recalculationInfo')">
+      <base-form-section
+        v-if="isUnderwriterRole && whichProduct !== 'pensionannuitynew' && whichProduct !== 'balam' && whichProduct !== 'tumar'"
+        :title="$dataStore.t('recalculationInfo')"
+      >
         <base-form-input
           v-model="productConditionsForm.lifeMultiply"
           :maska="$maska.numbers"
@@ -323,7 +326,7 @@
           :label="$dataStore.t('productConditionsForm.agencyPart')"
           :readonly="isDisabledAgentCommission"
           :clearable="!isDisabledAgentCommission"
-          :rules="formStore.lfb.add ? $rules.required : $rules.required.concat($rules.numbers, $rules.agentCommission)"
+          :rules="!formStore.lfb.add ? $rules.required.concat($rules.numbers, $rules.agentCommission) : productConditionsForm.agentCommission === 0 ? [] : $rules.required"
         />
       </base-form-section>
       <section v-if="whichProduct === 'pensionannuitynew'">
@@ -504,7 +507,7 @@
           <base-form-input
             v-model="contractDate"
             :maska="$maska.date"
-            :rules="!isDisabled ? $rules.required.concat($rules.date) : []"
+            :rules="!isDisabled ? $rules.required.concat($rules.date, [validateContractDate]) : []"
             :readonly="isDisabled || formStore.applicationData.processCode === 24 || isSlavePensionForm"
             :clearable="!isDisabled"
             :min-date="new Date()"
@@ -1838,6 +1841,14 @@ export default defineComponent({
       return formatedContracts;
     };
 
+    const validateContractDate = (v: any) => {
+      if (v && maxDate.value && formatDate(v) && formatDate(maxDate.value)) {
+        const invalidDate = (formatDate(v) ?? new Date()) > (formatDate(maxDate.value) ?? new Date());
+        if (invalidDate) return 'Дата заключения договора некорректна';
+      }
+      return true;
+    };
+
     const submitForm = async () => {
       vForm.value.validate().then(async (v: { valid: Boolean; errors: any }) => {
         if (v.valid) {
@@ -2147,7 +2158,11 @@ export default defineComponent({
           dataStore.processCode = constants.products[whichProduct.value as keyof typeof constants.products];
           await dataStore.getProcessPaymentPeriod();
         }
-        if (whichProduct.value === 'halykkazyna' || whichProduct.value === 'gons') {
+        if (
+          formStore.productConditionsForm.requestedSumInsured === null &&
+          formStore.productConditionsForm.insurancePremiumPerMonth === null &&
+          (whichProduct.value === 'halykkazyna' || whichProduct.value === 'gons')
+        ) {
           await dataStore.getCurrencies();
         }
         if (whichProduct.value === 'halykkazyna') {
@@ -2474,6 +2489,7 @@ export default defineComponent({
       underwriterCalculate,
       onInputInsurancePremiumPerMonth,
       onInputInsurancePremiumPerMonthInDollar,
+      validateContractDate,
       onInputSum,
       onInputPension,
       onInputSumDollar,

package/components/Panel/PanelHandler.vue

@@ -23,8 +23,8 @@
         >
       </base-content-block>
       <div class="flex flex-col gap-3" v-if="hasConditionsAction">
-        <base-btn :text="$dataStore.t('confirm.yes')" :loading="loading" @click="handleTask" />
-        <base-btn :btn="$styles.blueLightBtn" :loading="loading" :text="$dataStore.t('confirm.no')" @click="closePanel" />
+        <base-btn :text="$dataStore.t('confirm.yes')" :loading="$dataStore.isButtonsLoading" @click="handleTask" />
+        <base-btn :btn="$styles.blueLightBtn" :loading="$dataStore.isButtonsLoading" :text="$dataStore.t('confirm.no')" @click="closePanel" />
       </div>
     </div>
   </section>
@@ -41,7 +41,7 @@
     <div v-if="isScansDocuments" :class="[$styles.flexColNav]">
       <div v-if="isNewSign">
         <div class="flex flex-col gap-2">
-          <base-btn v-for="file in signingFiles" :text="`Скачать ${file.fileName}`" :loading="$dataStore.isButtonsLoading" @click="getFileNew(file)" />
+          <base-btn v-for="file in signingFiles" :text="`Скачать ${file.fileName}`" :loading="$dataStore.isButtonsLoading" @click="getDocNew(file)" />
           <base-form-section class="mt-4 flex flex-col !gap-2" :title="$dataStore.t('clients.attachScansSignDocs')">
             <base-file-input v-for="file in signingFiles" :label="`Вложить ${file.fileName}`" @input.prevent="onFileChangeScansNew($event, file)" @onClear="onClearFileNew(file)" />
           </base-form-section>
@@ -346,9 +346,9 @@ export default defineComponent({
       }
     };
 
-    const getFileNew = async (file: any) => {
+    const getDocNew = async (file: any) => {
       const newFile = signOptions.value?.signIds.find((i: any) => i.fileType == file.fileType);
-      if (newFile) await dataStore.getFileNew(newFile.id, 2, false, file.fileName);
+      if (newFile) await dataStore.getDocNew(newFile.id, 2, false, file.fileName);
     };
 
     const onFileChangeScansNew = async (event: InputEvent, file: any) => {
@@ -1013,7 +1013,7 @@ export default defineComponent({
       newSign,
       onFileChangeScansNew,
       onClearFileNew,
-      getFileNew,
+      getDocNew,
       inSigningOrder,
       isNewSign,
       hasEpayPay,

package/composables/classes.ts

@@ -327,10 +327,9 @@ class Person {
   getAgeByBirthDate() {
     const date = this.formatDate(this.birthDate);
     if (date) {
-      const age = Math.abs(new Date(Date.now() - new Date(date).getTime()).getUTCFullYear() - 1970);
-      if (new Date(date) < new Date(Date.now()) && age >= 0) {
-        return age.toString();
-      }
+      const birthDate = new Date(date);
+      const today = new Date();
+      return String(today.getFullYear() - birthDate.getFullYear() - (today < new Date(today.getFullYear(), birthDate.getMonth(), birthDate.getDate()) ? 1 : 0));
     } else {
       return null;
     }
@@ -1715,7 +1714,7 @@ export class PhysGroupClass extends BaseGroupClass {
 
 export class GroupMember extends PhysGroupClass {
   isLeader: boolean;
-
+  organizationStartDate: string;
   typeOfEconomicActivity: Value;
   activityTypes: { activityTypeName: string; empoloyeeCount: number }[];
   beneficalOwnerQuest: { order: number; text: string; answer: boolean | null }[];
@@ -1726,6 +1725,7 @@ export class GroupMember extends PhysGroupClass {
     super();
     // Client
     this.isLeader = false;
+    this.organizationStartDate = '';
     this.typeOfEconomicActivity = new Value();
     this.activityTypes = [];
     this.beneficalOwnerQuest = [

package/composables/index.ts

@@ -892,14 +892,10 @@ export class RoleController {
         this.isUSNSsanctioner() ||
         this.isUnderwriter() ||
         this.isActuary() ||
-        this.isAdmin() ||
         this.isCompliance() ||
-        this.isAnalyst() ||
         this.isUpk() ||
         this.isFinCenter() ||
         this.isSupervisor() ||
-        this.isSupport() ||
-        this.isDrn() ||
         this.isUrp() ||
         this.isUsns() ||
         this.isJurist() ||
@@ -916,7 +912,9 @@ export class RoleController {
         this.isExecutor() ||
         this.isArchivist() ||
         this.isUKP() ||
-        this.isDpDirector(),
+        this.isDpDirector() ||
+        this.isSecurity() ||
+        baseAccessRoles,
     };
   };
 }

package/locales/ru.json

@@ -134,6 +134,7 @@
     "successfullyDocSent": "Отправка документа прошла успешно",
     "templateDownloaded": "Шаблон скачан",
     "templateSentToEmail": "Шаблона отправлен на почту",
+    "fileOnlyBelow3mb": "Максимальный размер документа для загрузки - 3 МБ.",
     "fileOnlyBelow5mb": "Максимальный размер документа для загрузки - 5 МБ.",
     "fileOnlyBelow10mb": "Максимальный размер документа для загрузки - 10 МБ.",
     "fileOnlyBelow20mb": "Максимальный размер документа для загрузки - 20 МБ.",

package/package.json

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

package/store/data.store.ts

@@ -145,7 +145,7 @@ export const useDataStore = defineStore('data', {
         if (showError) this.showToaster('error', this.t('toaster.noUrl'));
       }
     },
-    getFilesByIIN(iin: string) {
+    getDocsByIIN(iin: string) {
       return iin ? this.formStore.signedDocumentList.filter(file => file.iin === iin && file.fileTypeName === 'Удостоверение личности') : null;
     },
     async getNewAccessToken() {
@@ -279,12 +279,12 @@ export const useDataStore = defineStore('data', {
         await this.router.replace({ name: route.name });
       }
     },
-    async getFile(file: DocumentItem, mode: string = 'view', fileType: string = 'pdf') {
+    async getDoc(file: DocumentItem, mode: string = 'view', fileType: string = 'pdf') {
       if (!file.id) return;
       try {
         this.isLoading = true;
         if (this.isPension) {
-          await this.api.file.getFileNew(file.id).then((response: any) => {
+          await this.api.file.getDocNew(file.id).then((response: any) => {
             if (!['pdf', 'docx'].includes(fileType)) {
               const blob = new Blob([response], { type: `image/${fileType}` });
               const url = window.URL.createObjectURL(blob);
@@ -318,7 +318,7 @@ export const useDataStore = defineStore('data', {
             }
           });
         } else {
-          await this.api.file.getFile(file.id).then((response: any) => {
+          await this.api.file.getDoc(file.id).then((response: any) => {
             if (!['pdf', 'docx'].includes(fileType)) {
               const blob = new Blob([response], { type: `image/${fileType}` });
               const url = window.URL.createObjectURL(blob);
@@ -358,10 +358,12 @@ export const useDataStore = defineStore('data', {
         this.isLoading = false;
       }
     },
-    async deleteFile(data: DocumentItem) {
+    async deleteFile(data: DocumentItem, showToaster: boolean = true) {
       try {
         await this.api.file.deleteFile(data);
-        this.showToaster('success', this.t('toaster.fileWasDeleted'), 3000);
+        if (showToaster) {
+          this.showToaster('success', this.t('toaster.fileWasDeleted'), 3000);
+        }
       } catch (err) {
         ErrorHandler(err);
       }
@@ -1616,16 +1618,19 @@ export const useDataStore = defineStore('data', {
         if (secondaryQuestions.status === 'fulfilled') {
           const baseAnketa = this.formStore[baseField];
           if (baseAnketa && baseAnketa.body && baseAnketa.body.length) {
-            baseAnketa.body.forEach(i => {
-              if (i.first.definedAnswers === 'Y' && i.second === null && secondaryQuestions.value) {
-                i.second = structuredClone(secondaryQuestions.value);
+            const isSpecialSurvey = this.isBaiterek || this.isBolashak || this.isLiferenta;
+            for (const i of baseAnketa.body) {
+              if (i.second === null && secondaryQuestions.value) {
+                i.second = isSpecialSurvey
+                  ? await this.api.getQuestionListSecondById(`${surveyType}second`, processInstanceId, insuredId, i.first.id)
+                  : structuredClone(secondaryQuestions.value);
               }
               if (i.first.definedAnswers === 'Y' && i.second && i.second.length) {
                 i.second.forEach(second => {
                   if (second.answerType === 'D') second.answerText = reformatDate(String(second.answerText));
                 });
               }
-            });
+            }
           }
         }
       } catch (err) {
@@ -2468,6 +2473,9 @@ export const useDataStore = defineStore('data', {
               this.formStore.applicationData.processCode === constants.products.halykkazynaap
                 ? this.getNumberWithSpacesAfterComma(applicationData.policyAppDto.premiumInCurrency)
                 : this.getNumberWithSpaces(applicationData.policyAppDto.premiumInCurrency);
+            if (applicationData.policyAppDto.currency === 'USD' && applicationData.policyAppDto.amount !== null && applicationData.policyAppDto.premium !== null) {
+              this.currencies.usd = applicationData.policyAppDto.currencyExchangeRate;
+            }
           }
           const riskGroup = this.riskGroup.find(item => {
             if (applicationData.policyAppDto.riskGroup == 0) {
@@ -2800,7 +2808,7 @@ export const useDataStore = defineStore('data', {
         await ncaLayerClient.connect();
         const activeTokens = await ncaLayerClient.getActiveTokens();
         const storageType = activeTokens[0] || NCALayerClient.fileStorageType;
-        const document = await this.getFileNew(groupId, signType, isXml);
+        const document = await this.getDocNew(groupId, signType, isXml);
         if (isXml) {
           const signedAgreement = await ncaLayerClient.signXml(storageType, document, 'SIGNATURE', '');
           const data = new FormData();
@@ -2819,9 +2827,9 @@ export const useDataStore = defineStore('data', {
         return err.name === 'NCALayerError' ? null : ErrorHandler(err);
       }
     },
-    async getFileNew(groupId: string, documentSignType: number, xml: boolean, fileName?: string) {
+    async getDocNew(groupId: string, documentSignType: number, xml: boolean, fileName?: string) {
       try {
-        let response: any = await this.api.file.generalGetFile(groupId, xml ? 5 : documentSignType);
+        let response: any = await this.api.file.generalGetDoc(groupId, xml ? 5 : documentSignType);
         let blob;
         if (response.hasOwnProperty('data')) {
           const document = JSON.parse(response.data).Document;
@@ -3680,6 +3688,24 @@ export const useDataStore = defineStore('data', {
         });
       }
     },
+    uniqPreparePersonData(local: GroupMember) {
+      const checkForNull = (value: any) => (value ? value : '');
+      try {
+        (Object.keys(local) as Array<keyof GroupMember>).forEach(key => {
+          if (key === 'actualAddress' || key === 'legalAddress') {
+            const address = `${checkForNull(local[key].country.nameRu)}, ${checkForNull(local[key].state.nameRu)},${
+              local[key].region.nameRu ? ` ${local[key].region.nameRu},` : ''
+            } ${checkForNull(local[key].regionType.nameRu)} ${checkForNull(local[key].city.nameRu)},${local[key].square ? ` квартал ${local[key].square},` : ''}${
+              local[key].microdistrict ? ` мкр ${local[key].microdistrict},` : ''
+            } ул. ${checkForNull(local[key].street)}, д. ${checkForNull(local[key].houseNumber)}`;
+            local[key].longName = address;
+            local[key].longNameKz = address;
+          }
+        });
+      } catch (e) {
+        ErrorHandler(e);
+      }
+    },
     async startApplicationV2(data: PolicyholderClass) {
       const policyholder = JSON.parse(JSON.stringify(data)) as any;
       this.preparePersonData(policyholder);
@@ -3699,6 +3725,7 @@ export const useDataStore = defineStore('data', {
         'clientData.authoritedPerson.addTaxResidency',
       ]);
       policyholder.clientData.authoritedPerson.gender = policyholder.clientData.authoritedPerson.gender.nameRu === 'Мужской' ? 1 : 2;
+      this.uniqPreparePersonData(policyholder.clientData);
       if (this.formStore.lfb.add) {
         policyholder.parentContractNumber = localStorage.getItem('policyNo');
         policyholder.parentContractId = localStorage.getItem('policyId');
@@ -3715,6 +3742,7 @@ export const useDataStore = defineStore('data', {
       const policyholder = JSON.parse(JSON.stringify(data)) as any;
       policyholder.clientData.authoritedPerson.gender = policyholder.clientData.authoritedPerson.gender.nameRu === 'Мужской' ? 1 : 2;
       this.preparePersonData(policyholder);
+      this.uniqPreparePersonData(policyholder.clientData);
       try {
         await this.api.saveClient(this.formStore.applicationData.processInstanceId, this.formStore.lfb.clientId, policyholder);
       } catch (err) {
@@ -3799,7 +3827,7 @@ export const useDataStore = defineStore('data', {
 
         this.formStore.productConditionsForm.calcDate = reformatDate(applicationData.policyAppDto.calcDate);
         this.formStore.productConditionsForm.contractEndDate = reformatDate(applicationData.policyAppDto.contractEndDate);
-        this.formStore.productConditionsForm.agentCommission = applicationData.policyAppDto.agentCommission === 0 ? null : applicationData.policyAppDto.agentCommission;
+        this.formStore.productConditionsForm.agentCommission = 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);

package/types/index.ts

@@ -139,8 +139,8 @@ export type EachAnketa = {
 };
 
 export enum AnswerName {
-  Нет = 'Нет',
-  Да = 'Да',
+  'Жоқ/Нет' = 'Жоқ/Нет',
+  'Иә/Да' = 'Иә/Да',
 }
 
 export enum AnswerType {