hl-core 0.0.9-beta.2 → 0.0.9-beta.3

package/components/Complex/MessageBlock.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="text-left p-6 mb-4" :class="[color, $libStyles.rounded]">
+  <div class="text-left p-6 mb-4" :class="[color, $libStyles.rounded, $libStyles.textTitle]">
     <v-icon :icon="icon" class="mr-4"></v-icon>
     {{ text }}
   </div>

package/components/Form/ManagerAttachment.vue

@@ -129,9 +129,9 @@ export default defineComponent({
         dataStore.panel.title = title;
         currentDictName.value = currentDict;
 
-        if (currentDict === 'ManagerPolicy') {
+        if (currentDict === 'ManagerPolicy' && formStore.RegionPolicy.ids) {
           isPanelLoading.value = true;
-          await dataStore.filterManagerByRegion(String(formStore.RegionPolicy.ids ?? ''));
+          await dataStore.filterManagerByRegion(formStore.RegionPolicy.ids as string);
         }
 
         isPanelOpen.value = true;

package/composables/classes.ts

@@ -405,11 +405,11 @@ export class Member extends Person {
   registrationRegion: Value;
   registrationRegionType: Value;
   registrationCity: Value;
-  registrationQuarter: string | null;
-  registrationMicroDistrict: string | null;
-  registrationStreet: string | null;
-  registrationNumberHouse: string | null;
-  registrationNumberApartment: string | null;
+  registrationQuarter?: string | null;
+  registrationMicroDistrict?: string | null;
+  registrationStreet?: string | null;
+  registrationNumberHouse?: string | null;
+  registrationNumberApartment?: string | null;
   birthRegion: Value;
   documentType: Value;
   documentNumber: string | null;

package/composables/constants.ts

@@ -10,6 +10,10 @@ export const constants = Object.freeze({
     gons: 10,
     halykkazyna: 11,
   },
+  amlProducts: {
+    checkcontragent: 1,
+    checkcontract: 2,
+  },
   editableStatuses: [Statuses.StartForm, Statuses.EditBeneficiaryForm, Statuses.EditForm],
   documentsLinkVisibleStatuses: [
     Statuses.DocumentsSignedFrom,

package/composables/index.ts

@@ -229,13 +229,19 @@ export const setAddressBeneficiary = (whichIndex: number, sameAddress: boolean)
     } else {
       if (beneficiary.response && beneficiary.response.addresses && beneficiary.response.addresses.length) {
         const benAddress = beneficiary.response.addresses;
-        const country = dataStore.countries.find(i => (i.nameRu as string).match(new RegExp(benAddress[0].countryName, 'i')));
-        const city = dataStore.cities.find(i => i.nameRu === benAddress[0].cityName.replace('г.', ''));
+        const countryName = benAddress[0].countryName;
+        const cityName = benAddress[0].cityName;
+        if (countryName) {
+          const country = dataStore.countries.find(i => (i.nameRu as string).match(new RegExp(countryName, 'i')));
+          beneficiary.registrationCountry = country ?? new Value();
+        }
+        if (cityName) {
+          const city = dataStore.cities.find(i => i.nameRu === cityName.replace('г.', ''));
+          beneficiary.registrationCity = city ?? new Value();
+        }
         const province = dataStore.states.find(i => i.ids === benAddress[0].stateCode);
         const localityType = dataStore.localityTypes.find(i => i.nameRu === benAddress[0].cityTypeName);
         const region = dataStore.regions.find(i => i.ids == benAddress[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 ?? '';

package/locales/kz.json

@@ -392,6 +392,11 @@
     "dicts": "Справочники",
     "aml": "AML",
     "amlLong": "Ақшаны жылыстатумен күрес",
+    "checkContract": "Присвоение уровня риска",
+    "checkContragent": "Проверка Контрагента",
+    "riskPoint": "Уровень риска",
+    "comment": "Комментарий",
+    "matchWith": "Совпадение по",
     "efoLong": "Единое фронтальное окно",
     "efo": "ЕФО",
     "lkaLong": "Личный кабинет Агента",

package/locales/ru.json

@@ -393,6 +393,11 @@
     "dicts": "Справочники",
     "aml": "AML",
     "amlLong": "Противодействие отмыву денег",
+    "checkContract": "Присвоение уровня риска",
+    "checkContragent": "Проверка Контрагента",
+    "riskPoint": "Уровень риска",
+    "comment": "Комментарий",
+    "matchWith": "Совпадение по",
     "efoLong": "Единое фронтальное окно",
     "efo": "ЕФО",
     "lkaLong": "Личный кабинет Агента",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.9-beta.2",
+  "version": "0.0.9-beta.3",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",
@@ -29,7 +29,7 @@
     "generate": "nuxt generate",
     "preview": "nuxt preview",
     "update:core": "git checkout -b %npm_package_version% && git add . && git commit -m \"%npm_package_version%\" && git push && git checkout main",
-    "update:aml": "cd .. && cd aml && yarn && git checkout -b %npm_package_version% && git add . && git commit -m \"%npm_package_version%\" && git push && git checkout main && cd .. && cd core",
+    "update:aml": "cd .. && cd aml && cd aml && yarn && git checkout -b %npm_package_version% && git add . && git commit -m \"%npm_package_version%\" && git push && git checkout main && cd .. && cd checkcontract && yarn && git checkout -b %npm_package_version% && git add . && git commit -m \"%npm_package_version%\" && git push && git checkout main && cd .. && cd core",
     "update:baiterek": "cd .. && cd baiterek && yarn && git checkout -b %npm_package_version% && git add . && git commit -m \"%npm_package_version%\" && git push && git checkout main && cd .. && cd core",
     "update:bolashak": "cd .. && cd bolashak && yarn && git checkout -b %npm_package_version% && git add . && git commit -m \"%npm_package_version%\" && git push && git checkout main && cd .. && cd core",
     "update:calculator": "cd .. && cd calculator && yarn && git checkout -b %npm_package_version% && git add . && git commit -m \"%npm_package_version%\" && git push && git checkout main && cd .. && cd core",
@@ -48,7 +48,7 @@
     "pull:kazyna": "cd .. && cd kazyna && git pull && cd .. && cd core",
     "pull:liferenta": "cd .. && cd liferenta && git pull && cd .. && cd core",
     "pull:lka": "cd .. && cd lka && git pull && cd .. && cd core",
-    "pull:all": "cd .. && cd aml && git pull && cd .. && cd baiterek && git pull && cd .. && cd bolashak && git pull && cd .. && cd calculator && git pull && cd .. && cd efo && git pull && cd .. && cd gons && git pull && cd .. && cd kazyna && git pull && cd .. && cd liferenta && git pull && cd .. && cd lka && git pull && cd ..",
+    "pull:all": "yarn pull:aml && yarn pull:baiterek && yarn pull:bolashak && yarn pull:calculator && yarn pull:efo && yarn pull:gons && yarn pull:kazyna && yarn pull:liferenta && yarn pull:lka",
     "typecheck": "nuxt typecheck"
   },
   "devDependencies": {

package/store/data.store.ts

@@ -44,7 +44,8 @@ export const useDataStore = defineStore('data', {
     isGons: state => state.product === 'gons',
     isKazyna: state => state.product === 'halykkazyna',
     isCalculator: state => state.product === 'calculator',
-    isComplianceWindow: state => state.product === 'compliance',
+    isCheckContract: state => state.product === 'checkcontract',
+    isCheckContragent: state => state.product === 'checkcontragent',
     isEveryFormDisabled: state => Object.values(state.formStore.isDisabled).every(i => i === true),
     hasClientAnketa: state => state.formStore.additionalInsuranceTerms.find(i => i.coverTypeCode === 10),
     isClientAnketaCondition: state =>
@@ -478,12 +479,15 @@ export const useDataStore = defineStore('data', {
       }
       if ('address' in user && user.address && user.address.length) {
         const userAddress = user.address[0];
-        const country = this.countries.find(i => i.nameRu?.match(new RegExp(userAddress.countryName, 'i')));
+        const countryName = userAddress.countryName;
+        if (countryName) {
+          const country = this.countries.find(i => i.nameRu?.match(new RegExp(countryName, 'i')));
+          member.registrationCountry = country ? country : new Value();
+        }
         const province = this.states.find(i => i.ids === userAddress.stateCode);
         const localityType = this.localityTypes.find(i => i.nameRu === userAddress.cityTypeName);
         const city = this.cities.find(i => !!userAddress.cityName && i.nameRu === userAddress.cityName.replace('г.', ''));
         const region = this.regions.find(i => !!userAddress.regionCode && i.ids == userAddress.regionCode);
-        member.registrationCountry = country ? country : new Value();
         member.registrationStreet = userAddress.streetName;
         member.registrationCity = city ? city : new Value();
         member.registrationNumberApartment = userAddress.apartmentNumber;
@@ -636,7 +640,7 @@ export const useDataStore = defineStore('data', {
         }))(user);
         const questionariesData: ContragentQuestionaries[] = Object.values(userQuestionnaires).map(question => {
           let questName = '';
-          let questionId = parseInt(String(question.ids)).toString();
+          let questionId = parseInt(question.ids as string).toString();
           if (questionId === '500003') {
             questName = 'Код сектора экономики';
           } else if (questionId === '500011') {
@@ -659,11 +663,11 @@ export const useDataStore = defineStore('data', {
           user.addTaxResidency = new Value();
         }
         const addTaxResidency = userResponseQuestionnaires !== null ? userResponseQuestionnaires.find(i => i.questId === '507777') : undefined;
-        if (user.addTaxResidency.nameRu !== null) {
+        if (user.addTaxResidency.nameRu !== null && user.addTaxResidency.ids) {
           questionariesData.push({
             id: addTaxResidency ? addTaxResidency.id : 0,
             contragentId: Number(user.id),
-            questAnswer: String(user.addTaxResidency.ids ?? ''),
+            questAnswer: user.addTaxResidency.ids,
             questAnswerName: user.addTaxResidency.nameRu,
             questName: 'Указать если налоговое резиденство  выбрано  другое',
             questId: '507777',
@@ -735,7 +739,7 @@ export const useDataStore = defineStore('data', {
           issuerNameRu: user.documentIssuers.nameRu,
           note: null,
           number: user.documentNumber,
-          type: user.documentType.ids ? String(user.documentType.ids) : '',
+          type: user.documentType.ids ? (user.documentType.ids as string) : undefined,
           typeName: user.documentType.nameRu,
           serial: null,
           verifyType: user.verifyType,
@@ -753,13 +757,13 @@ export const useDataStore = defineStore('data', {
         addressData.push({
           id: userResponseAddress !== null ? userResponseAddress[0].id : 0,
           contragentId: Number(user.id),
-          countryCode: String(user.registrationCountry.ids ?? ''),
+          countryCode: user.registrationCountry.ids ?? undefined,
           countryName: user.registrationCountry.nameRu ?? '',
-          stateCode: String(user.registrationProvince.ids ?? ''),
+          stateCode: user.registrationProvince.ids ?? undefined,
           stateName: user.registrationProvince.nameRu ?? '',
-          cityCode: String(user.registrationCity.code ?? ''),
+          cityCode: user.registrationCity.code ?? undefined,
           cityName: user.registrationCity.nameRu ?? '',
-          regionCode: String(user.registrationRegion.ids ?? ''),
+          regionCode: user.registrationRegion.ids ?? undefined,
           regionName: user.registrationRegion.nameRu,
           streetName: user.registrationStreet ?? '',
           kvartal: user.registrationQuarter,
@@ -942,9 +946,9 @@ export const useDataStore = defineStore('data', {
           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
-            ? String(this.formStore.productConditionsForm.processIndexRate.id)
-            : String(this.processIndexRate.find(i => i.code === '0')?.id ?? ''),
-          paymentPeriodId: String(this.formStore.productConditionsForm.paymentPeriod.id ?? ''),
+            ? this.formStore.productConditionsForm.processIndexRate.id ?? undefined
+            : this.processIndexRate.find(i => i.code === '0')?.id ?? undefined,
+          paymentPeriodId: this.formStore.productConditionsForm.paymentPeriod.id ?? undefined,
           lifeMultiply: formatProcents(this.formStore.productConditionsForm.lifeMultiply ?? ''),
           lifeAdditive: formatProcents(this.formStore.productConditionsForm.lifeAdditive ?? ''),
           adbMultiply: formatProcents(this.formStore.productConditionsForm.adbMultiply ?? ''),
@@ -962,9 +966,9 @@ export const useDataStore = defineStore('data', {
       }
       if (this.isLiferenta) {
         conditionsData.policyAppDto.guaranteedPaymentPeriod = this.formStore.productConditionsForm.guaranteedPeriod || 0;
-        conditionsData.policyAppDto.annuityTypeId = String(this.formStore.productConditionsForm.typeAnnuityInsurance.id ?? '');
+        conditionsData.policyAppDto.annuityTypeId = (this.formStore.productConditionsForm.typeAnnuityInsurance.id as string) ?? undefined;
         conditionsData.policyAppDto.paymentPeriod = Number(this.formStore.productConditionsForm.termAnnuityPayments);
-        conditionsData.policyAppDto.annuityPaymentPeriodId = String(this.formStore.productConditionsForm.periodAnnuityPayment.id ?? '');
+        conditionsData.policyAppDto.annuityPaymentPeriodId = (this.formStore.productConditionsForm.periodAnnuityPayment.id as string) ?? undefined;
       }
       return conditionsData;
     },
@@ -1052,11 +1056,11 @@ export const useDataStore = defineStore('data', {
         salesChannel: this.formStore.applicationData.insisWorkDataApp.salesChannel,
         salesChannelName: this.formStore.applicationData.insisWorkDataApp.salesChannelName,
         insrType: this.formStore.applicationData.insisWorkDataApp.insrType,
-        saleChanellPolicy: String(this.formStore.SaleChanellPolicy.ids ?? ''),
+        saleChanellPolicy: (this.formStore.SaleChanellPolicy.ids as string) ?? undefined,
         saleChanellPolicyName: this.formStore.SaleChanellPolicy.nameRu ?? '',
-        regionPolicy: String(this.formStore.RegionPolicy.ids ?? ''),
+        regionPolicy: (this.formStore.RegionPolicy.ids as string) ?? undefined,
         regionPolicyName: this.formStore.RegionPolicy.nameRu ?? '',
-        managerPolicy: String(this.formStore.ManagerPolicy.ids),
+        managerPolicy: this.formStore.ManagerPolicy.ids as string,
         managerPolicyName: this.formStore.ManagerPolicy.nameRu ?? '',
         insuranceProgramType: this.formStore.applicationData.insisWorkDataApp.insuranceProgramType,
       };
@@ -1514,9 +1518,9 @@ export const useDataStore = defineStore('data', {
           coverPeriod: Number(this.formStore.productConditionsForm.coverPeriod),
           payPeriod: Number(this.formStore.productConditionsForm.coverPeriod),
           indexRateId: this.formStore.productConditionsForm.processIndexRate?.id
-            ? String(this.formStore.productConditionsForm.processIndexRate.id)
-            : String(this.processIndexRate.find(i => i.code === '0')?.id),
-          paymentPeriodId: String(this.formStore.productConditionsForm.paymentPeriod.id),
+            ? this.formStore.productConditionsForm.processIndexRate.id ?? undefined
+            : this.processIndexRate.find(i => i.code === '0')?.id ?? undefined,
+          paymentPeriodId: (this.formStore.productConditionsForm.paymentPeriod.id as string) ?? undefined,
           addCovers: this.formStore.additionalInsuranceTermsWithout,
         };
         if (this.isKazyna || product === 'halykkazyna') {
@@ -1526,9 +1530,9 @@ export const useDataStore = defineStore('data', {
         }
         if (this.isLiferenta) {
           calculationData.guaranteedPaymentPeriod = this.formStore.productConditionsForm.guaranteedPeriod || 0;
-          calculationData.annuityTypeId = String(this.formStore.productConditionsForm.typeAnnuityInsurance.id);
+          calculationData.annuityTypeId = (this.formStore.productConditionsForm.typeAnnuityInsurance.id as string) ?? undefined;
           calculationData.paymentPeriod = Number(this.formStore.productConditionsForm.termAnnuityPayments);
-          calculationData.annuityPaymentPeriodId = String(this.formStore.productConditionsForm.periodAnnuityPayment.id);
+          calculationData.annuityPaymentPeriodId = (this.formStore.productConditionsForm.periodAnnuityPayment.id as string) ?? undefined;
         }
         const calculationResponse = await this.api.calculateWithoutApplication(calculationData, this.isCalculator ? product : undefined);
         this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(calculationResponse.amount);

package/types/index.ts

@@ -4,7 +4,20 @@ export {};
 
 declare global {
   type EnvModes = 'development' | 'test' | 'vercel' | 'production';
-  type Projects = 'aml' | 'baiterek' | 'bolashak' | 'calculator' | 'compliance' | 'efo' | 'gons' | 'halykkazyna' | 'liferenta' | 'lifetrip' | 'lka' | 'mycar';
+  type Projects =
+    | 'aml'
+    | 'baiterek'
+    | 'bolashak'
+    | 'calculator'
+    | 'efo'
+    | 'gons'
+    | 'halykkazyna'
+    | 'liferenta'
+    | 'lifetrip'
+    | 'lka'
+    | 'mycar'
+    | 'checkcontract'
+    | 'checkcontragent';
   type MemberKeys = keyof ReturnType<typeof useFormStore>;
   type MemberFormTypes = 'policyholderForm' | 'insuredForm' | 'beneficiaryForm' | 'beneficialOwnerForm' | 'policyholdersRepresentativeForm' | 'productConditionsForm';
   type SingleMember = 'policyholderForm' | 'policyholdersRepresentativeForm';
@@ -36,7 +49,7 @@ declare global {
     | 'time'
     | 'url'
     | 'week';
-  type TaskListItem = {
+  interface TaskListItem {
     addRegNumber: string | number;
     applicationTaskId: string;
     dateCreated: string;
@@ -54,7 +67,7 @@ declare global {
     status: string;
     userId: string;
     userName: string;
-  };
+  }
   type TaskHistory = {
     appointmentDate: string | null;
     comment: string | null;
@@ -229,8 +242,8 @@ declare global {
     premium: number | null;
     coverPeriod: number;
     payPeriod: number;
-    indexRateId?: string | null;
-    paymentPeriodId: string;
+    indexRateId?: string | number | null;
+    paymentPeriodId?: string;
     addCovers: AddCover[];
   };
 
@@ -367,14 +380,14 @@ declare global {
     contragentId: number;
     questId: string;
     questName: string;
-    questAnswer: string | null;
+    questAnswer: string | number | null;
     questAnswerName: string | null;
   };
 
   type ContragentDocuments = {
     id: number;
     contragentId: number;
-    type: string;
+    type?: string;
     typeName: string | null;
     serial: string | null;
     number: string | null;
@@ -392,23 +405,23 @@ declare global {
   type ContragentAddress = {
     id: number;
     contragentId: number;
-    type: string;
-    address: string;
-    countryCode: string;
-    countryName: string;
-    stateCode: string;
-    stateName: string;
-    cityCode: string;
-    cityName: string;
-    regionCode: string | null;
-    regionName: string | null;
-    streetName: string;
-    blockNumber: string;
-    apartmentNumber: string;
-    cityTypeId: number | null;
-    cityTypeName: string;
-    microRaion: string | null;
-    kvartal: string | null;
+    type?: string;
+    address?: string;
+    countryCode?: string | number;
+    countryName?: string;
+    stateCode?: string | number;
+    stateName?: string;
+    cityCode?: string | number;
+    cityName?: string;
+    regionCode?: string | number |null;
+    regionName?: string | null;
+    streetName?: string;
+    blockNumber?: string;
+    apartmentNumber?: string;
+    cityTypeId?: number | null;
+    cityTypeName?: string;
+    microRaion?: string | null;
+    kvartal?: string | null;
   };
 
   type ContragentContacts = {
@@ -447,10 +460,10 @@ declare global {
     isSpokesman?: boolean;
     coverPeriod?: number | null;
     payPeriod?: number | null;
-    indexRateId?: string;
+    indexRateId?: string | number;
     indexRateCode?: string;
     indexRateName?: string;
-    paymentPeriodId?: string;
+    paymentPeriodId?: string | number;
     paymentPeriodName?: string;
     lifeMultiply?: number;
     lifeAdditive?: number;