Merge pull request #1592 from slntopp/dev-fixes

Dev fixes

admin-ui/src/components/account/info.vue

@@ -2,19 +2,6 @@
   <v-card elevation="0" color="background-light" class="pa-4">
     <div style="z-index: 0; position: relative; top: -25px; right: 40px">
       <div class="d-flex justify-end mt-1 align-center flex-wrap">
-        <hint-btn hint="Create transaction/invoice">
-          <v-btn
-            class="ma-1"
-            :disabled="isLocked"
-            :to="{
-              name: 'Transactions create',
-              params: { account: account.uuid },
-            }"
-          >
-            <v-icon>mdi-invoice-text-outline</v-icon>
-          </v-btn>
-        </hint-btn>
-
         <hint-btn hint="Create instance">
           <v-btn
             class="ma-1"
@@ -75,10 +62,12 @@
             </v-btn>
           </confirm-dialog>
         </hint-btn>
-        <v-chip class="ma-1" color="primary" outlined
-          >Balance: {{ account.balance?.toFixed(2) || 0 }}
-          {{ account.currency }}</v-chip
-        >
+        <hint-btn hint="Create transaction/invoice">
+          <v-chip @click="openTransaction" class="ma-1" color="primary" outlined
+            >Balance: {{ account.balance?.toFixed(2) || 0 }}
+            {{ account.currency }}</v-chip
+          >
+        </hint-btn>
       </div>
     </div>
 
@@ -406,6 +395,12 @@ export default {
         this.isChangeRegularPaymentLoading = false;
       }
     },
