Merge pull request #215 from Support-pl/dev

fixed some bugs
Support-pl · Jun 28, 2023 · 204bff7 · 204bff7
2 parents 8678c8a + 3e8ffda
commit 204bff7
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 8 deletions.
diff --git a/src/components/appMain/appHeader.vue b/src/components/appMain/appHeader.vue
@@ -255,7 +255,7 @@ export default {
               icon: "reload",
               onClickFuncion: () => {
                 const params = {
-                  account: this.user.uuid,
+                  account: this.userdata.uuid,
                   page: this.$store.getters["nocloud/transactions/page"],
                   limit: this.$store.getters["nocloud/transactions/size"],
                   field: "proc",
@@ -496,7 +496,8 @@ export default {
       return conditions.some((el) => !!el);
     },
     isNeedBalance() {
-      if (this.headers[this.active])
+      if (this.user.paid_stop) return false;
+      else if (this.headers[this.active])
         return this.headers[this.active].needBalance;
       else if (this.$route.meta.isNeedBalance)
         return this.$route.meta.isNeedBalance;
@@ -522,9 +523,12 @@ export default {
     isLogged() {
       return this.$store.getters['nocloud/auth/isLoggedIn'];
     },
-    user() {
+    userdata() {
       return this.$store.getters['nocloud/auth/userdata'];
     },
+    user() {
+      return this.$store.getters['nocloud/auth/billingData'];
+    }
   },
   watch: {
     active() {

diff --git a/src/components/appMain/cloud/cloudItem.vue b/src/components/appMain/cloud/cloudItem.vue
@@ -179,9 +179,10 @@ export default {
 		getModuleProductBtn() {
 			const serviceType = this.$config.getServiceType(this.instance.groupname)?.toLowerCase();
       const isActive = ['active', 'running'].includes(this.instance.domainstatus?.toLowerCase());
-      const sp = this.getSP.find(({ uuid }) => uuid === this.instance.sp);
+      const key = this.instance.product ?? this.instance.config?.product;
+      const { meta } = this.instance.billingPlan?.products[key] ?? {};
 
-      if (sp?.meta.renew === false) return;
+      if (meta?.renew === false) return;
 			if (serviceType === undefined) return;
       if (this.instance.date === 0) return;
       if (!isActive && ['virtual', 'iaas'].includes(serviceType)) return;

diff --git a/src/components/appMain/newPaaS.vue b/src/components/appMain/newPaaS.vue
@@ -1614,11 +1614,12 @@ export default {
       if (group.config.ssh) this.options.isSSHExist = true;
       else this.options.isSSHExist = false;
     },
-    locationId() {
+    itemSP() {
       if (!this.dataLocalStorage.config) {
         this.options.os = { id: -1, name: "" };
       }
 
+      if (!this.itemSP?.uuid) return;
       this.$store.dispatch("nocloud/plans/fetch", {
         sp_uuid: this.itemSP.uuid,
         anonymously: !this.isLoggedIn

diff --git a/src/locales/ru.json b/src/locales/ru.json
@@ -40,7 +40,7 @@
 	"service": "услуга",
 	"services": "услуги",
 	"invoiceDate": "Дата счёта",
-	"dueDate": "Срок оплаты",
+	"dueDate": "Дата оплаты",
 	"Choice payment": "Способ оплаты",
 	"Information": "Информация",
 	"It’s empty...": "Тут пока ничего нет...",

diff --git a/src/routes/userService.vue b/src/routes/userService.vue
@@ -26,7 +26,7 @@
             </div>
           </div>
 
-          <div class="service-page__info" v-if="!service.clientid">
+          <div class="service-page__info" v-if="isActionsActive">
             <div class="service-page__info-title">
               {{ $t('Actions') }}:
               <div style="display: inline-flex; gap: 8px">
@@ -143,6 +143,16 @@
               </div>
             </a-col>
           </a-row>
+
+          <div class="service-page__info" v-if="description">
+            <div class="service-page__info-title">
+              {{ $t("description") | capitalize }}:
+            </div>
+            <div class="service-page__info-value">
+              <div v-html="description"></div>
+            </div>
+          </div>
+
           <component :is="getModuleButtons" :service="service" />
         </template>
 
@@ -427,6 +437,18 @@ export default {
       if (!(status === 'Active' || state?.state === 'RUNNING')) return;
       return () => import(`@/components/services/${serviceType}/draw`);
     },
+    isActionsActive() {
+      const key = this.service.product ?? this.service.config?.product;
+      const { meta } = this.service.billingPlan?.products[key] ?? {};
+
+      return !this.service.clientid && meta?.renew !== false;
+    },
+    description() {
+      const key = this.service.product ?? this.service.config.product;
+      const { meta } = this.service.billingPlan?.products[key] ?? {};
+
+      return meta?.description;
+    }
   },
 };
 </script>