hl-core 0.0.8-beta.7 → 0.0.8-beta.8

package/api/index.ts

@@ -13,7 +13,7 @@ export class ApiClass {
 
   private async axiosCall<T>(config: AxiosRequestConfig): Promise<T> {
     const dataStore = useDataStore();
-    if ((dataStore.isEFO && !this.baseURL) || (!dataStore.isEFO && (!this.baseURL || !this.productUrl))) {
+    if (((dataStore.isEFO || dataStore.isAML) && !this.baseURL) || (!dataStore.isEFO && !dataStore.isAML && (!this.baseURL || !this.productUrl))) {
       console.error('No Axios baseURL or productURL');
     }
     const { data } = await useAxios(this.baseURL).request<T>(config);

package/api/interceptors.ts

@@ -21,7 +21,7 @@ export default function (axios: AxiosInstance) {
       if (error.response.status === 401) {
         dataStore.$reset();
         localStorage.clear();
-        if (dataStore.isEFO) {
+        if (dataStore.isEFO || dataStore.isAML) {
           router.push({ name: 'Auth', query: { error: 401 } });
         } else {
           dataStore.sendToParent(constants.postActions.Error401, 401);

package/components/Form/FormBlock.vue

@@ -4,23 +4,32 @@
       <p :class="[$libStyles.textTitle, $libStyles.greenText]">{{ title }}</p>
       <p v-if="!!subtitle" :class="[$libStyles.greyText, $libStyles.textSimple]">{{ subtitle }}</p>
     </div>
-    <div class="ml-5 mt-6 grid grid-cols-4 md:gap-5 md:grid-cols-4 lg:grid-cols-7 auto-rows-fr items-center">
+    <div
+      class="ml-5 mt-6 grid auto-rows-fr items-center"
+      :class="[isShort ? 'grid-cols-2 md:gap-5 md:grid-cols-2 lg:grid-cols-2 mb-6' : 'grid-cols-4 md:gap-5 md:grid-cols-4 lg:grid-cols-7 ']"
+    >
       <span :class="[$libStyles.textSimple]" class="font-medium">{{ $t('form.fullName') }}</span>
       <span :class="[$libStyles.textSimple]" class="font-medium">{{ $t('form.iin') }}</span>
-      <span :class="[$libStyles.textSimple]" class="font-medium hidden lg:block"> {{ $t('form.gender') }}</span>
-      <span :class="[$libStyles.textSimple]" class="font-medium"> {{ $t('form.birthDate') }} </span>
-      <span :class="[$libStyles.textSimple]" class="font-medium hidden lg:block">{{ $t('form.Country') }} </span>
-      <span :class="[$libStyles.textSimple]" class="font-medium hidden lg:block"> {{ $t('code') }}</span>
+      <span v-if="!isShort" :class="[$libStyles.textSimple]" class="font-medium hidden lg:block"> {{ $t('form.gender') }}</span>
+      <span v-if="!isShort" :class="[$libStyles.textSimple]" class="font-medium"> {{ $t('form.birthDate') }} </span>
+      <span v-if="!isShort" :class="[$libStyles.textSimple]" class="font-medium hidden lg:block">{{ $t('form.Country') }} </span>
+      <span v-if="!isShort" :class="[$libStyles.textSimple]" class="font-medium hidden lg:block"> {{ $t('code') }}</span>
     </div>
-    <div v-if="isMultiple" class="ml-5 flex flex-col">
-      <div v-for="(each, index) of member" :key="index" class="grid grid-cols-4 md:gap-5 md:grid-cols-4 lg:grid-cols-7 auto-rows-fr items-center relative">
+    <div v-if="isMultiple" class="ml-5 flex flex-col" :class="[isShort ? 'mb-6' : '']">
+      <div
+        v-for="(each, index) of member"
+        :key="index"
+        class="grid auto-rows-fr items-center relative"
+        :class="[isShort ? 'grid-cols-2 md:gap-5 md:grid-cols-2 lg:grid-cols-2' : 'grid-cols-4 md:gap-5 md:grid-cols-4 lg:grid-cols-7']"
+      >
         <span :class="[getMemberInfo(each).fullName === null && $libStyles.emptyBlockCol]">{{ getMemberInfo(each).fullName }}</span>
         <span :class="[getMemberInfo(each).iin === null && $libStyles.emptyBlockCol]">{{ getMemberInfo(each).iin }}</span>
-        <span :class="[getMemberInfo(each).gender === null && $libStyles.emptyBlockCol]" class="hidden lg:block">{{ getMemberInfo(each).gender }} </span>
-        <span :class="[getMemberInfo(each).birthDate === null && $libStyles.emptyBlockCol]"> {{ getMemberInfo(each).birthDate }} </span>
-        <span :class="[getMemberInfo(each).birthPlace === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(each).birthPlace }} </span>
-        <span :class="[getMemberInfo(each).sectorCode === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(each).sectorCode }} </span>
+        <span v-if="!isShort" :class="[getMemberInfo(each).gender === null && $libStyles.emptyBlockCol]" class="hidden lg:block">{{ getMemberInfo(each).gender }} </span>
+        <span v-if="!isShort" :class="[getMemberInfo(each).birthDate === null && $libStyles.emptyBlockCol]"> {{ getMemberInfo(each).birthDate }} </span>
+        <span v-if="!isShort" :class="[getMemberInfo(each).birthPlace === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(each).birthPlace }} </span>
+        <span v-if="!isShort" :class="[getMemberInfo(each).sectorCode === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(each).sectorCode }} </span>
         <div
+          v-if="!isShort"
           class="rounded-br-lg transition-all h-[70px] w-[60px] place-self-end"
           :class="[$libStyles.blueBgLight, $libStyles.blueBgLightHover, disabled ? $libStyles.disabled : 'cursor-pointer']"
           @click="!disabled && $emit('onMore', { whichForm, index })"
@@ -29,14 +38,19 @@
         </div>
       </div>
     </div>
-    <div v-else class="ml-5 grid grid-cols-4 md:gap-5 md:grid-cols-4 lg:grid-cols-7 auto-rows-fr items-center relative">
+    <div
+      v-else
+      class="ml-5 grid auto-rows-fr items-center relative"
+      :class="[isShort ? 'grid-cols-2 md:gap-5 md:grid-cols-2 lg:grid-cols-2' : 'grid-cols-4 md:gap-5 md:grid-cols-4 lg:grid-cols-7']"
+    >
       <span :class="[getMemberInfo(member).fullName === null && $libStyles.emptyBlockCol]">{{ getMemberInfo(member).fullName }}</span>
       <span :class="[getMemberInfo(member).iin === null && $libStyles.emptyBlockCol]">{{ getMemberInfo(member).iin }}</span>
-      <span :class="[getMemberInfo(member).gender === null && $libStyles.emptyBlockCol]" class="hidden lg:block">{{ getMemberInfo(member).gender }} </span>
-      <span :class="[getMemberInfo(member).birthDate === null && $libStyles.emptyBlockCol]"> {{ getMemberInfo(member).birthDate }} </span>
-      <span :class="[getMemberInfo(member).birthPlace === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(member).birthPlace }} </span>
-      <span :class="[getMemberInfo(member).sectorCode === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(member).sectorCode }} </span>
+      <span v-if="!isShort" :class="[getMemberInfo(member).gender === null && $libStyles.emptyBlockCol]" class="hidden lg:block">{{ getMemberInfo(member).gender }} </span>
+      <span v-if="!isShort" :class="[getMemberInfo(member).birthDate === null && $libStyles.emptyBlockCol]"> {{ getMemberInfo(member).birthDate }} </span>
+      <span v-if="!isShort" :class="[getMemberInfo(member).birthPlace === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(member).birthPlace }} </span>
+      <span v-if="!isShort" :class="[getMemberInfo(member).sectorCode === null && $libStyles.emptyBlockCol]" class="hidden lg:block"> {{ getMemberInfo(member).sectorCode }} </span>
       <div
+        v-if="!isShort"
         class="rounded-br-lg transition-all h-[70px] w-[60px] place-self-end"
         :class="[$libStyles.blueBgLight, $libStyles.blueBgLightHover, disabled ? $libStyles.disabled : 'cursor-pointer']"
         @click="!disabled && $emit('onMore', { whichForm })"
@@ -45,7 +59,7 @@
       </div>
     </div>
     <div
-      v-if="isMultiple && more"
+      v-if="isMultiple && more && !isShort"
       :class="[$libStyles.blueBg, $libStyles.whiteText, $libStyles.textSimple, disabled ? $libStyles.disabled : 'cursor-pointer']"
       class="rounded-b-lg h-[36px] flex items-center font-medium justify-center"
       @click="!disabled && memberStore.addMember(whichForm)"
@@ -80,6 +94,10 @@ export default defineComponent({
       type: Boolean,
       default: false,
     },
+    type: {
+      type: String as PropType<'short' | 'default'>,
+      default: 'default',
+    },
   },
   emits: ['onMore', 'addMember'],
   setup(props) {
@@ -90,6 +108,8 @@ export default defineComponent({
     const isMultiple = ref(multipleMembers.includes(props.whichForm));
     const member: Member = formStore[props.whichForm as MemberKeys];
 
+    const isShort = computed(() => props.type === 'short');
+
     const getMemberInfo = (memberData: Member) => {
       return {
         fullName: computed(() => (memberData && memberData.getFullNameShorted() ? memberData.getFullNameShorted() : null)).value,
@@ -109,6 +129,7 @@ export default defineComponent({
       isMultiple,
 
       // Computed
+      isShort,
 
       // Functions
       getMemberInfo,

package/components/Layout/SettingsPanel.vue

@@ -34,7 +34,7 @@ const dataStore = useDataStore();
 const handleFontSize = (action: 'increase' | 'decrease') => {
   if (action === 'increase' && dataStore.fontSize < 24) dataStore.fontSize += 2;
   if (action === 'decrease' && dataStore.fontSize > 14) dataStore.fontSize -= 2;
-  if (dataStore.isEFO) {
+  if (dataStore.isEFO || dataStore.isAML) {
     dataStore.sendToChild(constants.postActions.font, dataStore.fontSize);
   } else {
     dataStore.sendToParent(constants.postActions.font, dataStore.fontSize);

package/components/Pages/MemberForm.vue

@@ -221,6 +221,13 @@
         <base-form-input v-model="member.jobPlace" :label="$t('form.jobPlace')" :readonly="isDisabled" :clearable="!isDisabled" :rules="$rules.required"></base-form-input>
       </base-form-section>
       <base-form-section :title="$t('form.placeRegistration')" v-if="$dataStore.hasPlaceSection(whichForm)">
+        <base-form-toggle
+          v-if="whichForm === formStore.beneficiaryFormKey"
+          v-model="sameAddress"
+          :disabled="isDisabled"
+          :has-border="false"
+          :title="$t('form.sameAddress')"
+        ></base-form-toggle>
         <base-panel-input
           v-model="member.registrationCountry"
           :value="member.registrationCountry.nameRu"
@@ -515,6 +522,7 @@ export default {
     const isDocumentOpen = ref<boolean>(false);
     const isPanelLoading = ref<boolean>(false);
     const familyDialog = ref<boolean>(false);
+    const sameAddress = ref<boolean>(false);
     const panelValue = ref<Value>(new Value());
     const panelList = ref<Value[]>([]);
     const currentPanel = ref<keyof typeof member.value>();
@@ -683,7 +691,7 @@ export default {
           isPanelLoading.value = true;
           newList = await asyncFunction(filterKey, member.value);
         }
-        panelList.value = newList;
+        panelList.value = filterList(newList, key);
         panelValue.value = member.value[currentPanel.value];
         isPanelLoading.value = false;
       } else {
@@ -691,6 +699,22 @@ export default {
       }
     };
 
+    const filterList = (list: Value[], key: string) => {
+      if (dataStore.isBolashak) {
+        if (key === 'relationDegree') {
+          if (whichForm.value === formStore.beneficiaryFormKey) {
+            const beneficiaryRelations = [12, 13, 14, 15, 20, 21, 22, 23];
+            return list.filter(i => beneficiaryRelations.includes(Number(i.ids)));
+          }
+          if (whichForm.value === formStore.insuredFormKey) {
+            const insuredRelations = [6, 7, 10, 11, 12, 13, 14, 15, 20, 21, 22, 23];
+            return list.filter(i => insuredRelations.includes(Number(i.ids)));
+          }
+        }
+      }
+      return list;
+    };
+
     const pickPanelValue = (item: Value) => {
       if (formStore.isDisabled[whichForm.value as keyof typeof formStore.isDisabled] === false) {
         dataStore.panel.open = false;
@@ -702,6 +726,55 @@ export default {
       }
     };
 
+    const setAddress = () => {
+      const beneficiary = formStore.beneficiaryForm[Number(whichIndex.value)];
+      const policyholder = formStore.policyholderForm;
+      if (sameAddress.value === 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 ?? '';
+        }
+      }
+    };
+
     const uploadFile = async (processInstanceId: string | number) => {
       const selectedDocument = dataStore.dicFileTypeList.find((i: Value) => i.nameRu === member.value.documentType.nameRu);
       const formData = new FormData();
@@ -1032,6 +1105,13 @@ export default {
       }
     });
 
+    watch(
+      () => sameAddress.value,
+      () => {
+        if (whichForm.value === formStore.beneficiaryFormKey) setAddress();
+      },
+    );
+
     watch(
       () => member.value.percentageOfPayoutAmount,
       val => {
@@ -1106,6 +1186,7 @@ export default {
       memberDocument,
       familyDialog,
       selectedFamilyMember,
+      sameAddress,
 
       // Computed
       whichForm,

package/components/Pages/ProductConditions.vue

@@ -295,7 +295,7 @@ export default defineComponent({
           isPanelLoading.value = true;
           newList = await asyncFunction(filterKey, formStore.productConditionsFormKey);
         }
-        panelList.value = newList;
+        panelList.value = filterList(newList, key);
         // @ts-ignore
         panelValue.value = productConditionsForm[currentPanel.value];
         isPanelLoading.value = false;
@@ -304,6 +304,15 @@ export default defineComponent({
       }
     };
 
+    const filterList = (list: Value[], key: string) => {
+      if (dataStore.isBaiterek) {
+        if (dataStore.isManagerHalykBank()) {
+          if (key === 'paymentPeriod') return list.filter(i => i.code !== 'single');
+        }
+      }
+      return list;
+    };
+
     const openTermPanel = async (title: string, asyncFunction: Function, questionId: string, index: number) => {
       if (!isDisabled.value) {
         searchQuery.value = '';

package/components/Panel/PanelHandler.vue

@@ -128,8 +128,10 @@ export default defineComponent({
           switch (dataStore.panelAction) {
             case constants.actions.pay:
               await dataStore.sendSMS('PayUrl', phoneNumber.value, formStore.epayLink);
+              break;
             case constants.actions.sign:
               await dataStore.sendSMS('SignUrl', phoneNumber.value, selectedClient.value?.uri);
+              break;
             default:
               await handleTask();
           }

package/composables/classes.ts

@@ -356,6 +356,13 @@ export class Contragent extends Person {
 }
 
 export class Member extends Person {
+  response?: {
+    contragent?: any;
+    questionnaires?: any;
+    contacts?: any;
+    documents?: any;
+    addresses?: any;
+  };
   verifyType: any;
   verifyDate: any;
   postIndex: string | null;

package/composables/constants.ts

@@ -27,7 +27,7 @@ export const constants = Object.freeze({
     agentMycar: 'AgentMycar',
     analyst: 'Analyst',
     upk: 'UPK',
-    financeCenter: 'FinanceCenter',
+    finCenter: 'FinCenter',
     supervisor: 'Supervisor',
     support: 'Support',
     managerHalykBank: 'ManagerHalykBank',

package/locales/en.json

@@ -180,6 +180,7 @@
   "questionnaireHealth": "Health questionnaire for the Insured",
   "chooseAll": "Select all",
   "statement": "Statement",
+  "childInfo": "Child info",
   "policyholderForm": "Policyholder",
   "policyholderAndInsured": "Insured / Policyholder",
   "policyholderAndInsuredSame": "Insured / Policyholder are the same person",

package/locales/kz.json

@@ -180,6 +180,7 @@
   "questionnaireHealth": "Анкета по здоровью Застрахованного",
   "chooseAll": "Выбрать все",
   "statement": "Заявление",
+  "childInfo": "Бала туралы ақпарат",
   "policyholderForm": "Страхователь",
   "policyholderAndInsured": "Застрахованный / Страхователь",
   "policyholderAndInsuredSame": "Застрахованный / Страхователь является одним лицом",

package/locales/ru.json

@@ -180,6 +180,7 @@
   "questionnaireHealth": "Анкета по здоровью Застрахованного",
   "chooseAll": "Выбрать все",
   "statement": "Заявление",
+  "childInfo": "Данные о ребенке",
   "policyholderForm": "Страхователь",
   "policyholderAndInsured": "Застрахованный / Страхователь",
   "policyholderAndInsuredSame": "Застрахованный / Страхователь является одним лицом",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.8-beta.7",
+  "version": "0.0.8-beta.8",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",
@@ -49,6 +49,6 @@
     "vue-i18n": "^9.2.2",
     "vue-toastification": "^2.0.0-rc.5",
     "vue-uuid": "^3.0.0",
-    "vuetify": "^3.2.2"
+    "vuetify": "^3.3.1"
   }
 }

package/pages/500.vue

@@ -69,7 +69,7 @@ export default defineComponent({
     });
 
     const goBack = () => {
-      if (dataStore.isEFO) {
+      if (dataStore.isEFO || dataStore.isAML) {
         router.push({ name: 'Auth' });
       } else {
         dataStore.sendToParent(constants.postActions.Error500, 500);

package/plugins/vuetifyPlugin.ts

@@ -10,6 +10,11 @@ export default defineNuxtPlugin(nuxtApp => {
     ssr: false,
     components,
     directives,
+    defaults: {
+      VForm: {
+        validateOn: 'lazy',
+      },
+    },
     theme: {
       themes: {
         light: {

package/store/data.store.js

@@ -31,6 +31,7 @@ export const useDataStore = defineStore('data', {
   }),
   getters: {
     isEFO: state => state.product === 'efo',
+    isAML: state => state.product === 'aml',
     isBaiterek: state => state.product === 'baiterek',
     isBolashak: state => state.product === 'bolashak',
     isMycar: state => state.product === 'mycar',
@@ -39,6 +40,7 @@ export const useDataStore = defineStore('data', {
     isPension: state => state.product === 'pension',
     isGons: state => state.product === 'gons',
     isKazyna: state => state.product === 'halykkazyna',
+    isComplianceWindow: state => state.product === 'compliance',
     isEveryFormDisabled: state => Object.values(state.formStore.isDisabled).every(i => i === true),
   },
   actions: {
@@ -63,7 +65,7 @@ export const useDataStore = defineStore('data', {
     },
     copyToClipboard(text) {
       if (typeof text === 'string' || typeof text === 'number') {
-        if (this.isEFO) {
+        if (this.isEFO || this.isAML) {
           navigator.clipboard.writeText(text);
         } else {
           this.sendToParent(constants.postActions.clipboard, text);
@@ -116,7 +118,7 @@ export const useDataStore = defineStore('data', {
             this.isCompliance() ||
             this.isAnalyst() ||
             this.isUpk() ||
-            this.isFinanceCenter() ||
+            this.isFinCenter() ||
             this.isSupervisor() ||
             this.isSupport();
           if (hasPermission) {
@@ -197,8 +199,8 @@ export const useDataStore = defineStore('data', {
     isSupport() {
       return this.isRole(constants.roles.support);
     },
-    isFinanceCenter() {
-      return this.isRole(constants.roles.financeCenter);
+    isFinCenter() {
+      return this.isRole(constants.roles.finCenter);
     },
     isSupervisor() {
       return this.isRole(constants.roles.supervisor);
@@ -762,6 +764,8 @@ export const useDataStore = defineStore('data', {
           verifyDate: user.verifyDate,
         });
 
+        const checkForNull = value => (value ? value : '');
+
         // ! SaveContragent -> Addresses
         let addressData = [];
         addressData.push({
@@ -778,11 +782,14 @@ export const useDataStore = defineStore('data', {
           streetName: user.registrationStreet,
           kvartal: user.registrationQuarter,
           microRaion: user.registrationMicroDistrict,
-          cityTypeId: Number(user.registrationRegionType.ids),
+          cityTypeId: Number(user.registrationRegionType.ids) > 0 ? Number(user.registrationRegionType.ids) : null,
           cityTypeName: user.registrationRegionType.nameRu,
           blockNumber: user.registrationNumberHouse,
           apartmentNumber: user.registrationNumberApartment,
-          address: `${user.birthPlace.nameRu}, ${user.registrationRegionType.nameRu} ${user.registrationCity.nameRu}, ул. ${user.registrationStreet}, д. ${user.registrationNumberHouse} кв. ${user.registrationNumberApartment}`,
+          address: `${checkForNull(user.birthPlace.nameRu)}, ${checkForNull(user.registrationRegionType.nameRu)} ${checkForNull(user.registrationCity.nameRu)}, ул. ${checkForNull(
+            user.registrationStreet,
+          )}, д. ${checkForNull(user.registrationNumberHouse)} кв. ${checkForNull(user.registrationNumberApartment)}`,
+
           type: 'H',
         });
 
@@ -1726,6 +1733,7 @@ export const useDataStore = defineStore('data', {
             } catch (err) {
               ErrorHandler(err);
             }
+            break;
           }
           case constants.actions.reject:
           case constants.actions.return:
@@ -1735,7 +1743,7 @@ export const useDataStore = defineStore('data', {
               const sended = await this.sendTask(taskId, action, comment);
               if (!sended) return;
               this.formStore.$reset();
-              if (this.isEFO) {
+              if (this.isEFO || this.isAML) {
                 await this.router.push({ name: 'Insurance-Product' });
               } else {
                 this.sendToParent(constants.postActions.toHomePage, this.t('toaster.successOperation') + 'SUCCESS');
@@ -1743,6 +1751,7 @@ export const useDataStore = defineStore('data', {
             } catch (err) {
               ErrorHandler(err);
             }
+            break;
           }
         }
         this.isButtonsLoading = false;