+    openTransaction() {
+      this.$router.push({
+        name: "Transactions create",
+        params: { account: this.account.uuid },
+      });
+    },
   },
   mounted() {
     this.title = this.account.title;

admin-ui/src/components/accounts_table.vue

@@ -127,6 +127,7 @@ const headers = ref([
   { text: "Address", value: "address" },
   { text: "Client currency", value: "currency" },
   { text: "Access level", value: "access.level" },
+  { text: "WHMCS ID", value: "data.whmcs_id" },
   { text: "Invoice based", value: "data.regular_payment" },
 ]);
 const levelColorMap = ref({
@@ -205,7 +206,7 @@ const requestOptions = computed(() => ({
       from: filter.value?.balance.from && +filter.value?.balance.from,
       to: filter.value?.balance.to && +filter.value?.balance.to,
     },
-    search_param: searchParam.value || undefined,
+    search_param: searchParam.value || filter.value.search_param || undefined,
   },
   page: options.value.page,
   limit: options.value.itemsPerPage,
@@ -236,6 +237,7 @@ const searchFields = computed(() => [
   { title: "Created date", key: "data.date_create", type: "date" },
   { title: "Country", key: "data.country", type: "input" },
   { title: "Address", key: "data.address", type: "input" },
+  { title: "WHMCS ID", key: "data.whmcs_id", type: "input" },
   {
     title: "Client currency",
     key: "currency",

admin-ui/src/components/instance/info.vue

@@ -38,7 +38,7 @@
       <v-col>
         <v-text-field
           readonly
-          label="email"
+          label="Email"
           :value="account?.data?.email"
           append-icon="mdi-content-copy"
           @click:append="addToClipboard(account?.data?.email)"
@@ -47,7 +47,7 @@
       <v-col>
         <v-text-field
           readonly
-          label="balance"
+          label="Balance"
           :value="account?.balance?.toFixed(2) || 0"
         />
       </v-col>
@@ -65,7 +65,7 @@
           <v-text-field
             v-model="copyInstance.title"
             ref="instance-title"
-            label="Instance title"
+            label="Instance name"
           >
             <template v-slot:append>
               <v-icon class="mr-2" @click="$refs['instance-title'].focus()"
@@ -103,11 +103,7 @@
           />
         </v-col>
         <v-col>
-          <route-text-field
-            :to="{ name: 'Plan', params: { planId: plan?.uuid } }"
-            :value="plan?.title"
-            label="Billing plan"
-          />
+          <v-text-field label="Location" readonly />
         </v-col>
         <v-col>
           <v-text-field readonly :value="type" label="Type" />
@@ -218,7 +214,7 @@ export default {
   methods: {
     addToClipboard,
     refreshInstance() {
-      this.$store.dispatch('reloadBtn/onclick')
+      this.$store.dispatch("reloadBtn/onclick");
     },
     updateCopy({ key, value }) {
       const keys = key.split(".");

admin-ui/src/components/instances_table.vue

@@ -510,7 +510,7 @@ export default {
       if (this.headers) return this.headers;
       const headers = [
         { text: "ID", value: "id" },
-        { text: "Title", value: "title" },
+        { text: "Name", value: "title" },
         { text: "Service", value: "service" },
         { text: "Account", value: "access" },
         { text: "Due date", value: "dueDate" },

admin-ui/src/components/modules/cpanel/billingInfo.vue

@@ -4,11 +4,22 @@
       <v-col>
         <v-text-field
           readonly
-          label="price model"
+          label="Price model"
           :value="template.billingPlan.title"
-          append-icon="mdi-pencil"
-          @click:append="priceModelDialog = true"
-        />
+        >
+          <template v-slot:append>
+            <v-icon @click="priceModelDialog = true">mdi-pencil</v-icon>
+            <v-icon
+              @click="
+                $router.push({
+                  name: 'Plan',
+                  params: { planId: template.billingPlan.uuid },
+                })
+              "
+              >mdi-login</v-icon
+            >
+          </template>
+        </v-text-field>
       </v-col>
       <v-col>
         <v-text-field

admin-ui/src/components/modules/cpanel/instanceCreate.vue

@@ -9,7 +9,7 @@
       <v-row>
         <v-col cols="6">
           <v-text-field
-            label="title"
+            label="Name"
             :value="instance.title"
             :rules="rules.req"
             @change="setValue('title', $event)"
@@ -22,14 +22,14 @@
             @change="setValue('billingPlan', $event)"
             item-text="title"
             return-object
-            label="price model"
+            label="Price model"
             :rules="planRules"
             item-value="uuid"
           ></v-select>
         </v-col>
         <v-col cols="6">
           <v-autocomplete
-            label="product"
+            label="Product"
             :items="products"
             item-text="title"
             item-value="key"
@@ -40,23 +40,23 @@
         </v-col>
         <v-col cols="6">
           <v-text-field
-            label="domain"
+            label="Domain"
             :rules="rules.req"
             :value="instance.config.domain"
             @change="setValue('config.domain', $event)"
           />
         </v-col>
         <v-col cols="6">
           <v-text-field
-            label="email"
+            label="Email"
             :rules="rules.req"
             :value="instance.config.email"
             @change="setValue('config.email', $event)"
           />
         </v-col>
         <v-col cols="6">
           <v-text-field
-            label="password"
+            label="Password"
             :rules="rules.req"
             :value="instance.config.password"
             @change="setValue('config.password', $event)"

admin-ui/src/components/modules/custom/instanceCreate.vue

@@ -10,7 +10,7 @@
         <v-col cols="6">
           <v-text-field
             @change="(newVal) => setValue('title', newVal)"
-            label="title"
+            label="Name"
             :value="instance.title"
           >
           </v-text-field>
@@ -21,7 +21,7 @@
         <v-col><h3>Config:</h3></v-col>
         <v-col cols="12">
           <json-editor
-            label="config"
+            label="Config"
             :json="instance.config"
             @changeValue="(newVal) => setValue('config', newVal)"
           />
@@ -30,7 +30,7 @@
         <v-col><h3>Resources:</h3></v-col>
         <v-col cols="12">
           <json-editor
-            label="resources"
+            label="Resources"
             :json="instance.resources"
             @changeValue="(newVal) => setValue('resources', newVal)"
           />
@@ -40,7 +40,7 @@
       <v-row>
         <v-col lg="6" cols="12">
           <v-autocomplete
-            label="price model"
+            label="Price model"
             item-text="title"
             item-value="uuid"
             :value="instance.plan"

admin-ui/src/components/modules/empty/billingInfo.vue

@@ -4,11 +4,22 @@
       <v-col>
         <v-text-field
           readonly
-          label="price model"
+          label="Price model"
           :value="template.billingPlan.title"
-          @click:append="priceModelDialog = true"
-          append-icon="mdi-pencil"
-        />
+        >
+          <template v-slot:append>
+            <v-icon @click="priceModelDialog = true">mdi-pencil</v-icon>
+            <v-icon
+              @click="
+                $router.push({
+                  name: 'Plan',
+                  params: { planId: template.billingPlan.uuid },
+                })
+              "
+              >mdi-login</v-icon
+            >
+          </template>
+        </v-text-field>
       </v-col>
       <v-col>
         <v-text-field
@@ -23,7 +34,7 @@
         <v-text-field
           readonly
           label="Date (create)"
-          :value="formatSecondsToDate(template.created,true)"
+          :value="formatSecondsToDate(template.created, true)"
         />
       </v-col>
 
@@ -247,7 +258,7 @@ const addonsHeaders = ref([
 const billingItems = ref([]);
 
 const dueDate = computed(() =>
-  formatSecondsToDate(template.value?.data?.next_payment_date,true)
+  formatSecondsToDate(template.value?.data?.next_payment_date, true)
 );
 const isMonitoringsEmpty = computed(() => dueDate.value === "-");
 

admin-ui/src/components/modules/empty/instanceCreate.vue

@@ -10,7 +10,7 @@
         <v-col cols="6">
           <v-text-field
             @change="(newVal) => setValue('title', newVal)"
-            label="title"
+            label="Name"
             :value="instance.title"
           >
           </v-text-field>
@@ -19,7 +19,7 @@
       <v-row>
         <v-col cols="6">
           <v-autocomplete
-            label="price model"
+            label="Price model"
             item-text="title"
             item-value="uuid"
             :value="instance.billing_plan"
@@ -30,7 +30,7 @@
         </v-col>
         <v-col cols="6">
           <v-autocomplete
-            label="product"
+            label="Product"
             :rules="requiredRule"
             :value="instance.product"
             v-if="products.length > 0"
@@ -53,7 +53,7 @@
 
         <v-col cols="6" v-if="addons.length">
           <v-autocomplete
-            label="addons"
+            label="Addons"
             :value="instance.config.addons"
             :items="addons"
             multiple

admin-ui/src/components/modules/ione/billingInfo.vue

@@ -4,11 +4,22 @@
       <v-col>
         <v-text-field
           readonly
-          label="price model"
+          label="Price model"
           :value="template.billingPlan.title"
-          @click:append="priceModelDialog = true"
-          append-icon="mdi-pencil"
-        />
+        >
+          <template v-slot:append>
+            <v-icon @click="priceModelDialog = true">mdi-pencil</v-icon>
+            <v-icon
+              @click="
+                $router.push({
+                  name: 'Plan',
+                  params: { planId: template.billingPlan.uuid },
+                })
+              "
+              >mdi-login</v-icon
+            >
+          </template>
+        </v-text-field>
       </v-col>
       <v-col>
         <v-text-field