hl-core 0.0.8-beta.36 → 0.0.8-beta.37

package/components/Pages/MemberForm.vue

@@ -122,7 +122,6 @@
           :label="$dataStore.t('form.percentageOfPayoutAmount')"
           :rules="$rules.required.concat($rules.numbers)"
         />
-        <base-form-toggle v-if="$dataStore.isGons" :disabled="isDisabled" :has-border="false" v-model="member.isPdl" :title="$dataStore.t('isMemberIPDL')" />
       </base-form-section>
       <base-form-section :title="$dataStore.t('policyholdersRepresentative.PowerOfAttorney')" v-if="whichForm === formStore.policyholdersRepresentativeFormKey">
         <base-form-input
@@ -240,13 +239,7 @@
         <base-form-input v-model.trim="member.jobPlace" :label="$dataStore.t('form.jobPlace')" :readonly="isDisabled" :clearable="!isDisabled" :rules="$rules.required" />
       </base-form-section>
       <base-form-section :title="$dataStore.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="$dataStore.t('form.sameAddress')"
-        />
+        <base-form-toggle v-if="hasSameAddressToggle" v-model="sameAddress" :disabled="isDisabled" :has-border="false" :title="$dataStore.t('form.sameAddress')" />
         <base-panel-input
           v-model="member.registrationCountry"
           :value="member.registrationCountry.nameRu"
@@ -433,6 +426,7 @@
           />
         </base-fade-transition>
         <base-panel-input
+          v-if="hasSignOfIPDL"
           v-model="member.signOfIPDL"
           :value="member.signOfIPDL.nameRu"
           :label="$dataStore.t('form.signOfIPDL')"
@@ -667,6 +661,13 @@ export default {
       }
       return false;
     });
+    const hasSignOfIPDL = computed(() => {
+      if (dataStore.isGons) {
+        return false;
+      }
+      return true;
+    });
+    const hasSameAddressToggle = computed(() => whichForm.value === formStore.beneficiaryFormKey && member.value.iin !== formStore.policyholderForm.iin);
 
     const birthDateRule = computed(() => {
       const baseDateRule = dataStore.rules.required.concat(dataStore.rules.birthDate);
@@ -1355,6 +1356,8 @@ export default {
       hasGKB,
       hasFamilyStatus,
       hasInsurancePay,
+      hasSignOfIPDL,
+      hasSameAddressToggle,
 
       // Rules
       ageRule,

package/components/Pages/ProductConditions.vue

@@ -287,8 +287,8 @@
             v-if="filterTermConditions(term)"
             v-model="additionalTerms[index]"
             :value="term.coverSumName"
-            :readonly="isDisabled"
-            :clearable="!isDisabled"
+            :readonly="isTermsDisabled"
+            :clearable="!isTermsDisabled"
             :label="term.coverTypeName"
             append-inner-icon="mdi mdi-chevron-right"
             :suffix="!!term.amount ? `${formatTermValue(term.amount)} ${currencySymbolsAddTerm}` : ''"
@@ -392,6 +392,12 @@ export default defineComponent({
       }
     });
     const isDisabled = computed(() => (dataStore.isCalculator ? false : !memberStore.isStatementEditible(formStore.productConditionsFormKey)));
+    const isTermsDisabled = computed(() => {
+      if (dataStore.isGons) {
+        return true;
+      }
+      return isDisabled.value;
+    });
     const isTask = computed(() => (route.params.taskId === '0' && props.isRecalculation === true) || dataStore.isTask());
     const isRecalculationDisabled = computed(() => formStore.isDisabled.recalculationForm);
     const isUnderwriterRole = computed(() => dataStore.isUnderwriter() || dataStore.isAdmin() || dataStore.isSupport());
@@ -611,6 +617,7 @@ export default defineComponent({
 
     const onInputInsurancePremiumPerMonthInDollar = (event: Event) => {
       if (event.target && 'value' in event.target && event.target.value && dataStore.currencies.usd) {
+        whichSum.value = 'insurancePremiumPerMonth';
         const calculatedPremium = getNumber(event.target.value as string);
         if (calculatedPremium) {
           productConditionsForm.insurancePremiumPerMonthInDollar = dataStore.getNumberWithSpaces(productConditionsForm.insurancePremiumPerMonthInDollar);
@@ -631,6 +638,7 @@ export default defineComponent({
 
     const onInputSumDollar = (event: Event) => {
       if (event.target && 'value' in event.target && event.target.value && dataStore.currencies.usd) {
+        whichSum.value = 'requestedSumInsured';
         const calculatedSum = getNumber(event.target.value as string);
         if (calculatedSum) {
           productConditionsForm.requestedSumInsuredInDollar = dataStore.getNumberWithSpaces(productConditionsForm.requestedSumInsuredInDollar);
@@ -888,6 +896,7 @@ export default defineComponent({
       // Computed
       isTask,
       isDisabled,
+      isTermsDisabled,
       isUnderwriterForm,
       insurancePremiumPerMonth,
       requestedSumInsured,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.8-beta.36",
+  "version": "0.0.8-beta.37",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",

package/store/data.store.js

@@ -1521,8 +1521,10 @@ export const useDataStore = defineStore('data', {
         }
         if (this.formStore.productConditionsForm.insurancePremiumPerMonth != null) {
           this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(result.value);
+          this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(applicationData.policyAppDto.premium);
         } else {
           this.formStore.productConditionsForm.insurancePremiumPerMonth = this.getNumberWithSpaces(result.value);
+          this.formStore.productConditionsForm.requestedSumInsured = this.getNumberWithSpaces(applicationData.policyAppDto.amount);
         }
         if (this.isLiferenta) {
           this.formStore.productConditionsForm.amountAnnuityPayments = this.getNumberWithSpaces(applicationData.policyAppDto.annuityMonthPay);