hl-core 0.0.8-beta.19 → 0.0.8-beta.20

package/components/Form/FormBlock.vue

@@ -1,7 +1,17 @@
 <template>
   <div class="pt-3 rounded-lg border-[1px]" :class="[$libStyles.whiteBg, disabled && $libStyles.disabled]">
     <div class="ml-5">
-      <p :class="[$libStyles.textTitle, $libStyles.greenText]">{{ title }}</p>
+      <div class="flex justify-between mr-5">
+        <p :class="[$libStyles.textTitle, $libStyles.greenText]">{{ title }}</p>
+        <div
+          v-if="isMultiple && more && !isShort"
+          :class="[$libStyles.blueBg, $libStyles.whiteText, $libStyles.textSimple, disabled ? $libStyles.disabled : 'cursor-pointer']"
+          class="hidden lg:flex transition-all rounded-lg h-[36px] flex items-center font-medium justify-center opacity-50 hover:opacity-90 w-[120px]"
+          @click="!disabled && memberStore.addMember(whichForm)"
+        >
+          {{ $t('buttons.add') }}
+        </div>
+      </div>
       <p v-if="!!subtitle" :class="[$libStyles.greyText, $libStyles.textSimple]">{{ subtitle }}</p>
     </div>
     <div
@@ -61,7 +71,7 @@
     <div
       v-if="isMultiple && more && !isShort"
       :class="[$libStyles.blueBg, $libStyles.whiteText, $libStyles.textSimple, disabled ? $libStyles.disabled : 'cursor-pointer']"
-      class="transition-all rounded-b-lg h-[36px] flex items-center font-medium justify-center opacity-50 hover:opacity-90"
+      class="block lg:hidden transition-all rounded-b-lg h-[36px] flex items-center font-medium justify-center opacity-50 hover:opacity-90"
       @click="!disabled && memberStore.addMember(whichForm)"
     >
       {{ $t('buttons.add') }}

package/components/Layout/SettingsPanel.vue

@@ -10,11 +10,11 @@
       <i class="mdi mdi-account-outline text-2xl text-[#A0B3D8]"></i
     ></base-panel-item>
     <base-panel-item v-if="$dataStore.isEFO" @click="changeBridge('lka')" class="cursor-pointer">
-    {{ $t('labels.lkaLong') }}
-      <i class="mdi mdi-card-account-details-outline text-2xl text-[#A0B3D8]"></i
+      {{ $t('labels.lkaLong') }}
+      <i class="mdi mdi-chevron-right text-2xl text-[#A0B3D8]"></i
     ></base-panel-item>
     <base-panel-item v-if="$dataStore.isLKA" @click="changeBridge('efo')" class="cursor-pointer">
-    {{ $t('labels.efoLong') }}
+      {{ $t('labels.efoLong') }}
       <i class="mdi mdi-web text-2xl text-[#A0B3D8]"></i
     ></base-panel-item>
     <base-panel-item
@@ -26,17 +26,22 @@
       {{ panelItem.title }}
       <i v-if="panelItem.icon" class="mdi text-xl text-[#A0B3D8]" :class="[panelItem.icon]"></i>
     </base-panel-item>
-    <base-panel-item @click="dialog = true" class="cursor-pointer">
-      Выход
-      <i class="mdi mdi-logout text-xl text-[#A0B3D8]"></i>
+    <base-panel-item v-if="hasHistory" @click="openHistory" class="cursor-pointer">
+      {{ $t('historyStatementsAndStatuses') }}
+      <i class="mdi mdi-history text-xl text-[#A0B3D8]"></i>
+    </base-panel-item>
+    <base-panel-item @click="dialogSignOut = true" class="cursor-pointer" :class="[$libStyles.redText]">
+      {{ $t('buttons.logout') }}
+      <i class="mdi mdi-logout text-xl"></i>
     </base-panel-item>
 
-    <base-dialog v-model="dialog" :title="$t('dialog.exit')" :subtitle="$t('dialog.dataWillClear')" actions="default" @yes="logoutUser" @no="dialog = false"> </base-dialog
+    <base-dialog v-model="dialogSignOut" :title="$t('dialog.exit')" :subtitle="$t('dialog.dataWillClear')" actions="default" @yes="logoutUser" @no="dialogSignOut = false">
+    </base-dialog
   ></base-drawer>
 </template>
 
 <script lang="ts" setup>
