hl-core 0.0.10-beta.24 → 0.0.10-beta.26

package/api/base.api.ts

@@ -984,10 +984,10 @@ export class ApiClass {
         url: `${this.pensionannuityNew.base}/GetEnpfRedirectUrl?id=${id}`,
       });
     },
-    setEnpfSharedId: async (sharedId: string, infoId: string) => {
+    setEnpfSharedId: async (sharedId: string, infoId: string, isProd: boolean) => {
       return await this.axiosCall<void>({
         method: Methods.POST,
-        baseURL: getStrValuePerEnv('efoBaseApi'),
+        baseURL: isProd === false ? getStrValuePerEnv('efoBaseApi').replace('kz/efo', 'kz/test/efo') : getStrValuePerEnv('efoBaseApi'),
         url: `${this.pensionannuityNew.base}/SetEnpfSharedId/${sharedId}/${infoId}`,
       });
     },
@@ -995,14 +995,14 @@ export class ApiClass {
 
   externalServices = {
     base: '/externalservices',
-    onlineAccess: async (data: { iinBin: string; documentType: string }) => {
-      return await this.axiosCall<void>({
+    getOnlineAccess: async (data: { iinBin: string; documentType: string }) => {
+      return await this.axiosCall<{ code: string; message: string }>({
         method: Methods.POST,
         url: `${this.externalServices.base}/api/ExternalServices/GetOnlineAccess`,
         data: data,
       });
     },
-    digitalDocuments: async (data: { iin: string; processInstanceId: string; code: string }) => {
+    getDigitalDocuments: async (data: { iin: string; processInstanceId: string; code: string }) => {
       return await this.axiosCall<void>({
         method: Methods.POST,
         url: `${this.externalServices.base}/api/ExternalServices/DigitalDocuments`,

package/components/Pages/Documents.vue

@@ -202,8 +202,8 @@ import type { Base, FileActions } from '../../types';
 
 export default defineComponent({
   setup() {
-    type DigitalDocNames = 'Удостоверение личности' | 'Паспорт';
-    type DigitalDocTypes = 'IdentityCard' | 'Passport';
+    type DigitalDocNames = 'Удостоверение личности' | 'Паспорт' | 'Вид на жительство иностранного гражданина';
+    type DigitalDocTypes = 'IdentityCard' | 'Passport' | 'Vnzh';
 
     const route = useRoute();
     const dataStore = useDataStore();
@@ -224,10 +224,11 @@ export default defineComponent({
     const documentType = ref<DigitalDocNames | null>(null);
     const otpCode = ref<string>('');
     const currentIin = ref<string>('');
-    const deleteFilesId = ['1', '2', '46'];
+    const deleteFilesId = ['1', '2', '4', '46'];
     const documentItems: Array<{ title: DigitalDocNames; value: DigitalDocTypes }> = [
       { title: 'Удостоверение личности', value: 'IdentityCard' },
       { title: 'Паспорт', value: 'Passport' },
+      { title: 'Вид на жительство иностранного гражданина', value: 'Vnzh' },
     ];
     const signedContract = reactive<{
       processInstanceId: string | number;
@@ -293,7 +294,7 @@ export default defineComponent({
     const policyholderForm = computed(() => formStore.policyholderForm as Base.Document.Digital);
     const insuredFiltered = computed(() => formStore.insuredForm.filter(i => i.iin !== formStore.policyholderForm.iin) as Base.Document.Digital[]);
     const beneficiaryFiltered = computed(() => formStore.beneficiaryForm.filter(i => i.iin !== formStore.policyholderForm.iin) as Base.Document.Digital[]);
-    const documentListFiltered = computed(() => formStore.signedDocumentList.filter(i => !['1', '2'].includes(String(i.fileTypeCode))));
+    const documentListFiltered = computed(() => formStore.signedDocumentList.filter(i => !['1', '2', '4'].includes(String(i.fileTypeCode))));
 
     const openPanel = async (document: DocumentItem) => {
       dataStore.rightPanel.title = document.fileTypeName!;
@@ -414,7 +415,7 @@ export default defineComponent({
         dataStore.rightPanel.open = false;
         dataStore.panelAction = null;
         await dataStore.getSignedDocList(formStore.applicationData.processInstanceId);
-        if (hasDigitalDocuments.value && (currentDocument.value.fileTypeCode === '1' || currentDocument.value.fileTypeCode === '2')) {
+        if (hasDigitalDocuments.value && (currentDocument.value.fileTypeCode === '1' || currentDocument.value.fileTypeCode === '2' || currentDocument.value.fileTypeCode === '4')) {
           getDigitalDocs();
         }
       }
@@ -426,7 +427,7 @@ export default defineComponent({
         return;
       }
       documentLoading.value = true;
-      const response = await dataStore.onlineAccess(currentIin.value, String(documentType.value));
+      const response = await dataStore.getOnlineAccess(currentIin.value, String(documentType.value));
       if (response) {
         dataStore.showToaster('success', dataStore.t('toaster.successOtp'), 3000);
       }
@@ -434,12 +435,16 @@ export default defineComponent({
     };
 
     const getDigitalDocument = async () => {
+      if (!documentType.value) {
+        dataStore.showToaster('error', 'Выберите тип документа', 3000);
+        return;
+      }
       if (!otpCode.value) {
         dataStore.showToaster('error', 'Введите код подтверждения', 3000);
         return;
       }
       documentLoading.value = true;
-      const response = await dataStore.digitalDocuments(currentIin.value, String(formStore.applicationData.processInstanceId), otpCode.value);
+      const response = await dataStore.getDigitalDocuments(currentIin.value, String(formStore.applicationData.processInstanceId), otpCode.value);
       if (response) {
         await dataStore.getSignedDocList(formStore.applicationData.processInstanceId);
         getDigitalDocs();
@@ -455,7 +460,9 @@ export default defineComponent({
     const findCommonDocs = (members: Base.Document.Digital[]) => {
       let commonDocs: IDocument[] = [];
       for (let member of members) {
-        const matchingDoc = formStore.signedDocumentList.find(doc => doc.iin === String(member.iin).replaceAll('-', '') && (doc.fileTypeCode === '1' || doc.fileTypeCode === '2'));
+        const matchingDoc = formStore.signedDocumentList.find(
+          doc => doc.iin === String(member.iin).replaceAll('-', '') && (doc.fileTypeCode === '1' || doc.fileTypeCode === '2' || doc.fileTypeCode === '4'),
+        );
         if (matchingDoc) commonDocs.push(matchingDoc);
       }
       return commonDocs;

package/components/Pages/MemberForm.vue

@@ -1003,7 +1003,7 @@ export default {
         (whichForm.value === formStore.beneficiaryFormKey && member.value.iin !== formStore.policyholderForm.iin) ||
         (dataStore.isLifetrip && whichForm.value === formStore.insuredFormKey && member.value.isInsuredUnderage),
     );
-    const hasWorkPositionDict = dataStore.isBaiterek && dataStore.isEfoParent;
+    const hasWorkPositionDict = dataStore.isBaiterek;
 
     const birthDateRule = computed(() => {
       const baseDateRule = dataStore.rules.required.concat(dataStore.rules.birthDate);

package/components/Pages/ProductConditions.vue

@@ -1474,7 +1474,7 @@ export default defineComponent({
     };
 
     const filterTermConditions = (term: AddCover) => {
-      if (term.coverTypeCode === 10) {
+      if (term.coverTypeCode === 10 && !props.isCalculator) {
         return !!formStore.insuredForm.find((member: Member) => member.iin === formStore.policyholderForm.iin) === false;
       }
       return true;

package/components/Utilities/Chip.vue

@@ -1,5 +1,5 @@
 <template>
-  <label v-if="chip && chip.title" class="transition-all leading-6 px-3 py-1 rounded-pill border-[1px] border-white mr-4 whitespace-nowrap" :class="[textSize, color]"
+  <label v-if="chip && chip.title" class="transition-all leading-6 px-3 rounded-pill border-[1px] border-white mr-4 whitespace-nowrap" :class="[textSize, color]"
     >{{ chip.title }}<v-tooltip v-if="chip.description" activator="parent" location="bottom" :max-width="maxWidth">{{ chip.description }}</v-tooltip></label
   >
 </template>

package/locales/ru.json

@@ -143,7 +143,8 @@
     "duplicateClient": "В списке присутствуют повторяющиеся клиенты",
     "notParsedDocument": "Не удалось получить данные",
     "errorOsns": "По данному БИН на дату заключения заявления не найден договор ОСНС. Просим проверить БИН Страхователя.",
-    "needDigDoc": "Нужно получить цифровой документ {text}"
+    "needDigDoc": "Нужно получить цифровой документ {text}",
+    "notDigDoc": "Выданный документ не найден"
   },
   "notSignedContract": "Неподписанный Договор",
   "Contract": "Договор страхования",

package/package.json

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

package/store/data.store.ts

@@ -2515,7 +2515,7 @@ export const useDataStore = defineStore('data', {
         ErrorHandler(err);
       }
     },
-    async nclayerSign(groupId: string, signType: number, isXml: boolean = false) {
+    async nclayerSign(groupId: string, signType: number, isXml: boolean = false, processInstanceId?: string) {
       try {
         const ncaLayerClient = new NCALayerClient();
         await ncaLayerClient.connect();
@@ -2525,7 +2525,7 @@ export const useDataStore = defineStore('data', {
         if (isXml) {
           const signedAgreement = await ncaLayerClient.signXml(storageType, document, 'SIGNATURE', '');
           const data = new FormData();
-          data.append('processInstanceId', String(this.formStore.applicationData.processInstanceId));
+          data.append('processInstanceId', processInstanceId ?? String(this.formStore.applicationData.processInstanceId));
           data.append('xmlData', signedAgreement);
           data.append('name', 'PAEnpf_Agreement');
           data.append('format', 'xml');
@@ -2841,7 +2841,7 @@ export const useDataStore = defineStore('data', {
         this.showToaster('error', this.t('toaster.notSavedMember', { text: 'страхователя' }), 3000);
         return false;
       }
-      if (this.isInitiator() && this.isEfoParent && this.formStore.policyholderForm.iin && !policyholderDoc) {
+      if (useEnv().isProduction && this.isInitiator() && this.isEfoParent && this.formStore.policyholderForm.iin && !policyholderDoc) {
         this.showToaster('error', this.t('toaster.needDigDoc', { text: 'страхователя' }));
         return false;
       }
@@ -3697,27 +3697,32 @@ export const useDataStore = defineStore('data', {
 
       return true;
     },
-    async onlineAccess(iin: string, documentType: string) {
+    async getOnlineAccess(iin: string, documentType: string) {
       try {
         const data = {
           iinBin: iin.replaceAll('-', ''),
           documentType: documentType,
         };
-        await this.api.externalServices.onlineAccess(data);
-        return true;
+        const response = await this.api.externalServices.getOnlineAccess(data);
+        if (response.code === 'PROFILE_DIGIDOCS_INTERNAL_ERROR') {
+          this.showToaster('error', this.t('toaster.notDigDoc'), 3000);
+          return false;
+        } else {
+          return true;
+        }
       } catch (err) {
         ErrorHandler(err);
         return null;
       }
     },
-    async digitalDocuments(iin: string, processInstanceId: string, code: string) {
+    async getDigitalDocuments(iin: string, processInstanceId: string, code: string) {
       try {
         const data = {
           iin: iin.replaceAll('-', ''),
           processInstanceId: processInstanceId,
           code: code.replace(/\s/g, ''),
         };
-        await this.api.externalServices.digitalDocuments(data);
+        await this.api.externalServices.getDigitalDocuments(data);
         return true;
       } catch (err) {
         ErrorHandler(err);