hl-core 0.0.10-beta.59 → 0.0.10-beta.60

package/components/Pages/ProductConditions.vue

@@ -144,7 +144,7 @@
           <base-panel-input
             v-if="hasGender"
             v-model="productConditionsForm.gender"
-            :value="productConditionsForm.gender?.nameRu"
+            :value="locale === 'ru' ? productConditionsForm.gender?.nameRu : productConditionsForm.gender?.nameKz"
             :readonly="isDisabled"
             :clearable="!isDisabled"
             :label="$dataStore.t('form.gender')"
@@ -156,7 +156,7 @@
         <base-panel-input
           v-if="hasCurrency"
           v-model="productConditionsForm.currency"
-          :value="productConditionsForm.currency.nameRu"
+          :value="locale === 'ru' ? productConditionsForm.currency.nameRu : productConditionsForm.currency.nameKz"
           :readonly="isDisabled"
           :clearable="!isDisabled"
           :label="$dataStore.t('agent.currency')"
@@ -196,7 +196,7 @@
         <base-panel-input
           v-if="hasPaymentPeriod"
           v-model="productConditionsForm.paymentPeriod"
-          :value="productConditionsForm.paymentPeriod?.nameRu"
+          :value="locale === 'ru' ? productConditionsForm.paymentPeriod?.nameRu : productConditionsForm.paymentPeriod?.nameKz"
           :readonly="isDisabledPaymentPeriod"
           :clearable="!isDisabledPaymentPeriod"
           :rules="$rules.objectRequired"
@@ -794,7 +794,7 @@
           <base-panel-input
             v-if="filterTermConditions(term)"
             v-model="additionalTerms[index]"
-            :value="term.coverSumName"
+            :value="locale === 'ru' ? term.coverSumName : term.coverSumNameKz"
             :readonly="isTermsDisabled"
             :clearable="false"
             :label="coverTypeName(term)"
@@ -894,7 +894,7 @@
           <base-panel-select-item
             v-for="(item, index) of panelList.filter(i => i.nameRu && (i.nameRu as string).match(new RegExp(searchQuery, 'i')))"
             :key="index"
-            :text="String(item.nameRu)"
+            :text="locale === 'ru' ? String(item.nameRu) : String(item.nameKz)"
             :selected="item.nameRu === panelValue.nameRu"
             @click="pickPanelValue(item)"
           />
@@ -940,7 +940,13 @@
                 </v-expansion-panel-text>
               </v-expansion-panel>
             </v-expansion-panels>
-            <base-panel-select-item v-else :key="index" :text="String(item.nameRu)" :selected="item.nameRu === termValue?.coverSumName" @click="pickTermValue(item)" />
+            <base-panel-select-item
+              v-else
+              :key="index"
+              :text="locale === 'ru' ? String(item.nameRu) : String(item.nameKz)"
+              :selected="item.nameRu === termValue?.coverSumName"
+              @click="pickTermValue(item)"
+            />
           </div>
         </div>
         <base-loader v-if="isPanelLoading" class="absolute mt-10" :size="50" />
@@ -981,6 +987,7 @@
 <script lang="ts">
 import { Member, Value, CountryValue, CalculatorForm, TransferContract, DocumentItem } from '../../composables/classes';
 import type { Projects, AddCover, AddCoverAnswer, FileActions } from '../../types';
