Merge pull request #770 from Support-pl/dev-fixes

fixed some bugs

public/config.json

@@ -22,5 +22,6 @@
   "languages": ["en", "ru", "vi", "fr", "pl"],
   "department": "nocloud",
   "vdc_enabled": true,
-  "shared_enabled": true
+  "shared_enabled": true,
+  "cloud_enabled": true
 }

src/appconfig.js

@@ -12,6 +12,7 @@ export default {
   languages: globalConfig.languages ?? ['en'],
   vdcEnabled: globalConfig.vdc_enabled ?? false,
   sharedEnabled: globalConfig.shared_enabled ?? false,
+  cloudEnabled: globalConfig.cloud_enabled ?? false,
 
   whmcsSiteUrl: globalConfig.whmcs?.site_url ?? '',
   whmcsRegistration: globalConfig.whmcs?.registration ?? false,

src/components/cloud/modules/ione/panels/plan.vue

@@ -103,6 +103,7 @@ import { computed, inject, nextTick, reactive, watch } from 'vue'
 import { useRoute } from 'vue-router'
 import { useCloudStore } from '@/stores/cloud.js'
 import { getPeriods, getTarification } from '@/functions.js'
+
 import ioneDrive from '@/components/cloud/create/ioneDrive.vue'
 import ioneFilters from '@/components/cloud/create/ioneFilters.vue'
 import ioneProducts from '@/components/cloud/create/ioneProducts.vue'
@@ -137,13 +138,14 @@ watch(() => props.productSize, (value) => {
   emits('update:periods', getPeriods(value, props.plans))
 })
 
-const data = localStorage.getItem('data') ?? route.query.data
+const data = localStorage.getItem('data') ?? route.query.data ?? '{}'
 
 if (props.products.length > 0) {
-  const { productSize } = JSON.parse(data ?? '{}')
+  const { productSize } = JSON.parse(data)
 
-  if (productSize) setProduct(productSize)
-  else if (props.products.length < 6) {
+  if (productSize && props.products.includes(productSize)) {
+    setProduct(productSize)
+  } else if (props.products.length < 6) {
     setProduct(props.products[1] ?? props.products[0])
   }
 }

src/components/cloud/modules/ovh vps/panels/plan.vue

@@ -156,9 +156,7 @@ const productKey = computed(() => {
 watch(product, (value) => {
   const product = props.products.find(({ group }) => group === value)
 
-  const dataString = (localStorage.getItem('data'))
-    ? localStorage.getItem('data')
-    : route.query.data ?? '{}'
+  const dataString = localStorage.getItem('data') ?? route.query.data ?? '{}'
   const data = JSON.parse(dataString)
 
   if (!product) return
@@ -209,9 +207,7 @@ watch(products, async (value) => {
     return
   }
 
-  const dataString = (localStorage.getItem('data'))
-    ? localStorage.getItem('data')
-    : route.query.data ?? '{}'
+  const dataString = localStorage.getItem('data') ?? route.query.data ?? '{}'
 
   if (dataString.includes('productSize')) {
     const data = JSON.parse(dataString)

src/i18n/locales/en.json

@@ -760,7 +760,7 @@
     "cpu": "CPU",
     "ram": "RAM",
     "gpu": "GPU",
-    "highCPU": "high CPU",
+    "highCPU": "high CPU from 3.50GHz",
     "withAdministration": "with administration",
     "country": {
       "VN": "Vietnam",

src/i18n/locales/ru.json

@@ -760,7 +760,7 @@
     "cpu": "ЦП",
     "ram": "ОЗУ",
     "gpu": "ГП",
-    "highCPU": "ЦП с повышенной частотой",
+    "highCPU": "ЦП с повышенной частотой от 3.50GHz",
     "withAdministration": "с администрированием",
     "country": {
       "BY": "Беларусь",

src/routes/cloud/createPaas.vue

@@ -136,7 +136,7 @@ const { filteredPlans, product, productSize, isPlansLoading } = useCloudPlans(ta
 
 watch(isPlansLoading, () => {
   if (dataLocalStorage.value.billing_plan) {
-    cloudStore.planId = dataLocalStorage.value.billing_plan.uuid
+    // cloudStore.planId = dataLocalStorage.value.billing_plan.uuid
   } else if (dataLocalStorage.value.locationId) {
     tarification.value = periods.value[0]?.value ?? ''
   }
@@ -216,6 +216,14 @@ watch(periods, (periods) => {
 })
 
 function setLocation (value) {
+  if (route.query.data) {
+    const query = { ...route.query }
+
+    delete query.data
+    dataLocalStorage.value = ''
+    router.push({ query })
+  }
+
   if (!(localStorage.getItem('data') && authStore.isLogged)) {
     cloudStore.locationId = value
     return

src/stores/app.js

@@ -36,17 +36,23 @@ export const useAppStore = defineStore('app', () => {
     })
   })
 
-  const buttons = computed(() =>
-    (isButtonsVisible.value)
-      ? [
-          { icon: DatabaseFilled, title: 'cloud' },
-          { icon: AppstoreOutlined, title: 'services' },
-          { icon: MessageOutlined, title: 'support' },
-          { icon: FundOutlined, title: 'billing' },
-          { icon: SettingFilled, title: 'settings' }
-        ]
-      : []
-  )
+  const buttons = computed(() => {
+    if (isButtonsVisible.value) {
+      const result = [
+        { icon: AppstoreOutlined, title: 'services' },
+        { icon: MessageOutlined, title: 'support' },
+        { icon: FundOutlined, title: 'billing' },
+        { icon: SettingFilled, title: 'settings' }
+      ]
+
+      if (config.cloudEnabled) {
+        result.unshift({ icon: DatabaseFilled, title: 'cloud' })
+      }
+      return result
+    }
+
+    return []
+  })
 
   function toDate (timestamp, sep = '.', withTime = true, reverse) {
     if (timestamp < 1) return '-'

src/stores/invoices.js

@@ -18,10 +18,10 @@ export const useInvoicesStore = defineStore('invoices', () => {
     if (filter.value[0] === 'all' || filter.value.length === 0) {
       filtered = invoices.value
     } else {
-      filtered = invoices.value.filter(ticket => filter.value.includes(ticket.status))
+      filtered = invoices.value.filter(({ status }) => filter.value.includes(status))
     }
 
-    return filtered.sort((a, b) => {
+    return filtered.toSorted((a, b) => {
       const dictionary = {
         Cancelled: 1,
         Paid: 1,
@@ -73,8 +73,11 @@ export const useInvoicesStore = defineStore('invoices', () => {
         })
 
         result.sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime())
-        if (!response[0]?.ERROR) invoices.value = result
-        else return response[0].ERROR
+        if (!response[0]?.ERROR) {
+          invoices.value = result.filter(({ id }) => id)
+        } else {
+          return response[0].ERROR
+        }
 
         return result
       } catch (error) {