-const dialog = ref(false);
+const dialogSignOut = ref(false);
 const dataStore = useDataStore();
 
 const handleFontSize = (action: 'increase' | 'decrease') => {
@@ -50,10 +55,18 @@ const handleFontSize = (action: 'increase' | 'decrease') => {
 };
 
 const logoutUser = async () => {
-  dialog.value = false;
+  dialogSignOut.value = false;
   await dataStore.logoutUser();
 };
 
+const hasHistory = computed(() => {
+  return !dataStore.isLKA;
+});
+
+const openHistory = async () => {
+  dataStore.sendToParent(constants.postActions.toStatementHistory, dataStore.product);
+};
+
 const changeBridge = async (toBridge: 'efo' | 'lka') => {
   const bridgeUrl = import.meta.env[`VITE_${toBridge.toUpperCase()}_URL`] as string;
   if (!bridgeUrl) return;

package/components/Menu/MenuNav.vue

@@ -111,6 +111,8 @@ export default defineComponent({
         case 'Insurance-Product':
         case 'Menu':
         case 'History':
+        case 'Main':
+        case 'taskId':
           return false;
         default:
           return true;

package/components/Pages/MemberForm.vue

@@ -563,14 +563,39 @@ export default {
       return generalCondition && perMemberCondtion();
     });
 
-    const hasGBDFL = computed(() => dataStore.controls.hasGBDFL && !hasGKB.value);
+    const hasGBDFL = computed(() => {
+      const perMemberCondition = () => {
+        switch (whichForm.value) {
+          case formStore.beneficiaryFormKey: {
+            if (dataStore.isKazyna || dataStore.isLiferenta) {
+              return !!member.value.iin;
+            }
+            if (dataStore.isBolashak || dataStore.isGons) {
+              return false;
+            }
+            return true;
+          }
+          case formStore.insuredFormKey:
+          case formStore.beneficiaryFormKey:
+          case formStore.beneficialOwnerFormKey:
+          case formStore.policyholdersRepresentativeFormKey:
+            return true;
+          default:
+            return true;
+        }
+      };
+      return dataStore.controls.hasGBDFL && perMemberCondition();
+    });
     const hasInsis = computed(() => dataStore.controls.hasInsis);
     const hasGKB = computed(() => {
-      const byProductCondition = dataStore.isGons || dataStore.isBolashak;
       const perMemberCondition = () => {
         switch (whichForm.value) {
-          case formStore.beneficiaryFormKey:
+          case formStore.beneficiaryFormKey: {
+            if (dataStore.isKazyna || dataStore.isLiferenta) {
+              return !member.value.iin;
+            }
             return member.value.id === 0;
+          }
           case formStore.policyholderFormKey:
           case formStore.insuredFormKey:
           case formStore.beneficialOwnerFormKey:
@@ -580,7 +605,7 @@ export default {
             return false;
         }
       };
-      return dataStore.controls.hasGKB && !!dataStore.isTask() && byProductCondition && perMemberCondition();
+      return dataStore.controls.hasGKB && !!dataStore.isTask() && perMemberCondition();
     });
 
     const birthDateRule = computed(() => {

package/composables/constants.ts

@@ -12,8 +12,8 @@ export const constants = Object.freeze({
 
   editableStatuses: ['StartForm', 'EditBeneficiaryForm', 'EditForm'],
   documentsLinkVisibleStatuses: ['DocumentsSignedFrom', 'UnderwriterForm', 'AffilationResolutionForm', 'Completed', 'InsurancePremiumOnlinePaid'],
-  returnStatementStatuses: ['DocumentsSignedFrom', 'WaitingInsurancePremiumForm', 'UnderwriterForm'],
-  cancelApplicationStatuses: ['StartForm', 'EditForm', 'WaitingInsurancePremiumForm', 'DocumentsSignedFrom'],
+  returnStatementStatuses: ['DocumentsSignedFrom', 'ContractSignedFrom', 'WaitingInsurancePremiumForm', 'UnderwriterForm'],
+  cancelApplicationStatuses: ['StartForm', 'EditForm', 'EditBeneficiaryForm', 'WaitingInsurancePremiumForm', 'DocumentsSignedFrom', 'ContractSignedFrom'],
   gbdErrors: ['INVALID', 'TIMEOUT', 'ERROR', 'NOT_FOUND'],
   types: {
     string: 'string',

package/composables/styles.ts

@@ -39,7 +39,7 @@ export class Styles {
   greyTextDark: string = 'text-[#9197A1]';
 
   // Red
-  redText: string = 'text-[#FF897D]';
+  redText: string = 'text-[#FD2D39]';
   redBg: string = 'bg-[#FF897D]';
   redBgHover: string = 'hover:bg-[#ff9b91]';
   // Error

package/locales/en.json

@@ -103,6 +103,8 @@
     "userLogin": "Login",
     "password": "Password",
     "login": "Log in",
+    "exit": "Exit",
+    "logout": "Log out",
     "save": "Save",
     "back": "Back",
     "sign": "Sign",
@@ -205,7 +207,7 @@
   "policyholderAndInsured": "Insured / Policyholder",
   "policyholderAndInsuredSame": "Insured / Policyholder are the same person",
   "insuredForm": "Insured",
-  "beneficiaryForm": "Beneficiary",
+"beneficiaryForm": "Beneficiary",
   "beneficialOwnerForm": "Beneficial Owner",
   "policyholdersRepresentativeForm": "Policyholder's Representative",
   "productConditions": "Product Conditions and Calculations",
@@ -222,6 +224,7 @@
   "requestedSumInsured": "Requested Sum Insured",
   "insurancePremiumPerMonth": "Insurance Premium per Month",
   "noStatementCalculator": "Cost calculator without entering data",
+  "calculator": "Calculator",
   "agreement": "Agreement",
   "clientsStatement": "Client's Statement",
   "document": "Document",
@@ -362,6 +365,8 @@
     "new": "Подать заявление"
   },
   "labels": {
+    "aml": "AML",
+    "amlLong": "Anti Money Laundering",
     "efoLong": "EFO",
     "efo": "EFO",
     "lkaLong": "LKA",