+import { useI18n } from 'vue-i18n';
 
 type PensionCalculation = {
   compulsoryContractAmount: number | string | null;
@@ -1009,6 +1016,7 @@ export default defineComponent({
     const formStore = useFormStore();
     const dataStore = useDataStore();
     const memberStore = useMemberStore();
+    const { locale } = useI18n();
 
     const whichProduct = ref<Projects | null>(dataStore.isCalculator ? props.product : dataStore.product!);
     const isCalculating = ref<boolean>(false);
@@ -1653,6 +1661,7 @@ export default defineComponent({
 
       additionalTerms.value[currentIndex.value].coverSumId = item.id as string;
       additionalTerms.value[currentIndex.value].coverSumName = item.nameRu as string;
+      additionalTerms.value[currentIndex.value].coverSumNameKz = item.nameKz as string;
 
       if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
         if (termValue.value && item.code === 'fixedinssum') {
@@ -1990,7 +1999,7 @@ export default defineComponent({
       if (whichProduct.value === 'lifebusiness' || whichProduct.value === 'gns') {
         return String(term.coverTypeNameRu);
       }
-      return term.coverTypeName;
+      return locale.value === 'ru' ? term.coverTypeName ?? '' : term.coverTypeNameKz ?? '';
     };
 
     const addTransferContract = () => {
@@ -2036,7 +2045,12 @@ export default defineComponent({
     };
 
     const submitForm = async () => {
-      if (whichProduct.value === 'pensionannuitynew') {
+      if (
+        whichProduct.value === 'pensionannuitynew' &&
+        (formStore.applicationData.statusCode === 'StartForm' ||
+          formStore.applicationData.statusCode === 'EditForm' ||
+          formStore.applicationData.statusCode === 'EditBeneficiaryForm')
+      ) {
         if (!enpfNoteFile.value) {
           dataStore.showToaster('error', 'Необходимо вложить Выписка ЕНПФ');
           return;
@@ -2618,6 +2632,7 @@ export default defineComponent({
       // State
       formStore,
       vForm,
+      locale,
       isLoading,
       whichProduct,
       productConditionsForm,

package/composables/classes.ts

@@ -1276,7 +1276,7 @@ export class DataStoreClass {
     this.ipdl = [new Value(1, null), new Value(2, 'Да'), new Value(3, 'Нет')];
     this.economySectorCode = [];
     this.economicActivityType = [];
-    this.gender = [new Value(0, null), new Value(1, 'Мужской'), new Value(2, 'Женский')];
+    this.gender = [new Value(0, null), new Value(1, 'Мужской', 'Ер'), new Value(2, 'Женский', 'Әйел')];
     this.authorityBasis = [];
     this.fontSize = 14;
     this.isFontChangerOpen = false;

package/composables/constants.ts

@@ -315,14 +315,14 @@ export const constants = Object.freeze({
     {
       code: 'KZT',
       id: '1',
-      nameKz: 'Тенге',
+      nameKz: 'Теңге',
       nameRu: 'Тенге',
       ids: '',
     },
     {
       code: 'USD',
       id: '2',
-      nameKz: 'С индексацией на курс USD',
+      nameKz: 'USD бағамына индексациямен',
       nameRu: 'С индексацией на курс USD',
       ids: '',
     },

package/package.json

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

package/store/data.store.ts

@@ -1360,7 +1360,7 @@ export const useDataStore = defineStore('data', {
       if (this.isLifetrip) return await this.getFromApi('dicAllCountries', 'getArmDicts', 'DicCountry');
     },
     async getDicTripType() {
-      if (this.isLifetrip) return await this.getFromApi('types', 'getArmDicts', 'DicTripType');
+      if (this.isLifetrip || this.isCalculator) return await this.getFromApi('types', 'getArmDicts', 'DicTripType');
     },
     async getDicTripPurpose() {
       if (this.isLifetrip) return await this.getFromApi('purposes', 'getArmDicts', 'DicTripPurpose');
@@ -1502,7 +1502,7 @@ export const useDataStore = defineStore('data', {
       if (this.isPension) return await this.getFromApi('transferContractCompanies', 'getInsuranceCompanies');
     },
     async getProcessIndexRate() {
-      const makeCall = (this.isBaiterek || this.isBolashak || this.isGons) && this.processCode;
+      const makeCall = (this.isBaiterek || this.isBolashak || this.isGons || this.isCalculator) && this.processCode;
       if (makeCall) return await this.getFromApi('processIndexRate', 'getProcessIndexRate', this.processCode);
     },
     async getProcessPaymentPeriod() {
@@ -1520,7 +1520,7 @@ export const useDataStore = defineStore('data', {
       return await this.getFromApi('dicAnnuityTypeList', 'getDicAnnuityTypeList');
     },
     async getProcessAnnuityPaymentPeriod() {
-      const makeCall = this.isLiferenta && this.processCode;
+      const makeCall = (this.isLiferenta || this.isCalculator) && this.processCode;
       if (makeCall) return await this.getFromApi('processAnnuityPaymentPeriod', 'getProcessAnnuityPaymentPeriod', this.processCode);
     },
     async getInsurancePay() {

package/types/index.ts

@@ -297,6 +297,7 @@ export interface AddCover {
   coverTypeCode: number;
   coverSumId: string;
   coverSumName: string;
+  coverSumNameKz: string;
   coverSumCode: string;
   amount: number;
   premium: number;