From c148ef339d18adff71bd2596682486eda6a0edb3 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 20 Sep 2023 21:58:15 +0400
Subject: [PATCH 001/123] add balance label & fix coluns

---
 admin-ui/src/components/account/info.vue | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/admin-ui/src/components/account/info.vue b/admin-ui/src/components/account/info.vue
index 04f99a03a..bd19537b0 100644
--- a/admin-ui/src/components/account/info.vue
+++ b/admin-ui/src/components/account/info.vue
@@ -1,15 +1,19 @@
 <template>
   <v-card elevation="0" color="background-light" class="pa-4">
+    <div style="position: absolute; top: 0; right: 75px">
+      <div>
+        <v-chip color="primary" outlined
+          >Balance: {{ account.balance?.toFixed(2) }}
+          {{ account.currency }}</v-chip
+        >
+      </div>
+    </div>
+
     <v-row>
-      <v-col cols="6">
-        <v-text-field
-          v-model="uuid"
-          readonly
-          label="UUID"
-          style="width: 330px"
-        />
+      <v-col cols="3">
+        <v-text-field v-model="uuid" readonly label="UUID" />
       </v-col>
-      <v-col cols="6">
+      <v-col cols="3">
         <v-text-field v-model="title" label="name" style="width: 330px" />
       </v-col>
     </v-row>

From 3f4efe8a06c69b9c65fced98b6b368d97bfdc177 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 20 Sep 2023 22:30:15 +0400
Subject: [PATCH 002/123] make tables look same

---
 .../components/modules/ione/billingInfo.vue   | 33 ++++++------
 .../components/modules/ovh/billingInfo.vue    | 54 +++++++++++--------
 2 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/admin-ui/src/components/modules/ione/billingInfo.vue b/admin-ui/src/components/modules/ione/billingInfo.vue
index 5179cf814..63cf34921 100644
--- a/admin-ui/src/components/modules/ione/billingInfo.vue
+++ b/admin-ui/src/components/modules/ione/billingInfo.vue
@@ -79,34 +79,32 @@
             <template v-slot:[`item.price`]="{ item }">
               <div class="d-flex">
                 <v-text-field
-                  class="mr-1"
-                  :suffix="accountCurrency"
-                  v-model="item.accountPrice"
-                  @input="updatePrice(item, true)"
-                  append-icon="mdi-pencil"
-                />
-                <v-text-field
-                  class="ml-1"
+                  class="mr-2"
                   :suffix="defaultCurrency"
                   v-model="item.price"
                   @input="updatePrice(item, false)"
                   append-icon="mdi-pencil"
                 />
+                <v-text-field
+                  class="ml-2"
+                  :suffix="accountCurrency"
+                  v-model="item.accountPrice"
+                  @input="updatePrice(item, true)"
+                  append-icon="mdi-pencil"
+                />
               </div>
             </template>
             <template v-slot:[`item.quantity`]="{ item }">
-              {{ item.quantity?.toFixed(2) }}
+              {{ item.quantity?.toFixed(2) }} {{ item.unit }}
             </template>
             <template v-slot:[`item.total`]="{ item }">
+              {{ totalPrices[item.name]?.toFixed(2) }}
+              {{ defaultCurrency }} /
               {{ totalAccountPrices[item.name]?.toFixed(2) }}
-              {{ accountCurrency }} / {{ totalPrices[item.name]?.toFixed(2) }}
-              {{ defaultCurrency }}
+              {{ accountCurrency }}
             </template>
             <template v-slot:body.append>
               <tr>
-                <td></td>
-                <td></td>
-                <td></td>
                 <td></td>
                 <td></td>
                 <td>
@@ -115,6 +113,8 @@
                       ?.period
                   }}
                 </td>
+                <td></td>
+                <td></td>
                 <td>
                   {{ totalAccountPrice }} {{ accountCurrency }} /
                   {{ totalPrice }}
@@ -197,11 +197,10 @@ const accountPrice = ref(0);
 const billingItems = ref([]);
 const billingHeaders = ref([
   { text: "Name", value: "name" },
-  { text: "Unit name", value: "unit" },
-  { text: "Price per unit", value: "price" },
-  { text: "Unit quantity", value: "quantity" },
   { text: "Payment term", value: "kind" },
   { text: "Billing period", value: "period" },
+  { text: "Price per unit", value: "price" },
+  { text: "Unit quantity", value: "quantity" },
   { text: "Total price", value: "total" },
 ]);
 
diff --git a/admin-ui/src/components/modules/ovh/billingInfo.vue b/admin-ui/src/components/modules/ovh/billingInfo.vue
index d78d972eb..b63d1fe4d 100644
--- a/admin-ui/src/components/modules/ovh/billingInfo.vue
+++ b/admin-ui/src/components/modules/ovh/billingInfo.vue
@@ -66,35 +66,37 @@
             <template v-slot:[`item.prices`]="{ item }">
               <div class="d-flex">
                 <v-text-field
-                  class="mr-1"
-                  v-model="item.accountPrice"
-                  @change="onUpdatePrice(item, true)"
-                  :suffix="accountCurrency"
+                  class="mr-2"
+                  v-model="item.price"
+                  @change="onUpdatePrice(item, false)"
+                  :suffix="defaultCurrency"
                   type="number"
                   append-icon="mdi-pencil"
                 ></v-text-field>
                 <v-text-field
-                  class="ml-1"
-                  v-model="item.price"
-                  @change="onUpdatePrice(item, false)"
-                  :suffix="defaultCurrency"
+                    color="grey"
+                  class="ml-2"
+                  v-model="item.accountPrice"
+                  @change="onUpdatePrice(item, true)"
+                  :suffix="accountCurrency"
                   type="number"
                   append-icon="mdi-pencil"
                 ></v-text-field>
               </div>
             </template>
             <template v-slot:[`item.basePrice`]="{ item }">
-              <v-text-field
-                :loading="isBasePricesLoading"
-                readonly
-                suffix="PLN"
-                :value="convertedBasePrices[item.key]"
-              ></v-text-field>
+              <v-skeleton-loader type="text" v-if="isBasePricesLoading" />
+              <span v-else> {{ convertedBasePrices[item.key] }} PLN </span>
             </template>
             <template v-slot:body.append>
               <tr>
-                <td>Total instance price</td>
                 <td></td>
+                <td></td>
+                <td>
+                  {{
+                    getBillingPeriod(tarrif.period)
+                  }}
+                </td>
                 <td>
                   {{
                     isBasePricesLoading
@@ -103,14 +105,13 @@
                   }}
                 </td>
                 <td>
-                  <div class="d-flex align-center">
-                    <span style="width: 50%">
-                      {{ [accountTotalNewPrice, accountCurrency].join(" ") }}
-                    </span>
-                    <span style="width: 50%">
+                  <div class="d-flex justify-end">
+                    <span class="mr-4">
                       {{
                         [totalNewPrice?.toFixed(2), defaultCurrency].join(" ")
                       }}
+                      /
+                      {{ [accountTotalNewPrice, accountCurrency].join(" ") }}
                     </span>
                   </div>
                 </td>
@@ -169,6 +170,7 @@ const pricesItems = ref([]);
 const basePrices = ref({});
 const pricesHeaders = ref([
   { text: "Name", value: "title" },
+  { text: "Payment term", value: "kind" },
   { text: "Billing period", value: "period" },
   { text: "Base price", value: "basePrice" },
   { text: "Price", value: "prices" },
@@ -345,6 +347,7 @@ const initPrices = () => {
     path: `billingPlan.products.${[duration.value, planCode.value].join(
       " "
     )}.price`,
+    kind: tarrif.value.kind,
     price: tarrif.value?.price,
     period: tarrif.value?.period,
   });
@@ -354,13 +357,20 @@ const initPrices = () => {
       (p) => p.key === getAddonKey(key)
     );
 
+    const addon = template.value.billingPlan.resources[addonIndex];
+
+    if (!addon) {
+      return;
+    }
+
     pricesItems.value.push({
-      price: template.value.billingPlan.resources[addonIndex]?.price || 0,
+      price: addon.price || 0,
       path: `billingPlan.resources.${addonIndex}.price`,
       title: key,
+      kind: addon.kind,
       key: key,
       index: ind + 1,
-      period: template.value.billingPlan.resources[addonIndex]?.period,
+      period: addon.period,
     });
   });
 

From e0a61ae625b61fbd789d08d344c5e08bb5c8a75b Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 21 Sep 2023 12:08:35 +0400
Subject: [PATCH 003/123] add colorized prices

---
 admin-ui/src/components/modules/ione/billingInfo.vue | 1 +
 admin-ui/src/components/modules/ovh/billingInfo.vue  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/admin-ui/src/components/modules/ione/billingInfo.vue b/admin-ui/src/components/modules/ione/billingInfo.vue
index 63cf34921..ad9e1c370 100644
--- a/admin-ui/src/components/modules/ione/billingInfo.vue
+++ b/admin-ui/src/components/modules/ione/billingInfo.vue
@@ -80,6 +80,7 @@
               <div class="d-flex">
                 <v-text-field
                   class="mr-2"
+                  color="red"
                   :suffix="defaultCurrency"
                   v-model="item.price"
                   @input="updatePrice(item, false)"
diff --git a/admin-ui/src/components/modules/ovh/billingInfo.vue b/admin-ui/src/components/modules/ovh/billingInfo.vue
index b63d1fe4d..55d2b3554 100644
--- a/admin-ui/src/components/modules/ovh/billingInfo.vue
+++ b/admin-ui/src/components/modules/ovh/billingInfo.vue
@@ -67,6 +67,7 @@
               <div class="d-flex">
                 <v-text-field
                   class="mr-2"
+                  color="red"
                   v-model="item.price"
                   @change="onUpdatePrice(item, false)"
                   :suffix="defaultCurrency"
@@ -74,7 +75,6 @@
                   append-icon="mdi-pencil"
                 ></v-text-field>
                 <v-text-field
-                    color="grey"
                   class="ml-2"
                   v-model="item.accountPrice"
                   @change="onUpdatePrice(item, true)"

From 870aa6adfab22047bd8bf79577a721fae96fc688 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 21 Sep 2023 12:39:58 +0400
Subject: [PATCH 004/123] refactor ovh prices

---
 admin-ui/src/components/plan/cloudTable.vue   | 13 +++--
 .../src/components/plan/dedicatedTable.vue    | 55 +++++++++++++------
 admin-ui/src/components/plan/vpsTable.vue     | 24 +++++---
 admin-ui/src/mixins/currencyRate.js           | 30 ----------
 4 files changed, 63 insertions(+), 59 deletions(-)
 delete mode 100644 admin-ui/src/mixins/currencyRate.js

diff --git a/admin-ui/src/components/plan/cloudTable.vue b/admin-ui/src/components/plan/cloudTable.vue
index 69bc83c56..e205fdd84 100644
--- a/admin-ui/src/components/plan/cloudTable.vue
+++ b/admin-ui/src/components/plan/cloudTable.vue
@@ -113,8 +113,8 @@ import {
 import api from "@/api";
 import { useStore } from "@/store";
 import NocloudTable from "@/components/table.vue";
-import usePlnRate from "@/hooks/usePlnRate";
 import { getMarginedValue } from "@/functions";
+import useCurrency from "@/hooks/useCurrency";
 
 const props = defineProps({
   fee: { type: Object, required: true },
@@ -127,7 +127,7 @@ const props = defineProps({
 const { sp, template, fee } = toRefs(props);
 
 const store = useStore();
-const rate = usePlnRate();
+const { convertTo } = useCurrency();
 
 const expanded = ref([]);
 const tab = ref("prices");
@@ -235,9 +235,10 @@ const fetchFlavours = async () => {
         const { gpu = { model: "", number: 0 } } = meta.technical[value] ?? {};
         const period = key === "monthly" ? "P1M" : "P1H";
         const planCode = `${period} ${flavour.id}`;
-        const price = parseFloat(
-          prices.value[selectedRegion.value]?.[flavour.planCodes[key]] * rate.value
-        ).toFixed(2);
+        const price = convertTo(
+          prices.value[selectedRegion.value]?.[flavour.planCodes[key]],
+          "PLN"
+        );
 
         newFlavours.push({
           ...flavour,
@@ -345,7 +346,7 @@ const changePlan = (plan) => {
           ram: item.ram,
           cpu: item.vcpus,
           gpu_name: item.gpu.model,
-          gpu_count: item.gpu.number
+          gpu_count: item.gpu.number,
         },
         meta: {
           priceCode: item.priceCode,
diff --git a/admin-ui/src/components/plan/dedicatedTable.vue b/admin-ui/src/components/plan/dedicatedTable.vue
index 76f9479b5..1f0ef48a8 100644
--- a/admin-ui/src/components/plan/dedicatedTable.vue
+++ b/admin-ui/src/components/plan/dedicatedTable.vue
@@ -35,7 +35,9 @@
       </template>
 
       <template v-slot:[`item.group`]="{ item }">
-        <template v-if="newGroup.mode === 'edit' && newGroup.planId === item.id">
+        <template
+          v-if="newGroup.mode === 'edit' && newGroup.planId === item.id"
+        >
           <v-text-field
             dense
             class="d-inline-block mr-1"
@@ -46,7 +48,9 @@
           <v-icon @click="newGroup.mode = 'none'">mdi-close</v-icon>
         </template>
 
-        <template v-if="newGroup.mode === 'create' && newGroup.planId === item.id">
+        <template
+          v-if="newGroup.mode === 'create' && newGroup.planId === item.id"
+        >
           <v-text-field
             dense
             class="d-inline-block mr-1"
@@ -68,10 +72,14 @@
           />
           <v-icon @click="changeMode('create', item)">mdi-plus</v-icon>
           <v-icon @click="changeMode('edit', item)">mdi-pencil</v-icon>
-          <v-icon v-if="groups.length > 1" @click="deleteGroup(item.group)">mdi-delete</v-icon>
+          <v-icon v-if="groups.length > 1" @click="deleteGroup(item.group)"
+            >mdi-delete</v-icon
+          >
         </template>
 
-        <template v-else-if="newGroup.planId !== item.id">{{ item.group }}</template>
+        <template v-else-if="newGroup.planId !== item.id">{{
+          item.group
+        }}</template>
       </template>
 
       <template v-slot:[`item.margin`]="{ item }">
@@ -156,7 +164,6 @@
 <script>
 import api from "@/api.js";
 import nocloudTable from "@/components/table.vue";
-import currencyRate from "@/mixins/currencyRate";
 import { getMarginedValue } from "@/functions";
 
 export default {
@@ -222,9 +229,8 @@ export default {
 
     groups: [],
     newGroup: { mode: "none", name: "", planId: "" },
-    usedFee: {}
+    usedFee: {},
   }),
-  mixins: [currencyRate],
   methods: {
     getAddons({ planCode, duration }) {
       return this.addons[planCode]?.filter((a) => a.duration === duration);
@@ -283,7 +289,7 @@ export default {
     async changePlan(plan) {
       if (!this.plans.every(({ group }) => this.groups.includes(group))) {
         this.$store.commit("snackbar/showSnackbarError", {
-          message: "You must select a group for the tariff!"
+          message: "You must select a group for the tariff!",
         });
         return "error";
       }
@@ -387,7 +393,8 @@ export default {
                 const menuWidth = menu.offsetWidth;
                 let marginLeft = 20;
 
-                if (width < menuWidth + x) marginLeft = width - (menuWidth + x) - 35;
+                if (width < menuWidth + x)
+                  marginLeft = width - (menuWidth + x) - 35;
                 const marginTop = marginLeft < 20 ? 20 : 0;
 
                 menu.style.left = `${x + marginLeft + window.scrollX}px`;
@@ -413,21 +420,24 @@ export default {
           const isYearly = duration === "P1Y" && pricingMode === "upfront12";
 
           if (isMonthly || isYearly) {
-            const newPrice = parseFloat((price.value * this.rate).toFixed(2));
+            const newPrice = this.convertPrice(price.value);
+
             const id = tariff
               ? this.getAddonId({ planCode, duration, tariff })
               : this.getTarrifId({ planCode, duration });
 
-            const installation = prices.find((price) =>
-              price.capacities.includes("installation") && price.pricingMode === pricingMode
+            const installation = prices.find(
+              (price) =>
+                price.capacities.includes("installation") &&
+                price.pricingMode === pricingMode
             );
 
             result.push({
               planCode,
               duration,
               installation_fee: {
-                price: { value: +(installation.price.value * this.rate).toFixed(2) },
-                value: installation.price.value
+                price: { value: +this.convertPrice(installation.price.value) },
+                value: installation.price.value,
               },
               price: { value: newPrice },
               name: productName,
@@ -603,11 +613,13 @@ export default {
         return result.every((el) => el);
       });
     },
+    convertPrice(price) {
+      return (price * this.plnRate).toFixed(2);
+    },
   },
   created() {
     this.$emit("changeLoading");
 
-    this.fetchRate();
     api.servicesProviders
       .action({
         action: "get_baremetal_plans",
@@ -644,6 +656,17 @@ export default {
     defaultCurrency() {
       return this.$store.getters["currencies/default"];
     },
+    rates() {
+      return this.$store.getters["currencies/rates"];
+    },
+    plnRate() {
+      if (this.defaultCurrency === "PLN") {
+        return 1;
+      }
+      return this.rates.find(
+        (r) => r.to === "PLN" && r.from === this.defaultCurrency
+      )?.rate;
+    },
   },
   watch: {
     plans() {
@@ -693,4 +716,4 @@ export default {
 .v-data-table__expanded__content {
   background: var(--v-background-base);
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/admin-ui/src/components/plan/vpsTable.vue b/admin-ui/src/components/plan/vpsTable.vue
index 1b2cf4e3a..362e6c934 100644
--- a/admin-ui/src/components/plan/vpsTable.vue
+++ b/admin-ui/src/components/plan/vpsTable.vue
@@ -198,7 +198,6 @@
 <script>
 import api from "@/api.js";
 import nocloudTable from "@/components/table.vue";
-import currencyRate from "@/mixins/currencyRate";
 import { getMarginedValue } from "@/functions";
 
 export default {
@@ -281,7 +280,6 @@ export default {
     tabsIndex: 0,
     usedFee: {},
   }),
-  mixins: [currencyRate],
   methods: {
     changeImage(value) {
       const i = this.images.indexOf(value);
@@ -390,7 +388,7 @@ export default {
           if (isMonthly || isYearly) {
             const code = planCode.split("-").slice(1).join("-");
             const option = windows.find((el) => el.planCode.includes(code));
-            const newPrice = parseFloat((price.value * this.rate).toFixed(2));
+            const newPrice = this.convertPrice(price.value);
 
             const { configurations, addonFamilies } = catalog.plans.find(
               ({ planCode }) => planCode.includes(code)
@@ -410,7 +408,7 @@ export default {
                 (el) =>
                   el.duration === duration && el.pricingMode === pricingMode
               );
-              const newPrice = parseFloat((value * this.rate).toFixed(2));
+              const newPrice = this.convertPrice(value);
 
               plan.windows = {
                 value,
@@ -467,7 +465,7 @@ export default {
             const isYearly = duration === "P1Y" && pricingMode === "upfront12";
 
             if (isMonthly || isYearly) {
-              const newPrice = parseFloat((price.value * this.rate).toFixed(2));
+              const newPrice = this.convertPrice(price.value);
 
               result.push({
                 price: { value: newPrice },
@@ -680,12 +678,13 @@ export default {
         return p;
       });
     },
+    convertPrice(price) {
+      return (price * this.plnRate).toFixed(2);
+    },
   },
   created() {
     this.$emit("changeLoading");
 
-    this.fetchRate();
-
     api.servicesProviders
       .action({ action: "get_plans", uuid: this.sp.uuid })
       .then(({ meta }) => {
@@ -718,6 +717,17 @@ export default {
     defaultCurrency() {
       return this.$store.getters["currencies/default"];
     },
+    rates() {
+      return this.$store.getters["currencies/rates"];
+    },
+    plnRate() {
+      if (this.defaultCurrency === "PLN") {
+        return 1;
+      }
+      return this.rates.find(
+        (r) => r.to === "PLN" && r.from === this.defaultCurrency
+      )?.rate;
+    },
   },
   watch: {
     tabsIndex(value) {
diff --git a/admin-ui/src/mixins/currencyRate.js b/admin-ui/src/mixins/currencyRate.js
deleted file mode 100644
index cbbda7716..000000000
--- a/admin-ui/src/mixins/currencyRate.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import api from "@/api";
-
-const currencyRate = {
-  data: () => ({ rate: null }),
-  computed: {
-    defaultCurrency() {
-      return this.$store.getters["currencies/default"];
-    },
-  },
-  methods: {
-    fetchRate(currency = "PLN") {
-      api
-        .get(`/billing/currencies/rates/${currency}/${this.defaultCurrency}`)
-        .then((res) => {
-          this.rate = res.rate;
-        })
-        .catch(() =>
-          api.get(
-            `/billing/currencies/rates/${this.defaultCurrency}/${currency}`
-          )
-        )
-        .then((res) => {
-          if (res) this.rate = 1 / res.rate;
-        })
-        .catch((err) => console.error(err));
-    },
-  },
-};
-
-export default currencyRate;

From 7072fec493dea3da262e4cfa91b41f3eb1e5f2aa Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 21 Sep 2023 13:39:18 +0400
Subject: [PATCH 005/123] fix convert to accountPrice

---
 admin-ui/src/components/ui/billingLabel.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin-ui/src/components/ui/billingLabel.vue b/admin-ui/src/components/ui/billingLabel.vue
index f6da499aa..ec8a7f557 100644
--- a/admin-ui/src/components/ui/billingLabel.vue
+++ b/admin-ui/src/components/ui/billingLabel.vue
@@ -51,7 +51,7 @@ const props = defineProps([
 ]);
 
 const store = useStore();
-const { convertFrom } = useCurrency();
+const { convertTo } = useCurrency();
 
 const { template, addonsPrice, tariffPrice, dueDate, account } = toRefs(props);
 
@@ -66,7 +66,7 @@ const accountCurrency = computed(() => {
 const price = computed(() => {
   const addonsSum = Object.values(addonsPrice.value).reduce((a, b) => a + b);
 
-  return convertFrom(tariffPrice.value + addonsSum, accountCurrency.value);
+  return convertTo(tariffPrice.value + addonsSum, accountCurrency.value);
 });
 
 const isRenewDisabled = computed(() => {
@@ -119,4 +119,4 @@ const renewTemplate = `
     `.trim();
 </script>
 
-<style scoped></style>
\ No newline at end of file
+<style scoped></style>

From 9fa0fadcc5389c9d237ff2ab1a9a9ebaaeba4330 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 21 Sep 2023 13:39:51 +0400
Subject: [PATCH 006/123] fix currency convert

---
 admin-ui/src/components/plan/cloudTable.vue     | 6 +++---
 admin-ui/src/components/plan/dedicatedTable.vue | 4 ++--
 admin-ui/src/components/plan/vpsTable.vue       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/admin-ui/src/components/plan/cloudTable.vue b/admin-ui/src/components/plan/cloudTable.vue
index e205fdd84..c8c8153d2 100644
--- a/admin-ui/src/components/plan/cloudTable.vue
+++ b/admin-ui/src/components/plan/cloudTable.vue
@@ -127,7 +127,7 @@ const props = defineProps({
 const { sp, template, fee } = toRefs(props);
 
 const store = useStore();
-const { convertTo } = useCurrency();
+const { convertFrom } = useCurrency();
 
 const expanded = ref([]);
 const tab = ref("prices");
@@ -235,7 +235,7 @@ const fetchFlavours = async () => {
         const { gpu = { model: "", number: 0 } } = meta.technical[value] ?? {};
         const period = key === "monthly" ? "P1M" : "P1H";
         const planCode = `${period} ${flavour.id}`;
-        const price = convertTo(
+        const price = convertFrom(
           prices.value[selectedRegion.value]?.[flavour.planCodes[key]],
           "PLN"
         );
@@ -389,4 +389,4 @@ const setFee = () => {
 defineExpose({ changePlan, setFee });
 </script>
 
-<style scoped></style>
+<style scoped></style>
\ No newline at end of file
diff --git a/admin-ui/src/components/plan/dedicatedTable.vue b/admin-ui/src/components/plan/dedicatedTable.vue
index 1f0ef48a8..5b710b4f3 100644
--- a/admin-ui/src/components/plan/dedicatedTable.vue
+++ b/admin-ui/src/components/plan/dedicatedTable.vue
@@ -664,7 +664,7 @@ export default {
         return 1;
       }
       return this.rates.find(
-        (r) => r.to === "PLN" && r.from === this.defaultCurrency
+        (r) => r.from === "PLN" && r.to === this.defaultCurrency
       )?.rate;
     },
   },
@@ -716,4 +716,4 @@ export default {
 .v-data-table__expanded__content {
   background: var(--v-background-base);
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/admin-ui/src/components/plan/vpsTable.vue b/admin-ui/src/components/plan/vpsTable.vue
index 362e6c934..326f8af39 100644
--- a/admin-ui/src/components/plan/vpsTable.vue
+++ b/admin-ui/src/components/plan/vpsTable.vue
@@ -725,7 +725,7 @@ export default {
         return 1;
       }
       return this.rates.find(
-        (r) => r.to === "PLN" && r.from === this.defaultCurrency
+        (r) => r.to === this.defaultCurrency && r.from === "PLN"
       )?.rate;
     },
   },

From 9b8834799e3f658b6a02e37b83ef2d7e6883be38 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 21 Sep 2023 13:39:59 +0400
Subject: [PATCH 007/123] fix convert from

---
 admin-ui/src/hooks/useCurrency.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-ui/src/hooks/useCurrency.js b/admin-ui/src/hooks/useCurrency.js
index 5f50fb832..f34f4d4be 100644
--- a/admin-ui/src/hooks/useCurrency.js
+++ b/admin-ui/src/hooks/useCurrency.js
@@ -23,7 +23,7 @@ const useCurrency = () => {
       )?.rate;
     }
 
-    return rate ? (price / rate).toFixed(2) : 0;
+    return rate ? (price * rate).toFixed(2) : 0;
   };
 
   const convertTo = (price, currency) => {

From 9a4e42d3ee397e0406b2a799487dade3349a0956 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 21 Sep 2023 13:47:00 +0400
Subject: [PATCH 008/123] add prices, fix aligmnet in dedicated

---
 .../src/components/plan/dedicatedTable.vue    | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/admin-ui/src/components/plan/dedicatedTable.vue b/admin-ui/src/components/plan/dedicatedTable.vue
index 5b710b4f3..8289f8e6d 100644
--- a/admin-ui/src/components/plan/dedicatedTable.vue
+++ b/admin-ui/src/components/plan/dedicatedTable.vue
@@ -31,7 +31,7 @@
       :footer-error="fetchError"
     >
       <template v-slot:[`item.name`]="{ item }">
-        <v-text-field dense style="width: 300px" v-model="item.name" />
+        <v-text-field dense style="width: 200px" v-model="item.name" />
       </template>
 
       <template v-slot:[`item.group`]="{ item }">
@@ -41,7 +41,7 @@
           <v-text-field
             dense
             class="d-inline-block mr-1"
-            style="width: 300px"
+            style="width: 200px"
             v-model="newGroup.name"
           />
           <v-icon @click="editGroup(item.group)">mdi-content-save</v-icon>
@@ -54,7 +54,7 @@
           <v-text-field
             dense
             class="d-inline-block mr-1"
-            style="width: 300px"
+            style="width: 200px"
             v-model="newGroup.name"
           />
           <v-icon @click="createGroup(item)">mdi-content-save</v-icon>
@@ -65,7 +65,7 @@
           <v-select
             dense
             class="d-inline-block"
-            style="width: 300px"
+            style="width: 200px"
             v-model="item.group"
             :items="groups"
             @change="item.name = getName(item)"
@@ -95,7 +95,12 @@
       </template>
 
       <template v-slot:[`item.value`]="{ item }">
-        <v-text-field dense style="width: 150px" v-model="item.value" />
+        <v-text-field
+          dense
+          style="min-width: 200px"
+          v-model="item.value"
+          :suffix="defaultCurrency"
+        />
       </template>
 
       <template v-slot:expanded-item="{ headers, item }">
@@ -146,7 +151,12 @@
               {{ value }} {{ defaultCurrency }}
             </template>
             <template v-slot:[`item.value`]="{ item }">
-              <v-text-field dense style="width: 150px" v-model="item.value" />
+              <v-text-field
+                dense
+                style="width: 200px"
+                :suffix="defaultCurrency"
+                v-model="item.value"
+              />
             </template>
             <template v-slot:[`item.sell`]="{ item }">
               <v-switch v-model="item.sell" />

From 8d58a62338bab338ee012e581767e451c52f6bb9 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 21 Sep 2023 13:51:23 +0400
Subject: [PATCH 009/123] add prices, fix aligmnet in vps

---
 admin-ui/src/components/plan/vpsTable.vue | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/admin-ui/src/components/plan/vpsTable.vue b/admin-ui/src/components/plan/vpsTable.vue
index 326f8af39..02293a2a8 100644
--- a/admin-ui/src/components/plan/vpsTable.vue
+++ b/admin-ui/src/components/plan/vpsTable.vue
@@ -113,7 +113,12 @@
             {{ value }} {{ defaultCurrency }}
           </template>
           <template v-slot:[`item.value`]="{ item }">
-            <v-text-field dense style="width: 150px" v-model="item.value" />
+            <v-text-field
+              dense
+              style="width: 200px"
+              :suffix="defaultCurrency"
+              v-model="item.value"
+            />
           </template>
           <template v-slot:[`item.sell`]="{ item }">
             <v-switch v-model="item.sell" />
@@ -161,7 +166,12 @@
             {{ value }} {{ defaultCurrency }}
           </template>
           <template v-slot:[`item.value`]="{ item }">
-            <v-text-field dense style="width: 150px" v-model="item.value" />
+            <v-text-field
+              dense
+              style="width: 200px"
+              :suffix="defaultCurrency"
+              v-model="item.value"
+            />
           </template>
           <template v-slot:[`item.sell`]="{ item }">
             <v-switch v-model="item.sell" />

From d269c29e1692d9d6f6ea0ac2d6dafdb64a4086e5 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 21 Sep 2023 13:54:40 +0400
Subject: [PATCH 010/123] add prices, fix aligmnet in cloud

---
 admin-ui/src/components/plan/cloudTable.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/admin-ui/src/components/plan/cloudTable.vue b/admin-ui/src/components/plan/cloudTable.vue
index c8c8153d2..d9cd711a4 100644
--- a/admin-ui/src/components/plan/cloudTable.vue
+++ b/admin-ui/src/components/plan/cloudTable.vue
@@ -43,11 +43,15 @@
           </template>
           <template v-slot:[`item.endPrice`]="{ item }">
             <v-text-field
-              style="min-width: 50px"
+              style="width: 200px"
+              :suffix="defaultCurrency"
               v-model.number="item.endPrice"
               type="number"
             />
           </template>
+          <template v-slot:[`item.price`]="{ value }">
+            {{ value }} {{ defaultCurrency }}
+          </template>
           <template v-slot:[`item.gpu.model`]="{ item }">
             <template v-if="item.gpu.model !== ''">
               {{ item.gpu.model }} (x{{ item.gpu.number }})
@@ -127,7 +131,7 @@ const props = defineProps({
 const { sp, template, fee } = toRefs(props);
 
 const store = useStore();
-const { convertFrom } = useCurrency();
+const { convertFrom, defaultCurrency } = useCurrency();
 
 const expanded = ref([]);
 const tab = ref("prices");
@@ -389,4 +393,4 @@ const setFee = () => {
 defineExpose({ changePlan, setFee });
 </script>
 
-<style scoped></style>
\ No newline at end of file
+<style scoped></style>

From 868361d68e983bc02bdfdd29f9f9ddcea4227946 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 21 Sep 2023 13:58:01 +0400
Subject: [PATCH 011/123] add currencies to products & resources

---
 admin-ui/src/components/plans_products_table.vue  |  5 +++++
 admin-ui/src/components/plans_resources_table.vue | 10 ++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/admin-ui/src/components/plans_products_table.vue b/admin-ui/src/components/plans_products_table.vue
index b3c26a731..253c43de0 100644
--- a/admin-ui/src/components/plans_products_table.vue
+++ b/admin-ui/src/components/plans_products_table.vue
@@ -72,6 +72,7 @@
             <v-text-field
               dense
               type="number"
+              :suffix="defaultCurrency"
               :value="item.price"
               :rules="generalRule"
               @change="(value) => changeProduct('price', value, item.id)"
@@ -147,6 +148,7 @@
                 type="number"
                 style="width: 150px"
                 :value="item.installationFee"
+                :suffix="defaultCurrency"
                 @input="
                   (value) => changeProduct('installationFee', +value, item.id)
                 "
@@ -174,6 +176,7 @@ import nocloudTable from "@/components/table.vue";
 import plansResourcesTable from "@/components/plans_resources_table.vue";
 import confirmDialog from "@/components/confirmDialog.vue";
 import { getFullDate } from "@/functions";
+import useCurrency from "@/hooks/useCurrency";
 
 const props = defineProps({
   type: { type: String, required: true },
@@ -183,6 +186,8 @@ const props = defineProps({
 const emits = defineEmits(["change:resource", "change:product"]);
 const { products, resources } = toRefs(props);
 
+const { defaultCurrency } = useCurrency();
+
 const table = ref();
 const fullDate = ref({});
 const selected = ref([]);
diff --git a/admin-ui/src/components/plans_resources_table.vue b/admin-ui/src/components/plans_resources_table.vue
index f369eaeaa..2178f372d 100644
--- a/admin-ui/src/components/plans_resources_table.vue
+++ b/admin-ui/src/components/plans_resources_table.vue
@@ -37,6 +37,7 @@
         <v-text-field
           dense
           type="number"
+          :suffix="defaultCurrency"
           :value="item.price"
           :rules="generalRule"
           @input="(value) => changeResource('price', value, item.id)"
@@ -94,9 +95,8 @@ import { ref, toRefs } from "vue";
 import nocloudTable from "@/components/table.vue";
 import dateField from "@/components/date.vue";
 import confirmDialog from "@/components/confirmDialog.vue";
-import {
-  getFullDate,
-} from "@/functions";
+import { getFullDate } from "@/functions";
+import useCurrency from "@/hooks/useCurrency";
 
 const props = defineProps({
   resources: { type: Array, required: true },
@@ -104,6 +104,8 @@ const props = defineProps({
 const emits = defineEmits(["change:resource"]);
 const { resources } = toRefs(props);
 
+const { defaultCurrency } = useCurrency();
+
 const fullDates = ref({});
 const selected = ref([]);
 const expanded = ref([]);
@@ -161,4 +163,4 @@ function removeConfig() {
 resources.value.forEach(({ period, id }) => {
   fullDates.value[id] = getFullDate(period);
 });
-</script>
+</script>
\ No newline at end of file

From 78ef7f536570d3920d1ce58b02588c28ca5ea15c Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 21 Sep 2023 16:04:07 +0400
Subject: [PATCH 012/123] refactor download yaml/json tempalte

---
 .../src/components/ServicesProvider/info.vue  | 35 ++++++++--------
 admin-ui/src/components/service-create.vue    | 29 ++++++-------
 .../components/ui/downloadTemplateButton.vue  | 26 ++++++++++++
 admin-ui/src/views/AppSettings.vue            | 17 ++++----
 admin-ui/src/views/PlansCreate.vue            | 41 ++++++++-----------
 .../src/views/ServicesProvidersCreate.vue     | 31 +++++++-------
 6 files changed, 99 insertions(+), 80 deletions(-)
 create mode 100644 admin-ui/src/components/ui/downloadTemplateButton.vue

diff --git a/admin-ui/src/components/ServicesProvider/info.vue b/admin-ui/src/components/ServicesProvider/info.vue
index d018887ee..7461f1793 100644
--- a/admin-ui/src/components/ServicesProvider/info.vue
+++ b/admin-ui/src/components/ServicesProvider/info.vue
@@ -40,9 +40,12 @@
           >
             Edit
           </v-btn>
-          <v-btn class="mx-2" @click="downloadFile">
-            Download {{ isJson ? "JSON" : "YAML" }}
-          </v-btn>
+          <download-template-button
+            :name="downloadedFileName"
+            :template="template"
+            class="mx-2"
+            :type="isJson ? 'JSON' : 'YAML'"
+          />
           <v-switch
             class="mr-2"
             style="margin-top: 5px; padding-top: 0"
@@ -93,7 +96,7 @@
               color="background-light"
             >
               <nocloud-table
-                  table-name="sp-binded-plans"
+                table-name="sp-binded-plans"
                 :items="plans"
                 :headers="headers"
                 :loading="isPlanLoading"
@@ -155,11 +158,16 @@ import extentionsMap from "@/components/extentions/map.js";
 import nocloudTable from "@/components/table.vue";
 import ConfirmDialog from "@/components/confirmDialog.vue";
 import { format } from "date-fns";
-import { downloadJSONFile, downloadYAMLFile } from "@/functions.js";
+import DownloadTemplateButton from "@/components/ui/downloadTemplateButton.vue";
 
 export default {
   name: "services-provider-info",
-  components: { JsonEditor, nocloudTable, ConfirmDialog },
+  components: {
+    DownloadTemplateButton,
+    JsonEditor,
+    nocloudTable,
+    ConfirmDialog,
+  },
   props: { template: { type: Object, required: true } },
   mixins: [snackbar],
   data: () => ({
@@ -321,16 +329,6 @@ export default {
           this.isDeleteLoading = false;
         });
     },
-    downloadFile() {
-      const name = this.template.title
-        ? this.template.title.replaceAll(" ", "_")
-        : "unknown_sp";
-      if (this.isJson) {
-        downloadJSONFile(this.template, name);
-      } else {
-        downloadYAMLFile(this.template, name);
-      }
-    },
   },
   mounted() {
     this.provider = this.template;
@@ -385,6 +383,11 @@ export default {
             import("@/components/modules/custom/serviceProviderInfo.vue");
       }
     },
+    downloadedFileName() {
+      return this.template.title
+        ? this.template.title.replaceAll(" ", "_")
+        : "unknown_sp";
+    },
   },
 };
 </script>
diff --git a/admin-ui/src/components/service-create.vue b/admin-ui/src/components/service-create.vue
index baca020a5..6c8d76746 100644
--- a/admin-ui/src/components/service-create.vue
+++ b/admin-ui/src/components/service-create.vue
@@ -69,7 +69,11 @@
             :items="fileTypes"
             v-model="selectedFileType"
           />
-          <v-btn class="mr-3" @click="downloadFile">Download</v-btn>
+          <download-template-button
+            :template="getService()"
+            :type="selectedFileType"
+            :name="downloadedFileName"
+          />
           <upload-file-button
             @file="uploadFile"
             :accept="selectedFileType.toLowerCase()"
@@ -192,16 +196,15 @@ import snackbar from "@/mixins/snackbar.js";
 
 import {
   defaultFilterObject,
-  downloadJSONFile,
-  downloadYAMLFile,
   readJSONFile,
   readYAMLFile,
 } from "@/functions.js";
 import UploadFileButton from "@/components/uploadFileButton.vue";
+import DownloadTemplateButton from "@/components/ui/downloadTemplateButton.vue";
 
 export default {
   name: "service-create",
-  components: { UploadFileButton },
+  components: { DownloadTemplateButton, UploadFileButton },
   data: () => ({
     formValid: false,
     rules: {
@@ -394,18 +397,6 @@ export default {
         this.plans.products.push(title);
       });
     },
-    downloadFile() {
-      const data = this.getService();
-      const name = data.service.title
-        ? (data.service.title + " service").replaceAll(" ", "_")
-        : "unknown_service";
-
-      if (this.selectedFileType === "JSON") {
-        downloadJSONFile(data, name);
-      } else if (this.selectedFileType === "YAML") {
-        downloadYAMLFile(data, name);
-      }
-    },
     async uploadFile(file) {
       let data = {};
       if (this.selectedFileType === "JSON") {
@@ -446,6 +437,12 @@ export default {
     planRules() {
       return this.plansVisible ? this.rules.req : [];
     },
+    downloadedFileName() {
+      const data = this.getService();
+      return data.service.title
+        ? (data.service.title + " service").replaceAll(" ", "_")
+        : "unknown_service";
+    },
   },
   created() {
     this.$store.dispatch("services/fetch").then(({ pool }) => {
diff --git a/admin-ui/src/components/ui/downloadTemplateButton.vue b/admin-ui/src/components/ui/downloadTemplateButton.vue
new file mode 100644
index 000000000..3315affec
--- /dev/null
+++ b/admin-ui/src/components/ui/downloadTemplateButton.vue
@@ -0,0 +1,26 @@
+<template>
+  <v-btn class="mr-2" @click="downloadFile">
+    Download {{ isJson ? "JSON" : "YAML" }}
+  </v-btn>
+</template>
+
+<script setup>
+import { downloadJSONFile, downloadYAMLFile } from "@/functions";
+import { computed, toRefs } from "vue";
+
+const props = defineProps(["name", "template", "type"]);
+const { name, template, type } = toRefs(props);
+
+const isJson = computed(() => {
+  return type.value === "JSON";
+});
+
+const downloadFile = () => {
+  const params = [template.value, name.value];
+  if (isJson.value) {
+    downloadJSONFile(...params);
+  } else {
+    downloadYAMLFile(...params);
+  }
+};
+</script>
diff --git a/admin-ui/src/views/AppSettings.vue b/admin-ui/src/views/AppSettings.vue
index 55b1e0799..64ca7bc80 100644
--- a/admin-ui/src/views/AppSettings.vue
+++ b/admin-ui/src/views/AppSettings.vue
@@ -10,9 +10,12 @@
           @change="onFileChange"
         />
       </div>
-      <v-btn @click="downloadSettings" color="background-light" class="mr-10"
-        >Download settings</v-btn
-      >
+      <download-template-button
+        class="mr-10"
+        :template="settings"
+        name="settings"
+        type="JSON"
+      />
     </div>
     <v-card-title class="px-0 mb-3"> Main:</v-card-title>
     <v-row>
@@ -96,12 +99,13 @@
 <script>
 import snackbar from "@/mixins/snackbar.js";
 import JsonEditor from "@/components/JsonEditor.vue";
-import { downloadJSONFile, readJSONFile } from "@/functions.js";
+import { readJSONFile } from "@/functions.js";
 import ColorPicker from "@/components/ui/colorPicker.vue";
+import DownloadTemplateButton from "@/components/ui/downloadTemplateButton.vue";
 
 export default {
   key: "app-settings",
-  components: { ColorPicker, JsonEditor },
+  components: { DownloadTemplateButton, ColorPicker, JsonEditor },
   mixins: [snackbar],
   data() {
     return {
@@ -133,9 +137,6 @@ export default {
     onFileChange(file) {
       readJSONFile(file).then((res) => (this.settings = res));
     },
-    downloadSettings() {
-      downloadJSONFile(this.settings, "settings");
-    },
     edit(data) {
       this.settings = data;
     },
diff --git a/admin-ui/src/views/PlansCreate.vue b/admin-ui/src/views/PlansCreate.vue
index 679c61f11..8bad82210 100644
--- a/admin-ui/src/views/PlansCreate.vue
+++ b/admin-ui/src/views/PlansCreate.vue
@@ -124,10 +124,11 @@
           >
             Create
           </v-btn>
-
-          <v-btn class="mr-2" @click="downloadFile">
-            Download {{ isJson ? "JSON" : "YAML" }}
-          </v-btn>
+          <download-template-button
+            :template="plan"
+            :type="isJson ? 'JSON' : 'YAML'"
+            :name="downloadedFileName"
+          />
           <v-switch
             class="d-inline-block mr-2"
             style="margin-top: 5px; padding-top: 0"
@@ -173,19 +174,18 @@ import snackbar from "@/mixins/snackbar.js";
 import confirmDialog from "@/components/confirmDialog.vue";
 import planOpensrs from "@/components/plan/opensrs/planOpensrs.vue";
 import JsonEditor from "@/components/JsonEditor.vue";
-
-import {
-  downloadJSONFile,
-  readJSONFile,
-  readYAMLFile,
-  downloadYAMLFile,
-  getTimestamp,
-} from "@/functions.js";
+import { readJSONFile, readYAMLFile, getTimestamp } from "@/functions.js";
+import DownloadTemplateButton from "@/components/ui/downloadTemplateButton.vue";
 
 export default {
   name: "plansCreate-view",
   mixins: [snackbar],
-  components: { confirmDialog, planOpensrs, JsonEditor },
+  components: {
+    DownloadTemplateButton,
+    confirmDialog,
+    planOpensrs,
+    JsonEditor,
+  },
   props: { item: { type: Object }, isEdit: { type: Boolean, default: false } },
   data: () => ({
     types: [],
@@ -422,16 +422,6 @@ export default {
           });
       }
     },
-    downloadFile() {
-      const name = this.plan.title
-        ? this.plan.title.replaceAll(" ", "_")
-        : "unknown_price_model";
-      if (this.isJson) {
-        downloadJSONFile(this.plan, name);
-      } else {
-        downloadYAMLFile(this.plan, name);
-      }
-    },
   },
   created() {
     this.$store.dispatch("plans/fetch", { silent: true }).catch((err) => {
@@ -513,6 +503,11 @@ export default {
 
       return filtered;
     },
+    downloadedFileName() {
+      return this.plan.title
+        ? this.plan.title.replaceAll(" ", "_")
+        : "unknown_price_model";
+    },
   },
   watch: {
     "plan.kind"() {
diff --git a/admin-ui/src/views/ServicesProvidersCreate.vue b/admin-ui/src/views/ServicesProvidersCreate.vue
index 71141f44a..0dd7ec98d 100644
--- a/admin-ui/src/views/ServicesProvidersCreate.vue
+++ b/admin-ui/src/views/ServicesProvidersCreate.vue
@@ -162,9 +162,12 @@
         </v-col>
         <v-col cols="6">
           <div class="d-flex align-start justify-center">
-            <v-btn class="mr-2" @click="downloadFile">
-              Download {{ isJson ? "JSON" : "YAML" }}
-            </v-btn>
+            <download-template-button
+              :type="isJson ? 'JSON' : 'YAML'"
+              class="mr-2"
+              :template="serviceProviderBody"
+              :name="downloadedFileName"
+            />
             <v-switch
               class="mr-2"
               style="margin-top: 5px; padding-top: 5px"
@@ -192,19 +195,18 @@ import JsonEditor from "@/components/JsonEditor.vue";
 
 import {
   mergeDeep,
-  downloadJSONFile,
   readJSONFile,
   readYAMLFile,
-  downloadYAMLFile,
   toKebabCase,
   toPascalCase,
 } from "@/functions.js";
 import AntIcon from "@/components/ui/antIcon.vue";
 import IconTitlePreview from "@/components/ui/iconTitlePreview.vue";
+import DownloadTemplateButton from "@/components/ui/downloadTemplateButton.vue";
 
 export default {
   name: "servicesProviders-create",
-  components: { IconTitlePreview, AntIcon, JsonEditor },
+  components: { DownloadTemplateButton, IconTitlePreview, AntIcon, JsonEditor },
   mixins: [snackbar],
   data: () => ({
     types: [],
@@ -262,7 +264,7 @@ export default {
     this.providerKey = this.generateComponentId();
     this.fetchExtentions();
 
-    if(id){
+    if (id) {
       this.$store.dispatch("servicesProviders/fetchById", id).then((res) => {
         if (!this.types.includes(res.type)) {
           this.customTitle = res.type;
@@ -317,6 +319,11 @@ export default {
     isProxyHide() {
       return ["cpanel"].includes(this.serviceProviderBody.type);
     },
+    downloadedFileName() {
+      return this.serviceProviderBody.title
+        ? this.serviceProviderBody.title.replaceAll(" ", "_")
+        : "unknown_sp";
+    },
   },
   methods: {
     generateComponentId() {
@@ -475,16 +482,6 @@ export default {
           });
       }
     },
-    downloadFile() {
-      const name = this.serviceProviderBody.title
-        ? this.serviceProviderBody.title.replaceAll(" ", "_")
-        : "unknown_sp";
-      if (this.isJson) {
-        downloadJSONFile(this.serviceProviderBody, name);
-      } else {
-        downloadYAMLFile(this.serviceProviderBody, name);
-      }
-    },
     setIconToKebabCase(icon) {
       this.provider.meta.service.icon = toKebabCase(icon);
     },

From ba0a03bdcabbc7204d6b772b904d4f834ad9c328 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 21 Sep 2023 16:11:15 +0400
Subject: [PATCH 013/123] add download plan

---
 .../components/ui/downloadTemplateButton.vue  |  6 ++---
 admin-ui/src/views/Plans.vue                  | 24 ++++++++++++++++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/admin-ui/src/components/ui/downloadTemplateButton.vue b/admin-ui/src/components/ui/downloadTemplateButton.vue
index 3315affec..884eb7817 100644
--- a/admin-ui/src/components/ui/downloadTemplateButton.vue
+++ b/admin-ui/src/components/ui/downloadTemplateButton.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-btn class="mr-2" @click="downloadFile">
+  <v-btn class="mr-2" @click="downloadFile" :disabled="disabled">
     Download {{ isJson ? "JSON" : "YAML" }}
   </v-btn>
 </template>
@@ -8,8 +8,8 @@
 import { downloadJSONFile, downloadYAMLFile } from "@/functions";
 import { computed, toRefs } from "vue";
 
-const props = defineProps(["name", "template", "type"]);
-const { name, template, type } = toRefs(props);
+const props = defineProps(["name", "template", "type", "disabled"]);
+const { name, template, type, disabled } = toRefs(props);
 
 const isJson = computed(() => {
   return type.value === "JSON";
diff --git a/admin-ui/src/views/Plans.vue b/admin-ui/src/views/Plans.vue
index b77d1c017..d999f2b39 100644
--- a/admin-ui/src/views/Plans.vue
+++ b/admin-ui/src/views/Plans.vue
@@ -60,6 +60,20 @@
       </template>
     </confirm-dialog>
 
+    <v-select
+      :items="fileTypes"
+      label="file type"
+      v-model="selectedFileType"
+      class="d-inline-block mx-2"
+    />
+    <download-template-button
+      class="mx-2"
+      :disabled="!selected.length"
+      :name="selected[0]?.title"
+      :type="selectedFileType"
+      :template="selected[0]"
+    />
+
     <v-autocomplete
       :filter="defaultFilterObject"
       label="Filter by SP"
@@ -111,10 +125,11 @@ import nocloudTable from "@/components/table.vue";
 import confirmDialog from "@/components/confirmDialog.vue";
 import { defaultFilterObject, filterArrayByTitleAndUuid } from "@/functions";
 import { mapGetters } from "vuex";
+import DownloadTemplateButton from "@/components/ui/downloadTemplateButton.vue";
 
 export default {
   name: "plans-view",
-  components: { nocloudTable, confirmDialog },
+  components: { DownloadTemplateButton, nocloudTable, confirmDialog },
   mixins: [snackbar, search],
   data: () => ({
     headers: [
@@ -136,6 +151,9 @@ export default {
     copyed: -1,
     fetchError: "",
     serviceProvider: null,
+
+    fileTypes: ["JSON", "YAML"],
+    selectedFileType: "JSON",
   }),
   methods: {
     defaultFilterObject,
@@ -297,7 +315,7 @@ export default {
     plans() {
       this.fetchError = "";
     },
-    typeItems(){
+    typeItems() {
       this.$store.commit("appSearch/setVariants", {
         kind: { items: ["static", "dynamic"], title: "Kind", isArray: true },
         type: { items: this.typeItems, isArray: true, title: "Type" },
@@ -322,4 +340,4 @@ export default {
     },
   },
 };
-</script>
\ No newline at end of file
+</script>

From d4f34741807f8c01da7298071561c479092dd86d Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 21 Sep 2023 16:12:03 +0400
Subject: [PATCH 014/123] change buttons colors

---
 admin-ui/src/views/Plans.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/admin-ui/src/views/Plans.vue b/admin-ui/src/views/Plans.vue
index d999f2b39..c88227bd2 100644
--- a/admin-ui/src/views/Plans.vue
+++ b/admin-ui/src/views/Plans.vue
@@ -1,13 +1,12 @@
 <template>
   <div class="pa-4">
-    <v-btn class="mr-2" color="background-light" :to="{ name: 'Plans create' }">
+    <v-btn class="mr-2" :to="{ name: 'Plans create' }">
       Create
     </v-btn>
 
     <confirm-dialog v-if="linked.length < 1" @confirm="deleteSelectedPlan">
       <v-btn
         class="mr-2"
-        color="background-light"
         :disabled="selected.length < 1"
         :loading="isDeleteLoading"
       >
@@ -25,7 +24,6 @@
     >
       <v-btn
         class="mr-2"
-        color="background-light"
         :disabled="selected.length < 1"
         :loading="isDeleteLoading"
       >

From 253d9bd30ab2af09b9e0caba576babbc7ea9076a Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Thu, 21 Sep 2023 16:29:47 +0300
Subject: [PATCH 015/123] Add bitrix link

---
 cmd/oauth2/main.go              |   2 +-
 pkg/oauth2/handlers/bitrix.go   | 145 ++++++++++++++++++++++++++------
 pkg/oauth2/handlers/github.go   |   8 +-
 pkg/oauth2/handlers/google.go   |   9 +-
 pkg/oauth2/handlers/handlers.go |   2 +-
 pkg/oauth2/main.go              |  10 ++-
 6 files changed, 141 insertions(+), 35 deletions(-)

diff --git a/cmd/oauth2/main.go b/cmd/oauth2/main.go
index 66e8bf41a..2893176ef 100644
--- a/cmd/oauth2/main.go
+++ b/cmd/oauth2/main.go
@@ -62,7 +62,7 @@ func main() {
 
 	registryClient := registry.NewAccountsServiceClient(registryConn)
 
-	server := oauth2.NewOAuth2Server(log, registryHost)
+	server := oauth2.NewOAuth2Server(log, SIGNING_KEY)
 	server.SetupRegistryClient(registryClient)
 	server.Start(port, corsAllowed)
 }
diff --git a/pkg/oauth2/handlers/bitrix.go b/pkg/oauth2/handlers/bitrix.go
index 726f4f14d..a193494e0 100644
--- a/pkg/oauth2/handlers/bitrix.go
+++ b/pkg/oauth2/handlers/bitrix.go
@@ -4,23 +4,34 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/golang-jwt/jwt/v4"
 	"github.com/gorilla/mux"
 	"github.com/slntopp/nocloud-proto/registry"
 	"github.com/slntopp/nocloud-proto/registry/accounts"
+	"github.com/slntopp/nocloud/pkg/nocloud"
 	"github.com/slntopp/nocloud/pkg/nocloud/auth"
 	"github.com/slntopp/nocloud/pkg/nocloud/schema"
 	"github.com/slntopp/nocloud/pkg/oauth2/config"
 	"go.uber.org/zap"
 	"golang.org/x/oauth2"
+	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
+	"google.golang.org/grpc/status"
 	"io"
 	"net/http"
+	"strings"
 	"sync"
 	"time"
 )
 
+type StateInfo struct {
+	RedirectUrl string
+	Token       string
+	Method      string
+}
+
 type BitrixOauthHandler struct {
-	states map[string]string
+	states map[string]*StateInfo
 	m      *sync.Mutex
 }
 
@@ -28,8 +39,14 @@ type UserInfo struct {
 	Result map[string]interface{} `json:"result"`
 }
 
-func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg config.OAuth2Config, regClient registry.AccountsServiceClient) {
-	g.states = map[string]string{}
+func (g *BitrixOauthHandler) Setup(
+	log *zap.Logger,
+	router *mux.Router,
+	cfg config.OAuth2Config,
+	regClient registry.AccountsServiceClient,
+	signingKey []byte,
+) {
+	g.states = map[string]*StateInfo{}
 	g.m = &sync.Mutex{}
 
 	oauth2Config := &oauth2.Config{
@@ -49,7 +66,41 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 		state, redirect := r.FormValue("state"), r.FormValue("redirect")
 
 		g.m.Lock()
-		g.states[state] = redirect
+		g.states[state] = &StateInfo{
+			RedirectUrl: redirect,
+			Method:      "sign_in",
+		}
+		g.m.Unlock()
+
+		url := oauth2Config.AuthCodeURL(state)
+
+		result := map[string]string{
+			"url": url,
+		}
+
+		marshal, _ := json.Marshal(result)
+		w.Write(marshal)
+	}))
+	router.Handle("/oauth/bitrix/link", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		state, redirect := r.FormValue("state"), r.FormValue("redirect")
+
+		authHeader := r.Header.Get("Authorization")
+		authHeaderSplit := strings.Split(authHeader, " ")
+
+		if len(authHeaderSplit) != 2 {
+			return
+		}
+
+		if authHeaderSplit[0] != "bearer" {
+			return
+		}
+
+		g.m.Lock()
+		g.states[state] = &StateInfo{
+			RedirectUrl: redirect,
+			Token:       authHeaderSplit[1],
+			Method:      "link",
+		}
 		g.m.Unlock()
 
 		url := oauth2Config.AuthCodeURL(state)
@@ -72,7 +123,7 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 			return
 		}
 
-		redirect = g.states[state]
+		stateInfo := g.states[state]
 		delete(g.states, state)
 		g.m.Unlock()
 
@@ -122,33 +173,50 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 
 		ctx := metadata.AppendToOutgoingContext(context.Background(), "authorization", "bearer "+rootToken)
 
-		resp, err := regClient.Token(ctx, &accounts.TokenRequest{
-			Auth: &accounts.Credentials{
-				Type: "oauth2-bitrix",
-				Data: []string{
-					field,
-					value,
-				},
-			},
-			Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
-		})
-		if err != nil {
-			_, err = regClient.Create(ctx, &accounts.CreateRequest{
-				Title:     fmt.Sprintf("%s %s", name, last_name),
-				Namespace: schema.ROOT_NAMESPACE_KEY,
+		if stateInfo.Method == "link" {
+			ncToken, err := jwt.Parse(stateInfo.Token, func(t *jwt.Token) (interface{}, error) {
+				if _, ok := t.Method.(*jwt.SigningMethodHMAC); !ok {
+					return nil, status.Errorf(codes.Unauthenticated, "Unexpected signing method: %v", t.Header["alg"])
+				}
+				return signingKey, nil
+			})
+
+			if err != nil {
+				log.Error("Failed to get token", zap.Error(err))
+				return
+			}
+
+			if !ncToken.Valid {
+				log.Error("Token invalid", zap.Error(err))
+				return
+			}
+
+			claims := ncToken.Claims.(jwt.MapClaims)
+			acc := claims[nocloud.NOCLOUD_ACCOUNT_CLAIM].(string)
+
+			resp, err := regClient.SetCredentials(ctx, &accounts.SetCredentialsRequest{
+				Account: acc,
 				Auth: &accounts.Credentials{
-					Type: "oauth2-bitrix",
+					Type: "oauth2",
 					Data: []string{
 						field,
 						value,
 					},
 				},
 			})
+
 			if err != nil {
 				log.Error("Failed create account", zap.Error(err))
 				return
 			}
-			resp, err = regClient.Token(ctx, &accounts.TokenRequest{
+
+			if !resp.GetResult() {
+				log.Error("False result")
+				return
+			}
+			http.Redirect(w, r, fmt.Sprintf("%s?token=%s", redirect, stateInfo.Token), http.StatusSeeOther)
+		} else {
+			resp, err := regClient.Token(ctx, &accounts.TokenRequest{
 				Auth: &accounts.Credentials{
 					Type: "oauth2-bitrix",
 					Data: []string{
@@ -159,12 +227,37 @@ func (g *BitrixOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg conf
 				Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
 			})
 			if err != nil {
-				log.Error("Failed get token", zap.Error(err))
-				return
+				_, err = regClient.Create(ctx, &accounts.CreateRequest{
+					Title:     fmt.Sprintf("%s %s", name, last_name),
+					Namespace: schema.ROOT_NAMESPACE_KEY,
+					Auth: &accounts.Credentials{
+						Type: "oauth2-bitrix",
+						Data: []string{
+							field,
+							value,
+						},
+					},
+				})
+				if err != nil {
+					log.Error("Failed create account", zap.Error(err))
+					return
+				}
+				resp, err = regClient.Token(ctx, &accounts.TokenRequest{
+					Auth: &accounts.Credentials{
+						Type: "oauth2-bitrix",
+						Data: []string{
+							field,
+							value,
+						},
+					},
+					Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
+				})
+				if err != nil {
+					log.Error("Failed get token", zap.Error(err))
+					return
+				}
 			}
+			http.Redirect(w, r, fmt.Sprintf("%s?token=%s", redirect, resp.GetToken()), http.StatusSeeOther)
 		}
-
-		http.Redirect(w, r, fmt.Sprintf("%s?token=%s", redirect, resp.GetToken()), http.StatusSeeOther)
-
 	}))
 }
diff --git a/pkg/oauth2/handlers/github.go b/pkg/oauth2/handlers/github.go
index f3195a87d..8ddb90082 100644
--- a/pkg/oauth2/handlers/github.go
+++ b/pkg/oauth2/handlers/github.go
@@ -25,7 +25,13 @@ type GithubOauthHandler struct {
 	m      *sync.Mutex
 }
 
-func (g *GithubOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg config.OAuth2Config, regClient registry.AccountsServiceClient) {
+func (g *GithubOauthHandler) Setup(
+	log *zap.Logger,
+	router *mux.Router,
+	cfg config.OAuth2Config,
+	regClient registry.AccountsServiceClient,
+	signingKey []byte,
+) {
 	g.states = map[string]string{}
 	g.m = &sync.Mutex{}
 
diff --git a/pkg/oauth2/handlers/google.go b/pkg/oauth2/handlers/google.go
index 57ef887ac..4c0750096 100644
--- a/pkg/oauth2/handlers/google.go
+++ b/pkg/oauth2/handlers/google.go
@@ -25,8 +25,13 @@ type GoogleOauthHandler struct {
 	m      *sync.Mutex
 }
 
-func (g *GoogleOauthHandler) Setup(log *zap.Logger, router *mux.Router, cfg config.OAuth2Config, regClient registry.AccountsServiceClient) {
-
+func (g *GoogleOauthHandler) Setup(
+	log *zap.Logger,
+	router *mux.Router,
+	cfg config.OAuth2Config,
+	regClient registry.AccountsServiceClient,
+	signingKey []byte,
+) {
 	g.states = map[string]string{}
 	g.m = &sync.Mutex{}
 
diff --git a/pkg/oauth2/handlers/handlers.go b/pkg/oauth2/handlers/handlers.go
index f7b2867b8..0e0e084ab 100644
--- a/pkg/oauth2/handlers/handlers.go
+++ b/pkg/oauth2/handlers/handlers.go
@@ -8,7 +8,7 @@ import (
 )
 
 type OAuthHandler interface {
-	Setup(*zap.Logger, *mux.Router, config.OAuth2Config, registry.AccountsServiceClient)
+	Setup(*zap.Logger, *mux.Router, config.OAuth2Config, registry.AccountsServiceClient, []byte)
 }
 
 func GetOAuthHandler(handlerType string) OAuthHandler {
diff --git a/pkg/oauth2/main.go b/pkg/oauth2/main.go
index e468b0326..4faf29536 100644
--- a/pkg/oauth2/main.go
+++ b/pkg/oauth2/main.go
@@ -15,15 +15,17 @@ import (
 type OAuth2Server struct {
 	router         *mux.Router
 	registryClient registry.AccountsServiceClient
+	signingKey     []byte
 
 	log *zap.Logger
 }
 
-func NewOAuth2Server(log *zap.Logger, host string) *OAuth2Server {
+func NewOAuth2Server(log *zap.Logger, signingKey []byte) *OAuth2Server {
 	log.Debug("New Server")
 	return &OAuth2Server{
-		log:    log.Named("OauthServer"),
-		router: mux.NewRouter(),
+		log:        log.Named("OauthServer"),
+		router:     mux.NewRouter(),
+		signingKey: signingKey,
 	}
 }
 
@@ -46,7 +48,7 @@ func (s *OAuth2Server) registerOAuthHandlers() {
 			continue
 		}
 
-		handler.Setup(s.log.Named(key), s.router, conf, s.registryClient)
+		handler.Setup(s.log.Named(key), s.router, conf, s.registryClient, s.signingKey)
 	}
 
 }

From 3f55fd3466d8383f5b6d58b87e8dc6f89dac5ae7 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 21 Sep 2023 20:06:35 +0400
Subject: [PATCH 016/123] change transaction types

---
 admin-ui/src/views/TransactionsCreate.vue | 108 ++++++++++++----------
 1 file changed, 57 insertions(+), 51 deletions(-)

diff --git a/admin-ui/src/views/TransactionsCreate.vue b/admin-ui/src/views/TransactionsCreate.vue
index 3750eec2f..8287c4bbc 100644
--- a/admin-ui/src/views/TransactionsCreate.vue
+++ b/admin-ui/src/views/TransactionsCreate.vue
@@ -9,31 +9,20 @@
               <v-subheader>Type</v-subheader>
             </v-col>
             <v-col cols="9">
-              <v-autocomplete
-                label="Type"
-                v-model="type"
-                item-value="value"
+              <v-select
+                item-value="id"
                 item-text="title"
+                label="Type"
+                v-model="typeId"
                 :items="types"
-              />
-            </v-col>
-          </v-row>
-        </v-col>
-      </v-row>
-      <v-row>
-        <v-col lg="6" cols="12">
-          <v-row align="center">
-            <v-col cols="3">
-              <v-subheader>Amount type</v-subheader>
-            </v-col>
-            <v-col cols="9">
-              <v-autocomplete
-                label="Amount type"
-                v-model="amountType"
-                item-value="value"
-                item-text="title"
-                :items="amountTypes"
-              />
+              >
+                <template v-slot:item="{ item }">
+                  <span>{{ item.title }} - {{ item.amount.title }}</span>
+                </template>
+                <template v-slot:selection="{ item }">
+                  <span>{{ item.title }} - {{ item.amount.title }}</span>
+                </template>
+              </v-select>
             </v-col>
           </v-row>
         </v-col>
@@ -67,6 +56,7 @@
                 label="Service"
                 item-value="title"
                 item-text="title"
+                clearable
                 v-model="transaction.service"
                 :items="servicesByAccount"
               />
@@ -230,11 +220,38 @@ export default {
     isLoading: false,
 
     types: [
-      { value: "invoice", title: "Invoice" },
-      { value: "transaction", title: "Transaction" },
+      {
+        id: 1,
+        value: "invoice",
+        title: "Invoice",
+        amount: { title: "Top-up invoice (with balance change)", value: true },
+      },
+      {
+        id: 2,
+        value: "invoice",
+        title: "Invoice",
+        amount: { title: "Payment invoice (no balance change)", value: false },
+      },
+      {
+        id: 3,
+        value: "transaction",
+        title: "Transaction",
+        amount: { title: "Top-up", value: false },
+      },
+      {
+        id: 4,
+        value: "transaction",
+        title: "Transaction",
+        amount: { title: "Debit", value: true },
+      },
+      {
+        id: 5,
+        value: "transaction",
+        title: "Transaction",
+        amount: { title: "Account balance", value: null },
+      },
     ],
-    type: "transaction",
-    amountType: true,
+    typeId: 4,
   }),
   methods: {
     defaultFilterObject,
@@ -253,15 +270,16 @@ export default {
 
       try {
         let total = this.transaction.total;
-        if (this.amountType === null) {
+        const amountType = this.fullType.amount.value;
+        if (amountType === null) {
           const balance = this.transaction.account.balance || 0;
           const difference = Math.abs(total - balance);
           total = (balance > total ? +difference : -difference).toFixed(2);
         } else {
           total = Math.abs(total);
-          total = this.amountType ? total : -total;
+          total = amountType ? total : -total;
           if (this.isInvoice) {
-            this.transaction.meta.invoiceType = this.amountType
+            this.transaction.meta.invoiceType = amountType
               ? "top-up"
               : "payment";
           }
@@ -279,7 +297,7 @@ export default {
 
         setTimeout(() => {
           this.$router.push({ name: "Transactions" });
-        }, 1500);
+        }, 500);
       } catch (err) {
         this.showSnackbarError({
           message: err,
@@ -319,7 +337,7 @@ export default {
   },
   created() {
     this.initDate();
-    this.transaction.meta.type = this.type;
+    this.transaction.meta.type = this.fullType.value;
 
     if (this.accounts.length < 2) {
       this.$store.dispatch("accounts/fetch");
@@ -392,41 +410,29 @@ export default {
       return new Date(`${this.date.value}T${this.time.value}`).getTime() / 1000;
     },
     isTransaction() {
-      return this.type === "transaction";
+      return this.fullType.value === "transaction";
     },
     isInvoice() {
-      return this.type === "invoice";
+      return this.fullType.value === "invoice";
     },
     amountRule() {
       return [
         (v) =>
-          (this.amountType === null ? v === 0 || !!v : !!v) ||
+          (this.fullType.amount.value === null ? v === 0 || !!v : !!v) ||
           "This field is required!",
       ];
     },
-    amountTypes() {
-      if (this.isTransaction) {
-        return [
-          { title: "Top-up", value: false },
-          { title: "Debit", value: true },
-          { title: "Account balance", value: null },
-        ];
-      }
-
-      return [
-        { title: "Top-up invoice (with balance change)", value: true },
-        { title: "Payment invoice (no balance change)", value: false },
-      ];
+    fullType() {
+      return this.types.find((t) => t.id === this.typeId);
     },
   },
   watch: {
     "transaction.service"() {
       this.transaction.meta.instances = [];
     },
-    type() {
-      this.transaction.meta.type = this.type;
+    typeId() {
+      this.transaction.meta.type = this.fullType.value;
       if (this.isInvoice) {
-        this.amountType = false;
         this.resetDate();
       } else if (this.isTransaction) {
         this.initDate();

From 608b7448b6283adb4be4b727c848e34be7e1d133 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Thu, 21 Sep 2023 19:11:44 +0300
Subject: [PATCH 017/123] Add record creating in transactions

---
 pkg/billing/transactions.go | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/pkg/billing/transactions.go b/pkg/billing/transactions.go
index da0dae97a..8b3c30876 100644
--- a/pkg/billing/transactions.go
+++ b/pkg/billing/transactions.go
@@ -179,9 +179,26 @@ func (s *BillingServiceServer) CreateTransaction(ctx context.Context, t *pb.Tran
 	if t.Meta == nil {
 		t.Meta = map[string]*structpb.Value{}
 		t.Meta["type"] = structpb.NewStringValue("transaction")
+	}
+
+	rec := s.records.Create(ctx, &pb.Record{
+		Start:     time.Now().Unix(),
+		End:       time.Now().Unix() + 1,
+		Exec:      time.Now().Unix(),
+		Processed: true,
+		Priority:  t.GetPriority(),
+		Total:     t.GetTotal(),
+		Currency:  t.GetCurrency(),
+		Service:   t.GetService(),
+		Account:   t.GetAccount(),
+	})
 
+	if t.GetRecords() == nil {
+		t.Records = []string{}
 	}
 
+	t.Records = append(t.Records, rec.Key())
+
 	r, err := s.transactions.Create(ctx, t)
 	if err != nil {
 		log.Error("Failed to create transaction", zap.Error(err))
@@ -415,6 +432,9 @@ LET rate = PRODUCT(
 
 LET total = transaction.total * rate
 
+FOR r in transaction.records
+	UPDATE r WITH {total: total} in @@records
+
 UPDATE transaction WITH {processed: true, proc: @now, currency: currency, total: total} IN @@transactions
 UPDATE account WITH { balance: account.balance - total } IN @@accounts
 
@@ -437,6 +457,9 @@ LET rate = PRODUCT(
 
 LET total = transaction.total * rate
 
+FOR r in transaction.records
+	UPDATE r WITH {total: total} in @@records
+
 UPDATE transaction WITH {currency: currency, total: total} IN @@transactions
 RETURN transaction
 `

From 35a339e07cea2ae156d29faedefdcf9ff76273ba Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Thu, 21 Sep 2023 19:19:58 +0300
Subject: [PATCH 018/123] Fix

---
 pkg/billing/transactions.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/billing/transactions.go b/pkg/billing/transactions.go
index 8b3c30876..fbeaf9483 100644
--- a/pkg/billing/transactions.go
+++ b/pkg/billing/transactions.go
@@ -220,6 +220,7 @@ func (s *BillingServiceServer) CreateTransaction(ctx context.Context, t *pb.Tran
 		_, err := s.db.Query(ctx, processUrgentTransaction, map[string]interface{}{
 			"@accounts":      schema.ACCOUNTS_COL,
 			"@transactions":  schema.TRANSACTIONS_COL,
+			"@records":       schema.RECORDS_COL,
 			"accountKey":     acc.String(),
 			"transactionKey": transaction.String(),
 			"currency":       currencyConf.Currency,
@@ -292,6 +293,7 @@ func (s *BillingServiceServer) CreateTransaction(ctx context.Context, t *pb.Tran
 
 		_, err := s.db.Query(ctx, updateTransactionWithCurrency, map[string]interface{}{
 			"@transactions":  schema.TRANSACTIONS_COL,
+			"@records":       schema.RECORDS_COL,
 			"accountKey":     acc.String(),
 			"transactionKey": transaction.String(),
 			"currency":       currencyConf.Currency,

From 0879bdf064b1c943b92b4460b16438c479f17f46 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 21 Sep 2023 20:42:04 +0400
Subject: [PATCH 019/123] hide service & add note in invoice

---
 admin-ui/src/views/TransactionsCreate.vue | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/admin-ui/src/views/TransactionsCreate.vue b/admin-ui/src/views/TransactionsCreate.vue
index 8287c4bbc..345c9b8f5 100644
--- a/admin-ui/src/views/TransactionsCreate.vue
+++ b/admin-ui/src/views/TransactionsCreate.vue
@@ -46,7 +46,7 @@
             </v-col>
           </v-row>
 
-          <v-row align="center">
+          <v-row align="center" v-if="!isServiceHide">
             <v-col cols="3">
               <v-subheader>Service</v-subheader>
             </v-col>
@@ -147,6 +147,15 @@
             </v-col>
           </v-row>
 
+          <v-row v-if="!isAdminNoteHide" class="mx-5">
+            <v-textarea
+              no-resize
+              label="Admin note"
+              :rules="generalRule"
+              v-model="transaction.meta.note"
+            ></v-textarea>
+          </v-row>
+
           <v-row class="mx-5">
             <v-textarea
               no-resize
@@ -310,7 +319,7 @@ export default {
       this.transaction.service =
         this.services.find(
           (service) => service.title === this.transaction.service
-        )?.uuid || "";
+        )?.uuid || undefined;
 
       this.transaction.exec = this.exec;
       if (!this.transaction.exec) {
@@ -425,6 +434,12 @@ export default {
     fullType() {
       return this.types.find((t) => t.id === this.typeId);
     },
+    isServiceHide() {
+      return this.isInvoice;
+    },
+    isAdminNoteHide() {
+      return this.isTransaction;
+    },
   },
   watch: {
     "transaction.service"() {
@@ -433,8 +448,11 @@ export default {
     typeId() {
       this.transaction.meta.type = this.fullType.value;
       if (this.isInvoice) {
+        this.transaction.service = undefined;
         this.resetDate();
       } else if (this.isTransaction) {
+        this.transaction.meta.note = undefined;
+        this.transaction.meta.invoiceType = undefined;
         this.initDate();
       }
     },

From 4cd2fd54123c5686c1cfa259da1fd9ef7fa80614 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 21 Sep 2023 20:53:36 +0400
Subject: [PATCH 020/123] add sendEmail

---
 admin-ui/src/views/TransactionsCreate.vue | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/admin-ui/src/views/TransactionsCreate.vue b/admin-ui/src/views/TransactionsCreate.vue
index 345c9b8f5..3c365ac66 100644
--- a/admin-ui/src/views/TransactionsCreate.vue
+++ b/admin-ui/src/views/TransactionsCreate.vue
@@ -147,6 +147,17 @@
             </v-col>
           </v-row>
 
+          <v-row align="center" v-if="!isSendEmailHide">
+            <v-col cols="3">
+              <v-subheader>Send email</v-subheader>
+            </v-col>
+            <v-col cols="9">
+              <div class="d-flex justify-end">
+                <v-switch v-model="transaction.meta.sendEmail" />
+              </div>
+            </v-col>
+          </v-row>
+
           <v-row v-if="!isAdminNoteHide" class="mx-5">
             <v-textarea
               no-resize
@@ -440,6 +451,9 @@ export default {
     isAdminNoteHide() {
       return this.isTransaction;
     },
+    isSendEmailHide() {
+      return this.isTransaction;
+    },
   },
   watch: {
     "transaction.service"() {
@@ -452,6 +466,7 @@ export default {
         this.resetDate();
       } else if (this.isTransaction) {
         this.transaction.meta.note = undefined;
+        this.transaction.meta.sendEmail = undefined;
         this.transaction.meta.invoiceType = undefined;
         this.initDate();
       }

From f9b04432fdc26e649f190d98a034be0812e128e6 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 21 Sep 2023 20:58:00 +0400
Subject: [PATCH 021/123] fix prices colors

---
 admin-ui/src/components/modules/ione/billingInfo.vue | 4 +++-
 admin-ui/src/components/modules/ovh/billingInfo.vue  | 6 ++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/admin-ui/src/components/modules/ione/billingInfo.vue b/admin-ui/src/components/modules/ione/billingInfo.vue
index ad9e1c370..e41d21884 100644
--- a/admin-ui/src/components/modules/ione/billingInfo.vue
+++ b/admin-ui/src/components/modules/ione/billingInfo.vue
@@ -80,14 +80,16 @@
               <div class="d-flex">
                 <v-text-field
                   class="mr-2"
-                  color="red"
                   :suffix="defaultCurrency"
                   v-model="item.price"
+                  type="number"
                   @input="updatePrice(item, false)"
                   append-icon="mdi-pencil"
                 />
                 <v-text-field
+                  style="color: #c921c9"
                   class="ml-2"
+                  type="number"
                   :suffix="accountCurrency"
                   v-model="item.accountPrice"
                   @input="updatePrice(item, true)"
diff --git a/admin-ui/src/components/modules/ovh/billingInfo.vue b/admin-ui/src/components/modules/ovh/billingInfo.vue
index 55d2b3554..9708f82bd 100644
--- a/admin-ui/src/components/modules/ovh/billingInfo.vue
+++ b/admin-ui/src/components/modules/ovh/billingInfo.vue
@@ -67,7 +67,6 @@
               <div class="d-flex">
                 <v-text-field
                   class="mr-2"
-                  color="red"
                   v-model="item.price"
                   @change="onUpdatePrice(item, false)"
                   :suffix="defaultCurrency"
@@ -76,6 +75,7 @@
                 ></v-text-field>
                 <v-text-field
                   class="ml-2"
+                  style="color: #c921c9"
                   v-model="item.accountPrice"
                   @change="onUpdatePrice(item, true)"
                   :suffix="accountCurrency"
@@ -93,9 +93,7 @@
                 <td></td>
                 <td></td>
                 <td>
-                  {{
-                    getBillingPeriod(tarrif.period)
-                  }}
+                  {{ getBillingPeriod(tarrif.period) }}
                 </td>
                 <td>
                   {{

From 5cfd8ddd2264127467686c3e99ac152a52c8a329 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 21 Sep 2023 21:06:01 +0400
Subject: [PATCH 022/123] redisign virtual billing info

---
 .../modules/virtual/billingInfo.vue           | 107 ++++++++++++------
 1 file changed, 71 insertions(+), 36 deletions(-)

diff --git a/admin-ui/src/components/modules/virtual/billingInfo.vue b/admin-ui/src/components/modules/virtual/billingInfo.vue
index d876d5931..1cdcce42d 100644
--- a/admin-ui/src/components/modules/virtual/billingInfo.vue
+++ b/admin-ui/src/components/modules/virtual/billingInfo.vue
@@ -20,7 +20,12 @@
         />
       </v-col>
       <v-col>
-        <v-text-field readonly label="Price instance total" :value="price" />
+        <v-text-field
+          readonly
+          label="Price instance total"
+          :suffix="defaultCurrency"
+          :value="price"
+        />
       </v-col>
       <v-col>
         <v-text-field
@@ -53,40 +58,67 @@
         />
       </v-col>
     </v-row>
-    <nocloud-table
-      class="mb-5"
-      :headers="billingHeaders"
-      :items="billingItems"
-      no-hide-uuid
-      :show-select="false"
-      hide-default-footer
-    >
-      <template v-slot:[`item.price`]="{ item }">
-        <v-text-field
-          v-model="item.price"
-          @input="updatePrice(item, false)"
-          append-icon="mdi-pencil"
-        />
-      </template>
-      <template v-slot:[`item.accountPrice`]="{ item }">
-        <v-text-field
-          v-model="item.accountPrice"
-          @input="updatePrice(item, true)"
-          append-icon="mdi-pencil"
-        />
-      </template>
-      <template v-slot:body.append>
-        <tr>
-          <td>Total:</td>
-          <td />
-          <td>
-            {{ billingItems.find((i) => i.name === template.product)?.period }}
-          </td>
-          <td>{{ [totalAccountPrice, accountCurrency].join(" ") }}</td>
-          <td>{{ totalPrice }}</td>
-        </tr>
-      </template>
-    </nocloud-table>
+
+    <v-expansion-panels>
+      <v-expansion-panel>
+        <v-expansion-panel-header color="background-light"
+          >Prices</v-expansion-panel-header
+        >
+        <v-expansion-panel-content
+          class="ione-billing"
+          color="background-light"
+        >
+          <nocloud-table
+            class="mb-5"
+            :headers="billingHeaders"
+            :items="billingItems"
+            no-hide-uuid
+            :show-select="false"
+            hide-default-footer
+          >
+            <template v-slot:[`item.price`]="{ item }">
+              <div class="d-flex">
+                <v-text-field
+                  class="mr-2"
+                  v-model="item.price"
+                  :suffix="defaultCurrency"
+                  @input="updatePrice(item, false)"
+                  append-icon="mdi-pencil"
+                />
+                <v-text-field
+                  class="ml-2"
+                  :suffix="accountCurrency"
+                  style="color: #c921c9"
+                  v-model="item.accountPrice"
+                  @input="updatePrice(item, true)"
+                  append-icon="mdi-pencil"
+                />
+              </div>
+            </template>
+            <template v-slot:body.append>
+              <tr>
+                <td></td>
+                <td />
+                <td>
+                  {{
+                    billingItems.find((i) => i.name === template.product)
+                      ?.period
+                  }}
+                </td>
+                <td>
+                  <div class="d-flex justify-end mr-4">
+                    {{ [totalPrice, defaultCurrency].join(" ") }}
+                    /
+                    {{ [totalAccountPrice, accountCurrency].join(" ") }}
+                  </div>
+                </td>
+              </tr>
+            </template>
+          </nocloud-table>
+        </v-expansion-panel-content>
+      </v-expansion-panel>
+    </v-expansion-panels>
+
     <change-monitorings
       :template="template"
       :service="service"
@@ -112,12 +144,14 @@ import ChangeMonitorings from "@/components/dialogs/changeMonitorings.vue";
 import EditPriceModel from "@/components/dialogs/editPriceModel.vue";
 import useAccountConverter from "@/hooks/useAccountConverter";
 import NocloudTable from "@/components/table.vue";
+import { useStore } from "@/store";
 
 const props = defineProps(["template", "plans", "service", "sp"]);
 const emit = defineEmits(["refresh"]);
 
 const { template, plans, service } = toRefs(props);
 
+const store = useStore();
 const {
   fetchAccountRate,
   accountCurrency,
@@ -133,7 +167,6 @@ const billingHeaders = ref([
   { text: "Name", value: "name" },
   { text: "Payment term", value: "kind" },
   { text: "Billing period", value: "period" },
-  { text: "Account price", value: "accountPrice" },
   { text: "Price", value: "price" },
 ]);
 const billingItems = ref([]);
@@ -160,6 +193,8 @@ const totalPrice = computed(() => {
 
 const billingPlan = computed(() => template.value.billingPlan);
 
+const defaultCurrency = computed(() => store.getters["currencies/default"]);
+
 onMounted(() => {
   fetchAccountRate();
   billingItems.value = getBillingItems();

From df4d39d5dedfa3f7e031cb6d1bbeaa92f004c3e7 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 21 Sep 2023 21:13:15 +0400
Subject: [PATCH 023/123] add multi downlaoded & change downloaded placement

---
 admin-ui/src/views/Plans.vue | 42 +++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/admin-ui/src/views/Plans.vue b/admin-ui/src/views/Plans.vue
index c88227bd2..07abbc6eb 100644
--- a/admin-ui/src/views/Plans.vue
+++ b/admin-ui/src/views/Plans.vue
@@ -1,13 +1,11 @@
 <template>
   <div class="pa-4">
-    <v-btn class="mr-2" :to="{ name: 'Plans create' }">
-      Create
-    </v-btn>
+    <v-btn class="mr-2" :to="{ name: 'Plans create' }"> Create </v-btn>
 
-    <confirm-dialog v-if="linked.length < 1" @confirm="deleteSelectedPlan">
+    <confirm-dialog v-if="linked.length !== 1" @confirm="deleteSelectedPlan">
       <v-btn
         class="mr-2"
-        :disabled="selected.length < 1"
+        :disabled="selected.length !== 1"
         :loading="isDeleteLoading"
       >
         Delete
@@ -58,20 +56,6 @@
       </template>
     </confirm-dialog>
 
-    <v-select
-      :items="fileTypes"
-      label="file type"
-      v-model="selectedFileType"
-      class="d-inline-block mx-2"
-    />
-    <download-template-button
-      class="mx-2"
-      :disabled="!selected.length"
-      :name="selected[0]?.title"
-      :type="selectedFileType"
-      :template="selected[0]"
-    />
-
     <v-autocomplete
       :filter="defaultFilterObject"
       label="Filter by SP"
@@ -84,7 +68,6 @@
 
     <nocloud-table
       table-name="plans"
-      single-select
       class="mt-4"
       :items="filtredPlans"
       :headers="headers"
@@ -111,6 +94,25 @@
           {{ instanceCountMap[item.uuid] }}
         </template>
       </template>
+
+      <template v-slot:footer.prepend>
+        <div class="d-flex align-center mt-2">
+          <v-select
+            style="width: 100px"
+            :items="fileTypes"
+            label="File type"
+            v-model="selectedFileType"
+            class="d-inline-block mx-2"
+          />
+          <download-template-button
+            class="mx-2"
+            :disabled="!selected.length"
+            name="selected_copy"
+            :type="selectedFileType"
+            :template="selected"
+          />
+        </div>
+      </template>
     </nocloud-table>
   </div>
 </template>

From d71dcf0be2bbb14d3066e51c87594512d9af4ce9 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Fri, 22 Sep 2023 00:45:38 +0400
Subject: [PATCH 024/123] fix empty transactions

---
 admin-ui/src/components/reports_table.vue | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/admin-ui/src/components/reports_table.vue b/admin-ui/src/components/reports_table.vue
index 6c2916442..47de1f14e 100644
--- a/admin-ui/src/components/reports_table.vue
+++ b/admin-ui/src/components/reports_table.vue
@@ -37,27 +37,18 @@
         <span>{{ new Date(value * 1000).toLocaleString() }}</span>
       </template>
       <template v-slot:[`item.service`]="{ value }">
-        <router-link
-          v-if="getService(value)"
-          :to="{ name: 'Service', params: { serviceId: value } }"
-        >
-          {{ getService(value).title }}
+        <router-link :to="{ name: 'Service', params: { serviceId: value } }">
+          {{ getService(value)?.title || value }}
         </router-link>
       </template>
       <template v-slot:[`item.instance`]="{ value }">
-        <router-link
-          v-if="getInstance(value)"
-          :to="{ name: 'Instance', params: { instanceId: value } }"
-        >
-          {{ getInstance(value).title }}
+        <router-link :to="{ name: 'Instance', params: { instanceId: value } }">
+          {{ getInstance(value)?.title || value }}
         </router-link>
       </template>
       <template v-slot:[`item.account`]="{ value }">
-        <router-link
-          v-if="getAccount(value)"
-          :to="{ name: 'Account', params: { accountId: value } }"
-        >
-          {{ getAccount(value).title }}
+        <router-link :to="{ name: 'Account', params: { accountId: value } }">
+          {{ getAccount(value)?.title || value }}
         </router-link>
       </template>
     </nocloud-table>

From 70c5cf360f61fde5dda88754ab09522b8e594bb0 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Fri, 22 Sep 2023 13:18:56 +0300
Subject: [PATCH 025/123] Fix

---
 pkg/oauth2/handlers/bitrix.go | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkg/oauth2/handlers/bitrix.go b/pkg/oauth2/handlers/bitrix.go
index a193494e0..8449b1acf 100644
--- a/pkg/oauth2/handlers/bitrix.go
+++ b/pkg/oauth2/handlers/bitrix.go
@@ -70,6 +70,7 @@ func (g *BitrixOauthHandler) Setup(
 			RedirectUrl: redirect,
 			Method:      "sign_in",
 		}
+		log.Debug("Put state", zap.Any("state", g.states[state]))
 		g.m.Unlock()
 
 		url := oauth2Config.AuthCodeURL(state)
@@ -88,10 +89,12 @@ func (g *BitrixOauthHandler) Setup(
 		authHeaderSplit := strings.Split(authHeader, " ")
 
 		if len(authHeaderSplit) != 2 {
+			log.Error("Len is not 2")
 			return
 		}
 
-		if authHeaderSplit[0] != "bearer" {
+		if strings.ToLower(authHeaderSplit[0]) != "bearer" {
+			log.Error("No bearer")
 			return
 		}
 
@@ -101,6 +104,7 @@ func (g *BitrixOauthHandler) Setup(
 			Token:       authHeaderSplit[1],
 			Method:      "link",
 		}
+		log.Debug("Put state", zap.Any("state", g.states[state]))
 		g.m.Unlock()
 
 		url := oauth2Config.AuthCodeURL(state)
@@ -124,6 +128,8 @@ func (g *BitrixOauthHandler) Setup(
 		}
 
 		stateInfo := g.states[state]
+
+		log.Debug("Get state", zap.Any("state", stateInfo))
 		delete(g.states, state)
 		g.m.Unlock()
 
@@ -156,6 +162,7 @@ func (g *BitrixOauthHandler) Setup(
 		}
 
 		if userInfo.Result == nil {
+			log.Error("No user info")
 			return
 		}
 

From 8f9bb4083bb85371f91a9c67e3c4e47bc9402295 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Fri, 22 Sep 2023 13:28:44 +0300
Subject: [PATCH 026/123] Fix

---
 pkg/oauth2/handlers/bitrix.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/oauth2/handlers/bitrix.go b/pkg/oauth2/handlers/bitrix.go
index 8449b1acf..99f09b5e5 100644
--- a/pkg/oauth2/handlers/bitrix.go
+++ b/pkg/oauth2/handlers/bitrix.go
@@ -204,7 +204,7 @@ func (g *BitrixOauthHandler) Setup(
 			resp, err := regClient.SetCredentials(ctx, &accounts.SetCredentialsRequest{
 				Account: acc,
 				Auth: &accounts.Credentials{
-					Type: "oauth2",
+					Type: "oauth2-bitrix",
 					Data: []string{
 						field,
 						value,

From a2e8434d184fcd964f1a023f59d09e1d4ba32d6a Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Fri, 22 Sep 2023 14:19:39 +0300
Subject: [PATCH 027/123] Fix

---
 pkg/oauth2/handlers/bitrix.go | 63 ++++++++++++++++++++++++++++++++---
 1 file changed, 58 insertions(+), 5 deletions(-)

diff --git a/pkg/oauth2/handlers/bitrix.go b/pkg/oauth2/handlers/bitrix.go
index 99f09b5e5..09fc8bd0c 100644
--- a/pkg/oauth2/handlers/bitrix.go
+++ b/pkg/oauth2/handlers/bitrix.go
@@ -17,6 +17,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/types/known/structpb"
 	"io"
 	"net/http"
 	"strings"
@@ -118,7 +119,6 @@ func (g *BitrixOauthHandler) Setup(
 	}))
 	router.Handle("/oauth/bitrix/checkout", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		state, code := r.FormValue("state"), r.FormValue("code")
-		var redirect string
 
 		g.m.Lock()
 
@@ -213,7 +213,7 @@ func (g *BitrixOauthHandler) Setup(
 			})
 
 			if err != nil {
-				log.Error("Failed create account", zap.Error(err))
+				log.Error("Failed set creds", zap.Error(err))
 				return
 			}
 
@@ -221,7 +221,39 @@ func (g *BitrixOauthHandler) Setup(
 				log.Error("False result")
 				return
 			}
-			http.Redirect(w, r, fmt.Sprintf("%s?token=%s", redirect, stateInfo.Token), http.StatusSeeOther)
+
+			get, err := regClient.Get(ctx, &accounts.GetRequest{
+				Uuid: acc,
+			})
+
+			if get.GetData() == nil {
+				get.Data = &structpb.Struct{
+					Fields: make(map[string]*structpb.Value),
+				}
+			}
+
+			if get.GetData().GetFields() == nil {
+				get.Data.Fields = map[string]*structpb.Value{}
+			}
+
+			_, ok := get.GetData().GetFields()["oauth_types"]
+
+			if !ok {
+				list, _ := structpb.NewList([]interface{}{
+					"oauth2-bitrix",
+				})
+				get.Data.Fields["oauth_types"] = structpb.NewListValue(list)
+			} else {
+				get.Data.GetFields()["oauth_types"].GetListValue().Values = append(get.Data.GetFields()["oauth_types"].GetListValue().GetValues(), structpb.NewStringValue("oauth2-bitrix"))
+			}
+
+			_, err = regClient.Update(ctx, get)
+			if err != nil {
+				log.Error("Failed to update")
+				return
+			}
+
+			http.Redirect(w, r, fmt.Sprintf("%s?token=%s", stateInfo.RedirectUrl, stateInfo.Token), http.StatusSeeOther)
 		} else {
 			resp, err := regClient.Token(ctx, &accounts.TokenRequest{
 				Auth: &accounts.Credentials{
@@ -234,7 +266,7 @@ func (g *BitrixOauthHandler) Setup(
 				Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
 			})
 			if err != nil {
-				_, err = regClient.Create(ctx, &accounts.CreateRequest{
+				create, err := regClient.Create(ctx, &accounts.CreateRequest{
 					Title:     fmt.Sprintf("%s %s", name, last_name),
 					Namespace: schema.ROOT_NAMESPACE_KEY,
 					Auth: &accounts.Credentials{
@@ -263,8 +295,29 @@ func (g *BitrixOauthHandler) Setup(
 					log.Error("Failed get token", zap.Error(err))
 					return
 				}
+
+				get, err := regClient.Get(ctx, &accounts.GetRequest{
+					Uuid: create.GetUuid(),
+				})
+
+				list, _ := structpb.NewList([]interface{}{
+					"oauth2-bitrix",
+				})
+				listValue := structpb.NewListValue(list)
+
+				get.Data = &structpb.Struct{
+					Fields: map[string]*structpb.Value{
+						"oauth_types": listValue,
+					},
+				}
+
+				_, err = regClient.Update(ctx, get)
+				if err != nil {
+					log.Error("Failed to update")
+					return
+				}
 			}
-			http.Redirect(w, r, fmt.Sprintf("%s?token=%s", redirect, resp.GetToken()), http.StatusSeeOther)
+			http.Redirect(w, r, fmt.Sprintf("%s?token=%s", stateInfo.RedirectUrl, resp.GetToken()), http.StatusSeeOther)
 		}
 	}))
 }

From e2e9d0ca9882d12a0e4bed95206493cde09b0709 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Fri, 22 Sep 2023 14:28:15 +0300
Subject: [PATCH 028/123] Fix

---
 pkg/oauth2/handlers/bitrix.go | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkg/oauth2/handlers/bitrix.go b/pkg/oauth2/handlers/bitrix.go
index 09fc8bd0c..7eea713f8 100644
--- a/pkg/oauth2/handlers/bitrix.go
+++ b/pkg/oauth2/handlers/bitrix.go
@@ -226,6 +226,11 @@ func (g *BitrixOauthHandler) Setup(
 				Uuid: acc,
 			})
 
+			if err != nil {
+				log.Error("Failed get acc", zap.Error(err))
+				return
+			}
+
 			if get.GetData() == nil {
 				get.Data = &structpb.Struct{
 					Fields: make(map[string]*structpb.Value),
@@ -300,6 +305,11 @@ func (g *BitrixOauthHandler) Setup(
 					Uuid: create.GetUuid(),
 				})
 
+				if err != nil {
+					log.Error("Failed get acc", zap.Error(err))
+					return
+				}
+
 				list, _ := structpb.NewList([]interface{}{
 					"oauth2-bitrix",
 				})

From abc23a61f89189af9a29af173fa0dd17951ae8d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 22 Sep 2023 15:28:42 +0200
Subject: [PATCH 029/123] Bump google.golang.org/grpc from 1.58.1 to 1.58.2
 (#1132)

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.58.1 to 1.58.2.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.58.1...v1.58.2)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index d5cd16edf..6736457fe 100644
--- a/go.mod
+++ b/go.mod
@@ -22,7 +22,7 @@ require (
 	go.uber.org/zap v1.26.0
 	golang.org/x/crypto v0.13.0
 	golang.org/x/oauth2 v0.12.0
-	google.golang.org/grpc v1.58.1
+	google.golang.org/grpc v1.58.2
 	google.golang.org/protobuf v1.31.0
 )
 
diff --git a/go.sum b/go.sum
index faaa54ac1..e0a1ff361 100644
--- a/go.sum
+++ b/go.sum
@@ -551,8 +551,8 @@ google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM
 google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
 google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.58.1 h1:OL+Vz23DTtrrldqHK49FUOPHyY75rvFqJfXC84NYW58=
-google.golang.org/grpc v1.58.1/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
+google.golang.org/grpc v1.58.2 h1:SXUpjxeVF3FKrTYQI4f4KvbGD5u2xccdYdurwowix5I=
+google.golang.org/grpc v1.58.2/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
 google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

From fac1e69df5267271b3b34a04d8b91299d47e79f5 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Fri, 22 Sep 2023 18:25:39 +0400
Subject: [PATCH 030/123] fix invoice total

---
 admin-ui/src/views/TransactionsCreate.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-ui/src/views/TransactionsCreate.vue b/admin-ui/src/views/TransactionsCreate.vue
index 3c365ac66..73a225312 100644
--- a/admin-ui/src/views/TransactionsCreate.vue
+++ b/admin-ui/src/views/TransactionsCreate.vue
@@ -244,13 +244,13 @@ export default {
         id: 1,
         value: "invoice",
         title: "Invoice",
-        amount: { title: "Top-up invoice (with balance change)", value: true },
+        amount: { title: "Top-up invoice (with balance change)", value: false },
       },
       {
         id: 2,
         value: "invoice",
         title: "Invoice",
-        amount: { title: "Payment invoice (no balance change)", value: false },
+        amount: { title: "Payment invoice (no balance change)", value: true },
       },
       {
         id: 3,

From 31f377ac886c8c6851af19ce74ada15af39e7a7e Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Mon, 25 Sep 2023 11:25:16 +0400
Subject: [PATCH 031/123] delete in & reset search

---
 admin-ui/src/components/search/search.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-ui/src/components/search/search.vue b/admin-ui/src/components/search/search.vue
index fab4f25a5..d0995f810 100644
--- a/admin-ui/src/components/search/search.vue
+++ b/admin-ui/src/components/search/search.vue
@@ -102,7 +102,7 @@
                       {{ searchParam || "" }}
                     </span>
                     <div>
-                      <span> in {{ item.title }} </span>
+                      <span> {{ item.title }} </span>
                       <v-btn
                         v-if="variants[item.key].items"
                         @click.stop="selectGroup(item)"
@@ -201,7 +201,7 @@ export default {
         },
       });
 
-      this.close();
+      this.searchParam = "";
     },
     selectGroup({ key }) {
       this.selectedGroupKey = key;

From 8c6e187d2376d0d6d6330f1095827d8e92e6e6a6 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Mon, 25 Sep 2023 11:32:43 +0400
Subject: [PATCH 032/123] fix tags dublicate

---
 admin-ui/src/components/search/search.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/admin-ui/src/components/search/search.vue b/admin-ui/src/components/search/search.vue
index d0995f810..c1bb049f8 100644
--- a/admin-ui/src/components/search/search.vue
+++ b/admin-ui/src/components/search/search.vue
@@ -290,10 +290,12 @@ export default {
       return values;
     },
     filteredCustomParamsValues() {
+      const params = this.customParamsValues.filter((a, i) => i > 0);
+
       if (!this.tagsSearchParam) {
-        return this.customParamsValues;
+        return params;
       }
-      return this.customParamsValues.filter((c) =>
+      return params.filter((c) =>
         c.title.toLowerCase().includes(this.tagsSearchParam.toLowerCase())
       );
     },

From 5ec1303c7c5d704c30138063f50c783563548360 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Mon, 25 Sep 2023 12:20:12 +0400
Subject: [PATCH 033/123] fix showed/filtred tags

---
 admin-ui/src/components/search/search.vue | 40 ++++++++++++++++++-----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/admin-ui/src/components/search/search.vue b/admin-ui/src/components/search/search.vue
index c1bb049f8..5c3da4d33 100644
--- a/admin-ui/src/components/search/search.vue
+++ b/admin-ui/src/components/search/search.vue
@@ -32,14 +32,17 @@
           </template>
 
           <template v-slot:append>
-            <search-tag
-              v-if="customParamsValues.length"
-              :param="customParamsValues[0]"
-              :variants="variants"
-            />
+            <div class="d-flex" v-if="customParamsValues.length">
+              <search-tag
+                v-for="param in showedCustomParams"
+                :key="param.value"
+                :param="param"
+                :variants="variants"
+              />
+            </div>
             <v-menu
               :close-on-content-click="false"
-              v-if="customParamsValues.length > 1"
+              v-if="filteredCustomParamsValues.length > 1"
               offset-y
               min-height="300px"
               max-height="300px"
@@ -54,7 +57,7 @@
                   outlined
                   v-on="on"
                 >
-                  +{{ customParamsValues.length - 1 }}
+                  +{{ filteredCustomParamsValues.length }}
                 </v-chip>
               </template>
               <v-card class="px-3" color="background-light">
@@ -289,8 +292,29 @@ export default {
 
       return values;
     },
+    showedCustomParams() {
+      const showed = [];
+      const maxLength = Math.floor(((window.innerWidth / 12) * 6) / 15);
+      let currLength = 0;
+
+      for (const param of this.customParamsValues) {
+        const title = param.isArray
+          ? `${this.variants[param.key]?.title || ""}:${param?.title}`
+          : param.title;
+        if (title.length + currLength < maxLength) {
+          currLength += title.length;
+          showed.push(param);
+        } else {
+          break;
+        }
+      }
+
+      return showed;
+    },
     filteredCustomParamsValues() {
-      const params = this.customParamsValues.filter((a, i) => i > 0);
+      const params = this.customParamsValues.filter(
+        (a, i) => i > this.showedCustomParams.length
+      );
 
       if (!this.tagsSearchParam) {
         return params;

From b7e27970bad505e44ada609d3ba533e2cae950f8 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Mon, 25 Sep 2023 12:21:50 +0400
Subject: [PATCH 034/123] change anywherer to other

---
 admin-ui/src/store/appSearch.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-ui/src/store/appSearch.js b/admin-ui/src/store/appSearch.js
index 4fa09fb52..f70c82d3f 100644
--- a/admin-ui/src/store/appSearch.js
+++ b/admin-ui/src/store/appSearch.js
@@ -70,7 +70,7 @@ export default {
     variants(state) {
       const variants = { ...state.variants };
       if (Object.keys(variants).length) {
-        variants["searchParam"] = { title: "Anywhere", key: "searchParam" };
+        variants["searchParam"] = { title: "Other", key: "searchParam" };
       }
       return variants;
     },

From b29c41df980702dddce994ff90d0a6d7d44c6544 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Mon, 25 Sep 2023 12:22:02 +0400
Subject: [PATCH 035/123] expnad search with

---
 admin-ui/src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-ui/src/App.vue b/admin-ui/src/App.vue
index b8c78aecd..05318f444 100644
--- a/admin-ui/src/App.vue
+++ b/admin-ui/src/App.vue
@@ -259,7 +259,7 @@
 
     <v-app-bar v-if="isLoggedIn" app color="background" elevation="0">
       <v-row style="width: 100%" justify="center" align="center">
-        <v-col cols="5">
+        <v-col cols="8">
           <app-search />
         </v-col>
         <v-col class="d-flex justify-start">

From 12075862dd22fbcd5e3c49b155326149cd646dd5 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Mon, 25 Sep 2023 12:23:28 +0400
Subject: [PATCH 036/123] fix reset after search

---
 admin-ui/src/components/search/search.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/admin-ui/src/components/search/search.vue b/admin-ui/src/components/search/search.vue
index 5c3da4d33..798aa9d7e 100644
--- a/admin-ui/src/components/search/search.vue
+++ b/admin-ui/src/components/search/search.vue
@@ -171,6 +171,7 @@ export default {
       }
       if (isSearchParam) {
         this.close();
+        this.searchParam = "";
       }
     },
     setEntity(index) {

From c4c333bacbf3fce293b73da7a2b3d74c11007917 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Mon, 25 Sep 2023 12:25:35 +0400
Subject: [PATCH 037/123] change search icon to right icon

---
 admin-ui/src/components/search/search.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-ui/src/components/search/search.vue b/admin-ui/src/components/search/search.vue
index 798aa9d7e..533dc15ac 100644
--- a/admin-ui/src/components/search/search.vue
+++ b/admin-ui/src/components/search/search.vue
@@ -111,7 +111,7 @@
                         @click.stop="selectGroup(item)"
                         icon
                       >
-                        <v-icon>mdi-magnify</v-icon>
+                        <v-icon>mdi-arrow-right</v-icon>
                       </v-btn>
                     </div>
                   </div>

From fdcb50d36925eeed79fbc18b53b147070e9c34de Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Sep 2023 15:29:19 +0200
Subject: [PATCH 038/123] Bump WillAbides/setup-go-faster from 1.11.0 to 1.12.0
 (#1134)

Bumps [WillAbides/setup-go-faster](https://github.com/willabides/setup-go-faster) from 1.11.0 to 1.12.0.
- [Release notes](https://github.com/willabides/setup-go-faster/releases)
- [Commits](https://github.com/willabides/setup-go-faster/compare/v1.11.0...v1.12.0)

---
updated-dependencies:
- dependency-name: WillAbides/setup-go-faster
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/checks.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 3dd1f66f9..78e64002e 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -23,7 +23,7 @@ jobs:
         with:
           fetch-depth: 1
       - name: Setup Go
-        uses: WillAbides/setup-go-faster@v1.11.0
+        uses: WillAbides/setup-go-faster@v1.12.0
         with:
           go-version: 1.19
       - name: Static Check

From 442c9804cccfd5f579661faedad477076855228b Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Mon, 25 Sep 2023 18:26:58 +0400
Subject: [PATCH 039/123] add GB prefix

---
 admin-ui/src/components/modules/ione/planConfiguration.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/admin-ui/src/components/modules/ione/planConfiguration.vue b/admin-ui/src/components/modules/ione/planConfiguration.vue
index f02128e5a..ecf7345a8 100644
--- a/admin-ui/src/components/modules/ione/planConfiguration.vue
+++ b/admin-ui/src/components/modules/ione/planConfiguration.vue
@@ -5,6 +5,7 @@
         <v-text-field
           label="Minimum disk size"
           type="number"
+          suffix="GB"
           v-model="meta.minDisk"
         />
       </v-col>
@@ -12,6 +13,7 @@
         <v-text-field
           label="Maximum disk size"
           type="number"
+          suffix="GB"
           v-model="meta.maxDisk"
         />
       </v-col>
@@ -54,7 +56,7 @@ export default {
     },
   },
   mounted() {
-    this.meta=this.template.meta
+    this.meta = this.template.meta;
   },
   watch: {
     "template.meta"(newVal) {
@@ -64,4 +66,4 @@ export default {
 };
 </script>
 
-<style scoped lang="scss"></style>
\ No newline at end of file
+<style scoped lang="scss"></style>

From 7315885e26d96b83bdce05f4901bc47e044c6883 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Mon, 25 Sep 2023 18:44:51 +0400
Subject: [PATCH 040/123] fix reports table duration

---
 admin-ui/src/components/account/reports.vue  |  7 ++++-
 admin-ui/src/components/instance/reports.vue |  7 ++++-
 admin-ui/src/components/reports_table.vue    | 32 ++++++++++++++------
 admin-ui/src/components/service/reports.vue  |  7 ++++-
 4 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/admin-ui/src/components/account/reports.vue b/admin-ui/src/components/account/reports.vue
index 4f8330e78..364b01a10 100644
--- a/admin-ui/src/components/account/reports.vue
+++ b/admin-ui/src/components/account/reports.vue
@@ -2,18 +2,23 @@
   <reports_table
     table-name="reports"
     hide-account
+    :duration="duration"
+    @input:duration="duration = $event"
     :filters="filters"
     hide-service
+    show-dates
   />
 </template>
 
 <script setup>
-import { toRefs, computed } from "vue";
+import { toRefs, computed, ref } from "vue";
 import Reports_table from "@/components/reports_table.vue";
 
 const props = defineProps(["account"]);
 const { account } = toRefs(props);
 
+const duration = ref({ to: null, from: null });
+
 const filters = computed(() => {
   return {
     account: [account.value.uuid],
diff --git a/admin-ui/src/components/instance/reports.vue b/admin-ui/src/components/instance/reports.vue
index 35c9149b8..845349d77 100644
--- a/admin-ui/src/components/instance/reports.vue
+++ b/admin-ui/src/components/instance/reports.vue
@@ -5,16 +5,21 @@
     hide-instance
     hide-service
     :filters="filters"
+    show-dates
+    :duration="duration"
+    @input:duration="duration = $event"
   />
 </template>
 
 <script setup>
-import { toRefs, computed } from "vue";
+import { toRefs, computed, ref } from "vue";
 import Reports_table from "@/components/reports_table.vue";
 
 const props = defineProps(["template"]);
 const { template } = toRefs(props);
 
+const duration = ref({ to: null, from: null });
+
 const filters = computed(() => {
   return {
     instance: [template.value.uuid],
diff --git a/admin-ui/src/components/reports_table.vue b/admin-ui/src/components/reports_table.vue
index 47de1f14e..ce0be6c95 100644
--- a/admin-ui/src/components/reports_table.vue
+++ b/admin-ui/src/components/reports_table.vue
@@ -1,11 +1,19 @@
 <template>
   <v-card elevation="0" color="background-light" class="pa-4">
-    <v-row>
+    <v-row v-if="showDates">
       <div style="max-width: 300px" class="mx-3">
-        <date-picker label="from" v-model="durationFilter.from" />
+        <date-picker
+          label="from"
+          :value="duration.from"
+          @input="emit('input:duration', { ...duration, from: $event })"
+        />
       </div>
       <div style="max-width: 300px" class="mx-3">
-        <date-picker label="to" v-model="durationFilter.to" />
+        <date-picker
+          label="to"
+          :value="duration.to"
+          @input="emit('input:duration', { ...duration, to: $event })"
+        />
       </div>
     </v-row>
     <nocloud-table
@@ -70,8 +78,13 @@ const props = defineProps({
   hideService: { type: Boolean, default: false },
   selectRecord: { type: Function, default: () => {} },
   tableName: { type: String },
+  showDates: { type: Boolean, default: false },
+  duration: { type: Object, default: () => ({ from: null, to: null }) },
 });
-const { filters, hideInstance, hideService, hideAccount } = toRefs(props);
+const { filters, hideInstance, hideService, hideAccount, duration, showDates } =
+  toRefs(props);
+
+const emit = defineEmits(["input:duration"]);
 
 const store = useStore();
 const { rates, convertFrom, defaultCurrency } = useCurrency();
@@ -84,7 +97,6 @@ const isCountLoading = ref(false);
 const fetchError = ref("");
 const options = ref({});
 const itemsPerPageOptions = ref([5, 10, 15, 25]);
-const durationFilter = ref({ to: "", from: "" });
 
 const reportsHeaders = computed(() => {
   const headers = [
@@ -122,11 +134,11 @@ const requestOptions = computed(() => ({
   limit: options.value.itemsPerPage,
   field: options.value.sortBy[0],
   sort: options.value.sortBy[0] && options.value.sortDesc[0] ? "DESC" : "ASC",
-  from: durationFilter.value.from
-    ? new Date(durationFilter.value.from).getTime() / 1000
+  from: duration.value.from
+    ? new Date(duration.value.from).getTime() / 1000
     : undefined,
-  to: durationFilter.value.to
-    ? new Date(durationFilter.value.to).getTime() / 1000
+  to: duration.value.to
+    ? new Date(duration.value.to).getTime() / 1000
     : undefined,
 }));
 
@@ -194,7 +206,7 @@ watch(rates, () => {
 });
 
 watch(
-  durationFilter,
+  duration,
   () => {
     onUpdateOptions(options.value);
   },
diff --git a/admin-ui/src/components/service/reports.vue b/admin-ui/src/components/service/reports.vue
index 79c2d151f..4511f9838 100644
--- a/admin-ui/src/components/service/reports.vue
+++ b/admin-ui/src/components/service/reports.vue
@@ -4,16 +4,21 @@
     hide-account
     hide-service
     :filters="filters"
+    show-dates
+    :duration="duration"
+    @input:duration="duration = $event"
   />
 </template>
 
 <script setup>
-import { toRefs, computed } from "vue";
+import { toRefs, computed, ref } from "vue";
 import Reports_table from "@/components/reports_table.vue";
 
 const props = defineProps(["service"]);
 const { service } = toRefs(props);
 
+const duration = ref({ to: null, from: null });
+
 const filters = computed(() => {
   return {
     service: [service.value.uuid],

From e81799d5138f2d8cf4ead68afeb77f693206b8c1 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Mon, 25 Sep 2023 18:45:13 +0400
Subject: [PATCH 041/123] move duration in transactions

---
 admin-ui/src/views/Transactions.vue | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/admin-ui/src/views/Transactions.vue b/admin-ui/src/views/Transactions.vue
index 184114d23..ad54abb7c 100644
--- a/admin-ui/src/views/Transactions.vue
+++ b/admin-ui/src/views/Transactions.vue
@@ -8,6 +8,13 @@
       Create
     </v-btn>
 
+    <div style="max-width: 300px" class="mx-3 d-inline-block">
+      <date-picker label="from" v-model="duration.from" />
+    </div>
+    <div style="max-width: 300px" class="mx-3 d-inline-block">
+      <date-picker label="to" v-model="duration.to" />
+    </div>
+
     <v-autocomplete
       :filter="defaultFilterObject"
       label="Account"
@@ -51,6 +58,7 @@
       v-if="!isInitLoading"
       table-name="transaction-table"
       :filters="filters"
+      :duration="duration"
       :select-record="selectTransaction"
     />
   </div>
@@ -64,9 +72,10 @@ import apexcharts from "vue-apexcharts";
 import { defaultFilterObject } from "@/functions";
 import { mapGetters } from "vuex";
 import reportsTable from "@/components/reports_table.vue";
+import DatePicker from "@/components/ui/datePicker.vue";
 export default {
   name: "transactions-view",
-  components: { reportsTable, apexcharts },
+  components: { DatePicker, reportsTable, apexcharts },
   mixins: [snackbar, search],
   data: () => ({
     accountId: null,
@@ -83,6 +92,7 @@ export default {
       theme: { palette: "palette10", mode: "dark" },
       legend: { showForSingleSeries: true },
     },
+    duration: { to: null, from: null },
   }),
   methods: {
     defaultFilterObject,

From a8c70e101ad6474737be73aad45d4e1391a88c5e Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Mon, 25 Sep 2023 23:19:20 +0300
Subject: [PATCH 042/123] Update transaction creation

---
 pkg/billing/transactions.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/billing/transactions.go b/pkg/billing/transactions.go
index fbeaf9483..7325f0616 100644
--- a/pkg/billing/transactions.go
+++ b/pkg/billing/transactions.go
@@ -191,6 +191,7 @@ func (s *BillingServiceServer) CreateTransaction(ctx context.Context, t *pb.Tran
 		Currency:  t.GetCurrency(),
 		Service:   t.GetService(),
 		Account:   t.GetAccount(),
+		Meta:      t.GetMeta(),
 	})
 
 	if t.GetRecords() == nil {

From e77b1cd65d22d8335d4e868381e0190e12bd6bdb Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 26 Sep 2023 11:22:18 +0400
Subject: [PATCH 043/123] add account prce

---
 admin-ui/src/components/instances_table.vue | 42 ++++++++++++++++++---
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/admin-ui/src/components/instances_table.vue b/admin-ui/src/components/instances_table.vue
index 771942afa..9041df2c9 100644
--- a/admin-ui/src/components/instances_table.vue
+++ b/admin-ui/src/components/instances_table.vue
@@ -61,7 +61,11 @@
     </template>
 
     <template v-slot:[`item.price`]="{ item }">
-      {{ getValue("price", item) }} {{ currency }}
+      {{ getValue("price", item) }}
+    </template>
+
+    <template v-slot:[`item.accountPrice`]="{ item }">
+      {{ getValue("accountPrice", item) }}
     </template>
 
     <template v-slot:[`item.period`]="{ item }">
@@ -275,6 +279,26 @@ export default {
         }
       }
     },
+    getNcuPrice(inst) {
+      return this.getPrice(inst) + " " + this.defaultCurrency;
+    },
+    getAccountPrice(inst) {
+      const accountCurrency = this.getAccount(inst)?.currency;
+
+      return (
+        (this.getPrice(inst) * this.getRate(accountCurrency)).toFixed(2) +
+        " " +
+        accountCurrency
+      );
+    },
+    getRate(currency) {
+      if (this.defaultCurrency === currency) {
+        return 1;
+      }
+      return this.rates.find(
+        (r) => r.to === currency && r.from === this.defaultCurrency
+      )?.rate;
+    },
     getPeriod(inst) {
       if (inst.type === "ione" && inst.billingPlan.kind === "DYNAMIC") {
         return "PayG";
@@ -387,6 +411,7 @@ export default {
         "billingPlan.title",
         "account.data.email",
         "price",
+        "accountPrice",
         "state.meta.networking.public",
       ];
       const instances = this.items.filter((i) => {
@@ -474,7 +499,8 @@ export default {
         { text: "Tariff", value: "product" },
         { text: "Service provider", value: "sp" },
         { text: "Type", value: "type" },
-        { text: "Price", value: "price" },
+        { text: "NCU price", value: "price" },
+        { text: "Account price", value: "accountPrice" },
         { text: "Period", value: "period" },
         { text: "Email", value: "email" },
         { text: "Date", value: "date" },
@@ -498,7 +524,8 @@ export default {
         email: this.getEmail,
         state: getState,
         product: (item) => item.product ?? this.getTariff(item) ?? "custom",
-        price: this.getPrice,
+        price: this.getNcuPrice,
+        accountPrice: this.getAccountPrice,
         period: this.getPeriod,
         date: this.getCreationDate,
         dueDate: this.getExpirationDate,
@@ -514,9 +541,6 @@ export default {
     isLoading() {
       return this.$store.getters["services/isLoading"];
     },
-    currency() {
-      return this.$store.getters["currencies/default"];
-    },
     priceModelItems() {
       return [
         ...new Set(
@@ -602,6 +626,12 @@ export default {
         },
       };
     },
+    rates() {
+      return this.$store.getters["currencies/rates"];
+    },
+    defaultCurrency() {
+      return this.$store.getters["currencies/default"];
+    },
   },
   watch: {
     instances() {

From 80c78bd834137131cee7821b169b93300ec5b6bf Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 26 Sep 2023 11:33:14 +0400
Subject: [PATCH 044/123] fix transaction types

---
 admin-ui/src/views/TransactionsCreate.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin-ui/src/views/TransactionsCreate.vue b/admin-ui/src/views/TransactionsCreate.vue
index 73a225312..09d85c585 100644
--- a/admin-ui/src/views/TransactionsCreate.vue
+++ b/admin-ui/src/views/TransactionsCreate.vue
@@ -244,13 +244,13 @@ export default {
         id: 1,
         value: "invoice",
         title: "Invoice",
-        amount: { title: "Top-up invoice (with balance change)", value: false },
+        amount: { title: "Payment invoice (no balance change)", value: true },
       },
       {
         id: 2,
         value: "invoice",
         title: "Invoice",
-        amount: { title: "Payment invoice (no balance change)", value: true },
+        amount: { title: "Top-up invoice (with balance change)", value: false },
       },
       {
         id: 3,
@@ -300,8 +300,8 @@ export default {
           total = amountType ? total : -total;
           if (this.isInvoice) {
             this.transaction.meta.invoiceType = amountType
-              ? "top-up"
-              : "payment";
+              ? "payment"
+              : "top-up";
           }
         }
 

From ad7d3f25ae65b54f5f6088ece240f0cac29bff0f Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Tue, 26 Sep 2023 10:36:44 +0300
Subject: [PATCH 045/123] Fix record meta

---
 pkg/billing/transactions.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkg/billing/transactions.go b/pkg/billing/transactions.go
index 7325f0616..3378d445d 100644
--- a/pkg/billing/transactions.go
+++ b/pkg/billing/transactions.go
@@ -191,7 +191,9 @@ func (s *BillingServiceServer) CreateTransaction(ctx context.Context, t *pb.Tran
 		Currency:  t.GetCurrency(),
 		Service:   t.GetService(),
 		Account:   t.GetAccount(),
-		Meta:      t.GetMeta(),
+		Meta: map[string]*structpb.Value{
+			"transactionType": t.Meta["transactionType"],
+		},
 	})
 
 	if t.GetRecords() == nil {

From 10fef38e559ff2e064da9ac6c630b2fee69b2be6 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 26 Sep 2023 11:45:21 +0400
Subject: [PATCH 046/123] make admin note not required in invoice

---
 admin-ui/src/views/TransactionsCreate.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/admin-ui/src/views/TransactionsCreate.vue b/admin-ui/src/views/TransactionsCreate.vue
index 09d85c585..2e4973bec 100644
--- a/admin-ui/src/views/TransactionsCreate.vue
+++ b/admin-ui/src/views/TransactionsCreate.vue
@@ -162,7 +162,6 @@
             <v-textarea
               no-resize
               label="Admin note"
-              :rules="generalRule"
               v-model="transaction.meta.note"
             ></v-textarea>
           </v-row>

From fb3e8418a674e711651d00d8d386f68e72fcf47e Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 26 Sep 2023 12:48:15 +0400
Subject: [PATCH 047/123] change transaction type & send fetch to whmcs if
 invoice

---
 admin-ui/src/views/TransactionsCreate.vue | 95 +++++++++++++++++------
 1 file changed, 71 insertions(+), 24 deletions(-)

diff --git a/admin-ui/src/views/TransactionsCreate.vue b/admin-ui/src/views/TransactionsCreate.vue
index 2e4973bec..5cfb232fc 100644
--- a/admin-ui/src/views/TransactionsCreate.vue
+++ b/admin-ui/src/views/TransactionsCreate.vue
@@ -222,7 +222,7 @@ export default {
       service: "",
       total: "",
       exec: 0,
-      meta: { instances: [], description: "", type: "" },
+      meta: { instances: [], description: "", transactionType: "" },
     },
     date: {
       title: "Date",
@@ -271,9 +271,24 @@ export default {
       },
     ],
     typeId: 4,
+
+    whmcsApi: "",
   }),
   methods: {
     defaultFilterObject,
+    sendTransactionType() {
+      let amount = "";
+
+      if (this.fullType.amount.value === null) {
+        amount = "account";
+      } else {
+        amount = this.fullType.amount.value ? "payment" : "top-up";
+      }
+      this.transaction.meta.transactionType = [
+        this.fullType.value,
+        amount,
+      ].join(" ");
+    },
     async tryToSend() {
       if (!this.isValid) {
         this.$refs.form.validate();
@@ -297,19 +312,44 @@ export default {
         } else {
           total = Math.abs(total);
           total = amountType ? total : -total;
-          if (this.isInvoice) {
-            this.transaction.meta.invoiceType = amountType
-              ? "payment"
-              : "top-up";
-          }
         }
 
-        await api.transactions.create({
-          ...this.transaction,
-          account: this.transaction.account.uuid,
-          total,
-          currency: this.transaction.account.currency,
-        });
+        const promises = [];
+        promises.push(
+          api.transactions.create({
+            ...this.transaction,
+            account: this.transaction.account.uuid,
+            total,
+            currency: this.transaction.account.currency,
+          })
+        );
+
+        if (this.transaction.meta.transactionType.startsWith("invoice")) {
+          console.log(
+            /https:\/\/(.+?\.?\/)/.exec(this.whmcsApi)[0] +
+              `modules/addons/nocloud/api/index.php?run=create_invoice&account=${
+                this.transaction.account.uuid
+              }&total=${this.transaction.total}&type=${
+                this.transaction.meta.transactionType.split(" ")[1]
+              }&description=${
+                this.transaction.meta.description
+              }&is_email=${!!this.transaction.meta.sendEmail}`
+          );
+          promises.push(
+            fetch(
+              /https:\/\/(.+?\.?\/)/.exec(this.whmcsApi)[0] +
+                `modules/addons/nocloud/api/index.php?run=create_invoice&account=${
+                  this.transaction.account.uuid
+                }&total=${this.transaction.total}&type=${
+                  this.transaction.meta.transactionType.split(" ")[1]
+                }&description=${
+                  this.transaction.meta.description
+                }&is_email=${!!this.transaction.meta.sendEmail}`
+            )
+          );
+        }
+
+        await Promise.all(promises);
         this.showSnackbarSuccess({
           message: "Transaction created successfully",
         });
@@ -354,29 +394,34 @@ export default {
       this.time.value = `${time}`;
     },
   },
-  created() {
+  async created() {
     this.initDate();
-    this.transaction.meta.type = this.fullType.value;
+    this.sendTransactionType();
 
     if (this.accounts.length < 2) {
       this.$store.dispatch("accounts/fetch");
     }
 
-    this.$store.dispatch("namespaces/fetch");
-    this.$store
-      .dispatch("services/fetch")
+    await Promise.all([
+      this.$store.dispatch("settings/fetch"),
+      this.$store.dispatch("namespaces/fetch"),
+      this.$store.dispatch("services/fetch"),
+    ])
       .then(() => {
         this.fetchError = "";
+        this.whmcsApi = JSON.parse(
+          this.settings.find(({ key }) => key === "whmcs").value
+        ).api;
       })
       .catch((err) => {
-        console.error(err);
-
-        this.fetchError = "Can't reach the server";
+        let fetchError = "Can't reach the server";
         if (err.response) {
-          this.fetchError += `: [ERROR]: ${err.response.data.message}`;
+          fetchError += `: [ERROR]: ${err.response.data.message}`;
         } else {
-          this.fetchError += `: [ERROR]: ${err.toJSON().message}`;
+          fetchError += `: [ERROR]: ${err.toJSON().message}`;
         }
+
+        this.showSnackbarError({ message: fetchError });
       });
   },
   computed: {
@@ -389,6 +434,9 @@ export default {
     services() {
       return this.$store.getters["services/all"];
     },
+    settings() {
+      return this.$store.getters["settings/all"];
+    },
     defaultCurrency() {
       return this.$store.getters["currencies/default"];
     },
@@ -459,14 +507,13 @@ export default {
       this.transaction.meta.instances = [];
     },
     typeId() {
-      this.transaction.meta.type = this.fullType.value;
+      this.sendTransactionType();
       if (this.isInvoice) {
         this.transaction.service = undefined;
         this.resetDate();
       } else if (this.isTransaction) {
         this.transaction.meta.note = undefined;
         this.transaction.meta.sendEmail = undefined;
-        this.transaction.meta.invoiceType = undefined;
         this.initDate();
       }
     },

From 8c1315e597c91df9f60712f9dd4fb15a9e986135 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Tue, 26 Sep 2023 11:48:47 +0300
Subject: [PATCH 048/123] Fix

---
 pkg/billing/transactions.go | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkg/billing/transactions.go b/pkg/billing/transactions.go
index 3378d445d..d38a30f09 100644
--- a/pkg/billing/transactions.go
+++ b/pkg/billing/transactions.go
@@ -181,6 +181,14 @@ func (s *BillingServiceServer) CreateTransaction(ctx context.Context, t *pb.Tran
 		t.Meta["type"] = structpb.NewStringValue("transaction")
 	}
 
+	meta := map[string]*structpb.Value{}
+
+	trType, ok := t.Meta["transactionType"]
+
+	if ok {
+		meta["transactionType"] = trType
+	}
+
 	rec := s.records.Create(ctx, &pb.Record{
 		Start:     time.Now().Unix(),
 		End:       time.Now().Unix() + 1,
@@ -191,9 +199,7 @@ func (s *BillingServiceServer) CreateTransaction(ctx context.Context, t *pb.Tran
 		Currency:  t.GetCurrency(),
 		Service:   t.GetService(),
 		Account:   t.GetAccount(),
-		Meta: map[string]*structpb.Value{
-			"transactionType": t.Meta["transactionType"],
-		},
+		Meta:      meta,
 	})
 
 	if t.GetRecords() == nil {

From 6521057c45f8362d54e7b86cd155bdac8e70df33 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 26 Sep 2023 13:41:55 +0400
Subject: [PATCH 049/123] fix empty addons

---
 admin-ui/src/components/ui/billingLabel.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-ui/src/components/ui/billingLabel.vue b/admin-ui/src/components/ui/billingLabel.vue
index ec8a7f557..236b8dfd5 100644
--- a/admin-ui/src/components/ui/billingLabel.vue
+++ b/admin-ui/src/components/ui/billingLabel.vue
@@ -64,7 +64,7 @@ const accountCurrency = computed(() => {
 });
 
 const price = computed(() => {
-  const addonsSum = Object.values(addonsPrice.value).reduce((a, b) => a + b);
+  const addonsSum = Object.values(addonsPrice.value).reduce((a, b) => a + b, 0);
 
   return convertTo(tariffPrice.value + addonsSum, accountCurrency.value);
 });

From 02868a0ca421d1cb0d540916692e6588688641c4 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 26 Sep 2023 13:42:14 +0400
Subject: [PATCH 050/123] add virtual billing label

---
 .../modules/virtual/billingLabel.vue          | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 admin-ui/src/components/modules/virtual/billingLabel.vue

diff --git a/admin-ui/src/components/modules/virtual/billingLabel.vue b/admin-ui/src/components/modules/virtual/billingLabel.vue
new file mode 100644
index 000000000..c86ff6681
--- /dev/null
+++ b/admin-ui/src/components/modules/virtual/billingLabel.vue
@@ -0,0 +1,44 @@
+<template>
+  <billing-label
+    :due-date="dueDate"
+    :tariff-price="tariffPrice"
+    :template="template"
+    :addons-price="{}"
+    :account="account"
+  />
+</template>
+
+<script setup>
+import { computed, toRefs } from "vue";
+import { formatSecondsToDate } from "@/functions";
+import billingLabel from "@/components/ui/billingLabel.vue";
+import { useStore } from "@/store";
+
+const props = defineProps(["template"]);
+
+const { template } = toRefs(props);
+
+const store = useStore();
+
+const account = computed(() => {
+  const namespace = store.getters["namespaces/all"]?.find(
+    (n) => n.uuid === template.value.access.namespace
+  );
+  const account = store.getters["accounts/all"].find(
+    (a) => a.uuid === namespace.access.namespace
+  );
+  return account;
+});
+
+const dueDate = computed(() => {
+  return formatSecondsToDate(+props.template?.data?.next_payment_date);
+});
+
+const tariffPrice = computed(() => {
+  const key = props.template.product;
+
+  return props.template.billingPlan.products[key]?.price ?? 0;
+});
+</script>
+
+<style scoped></style>

From d1847e34e5a222d2cfdaf981e9bf6edd7a4329af Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 26 Sep 2023 14:21:02 +0400
Subject: [PATCH 051/123] fix next payment date

---
 .../components/dialogs/changeMonitorings.vue  | 61 +++++++------------
 admin-ui/src/components/instances_table.vue   |  4 +-
 .../components/modules/ione/billingInfo.vue   |  5 +-
 .../components/modules/ione/billingLabel.vue  |  5 +-
 .../components/modules/ovh/billingInfo.vue    |  8 +--
 .../components/modules/ovh/billingLabel.vue   |  9 +--
 .../modules/virtual/billingInfo.vue           |  2 +-
 7 files changed, 29 insertions(+), 65 deletions(-)

diff --git a/admin-ui/src/components/dialogs/changeMonitorings.vue b/admin-ui/src/components/dialogs/changeMonitorings.vue
index 6ae19e4cc..7256f7a34 100644
--- a/admin-ui/src/components/dialogs/changeMonitorings.vue
+++ b/admin-ui/src/components/dialogs/changeMonitorings.vue
@@ -8,12 +8,12 @@
     <v-card class="pa-5">
       <v-card-title class="text-center">Change next payment dates</v-card-title>
       <div v-if="!isChangeAll">
-        <v-row v-for="key in Object.keys(lastMonitorings || {})" :key="key">
+        <v-row v-for="key in Object.keys(nextPaymentDates || {})" :key="key">
           <v-col cols="4">
-            <v-card-title>{{ lastMonitorings[key].title }}</v-card-title>
+            <v-card-title>{{ nextPaymentDates[key].title }}</v-card-title>
           </v-col>
           <v-col cols="8">
-            <date-picker :min="min" v-model="lastMonitorings[key].value" />
+            <date-picker :min="min" v-model="nextPaymentDates[key].value" />
           </v-col>
         </v-row>
       </div>
@@ -56,33 +56,22 @@ const store = useStore();
 const { template, service } = toRefs(props);
 const changeDatesLoading = ref(false);
 const isChangeAll = ref(true);
-const lastMonitorings = ref({});
+const nextPaymentDates = ref({});
 const newAllDate = ref();
 const min = ref();
 
-const setLastMonitorings = () => {
+const setNextPaymentDate = () => {
   const data = JSON.parse(JSON.stringify(template.value.data));
 
   const monitorings = {};
 
   Object.keys(data).forEach((key) => {
-    if (key.includes("last_monitoring") && data[key]) {
+    if (key.includes("next_payment_date") && data[key]) {
       const title = key
-        .replace("_last_monitoring", "")
-        .replace("last_monitoring", "product");
+        .replace("_next_payment_date", "")
+        .replace("next_payment_date", "product");
       let value = +data[key];
 
-      if (title === "product") {
-        value =
-          value +
-          +template.value.billingPlan.products[template.value.product].period;
-      } else {
-        value =
-          value +
-          +template.value.billingPlan.resources.find((r) => r.key === title)
-            ?.period;
-      }
-
       value = formatSecondsToDate(value);
       monitorings[key] = {
         value: value,
@@ -92,12 +81,14 @@ const setLastMonitorings = () => {
     }
   });
 
-  lastMonitorings.value = monitorings;
+  nextPaymentDates.value = monitorings;
 
-  newAllDate.value = monitorings["last_monitoring"].value;
+  newAllDate.value = monitorings["next_payment_date"].value;
 };
 
 const changeDates = async () => {
+  changeDatesLoading.value = true;
+
   const tempService = JSON.parse(JSON.stringify(service.value));
 
   const igIndex = tempService.instancesGroups.findIndex((ig) =>
@@ -109,28 +100,21 @@ const changeDates = async () => {
 
   const changedDates = {};
 
-  Object.keys(lastMonitorings.value).forEach((key) => {
+  Object.keys(nextPaymentDates.value).forEach((key) => {
     if (
       isChangeAll.value ||
-      lastMonitorings.value[key].firstValue != lastMonitorings.value[key].value
+      nextPaymentDates.value[key].firstValue !=
+        nextPaymentDates.value[key].value
     ) {
-      const { value, title } = lastMonitorings.value[key];
+      const { value } = nextPaymentDates.value[key];
 
-      let baseVal =
+      let newVal =
         new Date(isChangeAll.value ? newAllDate.value : value).getTime() / 1000;
+      let oldVal = new Date(template.value.data[key]).getTime();
 
-      if (title === "product") {
-        baseVal =
-          baseVal -
-          +template.value.billingPlan.products[template.value.product].period;
-      } else {
-        baseVal =
-          baseVal -
-          +template.value.billingPlan.resources.find((r) => r.key === title)
-            ?.period;
-      }
-
-      changedDates[key] = baseVal;
+      changedDates[key.replace("next_payment_date", "last_monitoring")] =
+        oldVal + (newVal - oldVal);
+      changedDates[key] = newVal;
     }
   });
 
@@ -139,7 +123,6 @@ const changeDates = async () => {
     ...changedDates,
   };
 
-  changeDatesLoading.value = true;
   try {
     await api.services._update(tempService);
     emit("refresh");
@@ -154,7 +137,7 @@ const changeDates = async () => {
 };
 
 onMounted(() => {
-  setLastMonitorings();
+  setNextPaymentDate();
   //tommoraw
   min.value = new Date(new Date().getTime() + 24 * 60 * 60 * 1000)
     .toISOString()
diff --git a/admin-ui/src/components/instances_table.vue b/admin-ui/src/components/instances_table.vue
index 9041df2c9..f9cc89056 100644
--- a/admin-ui/src/components/instances_table.vue
+++ b/admin-ui/src/components/instances_table.vue
@@ -350,8 +350,8 @@ export default {
       return inst.data.creation ?? "unknown";
     },
     getExpirationDate(inst) {
-      if (inst.type === "ovh") return inst.data.expiration;
-      if (inst.type === "ione") return this.date(inst.data.last_monitoring);
+      if (inst.data.next_payment_date)
+        return this.date(inst.data.next_payment_date);
       return "unknown";
     },
     getService({ service }) {
diff --git a/admin-ui/src/components/modules/ione/billingInfo.vue b/admin-ui/src/components/modules/ione/billingInfo.vue
index e41d21884..e7ca3aeec 100644
--- a/admin-ui/src/components/modules/ione/billingInfo.vue
+++ b/admin-ui/src/components/modules/ione/billingInfo.vue
@@ -214,10 +214,7 @@ onMounted(() => {
 });
 
 const date = computed(() =>
-  formatSecondsToDate(
-    +template.value?.data?.last_monitoring +
-      +template.value.billingPlan.products[template.value.product].period
-  )
+  formatSecondsToDate(+template.value?.data?.next_payment_date)
 );
 const defaultCurrency = computed(() => store.getters["currencies/default"]);
 const isMonitoringEmpty = computed(() => date.value === "-");
diff --git a/admin-ui/src/components/modules/ione/billingLabel.vue b/admin-ui/src/components/modules/ione/billingLabel.vue
index c4a42ba27..53b1cda0d 100644
--- a/admin-ui/src/components/modules/ione/billingLabel.vue
+++ b/admin-ui/src/components/modules/ione/billingLabel.vue
@@ -64,10 +64,7 @@ const addonsPrice = ref(
 );
 
 const dueDate = computed(() => {
-  return formatSecondsToDate(
-    +template.value?.data?.last_monitoring +
-      +template.value.billingPlan.products[template.value.product].period
-  );
+  return formatSecondsToDate(+template.value?.data?.next_payment_date);
 });
 </script>
 
diff --git a/admin-ui/src/components/modules/ovh/billingInfo.vue b/admin-ui/src/components/modules/ovh/billingInfo.vue
index 9708f82bd..2db5dff5c 100644
--- a/admin-ui/src/components/modules/ovh/billingInfo.vue
+++ b/admin-ui/src/components/modules/ovh/billingInfo.vue
@@ -328,13 +328,7 @@ const getAddonKey = (key) => {
 };
 
 const date = computed(() => {
-  if (type.value === "cloud") {
-    return formatSecondsToDate(
-      +template.value?.data?.last_monitoring + +tarrif.value.period
-    );
-  }
-
-  return template.value.data.expiration;
+  return formatSecondsToDate(+template.value?.data?.next_payment_date);
 });
 
 const initPrices = () => {
diff --git a/admin-ui/src/components/modules/ovh/billingLabel.vue b/admin-ui/src/components/modules/ovh/billingLabel.vue
index c702d8a9b..503a0b7ce 100644
--- a/admin-ui/src/components/modules/ovh/billingLabel.vue
+++ b/admin-ui/src/components/modules/ovh/billingLabel.vue
@@ -31,16 +31,9 @@ const account = computed(() => {
 });
 
 const dueDate = computed(() => {
-  const { duration, planCode } = props.template.config;
-  const key = `${duration} ${planCode}`;
-  if (props.template.config.type === "cloud") {
     return formatSecondsToDate(
-      +props.template?.data?.last_monitoring +
-        +props.template.billingPlan.products[key].period
+      +props.template?.data?.next_payment_date
     );
-  }
-
-  return props.template.data.expiration;
 });
 
 const tariffPrice = computed(() => {
diff --git a/admin-ui/src/components/modules/virtual/billingInfo.vue b/admin-ui/src/components/modules/virtual/billingInfo.vue
index 1cdcce42d..4b59d45a5 100644
--- a/admin-ui/src/components/modules/virtual/billingInfo.vue
+++ b/admin-ui/src/components/modules/virtual/billingInfo.vue
@@ -172,7 +172,7 @@ const billingHeaders = ref([
 const billingItems = ref([]);
 
 const date = computed(() =>
-  formatSecondsToDate(template.value?.data?.last_monitoring)
+  formatSecondsToDate(template.value?.data?.next_payment_date)
 );
 const isMonitoringsEmpty = computed(() => date.value === "-");
 

From c37892556178a6d06982b89a9f0ffc06f02fb516 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 26 Sep 2023 16:32:40 +0400
Subject: [PATCH 052/123] fix invoice whmcs

---
 admin-ui/src/views/TransactionsCreate.vue | 35 +++++++----------------
 1 file changed, 11 insertions(+), 24 deletions(-)

diff --git a/admin-ui/src/views/TransactionsCreate.vue b/admin-ui/src/views/TransactionsCreate.vue
index 5cfb232fc..541b8e45b 100644
--- a/admin-ui/src/views/TransactionsCreate.vue
+++ b/admin-ui/src/views/TransactionsCreate.vue
@@ -314,18 +314,16 @@ export default {
           total = amountType ? total : -total;
         }
 
-        const promises = [];
-        promises.push(
-          api.transactions.create({
-            ...this.transaction,
-            account: this.transaction.account.uuid,
-            total,
-            currency: this.transaction.account.currency,
-          })
-        );
+        const transaction = await api.transactions.create({
+          ...this.transaction,
+          account: this.transaction.account.uuid,
+          total,
+          currency: this.transaction.account.currency,
+        });
+        console.log(transaction);
 
         if (this.transaction.meta.transactionType.startsWith("invoice")) {
-          console.log(
+          await fetch(
             /https:\/\/(.+?\.?\/)/.exec(this.whmcsApi)[0] +
               `modules/addons/nocloud/api/index.php?run=create_invoice&account=${
                 this.transaction.account.uuid
@@ -333,23 +331,12 @@ export default {
                 this.transaction.meta.transactionType.split(" ")[1]
               }&description=${
                 this.transaction.meta.description
-              }&is_email=${!!this.transaction.meta.sendEmail}`
-          );
-          promises.push(
-            fetch(
-              /https:\/\/(.+?\.?\/)/.exec(this.whmcsApi)[0] +
-                `modules/addons/nocloud/api/index.php?run=create_invoice&account=${
-                  this.transaction.account.uuid
-                }&total=${this.transaction.total}&type=${
-                  this.transaction.meta.transactionType.split(" ")[1]
-                }&description=${
-                  this.transaction.meta.description
-                }&is_email=${!!this.transaction.meta.sendEmail}`
-            )
+              }&send_email=${!!this.transaction.meta.sendEmail}&transaction=${
+                transaction.uuid
+              }`
           );
         }
 
-        await Promise.all(promises);
         this.showSnackbarSuccess({
           message: "Transaction created successfully",
         });

From db5c3552bcc2df1bfeb31709a2735d49cc74b29e Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 26 Sep 2023 16:53:23 +0400
Subject: [PATCH 053/123] add transaction type

---
 admin-ui/src/components/reports_table.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/admin-ui/src/components/reports_table.vue b/admin-ui/src/components/reports_table.vue
index ce0be6c95..1838fe815 100644
--- a/admin-ui/src/components/reports_table.vue
+++ b/admin-ui/src/components/reports_table.vue
@@ -105,6 +105,7 @@ const reportsHeaders = computed(() => {
     { text: "Total", value: "totalPreview" },
     { text: "Total in default currency", value: "totalDefaultPreview" },
     { text: "Product or resource", value: "item" },
+    { text: "Type", value: "type" },
   ];
 
   if (!hideAccount.value) {
@@ -165,6 +166,7 @@ const onUpdateOptions = async (newOptions) => {
         service: r.service,
         instance: r.instance,
         account: r.account,
+        type: r.meta.transactionType,
         totalDefault: convertFrom(r.total, r.currency),
       };
     });

From 6408a9e83bb404dc2bfeee9568935bdcc4038c8f Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 26 Sep 2023 16:54:18 +0400
Subject: [PATCH 054/123] fix reports filtres

---
 admin-ui/src/components/reports_table.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-ui/src/components/reports_table.vue b/admin-ui/src/components/reports_table.vue
index 1838fe815..73d98f884 100644
--- a/admin-ui/src/components/reports_table.vue
+++ b/admin-ui/src/components/reports_table.vue
@@ -130,7 +130,7 @@ const isLoading = computed(() => {
 });
 
 const requestOptions = computed(() => ({
-  ...filters.value,
+  filters:filters.value,
   page: page.value,
   limit: options.value.itemsPerPage,
   field: options.value.sortBy[0],

From 50cf06c9fb14a12c229d13e593af52ced5df0572 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 26 Sep 2023 17:24:36 +0400
Subject: [PATCH 055/123] fix set account by default all

---
 admin-ui/src/views/Transactions.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/admin-ui/src/views/Transactions.vue b/admin-ui/src/views/Transactions.vue
index ad54abb7c..8558224e1 100644
--- a/admin-ui/src/views/Transactions.vue
+++ b/admin-ui/src/views/Transactions.vue
@@ -262,9 +262,6 @@ export default {
     chartLoading() {
       setTimeout(this.setListenerToLegend);
     },
-    user() {
-      this.accountId = this.user.uuid;
-    },
     accountId() {
       if (this.serviceId === null) {
         this.serviceId = null;

From 51aa6b81196c001f0e6c5ee8e30d2a0d14fba95e Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 26 Sep 2023 17:41:36 +0400
Subject: [PATCH 056/123] remove services + add multiply accounts

---
 admin-ui/src/views/Transactions.vue | 60 ++++++++---------------------
 1 file changed, 16 insertions(+), 44 deletions(-)

diff --git a/admin-ui/src/views/Transactions.vue b/admin-ui/src/views/Transactions.vue
index 8558224e1..18d69344a 100644
--- a/admin-ui/src/views/Transactions.vue
+++ b/admin-ui/src/views/Transactions.vue
@@ -17,22 +17,14 @@
 
     <v-autocomplete
       :filter="defaultFilterObject"
-      label="Account"
+      label="Accounts"
       item-text="title"
       item-value="uuid"
       class="d-inline-block mr-2"
-      v-model="accountId"
+      v-model="selectedAccounts"
+      multiple
       :items="accounts"
     />
-    <v-autocomplete
-      :filter="defaultFilterObject"
-      label="Service"
-      item-text="title"
-      item-value="uuid"
-      class="d-inline-block"
-      v-model="serviceId"
-      :items="servicesByAccount"
-    />
 
     <v-progress-linear indeterminate class="pt-1" v-if="chartLoading" />
     <template v-else-if="series.length < 1">
@@ -78,8 +70,7 @@ export default {
   components: { DatePicker, reportsTable, apexcharts },
   mixins: [snackbar, search],
   data: () => ({
-    accountId: null,
-    serviceId: null,
+    selectedAccounts: [],
     series: [],
     chartLoading: false,
     isInitLoading: true,
@@ -158,9 +149,9 @@ export default {
   },
   created() {
     if (this.$route.query.account) {
-      this.accountId = this.$route.query.account;
+      this.selectedAccounts = [this.$route.query.account];
     } else {
-      this.accountId = null;
+      this.selectedAccounts = [];
     }
     this.isInitLoading = false;
   },
@@ -169,11 +160,6 @@ export default {
     this.$store.dispatch("services/fetch");
     this.$store.dispatch("namespaces/fetch");
     this.$store.dispatch("currencies/fetch");
-
-    this.$store.commit("reloadBtn/setCallback", {
-      type: "transactions/init",
-      params: this.transactionData,
-    });
   },
   computed: {
     ...mapGetters("transactions", ["count", "page", "isLoading", "all"]),
@@ -187,23 +173,23 @@ export default {
       return this.$store.getters["namespaces/all"];
     },
     accounts() {
-      const accounts = this.$store.getters["accounts/all"];
-      return [{ title: "all", uuid: null }].concat(accounts);
+      return this.$store.getters["accounts/all"];
     },
     services() {
       return this.$store.getters["services/all"];
     },
     filters() {
       return {
-        service: this.serviceId ? [this.serviceId] : undefined,
-        account: this.accountId ? [this.accountId] : undefined,
+        account: this.selectedAccounts.length
+          ? this.selectedAccounts
+          : undefined,
       };
     },
     servicesByAccount() {
       let filtredServices = null;
-      if (this.accountId) {
-        const namespaceId = this.namespaces.find(
-          (n) => this.accountId === n.access.namespace
+      if (this.selectedAccounts.length) {
+        const namespaceId = this.namespaces.find((n) =>
+          this.selectedAccounts.includes(n.access.namespace)
         )?.uuid;
         filtredServices = this.services.filter((s) => {
           return s.access.namespace === namespaceId;
@@ -224,7 +210,7 @@ export default {
       let labels = [`0 ${this.defaultCurrency}`];
       let values = [0];
       let balance = 0;
-      if (!this.accountId) {
+      if (!this.selectedAccounts) {
         return { labels, values };
       }
       this.transactions?.forEach((el, i, arr) => {
@@ -247,27 +233,13 @@ export default {
     searchParam() {
       return this.$store.getters["appSearch/param"];
     },
-    transactionData() {
-      const data = {};
-      if (this.accountId || this.accountId === "all") {
-        data.account = this.accountId;
-      }
-      if (this.accountId) {
-        data.service = this.serviceId;
-      }
-      return data;
-    },
   },
   watch: {
     chartLoading() {
       setTimeout(this.setListenerToLegend);
     },
-    accountId() {
-      if (this.serviceId === null) {
-        this.serviceId = null;
-      } else {
-        this.serviceId = null;
-      }
+    accountId(newAccount) {
+      console.log(newAccount);
     },
   },
 };

From 876e1e97c5085ec1b0dba8cea4090ecb1bfc5e62 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 26 Sep 2023 18:26:14 +0400
Subject: [PATCH 057/123] add transaction type filter

---
 admin-ui/src/views/Transactions.vue | 57 ++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 18 deletions(-)

diff --git a/admin-ui/src/views/Transactions.vue b/admin-ui/src/views/Transactions.vue
index 18d69344a..496a162c0 100644
--- a/admin-ui/src/views/Transactions.vue
+++ b/admin-ui/src/views/Transactions.vue
@@ -26,6 +26,17 @@
       :items="accounts"
     />
 
+    <v-autocomplete
+      :filter="defaultFilterObject"
+      label="Instances"
+      item-text="title"
+      item-value="uuid"
+      class="d-inline-block mr-2"
+      v-model="selectedInstances"
+      multiple
+      :items="instances"
+    />
+
     <v-progress-linear indeterminate class="pt-1" v-if="chartLoading" />
     <template v-else-if="series.length < 1">
       <v-subheader v-if="balance.values.length > 1"> Balance: </v-subheader>
@@ -71,6 +82,7 @@ export default {
   mixins: [snackbar, search],
   data: () => ({
     selectedAccounts: [],
+    selectedInstances: [],
     series: [],
     chartLoading: false,
     isInitLoading: true,
@@ -183,27 +195,31 @@ export default {
         account: this.selectedAccounts.length
           ? this.selectedAccounts
           : undefined,
+        instance: this.selectedInstances.length
+          ? this.selectedInstances
+          : undefined,
       };
     },
     servicesByAccount() {
-      let filtredServices = null;
-      if (this.selectedAccounts.length) {
-        const namespaceId = this.namespaces.find((n) =>
-          this.selectedAccounts.includes(n.access.namespace)
-        )?.uuid;
-        filtredServices = this.services.filter((s) => {
-          return s.access.namespace === namespaceId;
+      const namespaces = this.namespaces
+        .filter((n) => this.selectedAccounts.includes(n.access.namespace))
+        .map((n) => n.uuid);
+
+      return this.services.filter((s) => {
+        return namespaces.includes(s.access.namespace);
+      });
+    },
+    instances() {
+      const instances = [];
+      this.servicesByAccount.forEach((s) => {
+        s.instancesGroups.forEach((ig) => {
+          ig.instances.forEach((i) =>
+            instances.push({ title: i.title, uuid: i.uuid })
+          );
         });
-      } else {
-        filtredServices = this.services;
-      }
+      });
 
-      return [{ title: "all", uuid: null }].concat(
-        filtredServices.map((el) => ({
-          title: `${el.title} (${el.uuid.slice(0, 8)})`,
-          uuid: el.uuid,
-        }))
-      );
+      return instances;
     },
     balance() {
       const dates = [];
@@ -238,8 +254,13 @@ export default {
     chartLoading() {
       setTimeout(this.setListenerToLegend);
     },
-    accountId(newAccount) {
-      console.log(newAccount);
+    selectedAccounts: {
+      handler() {
+        this.selectedInstances = this.selectedInstances.filter((si) =>
+          this.instances.find((i) => i.uuid === si)
+        );
+      },
+      deep: true,
     },
   },
 };

From 4f171152f5b36dd4f7dc7e8697bb460d96dcee1a Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 26 Sep 2023 18:38:26 +0400
Subject: [PATCH 058/123] delete sendEmail switch & add buttons

---
 admin-ui/src/views/TransactionsCreate.vue | 52 ++++++++++-------------
 1 file changed, 22 insertions(+), 30 deletions(-)

diff --git a/admin-ui/src/views/TransactionsCreate.vue b/admin-ui/src/views/TransactionsCreate.vue
index 541b8e45b..de11a659c 100644
--- a/admin-ui/src/views/TransactionsCreate.vue
+++ b/admin-ui/src/views/TransactionsCreate.vue
@@ -147,17 +147,6 @@
             </v-col>
           </v-row>
 
-          <v-row align="center" v-if="!isSendEmailHide">
-            <v-col cols="3">
-              <v-subheader>Send email</v-subheader>
-            </v-col>
-            <v-col cols="9">
-              <div class="d-flex justify-end">
-                <v-switch v-model="transaction.meta.sendEmail" />
-              </div>
-            </v-col>
-          </v-row>
-
           <v-row v-if="!isAdminNoteHide" class="mx-5">
             <v-textarea
               no-resize
@@ -189,17 +178,24 @@
         </v-col>
       </v-row>
 
-      <v-row>
-        <v-col>
-          <v-btn
-            class="mr-2"
-            color="background-light"
-            :loading="isLoading"
-            @click="tryToSend"
-          >
-            Create
-          </v-btn>
-        </v-col>
+      <v-row justify="start" class="mb-4">
+        <v-btn
+          class="mx-3"
+          color="background-light"
+          :loading="isLoading"
+          @click="tryToSend(false)"
+        >
+          Publish
+        </v-btn>
+        <v-btn
+          v-if="isPublishWithEmailAvailble"
+          class="mx-4"
+          color="background-light"
+          :loading="isLoading"
+          @click="tryToSend(true)"
+        >
+          Publish + email
+        </v-btn>
       </v-row>
     </v-form>
   </div>
@@ -289,7 +285,7 @@ export default {
         amount,
       ].join(" ");
     },
-    async tryToSend() {
+    async tryToSend(withEmail = false) {
       if (!this.isValid) {
         this.$refs.form.validate();
 
@@ -320,7 +316,6 @@ export default {
           total,
           currency: this.transaction.account.currency,
         });
-        console.log(transaction);
 
         if (this.transaction.meta.transactionType.startsWith("invoice")) {
           await fetch(
@@ -331,9 +326,7 @@ export default {
                 this.transaction.meta.transactionType.split(" ")[1]
               }&description=${
                 this.transaction.meta.description
-              }&send_email=${!!this.transaction.meta.sendEmail}&transaction=${
-                transaction.uuid
-              }`
+              }&send_email=${withEmail}&transaction=${transaction.uuid}`
           );
         }
 
@@ -485,8 +478,8 @@ export default {
     isAdminNoteHide() {
       return this.isTransaction;
     },
-    isSendEmailHide() {
-      return this.isTransaction;
+    isPublishWithEmailAvailble() {
+      return this.isInvoice;
     },
   },
   watch: {
@@ -500,7 +493,6 @@ export default {
         this.resetDate();
       } else if (this.isTransaction) {
         this.transaction.meta.note = undefined;
-        this.transaction.meta.sendEmail = undefined;
         this.initDate();
       }
     },

From dade67734b4a477a0fc05b97a32b96d2ff94ef32 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 26 Sep 2023 19:20:45 +0400
Subject: [PATCH 059/123] add replace showcase

---
 admin-ui/src/store/showcases.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/admin-ui/src/store/showcases.js b/admin-ui/src/store/showcases.js
index 5d9e6532a..78f5b8bd9 100644
--- a/admin-ui/src/store/showcases.js
+++ b/admin-ui/src/store/showcases.js
@@ -22,6 +22,11 @@ export default {
     removeShowcase(state, uuid) {
       state.showcases = state.showcases.filter((s) => s.uuid !== uuid);
     },
+    replaceShowcase(state, value) {
+      state.showcases = state.showcases.map((s) =>
+        s.uuid === value.uuid ? value : s
+      );
+    },
     setLoading(state, data) {
       state.loading = data;
     },

From 2e50c322760571a06bcc0aed77303230067f5479 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 26 Sep 2023 19:21:01 +0400
Subject: [PATCH 060/123] add enabled & update enabled

---
 admin-ui/src/components/showcases_table.vue | 38 +++++++++++++++++++--
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/admin-ui/src/components/showcases_table.vue b/admin-ui/src/components/showcases_table.vue
index e7f43c3c2..10af353f5 100644
--- a/admin-ui/src/components/showcases_table.vue
+++ b/admin-ui/src/components/showcases_table.vue
@@ -17,6 +17,16 @@
         {{ item.title }}
       </router-link>
     </template>
+
+    <template v-slot:[`item.public`]="{ item }">
+      <v-skeleton-loader v-if="updatedShowcase === item.uuid" type="text" />
+      <v-switch
+        v-else
+        :readonly="!!updatedShowcase"
+        :input-value="item.public"
+        @change="changeEnabled(item, $event)"
+      />
+    </template>
   </nocloud-table>
 </template>
 
@@ -24,17 +34,39 @@
 import NocloudTable from "@/components/table.vue";
 import IconTitlePreview from "@/components/ui/iconTitlePreview.vue";
 import { ref, toRefs } from "vue";
+import api from "@/api";
+import { useStore } from "@/store";
 
 const props = defineProps(["items", "loading", "value"]);
 const emits = defineEmits(["input"]);
 
 const { value, loading, items } = toRefs(props);
 
+const store = useStore();
+
+const updatedShowcase = ref("");
+
 const headers = ref([
-  { text: "uuid", value: "uuid" },
-  { text: "title", value: "title" },
-  { text: "preview", value: "preview" },
+  { text: "UUID", value: "uuid" },
+  { text: "Title", value: "title" },
+  { text: "Preview", value: "preview" },
+  { text: "Enabled", value: "public" },
 ]);
+
+const changeEnabled = async (item, value) => {
+  try {
+    updatedShowcase.value = item.uuid;
+    const data = { ...item, public: value };
+    await api.showcases.update(data);
+    store.commit("showcases/replaceShowcase", data);
+  } catch {
+    store.commit("snackbar/showSnackbarError", {
+      message: "Error during update showcase enabled",
+    });
+  } finally {
+    updatedShowcase.value = "";
+  }
+};
 </script>
 
 <style scoped></style>

From b8b3d26393528349668842faf16271e9f0b5f749 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Tue, 26 Sep 2023 19:03:12 +0300
Subject: [PATCH 061/123] Add unique types

---
 go.mod                 |  2 +-
 go.sum                 |  2 ++
 pkg/billing/records.go | 18 +++++++++++++++++-
 pkg/graph/records.go   | 41 +++++++++++++++++++++++++++++++++++++++++
 4 files changed, 61 insertions(+), 2 deletions(-)

diff --git a/go.mod b/go.mod
index 6736457fe..7b8ec9e94 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0
 	github.com/rabbitmq/amqp091-go v1.8.1
 	github.com/rs/cors v1.10.0
-	github.com/slntopp/nocloud-proto v0.0.0-20230912095707-1bb19975b685
+	github.com/slntopp/nocloud-proto v0.0.0-20230926155417-9f9c50e0b385
 	github.com/spf13/viper v1.16.0
 	github.com/stoewer/go-strcase v1.3.0
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75
diff --git a/go.sum b/go.sum
index e0a1ff361..430e2c912 100644
--- a/go.sum
+++ b/go.sum
@@ -204,6 +204,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/slntopp/nocloud-proto v0.0.0-20230912095707-1bb19975b685 h1:z55krMEmUcSgmnb3szZBhuqGdxEwcuLa0BcUotG/AO0=
 github.com/slntopp/nocloud-proto v0.0.0-20230912095707-1bb19975b685/go.mod h1:HY6zAuqFtnMRWY2uSvpvyBioOOk3iGl0qUdAxOhja0k=
+github.com/slntopp/nocloud-proto v0.0.0-20230926155417-9f9c50e0b385 h1:wmun3yLXCzIrY30MUgoGxeQVuSILPtxCRSpQSq/Szng=
+github.com/slntopp/nocloud-proto v0.0.0-20230926155417-9f9c50e0b385/go.mod h1:4Hsf0e2WQQOWaZj6sC1vVq4oCdu30asV+JzWk/xAlIg=
 github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
 github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
 github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA=
diff --git a/pkg/billing/records.go b/pkg/billing/records.go
index 38083a715..711109aa3 100644
--- a/pkg/billing/records.go
+++ b/pkg/billing/records.go
@@ -17,6 +17,7 @@ package billing
 
 import (
 	"context"
+	"google.golang.org/protobuf/types/known/structpb"
 	"time"
 
 	"github.com/arangodb/go-driver"
@@ -468,5 +469,20 @@ func (s *BillingServiceServer) GetRecordsReportsCount(ctx context.Context, req *
 	if err != nil {
 		return nil, err
 	}
-	return &pb.GetReportsCountResponse{Total: res}, nil
+
+	types, err := s.records.GetUnique(ctx)
+
+	if err != nil {
+		return nil, err
+	}
+
+	value, err := structpb.NewValue(types)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.GetReportsCountResponse{
+		Total:  res,
+		Unique: value,
+	}, nil
 }
diff --git a/pkg/graph/records.go b/pkg/graph/records.go
index 13f245fc0..600eebf8b 100644
--- a/pkg/graph/records.go
+++ b/pkg/graph/records.go
@@ -329,3 +329,44 @@ func (ctrl *RecordsController) GetRecordsReportsCount(ctx context.Context, req *
 
 	return result, nil
 }
+
+const uniqueQuery = `
+LET records = (
+	FOR r in @@records
+	FILTER r.meta != null
+	FILTER r.meta.transactionType != null
+	FILTER r.meta.transactionType != ""
+	RETURN r
+)
+
+RETURN UNIQUE(records[*].meta.transactionType)
+`
+
+func (ctrl *RecordsController) GetUnique(ctx context.Context) (map[string]interface{}, error) {
+
+	cur, err := ctrl.db.Query(ctx, uniqueQuery, map[string]interface{}{
+		"@records": schema.RECORDS_COL,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	var types []interface{}
+
+	for cur.HasMore() {
+		var uniqueType string
+
+		_, err := cur.ReadDocument(ctx, &uniqueType)
+		if err != nil {
+			return nil, err
+		}
+
+		types = append(types, uniqueType)
+	}
+
+	var result = map[string]interface{}{
+		"transactionType": types,
+	}
+
+	return result, nil
+}

From ecb62a97043fa4a4072d335ac5c23c5c91c40455 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Tue, 26 Sep 2023 19:13:57 +0300
Subject: [PATCH 062/123] Fix

---
 pkg/billing/records.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/billing/records.go b/pkg/billing/records.go
index 711109aa3..0a96714ef 100644
--- a/pkg/billing/records.go
+++ b/pkg/billing/records.go
@@ -476,6 +476,8 @@ func (s *BillingServiceServer) GetRecordsReportsCount(ctx context.Context, req *
 		return nil, err
 	}
 
+	s.log.Debug("Types", zap.Any("types", types))
+
 	value, err := structpb.NewValue(types)
 	if err != nil {
 		return nil, err

From 8eccb839287d2e37029251e1a3d47d2a34025c87 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Tue, 26 Sep 2023 19:19:58 +0300
Subject: [PATCH 063/123] Fix

---
 pkg/graph/records.go | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkg/graph/records.go b/pkg/graph/records.go
index 600eebf8b..9b80756c5 100644
--- a/pkg/graph/records.go
+++ b/pkg/graph/records.go
@@ -17,6 +17,7 @@ package graph
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"github.com/arangodb/go-driver"
 	pb "github.com/slntopp/nocloud-proto/billing"
@@ -351,21 +352,27 @@ func (ctrl *RecordsController) GetUnique(ctx context.Context) (map[string]interf
 		return nil, err
 	}
 
-	var types []interface{}
+	var types []string
 
-	for cur.HasMore() {
-		var uniqueType string
+	_, err = cur.ReadDocument(ctx, &types)
+	if err != nil {
+		return nil, err
+	}
 
-		_, err := cur.ReadDocument(ctx, &uniqueType)
-		if err != nil {
-			return nil, err
-		}
+	marshal, err := json.Marshal(types)
+	if err != nil {
+		return nil, err
+	}
 
-		types = append(types, uniqueType)
+	var iTypes []interface{}
+
+	err = json.Unmarshal(marshal, &iTypes)
+	if err != nil {
+		return nil, err
 	}
 
 	var result = map[string]interface{}{
-		"transactionType": types,
+		"transactionType": iTypes,
 	}
 
 	return result, nil

From 6ae6f386a9fa556745c55621e30ffa239a2da94a Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Tue, 26 Sep 2023 22:43:03 +0300
Subject: [PATCH 064/123] Fix

---
 pkg/graph/records.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/graph/records.go b/pkg/graph/records.go
index 9b80756c5..9d66a1932 100644
--- a/pkg/graph/records.go
+++ b/pkg/graph/records.go
@@ -216,7 +216,11 @@ func (ctrl *RecordsController) GetRecordsReports(ctx context.Context, req *pb.Ge
 			if len(values) == 0 {
 				continue
 			}
-			query += fmt.Sprintf(` FILTER record["%s"] in @%s`, key, key)
+			if key == "transactionType" {
+				query += fmt.Sprintf(` FILTER record.meta["%s"] in @%s`, key, key)
+			} else {
+				query += fmt.Sprintf(` FILTER record["%s"] in @%s`, key, key)
+			}
 			params[key] = values
 		}
 	}

From 0a2fb790d9a919d6b0877fd8ab3eb6dd40c9642e Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 27 Sep 2023 00:08:53 +0400
Subject: [PATCH 065/123] add dense props

---
 admin-ui/src/components/ui/datePicker.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/admin-ui/src/components/ui/datePicker.vue b/admin-ui/src/components/ui/datePicker.vue
index ad1152601..76b6832df 100644
--- a/admin-ui/src/components/ui/datePicker.vue
+++ b/admin-ui/src/components/ui/datePicker.vue
@@ -11,6 +11,7 @@
         prepend-inner-icon="mdi-calendar"
         :value="value"
         readonly
+        :dense="dense"
         :label="label"
       />
     </template>
@@ -26,8 +27,13 @@
 <script setup>
 import { toRefs } from "vue";
 
-const props = defineProps(["value", "min", "label"]);
-const { value, min, label } = toRefs(props);
+const props = defineProps({
+  value: {},
+  min: {},
+  label: {},
+  dense: { type: Boolean, default: false },
+});
+const { value, min, label, dense } = toRefs(props);
 
 const emits = defineEmits(["input"]);
 </script>

From 63f685f566762d0ea9e4868a348aed8e3b1b8639 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 27 Sep 2023 00:09:10 +0400
Subject: [PATCH 066/123] add emit unique

---
 admin-ui/src/components/reports_table.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/admin-ui/src/components/reports_table.vue b/admin-ui/src/components/reports_table.vue
index 73d98f884..d9e0df158 100644
--- a/admin-ui/src/components/reports_table.vue
+++ b/admin-ui/src/components/reports_table.vue
@@ -84,7 +84,7 @@ const props = defineProps({
 const { filters, hideInstance, hideService, hideAccount, duration, showDates } =
   toRefs(props);
 
-const emit = defineEmits(["input:duration"]);
+const emit = defineEmits(["input:unique", "input:duration"]);
 
 const store = useStore();
 const { rates, convertFrom, defaultCurrency } = useCurrency();
@@ -130,7 +130,7 @@ const isLoading = computed(() => {
 });
 
 const requestOptions = computed(() => ({
-  filters:filters.value,
+  filters: filters.value,
   page: page.value,
   limit: options.value.itemsPerPage,
   field: options.value.sortBy[0],
@@ -190,7 +190,9 @@ const setOptions = (newOptions) => {
 const init = async () => {
   isCountLoading.value = true;
   try {
-    count.value = +(await api.reports.count(requestOptions.value)).total;
+    const { total, unique } = await api.reports.count(requestOptions.value);
+    count.value = +total;
+    emit("input:unique", unique);
   } finally {
     isCountLoading.value = false;
   }

From d0be73e062dd9c40b0d90632c53a82c3029bfe41 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 27 Sep 2023 00:09:27 +0400
Subject: [PATCH 067/123] add transaction & fix selects aligments

---
 admin-ui/src/views/Transactions.vue | 93 ++++++++++++++++++-----------
 1 file changed, 57 insertions(+), 36 deletions(-)

diff --git a/admin-ui/src/views/Transactions.vue b/admin-ui/src/views/Transactions.vue
index 496a162c0..03efaa5d6 100644
--- a/admin-ui/src/views/Transactions.vue
+++ b/admin-ui/src/views/Transactions.vue
@@ -1,41 +1,56 @@
 <template>
   <div class="pa-4">
-    <v-btn
-      class="mr-2"
-      color="background-light"
-      :to="{ name: 'Transactions create' }"
-    >
-      Create
-    </v-btn>
-
-    <div style="max-width: 300px" class="mx-3 d-inline-block">
-      <date-picker label="from" v-model="duration.from" />
-    </div>
-    <div style="max-width: 300px" class="mx-3 d-inline-block">
-      <date-picker label="to" v-model="duration.to" />
-    </div>
-
-    <v-autocomplete
-      :filter="defaultFilterObject"
-      label="Accounts"
-      item-text="title"
-      item-value="uuid"
-      class="d-inline-block mr-2"
-      v-model="selectedAccounts"
-      multiple
-      :items="accounts"
-    />
-
-    <v-autocomplete
-      :filter="defaultFilterObject"
-      label="Instances"
-      item-text="title"
-      item-value="uuid"
-      class="d-inline-block mr-2"
-      v-model="selectedInstances"
-      multiple
-      :items="instances"
-    />
+    <v-row align="start">
+      <v-col cols="1">
+        <v-btn
+          class="mr-2"
+          color="background-light"
+          :to="{ name: 'Transactions create' }"
+        >
+          Create
+        </v-btn>
+      </v-col>
+      <v-col>
+        <date-picker dense label="from" v-model="duration.from" />
+      </v-col>
+      <v-col>
+        <date-picker dense label="to" v-model="duration.to" />
+      </v-col>
+      <v-col>
+        <v-autocomplete
+          :filter="defaultFilterObject"
+          label="Types"
+          dense
+          v-model="selectedTypes"
+          multiple
+          :items="types"
+        />
+      </v-col>
+      <v-col>
+        <v-autocomplete
+          dense
+          :filter="defaultFilterObject"
+          label="Accounts"
+          item-text="title"
+          item-value="uuid"
+          v-model="selectedAccounts"
+          multiple
+          :items="accounts"
+        />
+      </v-col>
+      <v-col>
+        <v-autocomplete
+          :filter="defaultFilterObject"
+          dense
+          label="Instances"
+          item-text="title"
+          item-value="uuid"
+          v-model="selectedInstances"
+          multiple
+          :items="instances"
+        />
+      </v-col>
+    </v-row>
 
     <v-progress-linear indeterminate class="pt-1" v-if="chartLoading" />
     <template v-else-if="series.length < 1">
@@ -62,6 +77,7 @@
       table-name="transaction-table"
       :filters="filters"
       :duration="duration"
+      @input:unique="types = $event.transactionType"
       :select-record="selectTransaction"
     />
   </div>
@@ -83,6 +99,8 @@ export default {
   data: () => ({
     selectedAccounts: [],
     selectedInstances: [],
+    selectedTypes: [],
+    types: [],
     series: [],
     chartLoading: false,
     isInitLoading: true,
@@ -198,6 +216,9 @@ export default {
         instance: this.selectedInstances.length
           ? this.selectedInstances
           : undefined,
+        transactionType: this.selectedTypes.length
+          ? this.selectedTypes
+          : undefined,
       };
     },
     servicesByAccount() {

From 410ff2d8a6f549ed952d9d2001be30fa92d6d3f1 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Tue, 26 Sep 2023 23:12:20 +0300
Subject: [PATCH 068/123] Fix

---
 pkg/graph/records.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/graph/records.go b/pkg/graph/records.go
index 9d66a1932..6121b387f 100644
--- a/pkg/graph/records.go
+++ b/pkg/graph/records.go
@@ -313,7 +313,11 @@ func (ctrl *RecordsController) GetRecordsReportsCount(ctx context.Context, req *
 			if len(values) == 0 {
 				continue
 			}
-			query += fmt.Sprintf(` FILTER record["%s"] in @%s`, key, key)
+			if key == "transactionType" {
+				query += fmt.Sprintf(` FILTER record.meta["%s"] in @%s`, key, key)
+			} else {
+				query += fmt.Sprintf(` FILTER record["%s"] in @%s`, key, key)
+			}
 			params[key] = values
 		}
 	}

From 7cf3eb051c1373c754e03edacfafaaa115757680 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 27 Sep 2023 13:24:15 +0400
Subject: [PATCH 069/123] change account balance transaction type

---
 admin-ui/src/views/TransactionsCreate.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-ui/src/views/TransactionsCreate.vue b/admin-ui/src/views/TransactionsCreate.vue
index de11a659c..58fb30132 100644
--- a/admin-ui/src/views/TransactionsCreate.vue
+++ b/admin-ui/src/views/TransactionsCreate.vue
@@ -263,7 +263,7 @@ export default {
         id: 5,
         value: "transaction",
         title: "Transaction",
-        amount: { title: "Account balance", value: null },
+        amount: { title: "Set account balance", value: null },
       },
     ],
     typeId: 4,
@@ -276,7 +276,7 @@ export default {
       let amount = "";
 
       if (this.fullType.amount.value === null) {
-        amount = "account";
+        amount = "account-balance";
       } else {
         amount = this.fullType.amount.value ? "payment" : "top-up";
       }

From 452350035c0768adbcc0712976bd0e65a5483b7f Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 27 Sep 2023 13:25:30 +0400
Subject: [PATCH 070/123] change state title

---
 admin-ui/src/components/modules/ione/additionalInstanceInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-ui/src/components/modules/ione/additionalInstanceInfo.vue b/admin-ui/src/components/modules/ione/additionalInstanceInfo.vue
index a78b9237e..a37e1e8eb 100644
--- a/admin-ui/src/components/modules/ione/additionalInstanceInfo.vue
+++ b/admin-ui/src/components/modules/ione/additionalInstanceInfo.vue
@@ -4,7 +4,7 @@
       <v-col>
         <v-text-field
           readonly
-          label="State"
+          label="OpenNebula State"
           :value="template.state.meta?.state_str || template.state.state"
         />
       </v-col>

From ea16b67a65259a8042bdd95c906b2fda3ed28ba5 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 27 Sep 2023 13:27:35 +0400
Subject: [PATCH 071/123] remove client currency

---
 admin-ui/src/components/instance/info.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/admin-ui/src/components/instance/info.vue b/admin-ui/src/components/instance/info.vue
index 77f57c838..d97bb9f23 100644
--- a/admin-ui/src/components/instance/info.vue
+++ b/admin-ui/src/components/instance/info.vue
@@ -46,13 +46,6 @@
           :value="account?.balance?.toFixed(2) || 0"
         />
       </v-col>
-      <v-col>
-        <v-text-field
-          readonly
-          label="client currency"
-          :value="account?.currency"
-        />
-      </v-col>
     </v-row>
     <!--    <component-->
     <!--      v-if="!type.includes('ovh') && !type.includes('ione')"-->

From d5f833a83f961824bc233d745c5c96213c2682c4 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 27 Sep 2023 17:49:58 +0400
Subject: [PATCH 072/123] refactor instance prices panels

---
 .../components/modules/ione/billingInfo.vue   | 133 ++++++++---------
 .../components/modules/ovh/billingInfo.vue    | 134 ++++++++----------
 .../modules/virtual/billingInfo.vue           | 106 +++++++-------
 .../components/ui/instancesPricesPanels.vue   |  21 +++
 4 files changed, 192 insertions(+), 202 deletions(-)
 create mode 100644 admin-ui/src/components/ui/instancesPricesPanels.vue

diff --git a/admin-ui/src/components/modules/ione/billingInfo.vue b/admin-ui/src/components/modules/ione/billingInfo.vue
index e7ca3aeec..15929a8e6 100644
--- a/admin-ui/src/components/modules/ione/billingInfo.vue
+++ b/admin-ui/src/components/modules/ione/billingInfo.vue
@@ -57,78 +57,66 @@
           @click:append="changeDatesDialog = true"
         />
       </v-col>
-      ></v-row
-    >
-    <v-expansion-panels>
-      <v-expansion-panel>
-        <v-expansion-panel-header color="background-light"
-          >Prices</v-expansion-panel-header
-        >
-        <v-expansion-panel-content
-          class="ione-billing"
-          color="background-light"
-        >
-          <nocloud-table
-            class="mb-5"
-            :headers="billingHeaders"
-            :items="billingItems"
-            no-hide-uuid
-            :show-select="false"
-            hide-default-footer
-          >
-            <template v-slot:[`item.price`]="{ item }">
-              <div class="d-flex">
-                <v-text-field
-                  class="mr-2"
-                  :suffix="defaultCurrency"
-                  v-model="item.price"
-                  type="number"
-                  @input="updatePrice(item, false)"
-                  append-icon="mdi-pencil"
-                />
-                <v-text-field
-                  style="color: #c921c9"
-                  class="ml-2"
-                  type="number"
-                  :suffix="accountCurrency"
-                  v-model="item.accountPrice"
-                  @input="updatePrice(item, true)"
-                  append-icon="mdi-pencil"
-                />
-              </div>
-            </template>
-            <template v-slot:[`item.quantity`]="{ item }">
-              {{ item.quantity?.toFixed(2) }} {{ item.unit }}
-            </template>
-            <template v-slot:[`item.total`]="{ item }">
-              {{ totalPrices[item.name]?.toFixed(2) }}
-              {{ defaultCurrency }} /
-              {{ totalAccountPrices[item.name]?.toFixed(2) }}
-              {{ accountCurrency }}
-            </template>
-            <template v-slot:body.append>
-              <tr>
-                <td></td>
-                <td></td>
-                <td>
-                  {{
-                    billingItems.find((i) => i.name === template.product)
-                      ?.period
-                  }}
-                </td>
-                <td></td>
-                <td></td>
-                <td>
-                  {{ totalAccountPrice }} {{ accountCurrency }} /
-                  {{ totalPrice }}
-                  {{ defaultCurrency }}
-                </td>
-              </tr>
-            </template>
-          </nocloud-table>
-        </v-expansion-panel-content>
-      </v-expansion-panel>
-    </v-expansion-panels>
+    </v-row>
+    <instances-prices-panels>
+      <nocloud-table
+        class="mb-5"
+        :headers="billingHeaders"
+        :items="billingItems"
+        no-hide-uuid
+        :show-select="false"
+        hide-default-footer
+      >
+        <template v-slot:[`item.price`]="{ item }">
+          <div class="d-flex">
+            <v-text-field
+              class="mr-2"
+              :suffix="defaultCurrency"
+              v-model="item.price"
+              type="number"
+              @input="updatePrice(item, false)"
+              append-icon="mdi-pencil"
+            />
+            <v-text-field
+              style="color: #c921c9"
+              class="ml-2"
+              type="number"
+              :suffix="accountCurrency"
+              v-model="item.accountPrice"
+              @input="updatePrice(item, true)"
+              append-icon="mdi-pencil"
+            />
+          </div>
+        </template>
+        <template v-slot:[`item.quantity`]="{ item }">
+          {{ item.quantity?.toFixed(2) }} {{ item.unit }}
+        </template>
+        <template v-slot:[`item.total`]="{ item }">
+          {{ totalPrices[item.name]?.toFixed(2) }}
+          {{ defaultCurrency }} /
+          {{ totalAccountPrices[item.name]?.toFixed(2) }}
+          {{ accountCurrency }}
+        </template>
+        <template v-slot:body.append>
+          <tr>
+            <td></td>
+            <td></td>
+            <td>
+              {{
+                billingItems.find((i) => i.name === template.product)?.period
+              }}
+            </td>
+            <td></td>
+            <td></td>
+            <td>
+              {{ totalAccountPrice }} {{ accountCurrency }} /
+              {{ totalPrice }}
+              {{ defaultCurrency }}
+            </td>
+          </tr>
+        </template>
+      </nocloud-table>
+    </instances-prices-panels>
     <change-ione-monitorings
       :template="template"
       :service="service"
@@ -177,6 +165,7 @@ import NocloudTable from "@/components/table.vue";
 import EditPriceModel from "@/components/dialogs/editPriceModel.vue";
 import useAccountConverter from "@/hooks/useAccountConverter";
 import { useStore } from "@/store";
+import InstancesPricesPanels from "@/components/ui/instancesPricesPanels.vue";
 
 const props = defineProps(["template", "plans", "service", "sp"]);
 const emit = defineEmits(["refresh", "update"]);
diff --git a/admin-ui/src/components/modules/ovh/billingInfo.vue b/admin-ui/src/components/modules/ovh/billingInfo.vue
index 2db5dff5c..25c2466eb 100644
--- a/admin-ui/src/components/modules/ovh/billingInfo.vue
+++ b/admin-ui/src/components/modules/ovh/billingInfo.vue
@@ -46,79 +46,68 @@
         <v-text-field readonly label="Due to date/next payment" :value="date" />
       </v-col>
     </v-row>
-    <v-expansion-panels>
-      <v-expansion-panel>
-        <v-expansion-panel-header color="background-light"
-          >Prices</v-expansion-panel-header
-        >
-        <v-expansion-panel-content
-          class="ione-billing"
-          color="background-light"
-        >
-          <nocloud-table
-            hide-default-footer
-            sort-by="index"
-            item-key="key"
-            :show-select="false"
-            :headers="pricesHeaders"
-            :items="pricesItems"
-          >
-            <template v-slot:[`item.prices`]="{ item }">
-              <div class="d-flex">
-                <v-text-field
-                  class="mr-2"
-                  v-model="item.price"
-                  @change="onUpdatePrice(item, false)"
-                  :suffix="defaultCurrency"
-                  type="number"
-                  append-icon="mdi-pencil"
-                ></v-text-field>
-                <v-text-field
-                  class="ml-2"
-                  style="color: #c921c9"
-                  v-model="item.accountPrice"
-                  @change="onUpdatePrice(item, true)"
-                  :suffix="accountCurrency"
-                  type="number"
-                  append-icon="mdi-pencil"
-                ></v-text-field>
+
+    <instances-prices-panels>
+      <nocloud-table
+        hide-default-footer
+        sort-by="index"
+        item-key="key"
+        :show-select="false"
+        :headers="pricesHeaders"
+        :items="pricesItems"
+      >
+        <template v-slot:[`item.prices`]="{ item }">
+          <div class="d-flex">
+            <v-text-field
+              class="mr-2"
+              v-model="item.price"
+              @change="onUpdatePrice(item, false)"
+              :suffix="defaultCurrency"
+              type="number"
+              append-icon="mdi-pencil"
+            ></v-text-field>
+            <v-text-field
+              class="ml-2"
+              style="color: #c921c9"
+              v-model="item.accountPrice"
+              @change="onUpdatePrice(item, true)"
+              :suffix="accountCurrency"
+              type="number"
+              append-icon="mdi-pencil"
+            ></v-text-field>
+          </div>
+        </template>
+        <template v-slot:[`item.basePrice`]="{ item }">
+          <v-skeleton-loader type="text" v-if="isBasePricesLoading" />
+          <span v-else> {{ convertedBasePrices[item.key] }} PLN </span>
+        </template>
+        <template v-slot:body.append>
+          <tr>
+            <td></td>
+            <td></td>
+            <td>
+              {{ getBillingPeriod(tarrif.period) }}
+            </td>
+            <td>
+              {{
+                isBasePricesLoading
+                  ? "Loading..."
+                  : [totalBasePrice, "PLN"].join(" ")
+              }}
+            </td>
+            <td>
+              <div class="d-flex justify-end">
+                <span class="mr-4">
+                  {{ [totalNewPrice?.toFixed(2), defaultCurrency].join(" ") }}
+                  /
+                  {{ [accountTotalNewPrice, accountCurrency].join(" ") }}
+                </span>
               </div>
-            </template>
-            <template v-slot:[`item.basePrice`]="{ item }">
-              <v-skeleton-loader type="text" v-if="isBasePricesLoading" />
-              <span v-else> {{ convertedBasePrices[item.key] }} PLN </span>
-            </template>
-            <template v-slot:body.append>
-              <tr>
-                <td></td>
-                <td></td>
-                <td>
-                  {{ getBillingPeriod(tarrif.period) }}
-                </td>
-                <td>
-                  {{
-                    isBasePricesLoading
-                      ? "Loading..."
-                      : [totalBasePrice, "PLN"].join(" ")
-                  }}
-                </td>
-                <td>
-                  <div class="d-flex justify-end">
-                    <span class="mr-4">
-                      {{
-                        [totalNewPrice?.toFixed(2), defaultCurrency].join(" ")
-                      }}
-                      /
-                      {{ [accountTotalNewPrice, accountCurrency].join(" ") }}
-                    </span>
-                  </div>
-                </td>
-              </tr>
-            </template>
-          </nocloud-table>
-        </v-expansion-panel-content>
-      </v-expansion-panel>
-    </v-expansion-panels>
+            </td>
+          </tr>
+        </template>
+      </nocloud-table>
+    </instances-prices-panels>
 
     <edit-price-model
       @refresh="emit('refresh')"
@@ -148,6 +137,7 @@ import EditPriceModel from "@/components/dialogs/editPriceModel.vue";
 import usePlnRate from "@/hooks/usePlnRate";
 import { formatSecondsToDate, getBillingPeriod } from "@/functions";
 import useAccountConverter from "@/hooks/useAccountConverter";
+import InstancesPricesPanels from "@/components/ui/instancesPricesPanels.vue";
 
 const props = defineProps(["template", "plans"]);
 const emit = defineEmits(["refresh", "update"]);
diff --git a/admin-ui/src/components/modules/virtual/billingInfo.vue b/admin-ui/src/components/modules/virtual/billingInfo.vue
index 4b59d45a5..bbe8911a1 100644
--- a/admin-ui/src/components/modules/virtual/billingInfo.vue
+++ b/admin-ui/src/components/modules/virtual/billingInfo.vue
@@ -59,65 +59,54 @@
       </v-col>
     </v-row>
 
-    <v-expansion-panels>
-      <v-expansion-panel>
-        <v-expansion-panel-header color="background-light"
-          >Prices</v-expansion-panel-header
-        >
-        <v-expansion-panel-content
-          class="ione-billing"
-          color="background-light"
-        >
-          <nocloud-table
-            class="mb-5"
-            :headers="billingHeaders"
-            :items="billingItems"
-            no-hide-uuid
-            :show-select="false"
-            hide-default-footer
-          >
-            <template v-slot:[`item.price`]="{ item }">
-              <div class="d-flex">
-                <v-text-field
-                  class="mr-2"
-                  v-model="item.price"
-                  :suffix="defaultCurrency"
-                  @input="updatePrice(item, false)"
-                  append-icon="mdi-pencil"
-                />
-                <v-text-field
-                  class="ml-2"
-                  :suffix="accountCurrency"
-                  style="color: #c921c9"
-                  v-model="item.accountPrice"
-                  @input="updatePrice(item, true)"
-                  append-icon="mdi-pencil"
-                />
+    <instances-prices-panels>
+      <nocloud-table
+        class="mb-5"
+        :headers="billingHeaders"
+        :items="billingItems"
+        no-hide-uuid
+        :show-select="false"
+        hide-default-footer
+      >
+        <template v-slot:[`item.price`]="{ item }">
+          <div class="d-flex">
+            <v-text-field
+              class="mr-2"
+              v-model="item.price"
+              :suffix="defaultCurrency"
+              @input="updatePrice(item, false)"
+              append-icon="mdi-pencil"
+            />
+            <v-text-field
+              class="ml-2"
+              :suffix="accountCurrency"
+              style="color: #c921c9"
+              v-model="item.accountPrice"
+              @input="updatePrice(item, true)"
+              append-icon="mdi-pencil"
+            />
+          </div>
+        </template>
+        <template v-slot:body.append>
+          <tr>
+            <td></td>
+            <td />
+            <td>
+              {{
+                billingItems.find((i) => i.name === template.product)?.period
+              }}
+            </td>
+            <td>
+              <div class="d-flex justify-end mr-4">
+                {{ [totalPrice, defaultCurrency].join(" ") }}
+                /
+                {{ [totalAccountPrice, accountCurrency].join(" ") }}
               </div>
-            </template>
-            <template v-slot:body.append>
-              <tr>
-                <td></td>
-                <td />
-                <td>
-                  {{
-                    billingItems.find((i) => i.name === template.product)
-                      ?.period
-                  }}
-                </td>
-                <td>
-                  <div class="d-flex justify-end mr-4">
-                    {{ [totalPrice, defaultCurrency].join(" ") }}
-                    /
-                    {{ [totalAccountPrice, accountCurrency].join(" ") }}
-                  </div>
-                </td>
-              </tr>
-            </template>
-          </nocloud-table>
-        </v-expansion-panel-content>
-      </v-expansion-panel>
-    </v-expansion-panels>
+            </td>
+          </tr>
+        </template>
+      </nocloud-table>
+    </instances-prices-panels>
 
     <change-monitorings
       :template="template"
@@ -145,6 +134,7 @@ import EditPriceModel from "@/components/dialogs/editPriceModel.vue";
 import useAccountConverter from "@/hooks/useAccountConverter";
 import NocloudTable from "@/components/table.vue";
 import { useStore } from "@/store";
+import InstancesPricesPanels from "@/components/ui/instancesPricesPanels.vue";
 
 const props = defineProps(["template", "plans", "service", "sp"]);
 const emit = defineEmits(["refresh"]);
diff --git a/admin-ui/src/components/ui/instancesPricesPanels.vue b/admin-ui/src/components/ui/instancesPricesPanels.vue
new file mode 100644
index 000000000..be3717d6d
--- /dev/null
+++ b/admin-ui/src/components/ui/instancesPricesPanels.vue
@@ -0,0 +1,21 @@
+<template>
+  <v-expansion-panels>
+    <v-expansion-panel>
+      <v-expansion-panel-header color="background-light">
+        <span style="color: rgb(255, 0, 255)" class="text-h6">Prices</span>
+        <template v-slot:actions>
+          <v-icon color="primary" x-large> $expand </v-icon>
+        </template>
+      </v-expansion-panel-header>
+      <v-expansion-panel-content color="background-light">
+        <slot />
+      </v-expansion-panel-content>
+    </v-expansion-panel>
+  </v-expansion-panels>
+</template>
+
+<script>
+export default {
+  name: "instancesPricesPanels",
+};
+</script>

From 4347c457858b7b29f6998879c2155d1b704aeb95 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 27 Sep 2023 17:54:17 +0400
Subject: [PATCH 073/123] make price colorfull

---
 admin-ui/src/components/modules/ione/billingInfo.vue    | 8 +++++---
 admin-ui/src/components/modules/ovh/billingInfo.vue     | 4 ++--
 admin-ui/src/components/modules/virtual/billingInfo.vue | 8 +++++---
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/admin-ui/src/components/modules/ione/billingInfo.vue b/admin-ui/src/components/modules/ione/billingInfo.vue
index 15929a8e6..6f7c077da 100644
--- a/admin-ui/src/components/modules/ione/billingInfo.vue
+++ b/admin-ui/src/components/modules/ione/billingInfo.vue
@@ -109,9 +109,11 @@
             <td></td>
             <td></td>
             <td>
-              {{ totalAccountPrice }} {{ accountCurrency }} /
-              {{ totalPrice }}
-              {{ defaultCurrency }}
+              <v-chip color="primary" outlined>
+                {{ totalAccountPrice }} {{ accountCurrency }} /
+                {{ totalPrice }}
+                {{ defaultCurrency }}
+              </v-chip>
             </td>
           </tr>
         </template>
diff --git a/admin-ui/src/components/modules/ovh/billingInfo.vue b/admin-ui/src/components/modules/ovh/billingInfo.vue
index 25c2466eb..4ef17a0c6 100644
--- a/admin-ui/src/components/modules/ovh/billingInfo.vue
+++ b/admin-ui/src/components/modules/ovh/billingInfo.vue
@@ -97,11 +97,11 @@
             </td>
             <td>
               <div class="d-flex justify-end">
-                <span class="mr-4">
+                <v-chip outlined color="primary" class="mr-4">
                   {{ [totalNewPrice?.toFixed(2), defaultCurrency].join(" ") }}
                   /
                   {{ [accountTotalNewPrice, accountCurrency].join(" ") }}
-                </span>
+                </v-chip>
               </div>
             </td>
           </tr>
diff --git a/admin-ui/src/components/modules/virtual/billingInfo.vue b/admin-ui/src/components/modules/virtual/billingInfo.vue
index bbe8911a1..e8178ade4 100644
--- a/admin-ui/src/components/modules/virtual/billingInfo.vue
+++ b/admin-ui/src/components/modules/virtual/billingInfo.vue
@@ -98,9 +98,11 @@
             </td>
             <td>
               <div class="d-flex justify-end mr-4">
-                {{ [totalPrice, defaultCurrency].join(" ") }}
-                /
-                {{ [totalAccountPrice, accountCurrency].join(" ") }}
+                <v-chip color="primary" outlined>
+                  {{ [totalPrice, defaultCurrency].join(" ") }}
+                  /
+                  {{ [totalAccountPrice, accountCurrency].join(" ") }}
+                </v-chip>
               </div>
             </td>
           </tr>

From 5be46859ffe6dcf806d2c0cb2fcab62437e6064e Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 27 Sep 2023 17:59:16 +0400
Subject: [PATCH 074/123] hide prices

---
 .../components/modules/ione/billingInfo.vue   | 20 -------------
 .../components/modules/ovh/billingInfo.vue    | 30 -------------------
 .../modules/virtual/billingInfo.vue           | 25 ----------------
 3 files changed, 75 deletions(-)

diff --git a/admin-ui/src/components/modules/ione/billingInfo.vue b/admin-ui/src/components/modules/ione/billingInfo.vue
index 6f7c077da..4b26a7d4e 100644
--- a/admin-ui/src/components/modules/ione/billingInfo.vue
+++ b/admin-ui/src/components/modules/ione/billingInfo.vue
@@ -19,22 +19,6 @@
           @click:append="changeTariffDialog = true"
         />
       </v-col>
-      <v-col>
-        <v-text-field
-          :suffix="defaultCurrency"
-          readonly
-          label="Price instance total"
-          :value="price"
-        />
-      </v-col>
-      <v-col>
-        <v-text-field
-          readonly
-          label="Account price instance total"
-          :value="accountPrice"
-          :suffix="accountCurrency"
-        />
-      </v-col>
       <v-col>
         <v-text-field
           readonly
@@ -186,8 +170,6 @@ const {
 const changeDatesDialog = ref(false);
 const changeTariffDialog = ref(false);
 const priceModelDialog = ref(false);
-const price = ref(0);
-const accountPrice = ref(0);
 const billingItems = ref([]);
 const billingHeaders = ref([
   { text: "Name", value: "name" },
@@ -200,7 +182,6 @@ const billingHeaders = ref([
 
 onMounted(() => {
   billingItems.value = getBillingItems();
-  price.value = totalPrice.value;
   fetchAccountRate(accountCurrency);
 });
 
@@ -337,7 +318,6 @@ watch(accountRate, () => {
     i.accountPrice = toAccountPrice(i.price);
     return i;
   });
-  accountPrice.value = totalAccountPrice.value;
 });
 </script>
 
diff --git a/admin-ui/src/components/modules/ovh/billingInfo.vue b/admin-ui/src/components/modules/ovh/billingInfo.vue
index 4ef17a0c6..c764be1fb 100644
--- a/admin-ui/src/components/modules/ovh/billingInfo.vue
+++ b/admin-ui/src/components/modules/ovh/billingInfo.vue
@@ -19,22 +19,6 @@
           @click:append="priceModelDialog = true"
         />
       </v-col>
-      <v-col>
-        <v-text-field
-          readonly
-          :suffix="defaultCurrency"
-          label="Price instance total"
-          :value="type === 'dedicated' ? +totalNewPrice?.toFixed(2) : getPrice"
-        />
-      </v-col>
-      <v-col>
-        <v-text-field
-          readonly
-          label="Account price instance total"
-          :value="accountTotalNewPrice"
-          :suffix="accountCurrency"
-        />
-      </v-col>
       <v-col>
         <v-text-field
           readonly
@@ -378,20 +362,6 @@ const tarrif = computed(() => {
   }
   return template.value.billingPlan.products[key];
 });
-const getPrice = computed(() => {
-  const prices = [];
-  prices.push(tarrif.value?.price);
-  addons.value.forEach((name) => {
-    prices.push(
-      template.value.billingPlan.resources.find(
-        (p) =>
-          p.key === [duration.value, planCode, name].join(" ") ||
-          p.key === [duration.value, name].join(" ")
-      )?.price || 0
-    );
-  });
-  return prices.reduce((acc, val) => acc + val, 0);
-});
 
 const service = computed(() =>
   store.getters["services/all"].find((s) => s.uuid === template.value.service)
diff --git a/admin-ui/src/components/modules/virtual/billingInfo.vue b/admin-ui/src/components/modules/virtual/billingInfo.vue
index e8178ade4..61c0b060f 100644
--- a/admin-ui/src/components/modules/virtual/billingInfo.vue
+++ b/admin-ui/src/components/modules/virtual/billingInfo.vue
@@ -19,22 +19,6 @@
           append-icon="mdi-pencil"
         />
       </v-col>
-      <v-col>
-        <v-text-field
-          readonly
-          label="Price instance total"
-          :suffix="defaultCurrency"
-          :value="price"
-        />
-      </v-col>
-      <v-col>
-        <v-text-field
-          readonly
-          label="Account price instance total"
-          :value="accountPrice"
-          :suffix="accountCurrency"
-        />
-      </v-col>
       <v-col>
         <v-text-field
           readonly
@@ -154,7 +138,6 @@ const {
 
 const changeDatesDialog = ref(false);
 const priceModelDialog = ref(false);
-const accountPrice = ref(0);
 const billingHeaders = ref([
   { text: "Name", value: "name" },
   { text: "Payment term", value: "kind" },
@@ -168,17 +151,10 @@ const date = computed(() =>
 );
 const isMonitoringsEmpty = computed(() => date.value === "-");
 
-const price = computed(() => {
-  return template.value.billingPlan.products[template.value.product]?.price;
-});
-
 const filtredPlans = computed(() =>
   plans.value.filter((p) => p.type === "virtual")
 );
 
-const totalAccountPrice = computed(() => {
-  return toAccountPrice(totalPrice.value);
-});
 const totalPrice = computed(() => {
   return billingItems.value.reduce((acc, i) => acc + +i.price, 0);
 });
@@ -193,7 +169,6 @@ onMounted(() => {
 });
 
 watch(accountRate, () => {
-  accountPrice.value = totalAccountPrice.value;
   billingItems.value = billingItems.value.map((i) => {
     i.accountPrice = toAccountPrice(i.price);
     return i;

From 1733f83877fbc0af1da54ba3206634881b432bc2 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 27 Sep 2023 18:21:44 +0400
Subject: [PATCH 075/123] add lock/unlock instance

---
 admin-ui/src/components/instance/controls.vue | 45 ++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/admin-ui/src/components/instance/controls.vue b/admin-ui/src/components/instance/controls.vue
index 393889af0..38539a001 100644
--- a/admin-ui/src/components/instance/controls.vue
+++ b/admin-ui/src/components/instance/controls.vue
@@ -16,6 +16,11 @@
     >
       {{ btn.title || btn.action }}
     </v-btn>
+    <confirm-dialog @confirm="lockInstance">
+      <v-btn :loading="isLockLoading" class="mr-2">
+        {{ template.data.lock ? "Unlock" : "Lock" }}
+      </v-btn>
+    </confirm-dialog>
     <confirm-dialog @confirm="deleteInstance">
       <v-btn class="mr-2" :loading="isLoading"> Delete </v-btn>
     </confirm-dialog>
@@ -60,7 +65,11 @@ export default {
     copyTemplate: { type: Object },
     sp: { type: Object },
   },
-  data: () => ({ isLoading: false, isSaveLoading: false }),
+  data: () => ({
+    isLoading: false,
+    isSaveLoading: false,
+    isLockLoading: false,
+  }),
   methods: {
     ...mapActions("actions", ["sendVmAction"]),
     async deleteInstance() {
@@ -97,6 +106,40 @@ export default {
         this.isLoading = false;
       }
     },
+    lockInstance() {
+      const lock = !this.template.data.lock;
+
+      const tempService = JSON.parse(JSON.stringify(this.service));
+      const igIndex = tempService.instancesGroups.findIndex((ig) =>
+        ig.instances.find((i) => i.uuid === this.template.uuid)
+      );
+      const instanceIndex = tempService.instancesGroups[
+        igIndex
+      ].instances.findIndex((i) => i.uuid === this.template.uuid);
+
+      tempService.instancesGroups[igIndex].instances[instanceIndex] = {
+        ...this.template,
+        data: { ...this.template.data, lock },
+      };
+
+      this.isLockLoading = true;
+      api.services
+        ._update(tempService)
+        .then(() => {
+          this.showSnackbarSuccess({
+            message: `Instance ${lock ? "lock" : "unlock"} successfully`,
+          });
+
+          this.$store.dispatch("services/fetch", this.template.uuid);
+          this.$store.dispatch("servicesProviders/fetch");
+        })
+        .catch((err) => {
+          this.showSnackbarError({ message: err });
+        })
+        .finally(() => {
+          this.isSaveLoading = false;
+        });
+    },
     async save() {
       const tempService = JSON.parse(JSON.stringify(this.service));
       const instance = JSON.parse(JSON.stringify(this.copyTemplate));

From f085aabeb07a11bcb814977b26cde656bae65d30 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 27 Sep 2023 19:31:11 +0400
Subject: [PATCH 076/123] refactor price & delete unused fetch

---
 .../components/modules/ione/billingInfo.vue   | 18 +++--
 .../components/modules/openai/billingInfo.vue |  6 +-
 .../components/modules/ovh/billingInfo.vue    | 21 ++----
 .../modules/virtual/billingInfo.vue           | 21 +++---
 admin-ui/src/hooks/useAccountConverter.js     | 70 -------------------
 admin-ui/src/hooks/useInstancePrices.js       | 50 +++++++++++++
 6 files changed, 74 insertions(+), 112 deletions(-)
 delete mode 100644 admin-ui/src/hooks/useAccountConverter.js
 create mode 100644 admin-ui/src/hooks/useInstancePrices.js

diff --git a/admin-ui/src/components/modules/ione/billingInfo.vue b/admin-ui/src/components/modules/ione/billingInfo.vue
index 4b26a7d4e..0271c6d75 100644
--- a/admin-ui/src/components/modules/ione/billingInfo.vue
+++ b/admin-ui/src/components/modules/ione/billingInfo.vue
@@ -149,7 +149,7 @@ import ChangeIoneMonitorings from "@/components/dialogs/changeMonitorings.vue";
 import ChangeIoneTarrif from "@/components/dialogs/changeIoneTarrif.vue";
 import NocloudTable from "@/components/table.vue";
 import EditPriceModel from "@/components/dialogs/editPriceModel.vue";
-import useAccountConverter from "@/hooks/useAccountConverter";
+import useInstancePrices from "@/hooks/useInstancePrices";
 import { useStore } from "@/store";
 import InstancesPricesPanels from "@/components/ui/instancesPricesPanels.vue";
 
@@ -159,13 +159,8 @@ const emit = defineEmits(["refresh", "update"]);
 const { template, service, sp, plans } = toRefs(props);
 
 const store = useStore();
-const {
-  fetchAccountRate,
-  accountCurrency,
-  toAccountPrice,
-  accountRate,
-  fromAccountPrice,
-} = useAccountConverter(template.value);
+const { accountCurrency, toAccountPrice, accountRate, fromAccountPrice } =
+  useInstancePrices(template.value);
 
 const changeDatesDialog = ref(false);
 const changeTariffDialog = ref(false);
@@ -182,7 +177,6 @@ const billingHeaders = ref([
 
 onMounted(() => {
   billingItems.value = getBillingItems();
-  fetchAccountRate(accountCurrency);
 });
 
 const date = computed(() =>
@@ -233,9 +227,11 @@ const totalAccountPrice = computed(() => toAccountPrice(totalPrice.value));
 const getBillingItems = () => {
   const items = [];
 
+  const price = billingPlan.value.products[template.value.product]?.price;
   items.push({
     name: template.value.product,
-    price: billingPlan.value.products[template.value.product]?.price,
+    price,
+    accountPrice: toAccountPrice(price),
     path: `billingPlan.products.${template.value.product}.price`,
     quantity: 1,
     unit: "pcs",
@@ -257,6 +253,7 @@ const getBillingItems = () => {
       items.push({
         name: resourceKey,
         price: addon.price,
+        accountPrice: toAccountPrice(addon.price),
         kind: addon.kind,
         period: addon.period,
         quantity,
@@ -276,6 +273,7 @@ const getBillingItems = () => {
     items.push({
       name: driveType,
       price: drive?.price,
+      accountPrice: toAccountPrice(drive.price),
       path: `billingPlan.resources.${driveIndex}.price`,
       kind: drive?.kind,
       quantity: template.value.resources.drive_size / 1024,
diff --git a/admin-ui/src/components/modules/openai/billingInfo.vue b/admin-ui/src/components/modules/openai/billingInfo.vue
index b8f29235f..783665662 100644
--- a/admin-ui/src/components/modules/openai/billingInfo.vue
+++ b/admin-ui/src/components/modules/openai/billingInfo.vue
@@ -90,7 +90,7 @@ import {
   watch,
 } from "vue";
 import NocloudTable from "@/components/table.vue";
-import useAccountConverter from "@/hooks/useAccountConverter";
+import useInstancePrices from "@/hooks/useInstancePrices";
 import { useStore } from "@/store";
 import api from "@/api";
 
@@ -101,12 +101,11 @@ const { template, plans, service } = toRefs(props);
 
 const store = useStore();
 const {
-  fetchAccountRate,
   accountCurrency,
   toAccountPrice,
   accountRate,
   fromAccountPrice,
-} = useAccountConverter(template.value);
+} = useInstancePrices(template.value);
 
 const priceModelDialog = ref(false);
 const newPlan = ref();
@@ -121,7 +120,6 @@ const billingHeaders = ref([
 
 onMounted(() => {
   billingItems.value = getBillingItems();
-  fetchAccountRate(accountCurrency);
 });
 const filteredPlans = computed(() =>
   plans.value.filter((p) => p.type === "openai")
diff --git a/admin-ui/src/components/modules/ovh/billingInfo.vue b/admin-ui/src/components/modules/ovh/billingInfo.vue
index c764be1fb..bb9e57b46 100644
--- a/admin-ui/src/components/modules/ovh/billingInfo.vue
+++ b/admin-ui/src/components/modules/ovh/billingInfo.vue
@@ -120,7 +120,7 @@ import { useStore } from "@/store";
 import EditPriceModel from "@/components/dialogs/editPriceModel.vue";
 import usePlnRate from "@/hooks/usePlnRate";
 import { formatSecondsToDate, getBillingPeriod } from "@/functions";
-import useAccountConverter from "@/hooks/useAccountConverter";
+import useInstancePrices from "@/hooks/useInstancePrices";
 import InstancesPricesPanels from "@/components/ui/instancesPricesPanels.vue";
 
 const props = defineProps(["template", "plans"]);
@@ -130,13 +130,8 @@ const { template, plans } = toRefs(props);
 
 const store = useStore();
 const rate = usePlnRate();
-const {
-  toAccountPrice,
-  fromAccountPrice,
-  fetchAccountRate,
-  accountCurrency,
-  accountRate,
-} = useAccountConverter(template.value);
+const { toAccountPrice, fromAccountPrice, accountCurrency, accountRate } =
+  useInstancePrices(template.value);
 
 const pricesItems = ref([]);
 const basePrices = ref({});
@@ -342,7 +337,7 @@ const initPrices = () => {
 
   pricesItems.value = pricesItems.value.map((i) => {
     i.period = getBillingPeriod(i.period);
-    i.accountPrice = i.price * accountRate.value;
+    i.accountPrice = toAccountPrice(i.price);
 
     return i;
   });
@@ -393,14 +388,6 @@ const getBasePrices = async () => {
 onMounted(() => {
   initPrices();
   getBasePrices();
-  if (accountCurrency.value) {
-    fetchAccountRate(accountCurrency.value).then(() => {
-      pricesItems.value = pricesItems.value.map((i) => {
-        i.accountPrice = toAccountPrice(i.price);
-        return i;
-      });
-    });
-  }
 });
 </script>
 
diff --git a/admin-ui/src/components/modules/virtual/billingInfo.vue b/admin-ui/src/components/modules/virtual/billingInfo.vue
index 61c0b060f..38596fc66 100644
--- a/admin-ui/src/components/modules/virtual/billingInfo.vue
+++ b/admin-ui/src/components/modules/virtual/billingInfo.vue
@@ -117,7 +117,7 @@ import { computed, defineProps, toRefs, ref, watch, onMounted } from "vue";
 import { formatSecondsToDate, getBillingPeriod } from "@/functions";
 import ChangeMonitorings from "@/components/dialogs/changeMonitorings.vue";
 import EditPriceModel from "@/components/dialogs/editPriceModel.vue";
-import useAccountConverter from "@/hooks/useAccountConverter";
+import useInstancePrices from "@/hooks/useInstancePrices";
 import NocloudTable from "@/components/table.vue";
 import { useStore } from "@/store";
 import InstancesPricesPanels from "@/components/ui/instancesPricesPanels.vue";
@@ -128,13 +128,8 @@ const emit = defineEmits(["refresh"]);
 const { template, plans, service } = toRefs(props);
 
 const store = useStore();
-const {
-  fetchAccountRate,
-  accountCurrency,
-  toAccountPrice,
-  accountRate,
-  fromAccountPrice,
-} = useAccountConverter(template.value);
+const { accountCurrency, toAccountPrice, accountRate, fromAccountPrice } =
+  useInstancePrices(template.value);
 
 const changeDatesDialog = ref(false);
 const priceModelDialog = ref(false);
@@ -159,12 +154,15 @@ const totalPrice = computed(() => {
   return billingItems.value.reduce((acc, i) => acc + +i.price, 0);
 });
 
+const totalAccountPrice = computed(() => {
+  return billingItems.value.reduce((acc, i) => acc + +i.accountPrice, 0);
+});
+
 const billingPlan = computed(() => template.value.billingPlan);
 
 const defaultCurrency = computed(() => store.getters["currencies/default"]);
 
 onMounted(() => {
-  fetchAccountRate();
   billingItems.value = getBillingItems();
 });
 
@@ -177,13 +175,14 @@ watch(accountRate, () => {
 
 const getBillingItems = () => {
   const items = [];
-
+  const price = billingPlan.value.products[template.value.product]?.price;
   items.push({
     name: template.value.product,
-    price: billingPlan.value.products[template.value.product]?.price,
+    price,
     path: `billingPlan.products.${template.value.product}.price`,
     kind: billingPlan.value.products[template.value.product]?.kind,
     period: billingPlan.value.products[template.value.product]?.period,
+    accountPrice: toAccountPrice(price),
   });
 
   return items.map((i) => {
diff --git a/admin-ui/src/hooks/useAccountConverter.js b/admin-ui/src/hooks/useAccountConverter.js
deleted file mode 100644
index b5e3c7384..000000000
--- a/admin-ui/src/hooks/useAccountConverter.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import api from "@/api";
-import { computed, ref, watch } from "vue";
-import { useStore } from "@/store";
-
-const useAccountConverter = (instance) => {
-  const store = useStore();
-
-  const accountRate = ref(0);
-
-  const namespace = computed(() =>
-    store.getters["namespaces/all"]?.find(
-      (n) => n.uuid === instance.access.namespace
-    )
-  );
-
-  const account = computed(() => {
-    if (!namespace.value) {
-      return;
-    }
-    return store.getters["accounts/all"]?.find(
-      (a) => a?.uuid === namespace.value.access.namespace
-    );
-  });
-
-  const accountCurrency = computed(() => account.value.currency);
-
-  const defaultCurrency = computed(() => {
-    return store.getters["currencies/default"];
-  });
-
-  const toAccountPrice = (price) => {
-    return accountRate.value ? (price / accountRate.value).toFixed(2) : 0;
-  };
-  const fromAccountPrice = (price) => {
-    return accountRate.value ? (price * accountRate.value).toFixed(2) : 0;
-  };
-
-  const fetchAccountRate = async () => {
-    if (!account.value.currency || !defaultCurrency.value) {
-      return;
-    }
-    if (account.value.currency === defaultCurrency.value) {
-      accountRate.value = 1;
-      return;
-    }
-    const res = await api.get(
-      `/billing/currencies/rates/${account.value.currency}/${defaultCurrency.value}`
-    );
-    accountRate.value = res.rate;
-  };
-
-  watch(accountCurrency, () => {
-    fetchAccountRate();
-  });
-
-  watch(defaultCurrency, () => {
-    fetchAccountRate();
-  });
-
-  return {
-    toAccountPrice,
-    fromAccountPrice,
-    fetchAccountRate,
-    account,
-    accountCurrency,
-    accountRate,
-  };
-};
-
-export default useAccountConverter;
diff --git a/admin-ui/src/hooks/useInstancePrices.js b/admin-ui/src/hooks/useInstancePrices.js
new file mode 100644
index 000000000..920110935
--- /dev/null
+++ b/admin-ui/src/hooks/useInstancePrices.js
@@ -0,0 +1,50 @@
+import { computed } from "vue";
+import { useStore } from "@/store";
+import useCurrency from "@/hooks/useCurrency";
+
+const useInstancePrices = (instance) => {
+  const store = useStore();
+  const { convertFrom, convertTo, rates, defaultCurrency } = useCurrency();
+
+  const namespace = computed(() =>
+    store.getters["namespaces/all"]?.find(
+      (n) => n.uuid === instance.access.namespace
+    )
+  );
+
+  const account = computed(() => {
+    if (!namespace.value) {
+      return;
+    }
+    return store.getters["accounts/all"]?.find(
+      (a) => a?.uuid === namespace.value.access.namespace
+    );
+  });
+
+  const accountCurrency = computed(() => account.value.currency);
+  const accountRate = computed(() => {
+    if (defaultCurrency.value === accountCurrency.value) {
+      return 1;
+    }
+    return rates.value.find(
+      (r) => r.to === accountCurrency.value && r.from === defaultCurrency.value
+    );
+  });
+
+  const toAccountPrice = (price) => {
+    return convertTo(price, accountCurrency.value);
+  };
+  const fromAccountPrice = (price) => {
+    return convertFrom(price, accountCurrency.value);
+  };
+
+  return {
+    toAccountPrice,
+    fromAccountPrice,
+    account,
+    accountCurrency,
+    accountRate,
+  };
+};
+
+export default useInstancePrices;

From 0bb95e6b4c7c0a0bbfc21454490cc409629bb5de Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Wed, 27 Sep 2023 19:32:52 +0400
Subject: [PATCH 077/123] hide balance

---
 admin-ui/src/App.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/admin-ui/src/App.vue b/admin-ui/src/App.vue
index 05318f444..9110b0763 100644
--- a/admin-ui/src/App.vue
+++ b/admin-ui/src/App.vue
@@ -276,7 +276,6 @@
           </v-btn>
         </v-col>
         <v-col class="d-flex justify-end align-center">
-          <balance title="Balance: " loged-in-user />
           <languages v-if="false" />
           <v-menu offset-y transition="slide-y-transition">
             <template v-slot:activator="{ on, attrs }">
@@ -301,6 +300,9 @@
                   >
                 </v-list-item-content>
               </v-list-item>
+              <v-list-item>
+                <balance title="Balance: " loged-in-user />
+              </v-list-item>
               <v-divider></v-divider>
               <v-list-item @click="logoutHandler">
                 <v-list-item-title>Logout</v-list-item-title>

From f384995ebafa7f020125c2e2414eddaddc642294 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Wed, 27 Sep 2023 22:05:14 +0300
Subject: [PATCH 078/123] Fix

---
 pkg/oauth2/handlers/bitrix.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkg/oauth2/handlers/bitrix.go b/pkg/oauth2/handlers/bitrix.go
index 7eea713f8..977d41b4d 100644
--- a/pkg/oauth2/handlers/bitrix.go
+++ b/pkg/oauth2/handlers/bitrix.go
@@ -169,6 +169,8 @@ func (g *BitrixOauthHandler) Setup(
 		user := userInfo.Result
 		value := user[field].(string)
 
+		log.Debug("User", zap.Any("user", user))
+
 		name := user["NAME"].(string)
 		last_name := user["LAST_NAME"].(string)
 

From 9b57d3f258cc6efc86002e72c443a94418ed3f0d Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Wed, 27 Sep 2023 22:17:40 +0300
Subject: [PATCH 079/123] Fix

---
 pkg/oauth2/handlers/bitrix.go | 43 +++++++++++++----------------------
 1 file changed, 16 insertions(+), 27 deletions(-)

diff --git a/pkg/oauth2/handlers/bitrix.go b/pkg/oauth2/handlers/bitrix.go
index 977d41b4d..4f42691dc 100644
--- a/pkg/oauth2/handlers/bitrix.go
+++ b/pkg/oauth2/handlers/bitrix.go
@@ -173,6 +173,7 @@ func (g *BitrixOauthHandler) Setup(
 
 		name := user["NAME"].(string)
 		last_name := user["LAST_NAME"].(string)
+		id := user["ID"].(string)
 
 		rootToken, err := auth.MakeToken(schema.ROOT_ACCOUNT_KEY)
 		if err != nil {
@@ -254,6 +255,8 @@ func (g *BitrixOauthHandler) Setup(
 				get.Data.GetFields()["oauth_types"].GetListValue().Values = append(get.Data.GetFields()["oauth_types"].GetListValue().GetValues(), structpb.NewStringValue("oauth2-bitrix"))
 			}
 
+			get.Data.Fields["bitrix"] = structpb.NewStringValue(id)
+
 			_, err = regClient.Update(ctx, get)
 			if err != nil {
 				log.Error("Failed to update")
@@ -273,9 +276,21 @@ func (g *BitrixOauthHandler) Setup(
 				Exp: int32(time.Now().Unix() + int64(time.Hour.Seconds()*2160)),
 			})
 			if err != nil {
-				create, err := regClient.Create(ctx, &accounts.CreateRequest{
+				list, _ := structpb.NewList([]interface{}{
+					"oauth2-bitrix",
+				})
+				listValue := structpb.NewListValue(list)
+
+				data := &structpb.Struct{
+					Fields: map[string]*structpb.Value{
+						"oauth_types": listValue,
+						"bitrix":      structpb.NewStringValue(id),
+					},
+				}
+				_, err := regClient.Create(ctx, &accounts.CreateRequest{
 					Title:     fmt.Sprintf("%s %s", name, last_name),
 					Namespace: schema.ROOT_NAMESPACE_KEY,
+					Data:      data,
 					Auth: &accounts.Credentials{
 						Type: "oauth2-bitrix",
 						Data: []string{
@@ -302,32 +317,6 @@ func (g *BitrixOauthHandler) Setup(
 					log.Error("Failed get token", zap.Error(err))
 					return
 				}
-
-				get, err := regClient.Get(ctx, &accounts.GetRequest{
-					Uuid: create.GetUuid(),
-				})
-
-				if err != nil {
-					log.Error("Failed get acc", zap.Error(err))
-					return
-				}
-
-				list, _ := structpb.NewList([]interface{}{
-					"oauth2-bitrix",
-				})
-				listValue := structpb.NewListValue(list)
-
-				get.Data = &structpb.Struct{
-					Fields: map[string]*structpb.Value{
-						"oauth_types": listValue,
-					},
-				}
-
-				_, err = regClient.Update(ctx, get)
-				if err != nil {
-					log.Error("Failed to update")
-					return
-				}
 			}
 			http.Redirect(w, r, fmt.Sprintf("%s?token=%s", stateInfo.RedirectUrl, resp.GetToken()), http.StatusSeeOther)
 		}

From c577d8bb0dea819360fc33d826b45147b268d633 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 28 Sep 2023 10:57:09 +0400
Subject: [PATCH 080/123] add groups to plan products

---
 .../src/components/plans_products_table.vue   | 122 +++++++++++++++---
 1 file changed, 104 insertions(+), 18 deletions(-)

diff --git a/admin-ui/src/components/plans_products_table.vue b/admin-ui/src/components/plans_products_table.vue
index 253c43de0..d8f4195d6 100644
--- a/admin-ui/src/components/plans_products_table.vue
+++ b/admin-ui/src/components/plans_products_table.vue
@@ -97,6 +97,33 @@
               @change="(value) => changeProduct('sorter', value, item.id)"
             />
           </template>
+          <template v-slot:[`item.group`]="{ item }">
+            <div class="d-flex align-center">
+              <v-select
+                v-if="productId !== item.id"
+                :items="[...groups.values()]"
+                :value="products[item.key].group"
+                @change="setGroup($event, item.id)"
+              />
+              <v-text-field v-else v-model="groupActionPayload" />
+              <template v-if="productId !== item.id">
+                <v-btn icon @click="setGroupAction('edit', products[item.key])">
+                  <v-icon>mdi-pencil</v-icon>
+                </v-btn>
+                <v-btn icon @click="setGroupAction('add', products[item.key])">
+                  <v-icon>mdi-plus</v-icon>
+                </v-btn>
+              </template>
+              <template v-else>
+                <v-btn icon @click="setGroupAction('')">
+                  <v-icon>mdi-cancel</v-icon>
+                </v-btn>
+                <v-btn icon @click="invokeGroupAction(item)">
+                  <v-icon>mdi-content-save</v-icon>
+                </v-btn>
+              </template>
+            </div>
+          </template>
           <template v-slot:[`item.kind`]="{ item }">
             <v-radio-group
               row
@@ -168,7 +195,7 @@
 </template>
 
 <script setup>
-import { computed, onMounted, ref, toRefs, watch } from "vue";
+import { onMounted, ref, toRefs, watch } from "vue";
 import { VueEditor } from "vue2-editor";
 import dateField from "@/components/date.vue";
 import JsonEditor from "@/components/JsonEditor.vue";
@@ -188,12 +215,18 @@ const { products, resources } = toRefs(props);
 
 const { defaultCurrency } = useCurrency();
 
+const productsArray = ref([]);
 const table = ref();
 const fullDate = ref({});
 const selected = ref([]);
 const expanded = ref([]);
 const tabsIndex = ref(0);
 
+const groups = ref(new Map());
+const productId = ref("");
+const groupAction = ref("");
+const groupActionPayload = ref("");
+
 const generalRule = [(v) => !!v || "This field is required!"];
 const kinds = ["POSTPAID", "PREPAID"];
 const tabs = ["Products", "Resources"];
@@ -204,12 +237,15 @@ const headers = [
   { text: "Price", value: "price", width: 150 },
   { text: "Period", value: "period", width: 220 },
   { text: "Kind", value: "kind", width: 228 },
+  { text: "Group", value: "group", width: 300 },
   { text: "Public", value: "public" },
   { text: "Sorter", value: "sorter" },
 ];
 
 onMounted(() => {
+  setProductsArray();
   setFullDates(products.value);
+  setDefaultGroups();
 });
 
 function changeDate({ value }, id) {
@@ -225,7 +261,61 @@ function changeResource(data) {
   emits("change:resource", data);
 }
 
+const setProductsArray = () => {
+  productsArray.value = Object.keys(products.value).map((key) => ({
+    ...products.value[key],
+    key,
+  }));
+};
+
+const setDefaultGroups = () => {
+  for (const key in products.value) {
+    let group = products.value[key]?.group;
+    if (!group) {
+      changeProduct("group", "default", products.value[key].id);
+      group = "default";
+    }
+
+    groups.value.set(group, group);
+  }
+};
+
+const setGroupAction = (action, item) => {
+  groupAction.value = action;
+  groupActionPayload.value = item?.group || "";
+  productId.value = item?.id || "";
+};
+
+const invokeGroupAction = (item) => {
+  if (groupAction.value === "edit") {
+    changeGroupName(products.value[item.key].group, groupActionPayload.value);
+  } else {
+    setGroup(groupActionPayload.value, item.id);
+  }
+
+  setGroupAction("");
+};
+
+const changeGroupName = (group, newGroup) => {
+  for (const key in products.value) {
+    if (products.value[key].group === group) {
+      changeProduct("group", newGroup, products.value[key].id);
+    }
+  }
+
+  groups.value.delete(group);
+  groups.value.set(newGroup, newGroup);
+  setProductsArray();
+};
+
+const setGroup = (group, id) => {
+  changeProduct("group", group, id);
+  groups.value.set(group, group);
+  setProductsArray();
+};
+
 const copyProducts = () => {
+  setProductsArray();
   const copiedProducts = [
     ...selected.value.map((p) => ({
       ...p,
@@ -251,30 +341,23 @@ const copyProducts = () => {
 };
 
 function addConfig() {
-  const value = [...productsArray.value];
-  const result = {};
-
-  value.push({
+  const result = { ...products.value };
+  result[""] = {
     key: "",
     title: "",
     kind: "POSTPAID",
     price: 0,
+    group: groups.value.values().next().value,
     period: 0,
     resources: {},
     public: true,
     meta: {},
-    sorter: value.length,
+    sorter: Object.keys(result).length,
     id: Math.random().toString(16).slice(2),
-  });
+  };
 
-  value.forEach((product, i) => {
-    const { key } = product;
-
-    delete product.key;
-    product.sorter = i;
-    result[key] = product;
-  });
   changeProduct("products", result);
+  setProductsArray();
 }
 
 function removeConfig() {
@@ -299,10 +382,6 @@ const setFullDates = (products) => {
   });
 };
 
-const productsArray = computed(() =>
-  Object.entries(products.value).map(([key, value]) => ({ key, ...value }))
-);
-
 watch(table, (value) => {
   const { rows } = value[0].$el.children[1].children[0];
   const allElements = Object.values(rows).slice(1);
@@ -369,6 +448,13 @@ watch(table, (value) => {
     });
   });
 });
+watch(
+  products,
+  () => {
+    setProductsArray();
+  },
+  { deep: true }
+);
 </script>
 
 <style lang="scss">

From 72a7b614453c53c40dfbb3e3242caa6152db74d9 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 28 Sep 2023 11:07:27 +0400
Subject: [PATCH 081/123] fix product names

---
 admin-ui/src/components/modules/ione/billingInfo.vue    | 7 +++++--
 admin-ui/src/components/modules/ovh/billingInfo.vue     | 6 +++---
 admin-ui/src/components/modules/virtual/billingInfo.vue | 2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/admin-ui/src/components/modules/ione/billingInfo.vue b/admin-ui/src/components/modules/ione/billingInfo.vue
index 0271c6d75..6771648eb 100644
--- a/admin-ui/src/components/modules/ione/billingInfo.vue
+++ b/admin-ui/src/components/modules/ione/billingInfo.vue
@@ -13,8 +13,11 @@
       <v-col>
         <v-text-field
           readonly
-          label="Tarif (product plan)"
-          :value="template.product"
+          label="Product name"
+          :value="
+            template.billingPlan.products[template.product]?.title ||
+            template.product
+          "
           append-icon="mdi-pencil"
           @click:append="changeTariffDialog = true"
         />
diff --git a/admin-ui/src/components/modules/ovh/billingInfo.vue b/admin-ui/src/components/modules/ovh/billingInfo.vue
index bb9e57b46..3c793459d 100644
--- a/admin-ui/src/components/modules/ovh/billingInfo.vue
+++ b/admin-ui/src/components/modules/ovh/billingInfo.vue
@@ -13,7 +13,7 @@
       <v-col>
         <v-text-field
           readonly
-          label="Tarif (product plan)"
+          label="Product name"
           :value="tarrif.title"
           append-icon="mdi-pencil"
           @click:append="priceModelDialog = true"
@@ -302,8 +302,8 @@ const date = computed(() => {
 
 const initPrices = () => {
   pricesItems.value.push({
-    title: "tarrif",
-    key: "tarrif",
+    title: planCode.value,
+    key: planCode.value,
     ind: 0,
     path: `billingPlan.products.${[duration.value, planCode.value].join(
       " "
diff --git a/admin-ui/src/components/modules/virtual/billingInfo.vue b/admin-ui/src/components/modules/virtual/billingInfo.vue
index 38596fc66..fe56c1890 100644
--- a/admin-ui/src/components/modules/virtual/billingInfo.vue
+++ b/admin-ui/src/components/modules/virtual/billingInfo.vue
@@ -13,7 +13,7 @@
       <v-col>
         <v-text-field
           readonly
-          label="Tarif (product plan)"
+          label="Product name"
           :value="billingPlan.products[template.product].title"
           @click:append="priceModelDialog = true"
           append-icon="mdi-pencil"

From c2601e2e1b7eb43e29d94a9cd75c2a7fdbdacc47 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 28 Sep 2023 11:09:40 +0400
Subject: [PATCH 082/123] fix ovh cpu aligment

---
 .../src/components/modules/ovh/additionalInstanceInfo.vue     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-ui/src/components/modules/ovh/additionalInstanceInfo.vue b/admin-ui/src/components/modules/ovh/additionalInstanceInfo.vue
index e41be9376..f9b3c61a6 100644
--- a/admin-ui/src/components/modules/ovh/additionalInstanceInfo.vue
+++ b/admin-ui/src/components/modules/ovh/additionalInstanceInfo.vue
@@ -24,11 +24,11 @@
           @click:append="isVisible = !isVisible"
         />
       </v-col>
+    </v-row>
+    <v-row>
       <v-col>
         <v-text-field readonly :value="cpu" label="CPU" />
       </v-col>
-    </v-row>
-    <v-row>
       <v-col>
         <v-text-field readonly :value="template.resources.ram" label="RAM" />
       </v-col>

From 0a5932b25f6c58e195e375e0ec653971d4af2e41 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Thu, 28 Sep 2023 11:41:22 +0300
Subject: [PATCH 083/123] Add group to product

---
 go.mod | 2 +-
 go.sum | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/go.mod b/go.mod
index 7b8ec9e94..727c25151 100644
--- a/go.mod
+++ b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0
 	github.com/rabbitmq/amqp091-go v1.8.1
 	github.com/rs/cors v1.10.0
-	github.com/slntopp/nocloud-proto v0.0.0-20230926155417-9f9c50e0b385
+	github.com/slntopp/nocloud-proto v0.0.0-20230928084001-11a2827103dc
 	github.com/spf13/viper v1.16.0
 	github.com/stoewer/go-strcase v1.3.0
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75
diff --git a/go.sum b/go.sum
index 430e2c912..92cb1bd5e 100644
--- a/go.sum
+++ b/go.sum
@@ -202,10 +202,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/slntopp/nocloud-proto v0.0.0-20230912095707-1bb19975b685 h1:z55krMEmUcSgmnb3szZBhuqGdxEwcuLa0BcUotG/AO0=
-github.com/slntopp/nocloud-proto v0.0.0-20230912095707-1bb19975b685/go.mod h1:HY6zAuqFtnMRWY2uSvpvyBioOOk3iGl0qUdAxOhja0k=
-github.com/slntopp/nocloud-proto v0.0.0-20230926155417-9f9c50e0b385 h1:wmun3yLXCzIrY30MUgoGxeQVuSILPtxCRSpQSq/Szng=
-github.com/slntopp/nocloud-proto v0.0.0-20230926155417-9f9c50e0b385/go.mod h1:4Hsf0e2WQQOWaZj6sC1vVq4oCdu30asV+JzWk/xAlIg=
+github.com/slntopp/nocloud-proto v0.0.0-20230928084001-11a2827103dc h1:wGiOebdVhsFpv1hPDJTMn8yq8//qewSsEFP8IkX3SyY=
+github.com/slntopp/nocloud-proto v0.0.0-20230928084001-11a2827103dc/go.mod h1:4Hsf0e2WQQOWaZj6sC1vVq4oCdu30asV+JzWk/xAlIg=
 github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
 github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
 github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA=

From 867073407b36ded2a58c550317ba02b8e16a9aef Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 28 Sep 2023 13:20:44 +0400
Subject: [PATCH 084/123] fix ovh base price

---
 admin-ui/src/components/modules/ovh/billingInfo.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin-ui/src/components/modules/ovh/billingInfo.vue b/admin-ui/src/components/modules/ovh/billingInfo.vue
index 3c793459d..accb6357b 100644
--- a/admin-ui/src/components/modules/ovh/billingInfo.vue
+++ b/admin-ui/src/components/modules/ovh/billingInfo.vue
@@ -209,7 +209,7 @@ const getVpsPrices = async () => {
   const prices = {};
 
   const planCodeCurr = meta.plans.find((p) => planCode.value === p.planCode);
-  prices["tarrif"] = getPriceFromProduct(planCodeCurr);
+  prices[planCode.value] = getPriceFromProduct(planCodeCurr);
   addons.value.forEach((addon) => {
     Object.keys(meta).forEach((metaKey) => {
       const product =
@@ -231,7 +231,7 @@ const getDedicatedPrice = async () => {
   const prices = {};
 
   const planCodeCurr = meta.plans.find((p) => planCode.value === p.planCode);
-  prices["tarrif"] = getPriceFromProduct(planCodeCurr);
+  prices[planCode.value] = getPriceFromProduct(planCodeCurr);
   const addonsPrice = await api.servicesProviders.action({
     action: "get_baremetal_options",
     uuid: template.value.sp,
@@ -273,7 +273,7 @@ const getCloudPrices = async () => {
       projectId: fullSp.vars?.projectId?.value?.default,
     },
   });
-  prices["tarrif"] = meta.codes[tarrif.value?.meta?.priceCode];
+  prices[planCode.value] = meta.codes[tarrif.value?.meta?.priceCode];
   return prices;
 };
 const getPriceFromProduct = (product) => {

From 6b0a8eac75e3beb58a92e34abaad3bddc4daf7b3 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 28 Sep 2023 16:40:51 +0400
Subject: [PATCH 085/123] fix invoice priority

---
 admin-ui/src/views/TransactionsCreate.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/admin-ui/src/views/TransactionsCreate.vue b/admin-ui/src/views/TransactionsCreate.vue
index 58fb30132..5de8dc14c 100644
--- a/admin-ui/src/views/TransactionsCreate.vue
+++ b/admin-ui/src/views/TransactionsCreate.vue
@@ -352,9 +352,6 @@ export default {
         )?.uuid || undefined;
 
       this.transaction.exec = this.exec;
-      if (!this.transaction.exec) {
-        this.transaction.priority = "NORMAL";
-      }
       this.transaction.total *= 1;
     },
     resetDate() {

From b8d1931e5633af9e92d17198cfd9c0698bba9faf Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Thu, 28 Sep 2023 15:41:44 +0300
Subject: [PATCH 086/123] Fix

---
 pkg/eventbus/handlers.go | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/pkg/eventbus/handlers.go b/pkg/eventbus/handlers.go
index 6d14af36f..7a0dce0ac 100644
--- a/pkg/eventbus/handlers.go
+++ b/pkg/eventbus/handlers.go
@@ -41,14 +41,23 @@ LET account = LAST(
         RETURN node
     )
     
-RETURN {account: account._key, service: srv.title, instance: doc.title, product: doc.product}
+RETURN {
+	account: account._key, 
+	service: srv.title, 
+	instance: doc.title, 
+	product: doc.product, 
+	next_payment_date: doc.data.next_payment_date,
+	ip: doc.state.meta.networking.public[0]
+}
 `
 
 type EventInfo struct {
-	Account  string `json:"account"`
-	Service  string `json:"service"`
-	Instance string `json:"instance"`
-	Product  string `json:"product,omitempty"`
+	Account         string `json:"account"`
+	Service         string `json:"service"`
+	Instance        string `json:"instance"`
+	Product         string `json:"product,omitempty"`
+	Ip              string `json:"ip,omitempty"`
+	NextPaymentDate string `json:"next_payment_date,omitempty"`
 }
 
 func GetInstAccountHandler(ctx context.Context, event *pb.Event, db driver.Database) (*pb.Event, error) {
@@ -83,6 +92,12 @@ func GetInstAccountHandler(ctx context.Context, event *pb.Event, db driver.Datab
 	if eventInfo.Product != "" {
 		event.Data["product"] = structpb.NewStringValue(eventInfo.Product)
 	}
+	if eventInfo.Ip != "" {
+		event.Data["ip"] = structpb.NewStringValue(eventInfo.Ip)
+	}
+	if eventInfo.NextPaymentDate != "" {
+		event.Data["next_payment_date"] = structpb.NewStringValue(eventInfo.NextPaymentDate)
+	}
 	event.Data["instance_uuid"] = structpb.NewStringValue(event.GetUuid())
 	event.Uuid = eventInfo.Account
 	event.Type = "email"

From f26babb156df0c43b710bea5ba7f1cfc2592959d Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Thu, 28 Sep 2023 15:57:09 +0300
Subject: [PATCH 087/123] Fix

---
 pkg/oauth2/handlers/bitrix.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/oauth2/handlers/bitrix.go b/pkg/oauth2/handlers/bitrix.go
index 4f42691dc..ea1412b63 100644
--- a/pkg/oauth2/handlers/bitrix.go
+++ b/pkg/oauth2/handlers/bitrix.go
@@ -255,7 +255,7 @@ func (g *BitrixOauthHandler) Setup(
 				get.Data.GetFields()["oauth_types"].GetListValue().Values = append(get.Data.GetFields()["oauth_types"].GetListValue().GetValues(), structpb.NewStringValue("oauth2-bitrix"))
 			}
 
-			get.Data.Fields["bitrix"] = structpb.NewStringValue(id)
+			get.Data.Fields["bitrix24"] = structpb.NewStringValue(id)
 
 			_, err = regClient.Update(ctx, get)
 			if err != nil {
@@ -284,7 +284,7 @@ func (g *BitrixOauthHandler) Setup(
 				data := &structpb.Struct{
 					Fields: map[string]*structpb.Value{
 						"oauth_types": listValue,
-						"bitrix":      structpb.NewStringValue(id),
+						"bitrix24":    structpb.NewStringValue(id),
 					},
 				}
 				_, err := regClient.Create(ctx, &accounts.CreateRequest{

From 4b52228d52045b407bd30b45923bb11c3d09fb5d Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 28 Sep 2023 17:04:40 +0400
Subject: [PATCH 088/123] add other account data

---
 admin-ui/src/components/accounts_table.vue | 34 +++++++++++++++++-----
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/admin-ui/src/components/accounts_table.vue b/admin-ui/src/components/accounts_table.vue
index 33df6b7f6..90ae2d6ec 100644
--- a/admin-ui/src/components/accounts_table.vue
+++ b/admin-ui/src/components/accounts_table.vue
@@ -2,7 +2,7 @@
   <nocloud-table
     table-name="accounts"
     :headers="headers"
-    :items="filtredAccounts"
+    :items="filteredAccounts"
     :value="selected"
     :loading="loading"
     :single-select="singleSelect"
@@ -44,6 +44,17 @@
         :value="item.balance"
       />
     </template>
+    <template v-slot:[`item.address`]="{ item }">
+      <v-tooltip> </v-tooltip>
+      <v-tooltip bottom>
+        <template v-slot:activator="{ on, attrs }">
+          <span v-bind="attrs" v-on="on">
+            {{ item.data?.city || item.data?.address }}
+          </span>
+        </template>
+        <span>{{ item.data?.address }}</span>
+      </v-tooltip>
+    </template>
     <template v-slot:[`item.access.level`]="{ value }">
       <v-chip :color="colorChip(value)">
         {{ value }}
@@ -63,7 +74,7 @@ import noCloudTable from "@/components/table.vue";
 import Balance from "./balance.vue";
 import LoginInAccountIcon from "@/components/ui/loginInAccountIcon.vue";
 import { mapGetters } from "vuex";
-import { filterByKeysAndParam } from "@/functions";
+import { filterByKeysAndParam, formatSecondsToDate } from "@/functions";
 
 export default {
   name: "accounts-table",
@@ -95,6 +106,9 @@ export default {
         { text: "UUID", value: "uuid" },
         { text: "Balance", value: "balance" },
         { text: "Email", value: "data.email" },
+        { text: "Created date", value: "data.date_create" },
+        { text: "Country", value: "data.country" },
+        { text: "Address", value: "address" },
         { text: "Client currency", value: "currency" },
         { text: "Access level", value: "access.level" },
         { text: "Group(NameSpace)", value: "namespace" },
@@ -130,17 +144,23 @@ export default {
       searchParam: "customSearchParam",
       searchParams: "customParams",
     }),
-    tableData() {
-      return this.$store.getters["accounts/all"];
+    accounts() {
+      return this.$store.getters["accounts/all"].map((a) => ({
+        ...a,
+        data: {
+          ...a.data,
+          date_create: formatSecondsToDate(a.data?.date_create),
+        },
+      }));
     },
-    filtredAccounts() {
+    filteredAccounts() {
       const searchParams = { ...this.searchParams };
 
       if (this.namespace) {
         searchParams["access.namespace"] = [{ value: this.namespace }];
       }
 
-      const accounts = this.tableData.filter((a) =>
+      const accounts = this.accounts.filter((a) =>
         Object.keys(searchParams).every((k) => {
           return (
             !searchParams?.[k] ||
@@ -210,7 +230,7 @@ export default {
     }, 0);
   },
   watch: {
-    tableData() {
+    accounts() {
       this.fetchError = "";
     },
   },

From 1f2c32cd3298dcdd1390931d714fe9a6016d2d58 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Thu, 28 Sep 2023 16:27:46 +0300
Subject: [PATCH 089/123] Fix

---
 pkg/eventbus/handlers.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkg/eventbus/handlers.go b/pkg/eventbus/handlers.go
index 7a0dce0ac..9f9cb2b67 100644
--- a/pkg/eventbus/handlers.go
+++ b/pkg/eventbus/handlers.go
@@ -52,12 +52,12 @@ RETURN {
 `
 
 type EventInfo struct {
-	Account         string `json:"account"`
-	Service         string `json:"service"`
-	Instance        string `json:"instance"`
-	Product         string `json:"product,omitempty"`
-	Ip              string `json:"ip,omitempty"`
-	NextPaymentDate string `json:"next_payment_date,omitempty"`
+	Account         string  `json:"account"`
+	Service         string  `json:"service"`
+	Instance        string  `json:"instance"`
+	Product         string  `json:"product,omitempty"`
+	Ip              string  `json:"ip,omitempty"`
+	NextPaymentDate float64 `json:"next_payment_date,omitempty"`
 }
 
 func GetInstAccountHandler(ctx context.Context, event *pb.Event, db driver.Database) (*pb.Event, error) {
@@ -95,8 +95,8 @@ func GetInstAccountHandler(ctx context.Context, event *pb.Event, db driver.Datab
 	if eventInfo.Ip != "" {
 		event.Data["ip"] = structpb.NewStringValue(eventInfo.Ip)
 	}
-	if eventInfo.NextPaymentDate != "" {
-		event.Data["next_payment_date"] = structpb.NewStringValue(eventInfo.NextPaymentDate)
+	if eventInfo.NextPaymentDate != 0 {
+		event.Data["next_payment_date"] = structpb.NewNumberValue(eventInfo.NextPaymentDate)
 	}
 	event.Data["instance_uuid"] = structpb.NewStringValue(event.GetUuid())
 	event.Uuid = eventInfo.Account

From 4c06b48d851ff10d782c75e6a969142c170db6e7 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 28 Sep 2023 18:53:12 +0400
Subject: [PATCH 090/123] fix plans delete error

---
 admin-ui/src/views/Plans.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-ui/src/views/Plans.vue b/admin-ui/src/views/Plans.vue
index 07abbc6eb..6cc36916d 100644
--- a/admin-ui/src/views/Plans.vue
+++ b/admin-ui/src/views/Plans.vue
@@ -199,7 +199,7 @@ export default {
       Promise.all(promises)
         .then(() => api.plans.delete(this.selected[0].uuid))
         .then(() => {
-          this.$store.dispatch("plans/fetch", { withCount: true });
+          this.$store.dispatch("plans/fetch");
           this.showSnackbar({
             message: "Price model deleted successfully.",
           });

From 0a045e564d746eee1c550e6789c2d78c9fa090ea Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Thu, 28 Sep 2023 17:58:46 +0300
Subject: [PATCH 091/123] Fix

---
 pkg/billing/transactions.go | 79 ++++++++++++++++++++++++++++++++++++-
 pkg/eventbus/handlers.go    |  1 +
 2 files changed, 79 insertions(+), 1 deletion(-)

diff --git a/pkg/billing/transactions.go b/pkg/billing/transactions.go
index d38a30f09..cd449fe4a 100644
--- a/pkg/billing/transactions.go
+++ b/pkg/billing/transactions.go
@@ -220,7 +220,7 @@ func (s *BillingServiceServer) CreateTransaction(ctx context.Context, t *pb.Tran
 		Key:  "transaction_created",
 	})
 
-	if r.Transaction.Priority == pb.Priority_URGENT {
+	if r.Transaction.Priority == pb.Priority_URGENT && r.Transaction.GetExec() != 0 {
 		acc := driver.NewDocumentID(schema.ACCOUNTS_COL, r.Transaction.Account)
 		transaction := driver.NewDocumentID(schema.TRANSACTIONS_COL, r.Transaction.Uuid)
 		currencyConf := MakeCurrencyConf(ctx, log)
@@ -424,6 +424,83 @@ func (s *BillingServiceServer) UpdateTransaction(ctx context.Context, req *pb.Tr
 		log.Error("Failed to update transaction", zap.Error(err))
 		return nil, status.Error(codes.Internal, "Failed to update transaction")
 	}
+
+	if t.GetPriority() == pb.Priority_URGENT {
+		acc := driver.NewDocumentID(schema.ACCOUNTS_COL, t.Account)
+		transaction := driver.NewDocumentID(schema.TRANSACTIONS_COL, t.Uuid)
+		currencyConf := MakeCurrencyConf(ctx, log)
+		suspConf := MakeSuspendConf(ctx, log)
+
+		_, err := s.db.Query(ctx, processUrgentTransaction, map[string]interface{}{
+			"@accounts":      schema.ACCOUNTS_COL,
+			"@transactions":  schema.TRANSACTIONS_COL,
+			"@records":       schema.RECORDS_COL,
+			"accountKey":     acc.String(),
+			"transactionKey": transaction.String(),
+			"currency":       currencyConf.Currency,
+			"currencies":     schema.CUR_COL,
+			"now":            time.Now().Unix(),
+			"graph":          schema.BILLING_GRAPH.Name,
+		})
+		if err != nil {
+			log.Error("Failed to process transaction", zap.String("err", err.Error()))
+			return nil, status.Error(codes.Internal, err.Error())
+		}
+
+		dbAcc, err := accClient.Get(ctx, &accounts.GetRequest{Uuid: t.Account, Public: false})
+
+		if err != nil {
+			log.Error("Failed to get account", zap.String("err", err.Error()))
+			return nil, status.Error(codes.Internal, err.Error())
+		}
+
+		var cur pb.Currency
+
+		if dbAcc.Currency == nil {
+			cur = pb.Currency_NCU
+		} else {
+			cur = *dbAcc.Currency
+		}
+
+		var rate float64 = 1
+
+		if cur != pb.Currency(currencyConf.Currency) {
+			rate, err = s.currencies.GetExchangeRate(ctx, cur, pb.Currency(currencyConf.Currency))
+
+			if err != nil {
+				log.Error("Failed to get exchange rate", zap.String("err", err.Error()))
+				return nil, status.Error(codes.Internal, err.Error())
+			}
+		}
+
+		var balance = 0.0
+		if dbAcc.Balance != nil {
+			balance = *dbAcc.Balance
+		}
+
+		balance = balance * rate
+
+		var isSuspended = false
+
+		if dbAcc.Suspended != nil {
+			isSuspended = *dbAcc.Suspended
+		}
+
+		if !isSuspended && balance < suspConf.Limit {
+			_, err := accClient.Suspend(ctx, &accounts.SuspendRequest{Uuid: t.Account})
+			if err != nil {
+				log.Error("Failed to suspend account", zap.String("err", err.Error()))
+				return nil, status.Error(codes.Internal, err.Error())
+			}
+		} else if isSuspended && balance > suspConf.Limit {
+			_, err := accClient.Unsuspend(ctx, &accounts.UnsuspendRequest{Uuid: t.Account})
+			if err != nil {
+				log.Error("Failed to unsuspend account", zap.String("err", err.Error()))
+				return nil, status.Error(codes.Internal, err.Error())
+			}
+		}
+	}
+
 	return &pb.UpdateTransactionResponse{Result: true}, nil
 }
 
diff --git a/pkg/eventbus/handlers.go b/pkg/eventbus/handlers.go
index 9f9cb2b67..8ef15951e 100644
--- a/pkg/eventbus/handlers.go
+++ b/pkg/eventbus/handlers.go
@@ -58,6 +58,7 @@ type EventInfo struct {
 	Product         string  `json:"product,omitempty"`
 	Ip              string  `json:"ip,omitempty"`
 	NextPaymentDate float64 `json:"next_payment_date,omitempty"`
+	Price           float64 `json:"price"`
 }
 
 func GetInstAccountHandler(ctx context.Context, event *pb.Event, db driver.Database) (*pb.Event, error) {

From 1bf5a41caf0efccde3449b6a4d00c2660ab0dc2d Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Thu, 28 Sep 2023 19:36:44 +0400
Subject: [PATCH 092/123] add multiply deleted unlinked plans

---
 admin-ui/src/views/Plans.vue | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/admin-ui/src/views/Plans.vue b/admin-ui/src/views/Plans.vue
index 6cc36916d..1505944ff 100644
--- a/admin-ui/src/views/Plans.vue
+++ b/admin-ui/src/views/Plans.vue
@@ -5,7 +5,7 @@
     <confirm-dialog v-if="linked.length !== 1" @confirm="deleteSelectedPlan">
       <v-btn
         class="mr-2"
-        :disabled="selected.length !== 1"
+        :disabled="isDeleteDisabled"
         :loading="isDeleteLoading"
       >
         Delete
@@ -196,8 +196,10 @@ export default {
       }
 
       this.isDeleteLoading = true;
+      const deletePromises = this.selected.map((s) => api.plans.delete(s.uuid));
+
       Promise.all(promises)
-        .then(() => api.plans.delete(this.selected[0].uuid))
+        .then(() => Promise.all(deletePromises))
         .then(() => {
           this.$store.dispatch("plans/fetch");
           this.showSnackbar({
@@ -310,6 +312,25 @@ export default {
     typeItems() {
       return [...new Set(this.plans.map((p) => p.type.toLowerCase()))];
     },
+    isDeleteDisabled() {
+      if (
+        !Object.keys(this.instanceCountMap).length ||
+        this.selected.length === 0
+      ) {
+        return true;
+      }
+      const withInstances = this.selected.filter(
+        (s) => this.instanceCountMap[s.uuid] > 0
+      );
+      const withOutInstances = this.selected.filter(
+        (s) => this.instanceCountMap[s.uuid] === 0
+      );
+
+      return (
+        withInstances.length > 1 ||
+        (withOutInstances.length > 0 && withInstances.length > 0)
+      );
+    },
   },
   watch: {
     plans() {

From e217a16805908cda0be56c456d0153138a71eca7 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Thu, 28 Sep 2023 19:31:45 +0300
Subject: [PATCH 093/123] Fix

---
 pkg/eventbus/handlers.go | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/pkg/eventbus/handlers.go b/pkg/eventbus/handlers.go
index 8ef15951e..67fec40ec 100644
--- a/pkg/eventbus/handlers.go
+++ b/pkg/eventbus/handlers.go
@@ -40,14 +40,35 @@ LET account = LAST(
     FILTER IS_SAME_COLLECTION(node, @@accounts)
         RETURN node
     )
-    
+
+LET rate_one = LAST(
+	FOR i IN Currencies2Currencies
+    FILTER (i.to == 0 || i.from == 0) && i.rate == 1
+        RETURN i
+)
+
+LET default_cur = rate_one.to == 0 ? rate_one.from : rate_one.to
+
+LET currency = account.currency != null ? account.currency : default_cur
+LET rate = PRODUCT(
+	FOR vertex, edge IN OUTBOUND
+	SHORTEST_PATH DOCUMENT(CONCAT(@currencies, "/", TO_NUMBER(transaction.currency)))
+	TO DOCUMENT(CONCAT(@currencies, "/", currency))
+	GRAPH @graph
+	FILTER edge
+		RETURN edge.rate
+)
+
+LET price = doc.billing_plan.products[doc.product] == null ? 0 : doc.billing_plan.products[doc.product]
+
 RETURN {
 	account: account._key, 
 	service: srv.title, 
 	instance: doc.title, 
 	product: doc.product, 
 	next_payment_date: doc.data.next_payment_date,
-	ip: doc.state.meta.networking.public[0]
+	ip: doc.state.meta.networking.public[0],
+	price: price * rate
 }
 `
 
@@ -58,7 +79,7 @@ type EventInfo struct {
 	Product         string  `json:"product,omitempty"`
 	Ip              string  `json:"ip,omitempty"`
 	NextPaymentDate float64 `json:"next_payment_date,omitempty"`
-	Price           float64 `json:"price"`
+	Price           float64 `json:"price,omitempty"`
 }
 
 func GetInstAccountHandler(ctx context.Context, event *pb.Event, db driver.Database) (*pb.Event, error) {

From 6100395f7f36bedd0d8f7b0b63f77b367c33a2b1 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Thu, 28 Sep 2023 19:36:33 +0300
Subject: [PATCH 094/123] Fix

---
 pkg/eventbus/handlers.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkg/eventbus/handlers.go b/pkg/eventbus/handlers.go
index 67fec40ec..1ca0dddf5 100644
--- a/pkg/eventbus/handlers.go
+++ b/pkg/eventbus/handlers.go
@@ -52,8 +52,8 @@ LET default_cur = rate_one.to == 0 ? rate_one.from : rate_one.to
 LET currency = account.currency != null ? account.currency : default_cur
 LET rate = PRODUCT(
 	FOR vertex, edge IN OUTBOUND
-	SHORTEST_PATH DOCUMENT(CONCAT(@currencies, "/", TO_NUMBER(transaction.currency)))
-	TO DOCUMENT(CONCAT(@currencies, "/", currency))
+	SHORTEST_PATH DOCUMENT(CONCAT(@@currencies, "/", TO_NUMBER(transaction.currency)))
+	TO DOCUMENT(CONCAT(@@currencies, "/", currency))
 	GRAPH @graph
 	FILTER edge
 		RETURN edge.rate
@@ -94,6 +94,8 @@ func GetInstAccountHandler(ctx context.Context, event *pb.Event, db driver.Datab
 		"permissions": schema.PERMISSIONS_GRAPH.Name,
 		"@services":   schema.SERVICES_COL,
 		"@accounts":   schema.ACCOUNTS_COL,
+		"@currencies": schema.CUR_COL,
+		"graph":       schema.BILLING_GRAPH.Name,
 	})
 	if err != nil {
 		return nil, err

From ee929c6e4f06b49b2d79a1c86978ad1fe1767806 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Thu, 28 Sep 2023 19:43:21 +0300
Subject: [PATCH 095/123] Fix

---
 pkg/eventbus/handlers.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/eventbus/handlers.go b/pkg/eventbus/handlers.go
index 1ca0dddf5..aae4cd55e 100644
--- a/pkg/eventbus/handlers.go
+++ b/pkg/eventbus/handlers.go
@@ -52,7 +52,7 @@ LET default_cur = rate_one.to == 0 ? rate_one.from : rate_one.to
 LET currency = account.currency != null ? account.currency : default_cur
 LET rate = PRODUCT(
 	FOR vertex, edge IN OUTBOUND
-	SHORTEST_PATH DOCUMENT(CONCAT(@@currencies, "/", TO_NUMBER(transaction.currency)))
+	SHORTEST_PATH DOCUMENT(CONCAT(@@currencies, "/", default_cur))
 	TO DOCUMENT(CONCAT(@@currencies, "/", currency))
 	GRAPH @graph
 	FILTER edge

From 35bb645696bec099276457fe727611b35d0ed5c6 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Thu, 28 Sep 2023 19:54:36 +0300
Subject: [PATCH 096/123] Fix

---
 pkg/eventbus/handlers.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkg/eventbus/handlers.go b/pkg/eventbus/handlers.go
index aae4cd55e..afbc3414c 100644
--- a/pkg/eventbus/handlers.go
+++ b/pkg/eventbus/handlers.go
@@ -42,7 +42,7 @@ LET account = LAST(
     )
 
 LET rate_one = LAST(
-	FOR i IN Currencies2Currencies
+	FOR i IN @@c2c
     FILTER (i.to == 0 || i.from == 0) && i.rate == 1
         RETURN i
 )
@@ -52,14 +52,14 @@ LET default_cur = rate_one.to == 0 ? rate_one.from : rate_one.to
 LET currency = account.currency != null ? account.currency : default_cur
 LET rate = PRODUCT(
 	FOR vertex, edge IN OUTBOUND
-	SHORTEST_PATH DOCUMENT(CONCAT(@@currencies, "/", default_cur))
-	TO DOCUMENT(CONCAT(@@currencies, "/", currency))
+	SHORTEST_PATH DOCUMENT(CONCAT(@currencies, "/", default_cur))
+	TO DOCUMENT(CONCAT(@currencies, "/", currency))
 	GRAPH @graph
 	FILTER edge
 		RETURN edge.rate
 )
 
-LET price = doc.billing_plan.products[doc.product] == null ? 0 : doc.billing_plan.products[doc.product]
+LET price = doc.billing_plan.products[doc.product] == null ? 0 : doc.billing_plan.products[doc.product].price
 
 RETURN {
 	account: account._key, 
@@ -96,6 +96,7 @@ func GetInstAccountHandler(ctx context.Context, event *pb.Event, db driver.Datab
 		"@accounts":   schema.ACCOUNTS_COL,
 		"@currencies": schema.CUR_COL,
 		"graph":       schema.BILLING_GRAPH.Name,
+		"@c2c":        schema.CUR2CUR,
 	})
 	if err != nil {
 		return nil, err

From 8dfe330ddcf47c43ddbb058da6ac4e4f42feee54 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Thu, 28 Sep 2023 20:00:13 +0300
Subject: [PATCH 097/123] Fix

---
 pkg/eventbus/handlers.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/eventbus/handlers.go b/pkg/eventbus/handlers.go
index afbc3414c..e9ee966f2 100644
--- a/pkg/eventbus/handlers.go
+++ b/pkg/eventbus/handlers.go
@@ -94,7 +94,7 @@ func GetInstAccountHandler(ctx context.Context, event *pb.Event, db driver.Datab
 		"permissions": schema.PERMISSIONS_GRAPH.Name,
 		"@services":   schema.SERVICES_COL,
 		"@accounts":   schema.ACCOUNTS_COL,
-		"@currencies": schema.CUR_COL,
+		"currencies":  schema.CUR_COL,
 		"graph":       schema.BILLING_GRAPH.Name,
 		"@c2c":        schema.CUR2CUR,
 	})

From dd73247fff8263c7327ef346f9b3d646425d6e6c Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Thu, 28 Sep 2023 20:06:45 +0300
Subject: [PATCH 098/123] Fix

---
 pkg/eventbus/handlers.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkg/eventbus/handlers.go b/pkg/eventbus/handlers.go
index e9ee966f2..0558c0a9a 100644
--- a/pkg/eventbus/handlers.go
+++ b/pkg/eventbus/handlers.go
@@ -124,6 +124,7 @@ func GetInstAccountHandler(ctx context.Context, event *pb.Event, db driver.Datab
 		event.Data["next_payment_date"] = structpb.NewNumberValue(eventInfo.NextPaymentDate)
 	}
 	event.Data["instance_uuid"] = structpb.NewStringValue(event.GetUuid())
+	event.Data["price"] = structpb.NewNumberValue(eventInfo.Price)
 	event.Uuid = eventInfo.Account
 	event.Type = "email"
 

From 91dedc131eb9d096288c438dbc30a72a79ce5688 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Fri, 29 Sep 2023 11:58:25 +0400
Subject: [PATCH 099/123] add auto_renew change in billing label

---
 admin-ui/src/components/instance/info.vue     |  4 +++-
 .../components/modules/ione/billingLabel.vue  |  2 ++
 .../components/modules/ovh/billingLabel.vue   |  6 +++---
 .../modules/virtual/billingLabel.vue          |  2 ++
 admin-ui/src/components/ui/billingLabel.vue   | 21 +++++++++++++++----
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/admin-ui/src/components/instance/info.vue b/admin-ui/src/components/instance/info.vue
index d97bb9f23..d35fb89f9 100644
--- a/admin-ui/src/components/instance/info.vue
+++ b/admin-ui/src/components/instance/info.vue
@@ -131,7 +131,9 @@
       v-if="billingLabelComponent"
       style="position: absolute; top: 0; right: 75px"
     >
-      <component :is="billingLabelComponent" :template="copyInstance" />
+      <component
+          @update="updateCopy"
+          :is="billingLabelComponent" :template="copyInstance" />
     </div>
   </v-card>
 </template>
diff --git a/admin-ui/src/components/modules/ione/billingLabel.vue b/admin-ui/src/components/modules/ione/billingLabel.vue
index 53b1cda0d..77bd514a0 100644
--- a/admin-ui/src/components/modules/ione/billingLabel.vue
+++ b/admin-ui/src/components/modules/ione/billingLabel.vue
@@ -5,6 +5,7 @@
     :addons-price="addonsPrice"
     :tariff-price="tariffPrice"
     :due-date="dueDate"
+    @update="emit('update', $event)"
   />
 </template>
 
@@ -15,6 +16,7 @@ import { useStore } from "@/store";
 import billingLabel from "@/components/ui/billingLabel.vue";
 
 const props = defineProps(["template"]);
+const emit = defineEmits(["update"]);
 
 const store = useStore();
 
diff --git a/admin-ui/src/components/modules/ovh/billingLabel.vue b/admin-ui/src/components/modules/ovh/billingLabel.vue
index 503a0b7ce..da8f9b37a 100644
--- a/admin-ui/src/components/modules/ovh/billingLabel.vue
+++ b/admin-ui/src/components/modules/ovh/billingLabel.vue
@@ -5,6 +5,7 @@
     :template="template"
     :addons-price="addonsPrice"
     :account="account"
+    @update="emit('update', $event)"
   />
 </template>
 
@@ -15,6 +16,7 @@ import billingLabel from "@/components/ui/billingLabel.vue";
 import { useStore } from "@/store";
 
 const props = defineProps(["template"]);
+const emit = defineEmits(["update"]);
 
 const { template } = toRefs(props);
 
@@ -31,9 +33,7 @@ const account = computed(() => {
 });
 
 const dueDate = computed(() => {
-    return formatSecondsToDate(
-      +props.template?.data?.next_payment_date
-    );
+  return formatSecondsToDate(+props.template?.data?.next_payment_date);
 });
 
 const tariffPrice = computed(() => {
diff --git a/admin-ui/src/components/modules/virtual/billingLabel.vue b/admin-ui/src/components/modules/virtual/billingLabel.vue
index c86ff6681..0e0496ea9 100644
--- a/admin-ui/src/components/modules/virtual/billingLabel.vue
+++ b/admin-ui/src/components/modules/virtual/billingLabel.vue
@@ -5,6 +5,7 @@
     :template="template"
     :addons-price="{}"
     :account="account"
+    @update="emit('update', $event)"
   />
 </template>
 
@@ -15,6 +16,7 @@ import billingLabel from "@/components/ui/billingLabel.vue";
 import { useStore } from "@/store";
 
 const props = defineProps(["template"]);
+const emit = defineEmits(["update"]);
 
 const { template } = toRefs(props);
 
diff --git a/admin-ui/src/components/ui/billingLabel.vue b/admin-ui/src/components/ui/billingLabel.vue
index 236b8dfd5..7b00a491a 100644
--- a/admin-ui/src/components/ui/billingLabel.vue
+++ b/admin-ui/src/components/ui/billingLabel.vue
@@ -4,6 +4,18 @@
       <v-col>
         <v-chip outlined color="primary">Due to date: {{ dueDate }}</v-chip>
       </v-col>
+      <v-col
+        style="max-height: 50px"
+        class="d-flex justify-end align-start pa-0"
+      >
+        <v-switch
+          hide-details
+          dense
+          :input-value="template.config.auto_renew"
+          @change="emit('update', { key: 'config.auto_renew', value: !!$event })"
+          label="Auto"
+        />
+      </v-col>
       <v-col>
         <confirm-dialog
           title="Do you want to renew server?"
@@ -23,12 +35,12 @@
       </v-col>
     </v-row>
     <v-row class="mt-0" align="center" justify="end">
-      <v-col class="d-flex justify-end">
+      <v-col cols="4" class="d-flex justify-end px-0">
         <v-chip color="primary" outlined
           >Price: {{ price }} {{ accountCurrency }}</v-chip
         >
       </v-col>
-      <v-col class="d-flex justify-end">
+      <v-col cols="4" class="d-flex justify-end px-0">
         <instance-state :state="template.state.state" />
       </v-col>
     </v-row>
@@ -49,12 +61,13 @@ const props = defineProps([
   "tariffPrice",
   "account",
 ]);
+const { template, addonsPrice, tariffPrice, dueDate, account } = toRefs(props);
+
+const emit = defineEmits(["update"]);
 
 const store = useStore();
 const { convertTo } = useCurrency();
 
-const { template, addonsPrice, tariffPrice, dueDate, account } = toRefs(props);
-
 const currency = computed(() => ({
   code: store.getters["currencies/default"],
 }));

From 2d671d87a40a2bc6c77e646e44dfab183ff24952 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Fri, 29 Sep 2023 12:33:19 +0400
Subject: [PATCH 100/123] add currency & currency change

---
 admin-ui/src/components/account/info.vue | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/admin-ui/src/components/account/info.vue b/admin-ui/src/components/account/info.vue
index bd19537b0..8bec49702 100644
--- a/admin-ui/src/components/account/info.vue
+++ b/admin-ui/src/components/account/info.vue
@@ -16,6 +16,9 @@
       <v-col cols="3">
         <v-text-field v-model="title" label="name" style="width: 330px" />
       </v-col>
+      <v-col cols="3">
+        <v-select :items="currencies" v-model="currency" label="currency" style="width: 330px" />
+      </v-col>
     </v-row>
     <v-card-title class="px-0">Instances:</v-card-title>
 
@@ -109,6 +112,7 @@ export default {
     navTitles: config.navTitles ?? {},
     uuid: "",
     title: "",
+    currency:"",
     keys: [],
     selected: [],
     isVisible: false,
@@ -135,7 +139,10 @@ export default {
       this.selected = [];
     },
     editAccount() {
-      const newAccount = { ...this.account, title: this.title };
+      const newAccount = { ...this.account, title: this.title ,currency:this.currency};
+      if(!newAccount.data){
+        newAccount.data={}
+      }
       newAccount.data.ssh_keys = this.keys;
 
       this.isEditLoading = true;
@@ -160,6 +167,7 @@ export default {
   },
   mounted() {
     this.title = this.account.title;
+    this.currency = this.account.currency;
     this.uuid = this.account.uuid;
     this.keys = this.account.data?.ssh_keys || [];
     if (this.namespaces.length < 2) {
@@ -179,6 +187,9 @@ export default {
     services() {
       return this.$store.getters["services/all"];
     },
+    currencies() {
+      return this.$store.getters["currencies/all"].filter((c) => c !== "NCU");
+    },
     servicesProviders() {
       return this.$store.getters["servicesProviders/all"];
     },

From db68b92bc0fa978006ebfc81962b2860a8afda46 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Fri, 29 Sep 2023 13:19:04 +0400
Subject: [PATCH 101/123] fix configuration download

---
 .../src/components/plan/dedicatedTable.vue    | 68 ++++++++++---------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/admin-ui/src/components/plan/dedicatedTable.vue b/admin-ui/src/components/plan/dedicatedTable.vue
index 8289f8e6d..6fb189c24 100644
--- a/admin-ui/src/components/plan/dedicatedTable.vue
+++ b/admin-ui/src/components/plan/dedicatedTable.vue
@@ -310,43 +310,49 @@ export default {
       plan.resources = this.template.resources;
       plan.products = this.template.products;
 
-      for await (const el of this.plans) {
-        if (el.sell) {
-          const {
-            meta: { requiredConfiguration },
-          } = await api.post(`/sp/${uuid}/invoke`, {
+      const enabledPlans = this.plans.filter((el) => el.sell);
+      const configurations = await Promise.all(
+        enabledPlans.map((el) =>
+          api.post(`/sp/${uuid}/invoke`, {
             method: "get_required_configuration",
             params: {
               planCode: el.planCode,
               duration: el.duration,
               pricingMode: el.duration === "P1M" ? "default" : "upfront12",
             },
-          });
-
-          const addons = this.getAddons(el)
-            ? this.getAddons(el)
-                .filter((addon) => addon.sell)
-                ?.map((el) => ({ id: el.planCode, title: el.name }))
-            : plan.products[el.id]?.meta.addons;
-
-          const datacenter =
-            requiredConfiguration.find((el) => el.label.includes("datacenter"))
-              ?.allowedValues ?? [];
-
-          const os =
-            requiredConfiguration.find((el) => el.label.includes("os"))
-              ?.allowedValues ?? [];
-
-          plan.products[el.id] = {
-            kind: "PREPAID",
-            title: el.name,
-            price: el.value,
-            period: this.getPeriod(el.duration),
-            sorter: Object.keys(plan.products).length,
-            installation_fee: el.installation_fee.value,
-            meta: { addons, datacenter, os },
-          };
-        }
+          })
+        )
+      );
+
+      for (let i = 0; i < configurations.length; i++) {
+        const {
+          meta: { requiredConfiguration },
+        } = configurations[i];
+        const el = enabledPlans[i];
+
+        const addons = this.getAddons(el)
+          ? this.getAddons(el)
+              .filter((addon) => addon.sell)
+              ?.map((el) => ({ id: el.planCode, title: el.name }))
+          : plan.products[el.id]?.meta.addons;
+
+        const datacenter =
+          requiredConfiguration.find((el) => el.label.includes("datacenter"))
+            ?.allowedValues ?? [];
+
+        const os =
+          requiredConfiguration.find((el) => el.label.includes("os"))
+            ?.allowedValues ?? [];
+
+        plan.products[el.id] = {
+          kind: "PREPAID",
+          title: el.name,
+          price: el.value,
+          period: this.getPeriod(el.duration),
+          sorter: Object.keys(plan.products).length,
+          installation_fee: el.installation_fee.value,
+          meta: { addons, datacenter, os },
+        };
       }
       Object.values(this.addons).forEach((planCodeAddons) => {
         planCodeAddons.forEach((el) => {

From d1b6fd813ec6ee9238fc75488c1a38eb09d92df9 Mon Sep 17 00:00:00 2001
From: 639852 <sasha.bobyliev@mail.ru>
Date: Fri, 29 Sep 2023 14:10:27 +0400
Subject: [PATCH 102/123] - Added button to open instances by user from chat

---
 admin-ui/src/App.vue                          | 52 ++++++++++++++++---
 .../src/components/ui/loginInAccountIcon.vue  |  3 +-
 admin-ui/src/router/index.js                  |  8 +++
 admin-ui/src/store/auth.js                    | 27 ++++++++--
 admin-ui/src/views/ChatsInstancesPage.vue     | 38 ++++++++++++++
 5 files changed, 114 insertions(+), 14 deletions(-)
 create mode 100644 admin-ui/src/views/ChatsInstancesPage.vue

diff --git a/admin-ui/src/App.vue b/admin-ui/src/App.vue
index 43286d2a2..783887010 100644
--- a/admin-ui/src/App.vue
+++ b/admin-ui/src/App.vue
@@ -6,6 +6,7 @@
     <v-navigation-drawer
       app
       permanent
+      v-if="$route.name !== 'Instances by account'"
       :color="asideColor"
       :mini-variant="isMenuMinimize"
     >
@@ -275,7 +276,7 @@
             <v-icon>mdi-reload</v-icon>
           </v-btn>
         </v-col>
-        <v-col class="d-flex justify-end align-center">
+        <v-col v-if="$route.name !== 'Instances by account'" class="d-flex justify-end align-center">
           <languages v-if="false" />
           <v-menu offset-y transition="slide-y-transition">
             <template v-slot:activator="{ on, attrs }">
@@ -314,6 +315,15 @@
       <v-spacer></v-spacer>
     </v-app-bar>
 
+    <v-btn
+      color="success"
+      v-if="overlay.uuid"
+      style="position: absolute; top: 90px; right: 25px; z-index: 100"
+      @click="overlay.onClick(overlay.uuid)"
+    >
+      {{ overlay.buttonTitle }}
+    </v-btn>
+
     <v-main>
       <router-view />
     </v-main>
@@ -323,6 +333,7 @@
 </template>
 
 <script>
+import api from "@/api.js";
 import config from "@/config.js";
 import balance from "@/components/balance.vue";
 import languages from "@/components/languages.vue";
@@ -338,6 +349,15 @@ export default {
     easterEgg: false,
     config,
     navTitles: config.navTitles ?? {},
+    overlay: {
+      buttonTitle: '',
+      uuid: '',
+      onClick(uuid) {
+        const params = `scrollbars=no,status=no,location=no,toolbar=no,menubar=no,popup=yes width=768,height=540,left=100,top=100`;
+
+        window.open(`/admin/instances/account/${uuid}`, 'overlay', params);
+      }
+    }
   }),
   methods: {
     logoutHandler() {
@@ -422,14 +442,28 @@ export default {
     },
   },
   created() {
-    // window.addEventListener("message", ({ data, origin }) => {
-    //   const url = `https://app.${location.host.split(".").slice(1).join(".")}`;
+    window.addEventListener("message", ({ data, origin }) => {
+      if (origin.includes("localhost") || !data) return;
+      if (data === "ready") return;
+      if (data.type === "get-user") {
+        const setting = "plugin-chats-overlay";
+
+        api.settings.get([setting]).then((res) => {
+          const { title } = JSON.parse(res[setting]);
 
-    //   if (origin !== url) return;
-    //   if (data === 'ready') return;
-    //   this.$store.commit("auth/setToken", data);
-    //   location.assign("/admin");
-    // });
+          this.overlay.buttonTitle = title;
+          this.overlay.uuid = data.value.uuid;
+        });
+        return;
+      }
+      if (data.type === "open-user") {
+        window.open(`/admin/accounts/${data.value.uuid}`, "_blank");
+        return;
+      }
+
+      this.$store.commit("auth/setToken", data);
+      location.assign("/admin");
+    });
 
     this.$store.dispatch("auth/load");
 
@@ -466,6 +500,8 @@ export default {
     });
 
     this.$router.afterEach((to) => {
+      this.overlay.uuid = "";
+      this.overlay.buttonTitle = "";
       this.setTitle(to.name);
     });
 
diff --git a/admin-ui/src/components/ui/loginInAccountIcon.vue b/admin-ui/src/components/ui/loginInAccountIcon.vue
index 4e37c8452..cd5585f87 100644
--- a/admin-ui/src/components/ui/loginInAccountIcon.vue
+++ b/admin-ui/src/components/ui/loginInAccountIcon.vue
@@ -3,7 +3,6 @@
 </template>
 
 <script setup>
-import api from "@/api";
 import { useStore } from "@/store";
 
 const props = defineProps(["uuid", "instanceId", "type"]);
@@ -13,7 +12,7 @@ const loginHandler = () => {
   store
     .dispatch("auth/loginToApp", { uuid: props.uuid, type: "whmcs" })
     .then(({ token }) => {
-      api.settings.get(["app"]).then((res) => {
+      store.dispatch('auth/getAppURL').then((res) => {
         const win = window.open(JSON.parse(res.app).url);
 
         window.addEventListener('message', () => {
diff --git a/admin-ui/src/router/index.js b/admin-ui/src/router/index.js
index 3eac37709..1867fc5c0 100644
--- a/admin-ui/src/router/index.js
+++ b/admin-ui/src/router/index.js
@@ -49,6 +49,14 @@ const routes = [
       requireLogin: true,
     },
   },
+  {
+    path: "/instances/account/:uuid",
+    name: "Instances by account",
+    component: () => import("../views/ChatsInstancesPage.vue"),
+    meta: {
+      requireLogin: true,
+    },
+  },
   {
     path: "/sp",
     name: "ServicesProviders",
diff --git a/admin-ui/src/store/auth.js b/admin-ui/src/store/auth.js
index 9dd50e584..3a828fcf3 100644
--- a/admin-ui/src/store/auth.js
+++ b/admin-ui/src/store/auth.js
@@ -9,6 +9,7 @@ export default {
   state: {
     token: "",
     userdata: {},
+    appURL: ""
   },
   mutations: {
     setToken(state, token) {
@@ -21,12 +22,14 @@ export default {
     setUserdata(state, data) {
       state.userdata = data;
     },
+    setAppURL(state, data) {
+      state.appURL = data;
+    }
   },
   actions: {
     login({ commit }, { login, password, type }) {
       return new Promise((resolve, reject) => {
-        api
-          .authorizeCustom({
+        api.authorizeCustom({
             auth: { data: [login, password], type },
             exp: Math.round((Date.now() + 7776e6) / 1000),
             root_claim: true
@@ -41,10 +44,26 @@ export default {
           });
       });
     },
+    getAppURL({ state, commit }) {
+      return new Promise((resolve, reject) => {
+        if (state.appURL !== "") {
+          resolve(state.appURL);
+          return;
+        }
+
+        api.settings.get(["app"])
+          .then((response) => {
+            commit("setAppURL", JSON.parse(response.app).url)
+            resolve(response);
+          })
+          .catch((error) => {
+            reject(error);
+          });
+      });
+    },
     loginToApp(_, { type, uuid }) {
       return new Promise((resolve, reject) => {
-        api
-          .authorizeCustom({ auth: { type, data: [] }, uuid })
+        api.authorizeCustom({ auth: { type, data: [] }, uuid })
           .then((response) => {
             resolve(response);
           })
diff --git a/admin-ui/src/views/ChatsInstancesPage.vue b/admin-ui/src/views/ChatsInstancesPage.vue
new file mode 100644
index 000000000..9e4db70da
--- /dev/null
+++ b/admin-ui/src/views/ChatsInstancesPage.vue
@@ -0,0 +1,38 @@
+<template>
+  <v-card elevation="0" color="background" class="pa-4">
+    <instances-table
+      :value="null"
+      :items="accountInstances"
+      :show-select="false"
+    />
+  </v-card>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+import store from '@/store'
+import router from '@/router'
+import instancesTable from '@/components/instances_table.vue'
+
+const namespaces = computed(() =>
+  store.getters['namespaces/all'] ?? []
+)
+
+const instances = computed(() =>
+  store.getters['services/getInstances'] ?? []
+)
+
+const accountInstances = computed(() => {
+  const namespace = namespaces.value.find(({ access }) => 
+    access.namespace === router.currentRoute.params.uuid
+  )
+
+  if (!namespace) return []
+  return instances.value.filter(({ access }) =>
+    access.namespace === namespace.uuid
+  )
+})
+
+store.dispatch('services/fetch')
+store.dispatch('namespaces/fetch')
+</script>

From 7c23eebf3963c494268ca26c5780ece8db3a8c37 Mon Sep 17 00:00:00 2001
From: Nikita Zhamoidzik <gorobot.nz@gmail.com>
Date: Fri, 29 Sep 2023 14:52:35 +0300
Subject: [PATCH 103/123] Update currency

---
 pkg/registry/accounts.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkg/registry/accounts.go b/pkg/registry/accounts.go
index a4e7367bc..a363a4d0b 100644
--- a/pkg/registry/accounts.go
+++ b/pkg/registry/accounts.go
@@ -503,6 +503,11 @@ func (s *AccountsServiceServer) Update(ctx context.Context, request *accountspb.
 		patch["title"] = request.Title
 	}
 
+	if acc.Currency != request.Currency {
+		log.Debug("Title patch detected")
+		patch["currency"] = request.Currency
+	}
+
 	if request.Data == nil {
 		log.Debug("Data patch is not present, skipping")
 		goto patch

From 95dd44be42c8a921643ef32fbdcd6feccb98a23b Mon Sep 17 00:00:00 2001
From: 639852 <sasha.bobyliev@mail.ru>
Date: Fri, 29 Sep 2023 23:59:19 +0400
Subject: [PATCH 104/123] - Fixed bug with endless reloading page

---
 admin-ui/src/App.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/admin-ui/src/App.vue b/admin-ui/src/App.vue
index 783887010..b398e1833 100644
--- a/admin-ui/src/App.vue
+++ b/admin-ui/src/App.vue
@@ -460,9 +460,7 @@ export default {
         window.open(`/admin/accounts/${data.value.uuid}`, "_blank");
         return;
       }
-
-      this.$store.commit("auth/setToken", data);
-      location.assign("/admin");
+      console.log(data, origin);
     });
 
     this.$store.dispatch("auth/load");

From 2fb255e1f26dddec0ce577a8d905aa5f8293f7b6 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Mon, 2 Oct 2023 12:40:03 +0400
Subject: [PATCH 105/123] fix dedicated groups

---
 .../src/components/plan/dedicatedTable.vue    | 21 ++++++-------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/admin-ui/src/components/plan/dedicatedTable.vue b/admin-ui/src/components/plan/dedicatedTable.vue
index 6fb189c24..769cf1a75 100644
--- a/admin-ui/src/components/plan/dedicatedTable.vue
+++ b/admin-ui/src/components/plan/dedicatedTable.vue
@@ -68,7 +68,6 @@
             style="width: 200px"
             v-model="item.group"
             :items="groups"
-            @change="item.name = getName(item)"
           />
           <v-icon @click="changeMode('create', item)">mdi-plus</v-icon>
           <v-icon @click="changeMode('edit', item)">mdi-pencil</v-icon>
@@ -304,11 +303,12 @@ export default {
         return "error";
       }
 
+      plan.products = {};
+
       const sp = this.$store.getters["servicesProviders/all"];
       const { uuid } = sp.find((el) => el.type === "ovh");
 
       plan.resources = this.template.resources;
-      plan.products = this.template.products;
 
       const enabledPlans = this.plans.filter((el) => el.sell);
       const configurations = await Promise.all(
@@ -348,6 +348,7 @@ export default {
           kind: "PREPAID",
           title: el.name,
           price: el.value,
+          group: el.group,
           period: this.getPeriod(el.duration),
           sorter: Object.keys(plan.products).length,
           installation_fee: el.installation_fee.value,
@@ -514,13 +515,6 @@ export default {
           return "yearly";
       }
     },
-    getName({ name, group }) {
-      const newGroup = `${group[0].toUpperCase()}${group.slice(1)}`;
-      const sep = /[\W0-9]/.exec(name)[0];
-      const newName = name.split(sep).splice(1).join(sep);
-
-      return `${newGroup}${sep}${newName}`;
-    },
     getMargin({ value, price }, filter = true) {
       if (!this.usedFee.ranges) {
         if (filter) this.changeFilters({ margin: "none" }, ["Margin"]);
@@ -581,7 +575,6 @@ export default {
       this.plans.forEach((plan, index) => {
         if (plan.group !== group) return;
         this.plans[index].group = this.newGroup.name;
-        this.plans[index].name = this.getName(plan);
       });
 
       this.changeMode("none", { id: -1, group: "" });
@@ -589,7 +582,6 @@ export default {
     createGroup(plan) {
       this.groups.push(this.newGroup.name);
       plan.group = this.newGroup.name;
-      plan.name = this.getName(plan);
 
       this.changeMode("none", { id: -1, group: "" });
     },
@@ -598,7 +590,6 @@ export default {
       this.plans.forEach((plan, i) => {
         if (plan.group !== group) return;
         this.plans[i].group = this.groups[0];
-        this.plans[i].name = this.getName(plan);
       });
     },
     changeMode(mode, { id, group }) {
@@ -694,18 +685,18 @@ export default {
         this.plans.forEach((plan, i) => {
           const product = this.template.products[plan.id];
           const title = (product?.title ?? plan.name).toUpperCase();
-          const group = title.split(/[\W0-9]/)[0];
+          const group = product?.group || title.split(/[\W0-9]/)[0];
 
           if (product) {
             this.plans[i].name = product.title;
             this.plans[i].value = product.price;
-            this.plans[i].group = group;
             this.plans[i].sell = true;
             this.plans[i].isBeenSell = true;
           } else {
             this.plans[i].name = title;
-            this.plans[i].group = group;
           }
+          this.plans[i].group = group;
+
           if (!this.groups.includes(group)) this.groups.push(group);
         });
 

From 567daf10d0dc23d52ddc44d21e4f2c88e947e96c Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Mon, 2 Oct 2023 12:40:13 +0400
Subject: [PATCH 106/123] fix vps groups

---
 admin-ui/src/components/plan/vpsTable.vue | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/admin-ui/src/components/plan/vpsTable.vue b/admin-ui/src/components/plan/vpsTable.vue
index 02293a2a8..706b4bd31 100644
--- a/admin-ui/src/components/plan/vpsTable.vue
+++ b/admin-ui/src/components/plan/vpsTable.vue
@@ -92,7 +92,6 @@
                 style="width: 200px"
                 v-model="item.group"
                 :items="groups"
-                @change="item.name = getName(item)"
               />
               <v-icon @click="changeMode('create', item)">mdi-plus</v-icon>
               <v-icon @click="changeMode('edit', item)">mdi-pencil</v-icon>
@@ -317,6 +316,7 @@ export default {
             kind: "PREPAID",
             title: el.name,
             price: el.value,
+            group: el.group,
             period: this.getPeriod(el.duration),
             resources: { cpu: +cpu, ram: ram * 1024, disk: disk * 1024 },
             sorter: Object.keys(plan.products).length,
@@ -541,15 +541,6 @@ export default {
           return "yearly";
       }
     },
-    getName({ name, group }) {
-      const newGroup = `${group[0].toUpperCase()}${group.slice(1)}`;
-      const slicedName = name.replace(/VPS[\W0-9]/, "");
-      const sep = /[\W0-9]/.exec(slicedName)[0];
-      const newName = slicedName.split(sep).splice(1).join(sep);
-
-      if (!name.startsWith("VPS")) return `${newGroup}${sep}${newName}`;
-      else return `VPS ${newGroup} ${name.split(" ").at(-1)}`;
-    },
     getMargin({ value, price }, filter = true) {
       if (!this.usedFee.ranges) {
         if (filter) this.changeFilters({ margin: "none" }, ["Margin"]);
@@ -610,7 +601,6 @@ export default {
       this.plans.forEach((plan, index) => {
         if (plan.group !== group) return;
         this.plans[index].group = this.newGroupName;
-        this.plans[index].name = this.getName(plan);
       });
 
       this.changeMode("none", { id: -1, group: "" });
@@ -618,7 +608,6 @@ export default {
     createGroup(plan) {
       this.groups.push(this.newGroupName);
       plan.group = this.newGroupName;
-      plan.name = this.getName(plan);
 
       this.changeMode("none", { id: -1, group: "" });
     },
@@ -627,7 +616,6 @@ export default {
       this.plans.forEach((plan, i) => {
         if (plan.group !== group) return;
         this.plans[i].group = this.groups[0];
-        this.plans[i].name = this.getName(plan);
       });
     },
     changeMode(mode, { id, group }) {
@@ -768,7 +756,7 @@ export default {
             el.includes("windows")
           );
           const title = (product?.title ?? plan.name).replace(/VPS[\W0-9]/, "");
-          const group = title.split(/[\W0-9]/)[0];
+          const group = product?.group || title.split(/[\W0-9]/)[0];
 
           if (product) {
             this.plans[i].name = product.title;

From fadee308b66511d0cbaeeb9f8b1b71ea7bf71428 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Oct 2023 15:49:30 +0200
Subject: [PATCH 107/123] Bump github.com/rs/cors from 1.10.0 to 1.10.1 (#1151)

Bumps [github.com/rs/cors](https://github.com/rs/cors) from 1.10.0 to 1.10.1.
- [Release notes](https://github.com/rs/cors/releases)
- [Commits](https://github.com/rs/cors/compare/v1.10.0...v1.10.1)

---
updated-dependencies:
- dependency-name: github.com/rs/cors
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 727c25151..0309275ff 100644
--- a/go.mod
+++ b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0
 	github.com/rabbitmq/amqp091-go v1.8.1
-	github.com/rs/cors v1.10.0
+	github.com/rs/cors v1.10.1
 	github.com/slntopp/nocloud-proto v0.0.0-20230928084001-11a2827103dc
 	github.com/spf13/viper v1.16.0
 	github.com/stoewer/go-strcase v1.3.0
diff --git a/go.sum b/go.sum
index 92cb1bd5e..11191edcc 100644
--- a/go.sum
+++ b/go.sum
@@ -196,8 +196,8 @@ github.com/rabbitmq/amqp091-go v1.8.1 h1:RejT1SBUim5doqcL6s7iN6SBmsQqyTgXb1xMlH0
 github.com/rabbitmq/amqp091-go v1.8.1/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
-github.com/rs/cors v1.10.0 h1:62NOS1h+r8p1mW6FM0FSB0exioXLhd/sh15KpjWBZ+8=
-github.com/rs/cors v1.10.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
+github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo=
+github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=

From bf935e383e3f192745c2719976b83f8c8915668a Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 3 Oct 2023 11:12:43 +0400
Subject: [PATCH 108/123] fix ovh durations

---
 admin-ui/src/components/modules/ovh/instanceCreate.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/admin-ui/src/components/modules/ovh/instanceCreate.vue b/admin-ui/src/components/modules/ovh/instanceCreate.vue
index fda46bfa4..a44a67b3e 100644
--- a/admin-ui/src/components/modules/ovh/instanceCreate.vue
+++ b/admin-ui/src/components/modules/ovh/instanceCreate.vue
@@ -193,7 +193,6 @@ export default {
     regions: {},
     images: {},
     addons: {},
-    durationItems: ["P1H", "P1M", "P1Y"],
 
     ovhTypes: [
       { title: "ovh vps", value: "vps" },
@@ -397,6 +396,14 @@ export default {
 
       return tariffs;
     },
+    durationItems() {
+      const items = new Set();
+      this.flavors[this.instance.billing_plan?.uuid]?.forEach((item) => {
+        items.add(item.duration);
+      });
+
+      return [...items.values()];
+    },
   },
   async created() {
     if (!this.isEdit) {

From c1c981f6459003b86752666fedb0eef7df1d0196 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 3 Oct 2023 11:19:18 +0400
Subject: [PATCH 109/123] fix pricing mode not set

---
 admin-ui/src/components/modules/ovh/instanceCreate.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/admin-ui/src/components/modules/ovh/instanceCreate.vue b/admin-ui/src/components/modules/ovh/instanceCreate.vue
index a44a67b3e..2f7913541 100644
--- a/admin-ui/src/components/modules/ovh/instanceCreate.vue
+++ b/admin-ui/src/components/modules/ovh/instanceCreate.vue
@@ -246,6 +246,7 @@ export default {
       this.addons[planCode] = newAddons;
     },
     setValue(path, val) {
+      console.log(path, val);
       const data = JSON.parse(JSON.stringify(this.instance));
 
       if (path.includes("billing_plan")) {
@@ -320,7 +321,10 @@ export default {
       }
 
       if (path.includes("duration")) {
-        data.config.pricingMode = val === "P1M" ? "default" : "upfront12";
+        this.$emit("set-value", {
+          value: val === "P1M" ? "default" : "upfront12",
+          key: "config.pricingMode",
+        });
       }
 
       if (path.includes("addons")) {

From 33b363657fa55fece6a79fb940f69026a0a43692 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 3 Oct 2023 11:20:25 +0400
Subject: [PATCH 110/123] fix pricing mode p1h

---
 admin-ui/src/components/modules/ovh/instanceCreate.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-ui/src/components/modules/ovh/instanceCreate.vue b/admin-ui/src/components/modules/ovh/instanceCreate.vue
index 2f7913541..3a10ac790 100644
--- a/admin-ui/src/components/modules/ovh/instanceCreate.vue
+++ b/admin-ui/src/components/modules/ovh/instanceCreate.vue
@@ -322,7 +322,7 @@ export default {
 
       if (path.includes("duration")) {
         this.$emit("set-value", {
-          value: val === "P1M" ? "default" : "upfront12",
+          value: val === "P1Y" ? "upfront12" : "default",
           key: "config.pricingMode",
         });
       }

From e36560e530e6e8353877330f28b27dcf51a019eb Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 3 Oct 2023 11:24:57 +0400
Subject: [PATCH 111/123] fix product set

---
 .../components/modules/ovh/instanceCreate.vue | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/admin-ui/src/components/modules/ovh/instanceCreate.vue b/admin-ui/src/components/modules/ovh/instanceCreate.vue
index 3a10ac790..9aea2ab11 100644
--- a/admin-ui/src/components/modules/ovh/instanceCreate.vue
+++ b/admin-ui/src/components/modules/ovh/instanceCreate.vue
@@ -374,13 +374,10 @@ export default {
       return this.instance.config.addons.find((a) => addon.includes(a));
     },
     setProduct() {
-      const data = JSON.parse(JSON.stringify(this.instance));
-      if (data.billing_plan?.kind?.toLowerCase() === "static") {
-        this.$emit("set-value", {
-          value: `${data.config?.duration} ${data.config?.planCode}`,
-          key: "product",
-        });
-      }
+      this.$emit("set-value", {
+        value: this.product,
+        key: "product",
+      });
     },
     setInstanceGroup(key, value) {
       this.$emit("set-instance-group", { ...this.instanceGroup, [key]: value });
@@ -400,6 +397,12 @@ export default {
 
       return tariffs;
     },
+    product() {
+      return [
+        this.instance.config.duration,
+        this.instance.config.planCode,
+      ].join(" ");
+    },
     durationItems() {
       const items = new Set();
       this.flavors[this.instance.billing_plan?.uuid]?.forEach((item) => {
@@ -426,9 +429,7 @@ export default {
         this.instance.config.configuration.vps_os
       );
       this.setAddons(
-        this.instance.billing_plan.products[
-          `${this.instance.config.duration} ${this.instance.config.planCode}`
-        ]?.meta?.addons,
+        this.instance.billing_plan.products[this.product]?.meta?.addons,
         this.instance.config.planCode
       );
     }

From 0c33b57d7da680c0727075a7a78d14161eb839e4 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 3 Oct 2023 11:25:22 +0400
Subject: [PATCH 112/123] reset default duration

---
 admin-ui/src/components/modules/ovh/instanceCreate.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin-ui/src/components/modules/ovh/instanceCreate.vue b/admin-ui/src/components/modules/ovh/instanceCreate.vue
index 9aea2ab11..7a927c4f3 100644
--- a/admin-ui/src/components/modules/ovh/instanceCreate.vue
+++ b/admin-ui/src/components/modules/ovh/instanceCreate.vue
@@ -164,8 +164,8 @@ const getDefaultInstance = () => ({
       vps_datacenter: null,
       vps_os: null,
     },
-    duration: "P1M",
-    pricingMode: "default",
+    duration: "",
+    pricingMode: "",
     addons: [],
   },
   data: { existing: false },

From 56d6bc7cb09ff635c64e92868884572421262515 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 3 Oct 2023 11:32:35 +0400
Subject: [PATCH 113/123] fix account price

---
 admin-ui/src/components/dialogs/editPriceModel.vue | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/admin-ui/src/components/dialogs/editPriceModel.vue b/admin-ui/src/components/dialogs/editPriceModel.vue
index a35e323ee..5d103d92e 100644
--- a/admin-ui/src/components/dialogs/editPriceModel.vue
+++ b/admin-ui/src/components/dialogs/editPriceModel.vue
@@ -72,8 +72,7 @@
 import { toRefs, ref, computed, onMounted, watch } from "vue";
 import api from "@/api";
 import { getBillingPeriod } from "@/functions";
-import useRate from "@/hooks/useRate";
-import { useStore } from "@/store";
+import useCurrency from "@/hooks/useCurrency";
 
 const props = defineProps([
   "template",
@@ -85,13 +84,11 @@ const props = defineProps([
 ]);
 const emit = defineEmits(["refresh", "input"]);
 
-const { convertFrom } = useRate();
+const { convertTo, defaultCurrency } = useCurrency();
 
 const { template, plans, service, accountRate, accountCurrency } =
   toRefs(props);
 
-const store = useStore();
-
 const isChangePMLoading = ref(false);
 const plan = ref({});
 const product = ref({});
@@ -209,13 +206,11 @@ const isChangeBtnDisabled = computed(() => {
 const fullProduct = computed(() => plan.value?.products?.[product.value]);
 
 const accountPrice = computed(() =>
-  accountRate.value && fullProduct.value?.price
-    ? convertFrom(fullProduct.value.price, accountRate.value)
+  accountCurrency.value && fullProduct.value?.price
+    ? convertTo(fullProduct.value.price, accountCurrency.value)
     : 0
 );
 
-const defaultCurrency = computed(() => store.getters["currencies/default"]);
-
 const changePM = () => {
   const tempService = JSON.parse(JSON.stringify(service.value));
 

From b4f907b15625b264fad57d3c3c38ada17fdddc62 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 3 Oct 2023 14:05:00 +0400
Subject: [PATCH 114/123] make currency readonly if currency exist

---
 admin-ui/src/components/account/info.vue | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/admin-ui/src/components/account/info.vue b/admin-ui/src/components/account/info.vue
index 8bec49702..11aac9850 100644
--- a/admin-ui/src/components/account/info.vue
+++ b/admin-ui/src/components/account/info.vue
@@ -17,7 +17,13 @@
         <v-text-field v-model="title" label="name" style="width: 330px" />
       </v-col>
       <v-col cols="3">
-        <v-select :items="currencies" v-model="currency" label="currency" style="width: 330px" />
+        <v-select
+          :readonly="isCurrencyReadonly"
+          :items="currencies"
+          v-model="currency"
+          label="currency"
+          style="width: 330px"
+        />
       </v-col>
     </v-row>
     <v-card-title class="px-0">Instances:</v-card-title>
@@ -112,7 +118,7 @@ export default {
     navTitles: config.navTitles ?? {},
     uuid: "",
     title: "",
-    currency:"",
+    currency: "",
     keys: [],
     selected: [],
     isVisible: false,
@@ -139,9 +145,13 @@ export default {
       this.selected = [];
     },
     editAccount() {
-      const newAccount = { ...this.account, title: this.title ,currency:this.currency};
-      if(!newAccount.data){
-        newAccount.data={}
+      const newAccount = {
+        ...this.account,
+        title: this.title,
+        currency: this.currency,
+      };
+      if (!newAccount.data) {
+        newAccount.data = {};
       }
       newAccount.data.ssh_keys = this.keys;
 
@@ -204,6 +214,9 @@ export default {
         (i) => i.access.namespace === accountNamespace.uuid
       );
     },
+    isCurrencyReadonly() {
+      return this.account.currency && this.account.currency !== "NCU";
+    },
   },
 };
 </script>

From 026030f080dbf47b919e4df67ec898509621e911 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 3 Oct 2023 14:07:00 +0400
Subject: [PATCH 115/123] change lock to user lock

---
 admin-ui/src/components/instance/controls.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin-ui/src/components/instance/controls.vue b/admin-ui/src/components/instance/controls.vue
index 38539a001..78b8285dc 100644
--- a/admin-ui/src/components/instance/controls.vue
+++ b/admin-ui/src/components/instance/controls.vue
@@ -18,7 +18,7 @@
     </v-btn>
     <confirm-dialog @confirm="lockInstance">
       <v-btn :loading="isLockLoading" class="mr-2">
-        {{ template.data.lock ? "Unlock" : "Lock" }}
+        {{ template.data.lock ? "User unlock" : "User lock" }}
       </v-btn>
     </confirm-dialog>
     <confirm-dialog @confirm="deleteInstance">

From 93027cddfe500eab7133973e70cbfc6ea6eac0c9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Oct 2023 12:08:41 +0200
Subject: [PATCH 116/123] Bump github.com/rabbitmq/amqp091-go from 1.8.1 to
 1.9.0 (#1155)

Bumps [github.com/rabbitmq/amqp091-go](https://github.com/rabbitmq/amqp091-go) from 1.8.1 to 1.9.0.
- [Release notes](https://github.com/rabbitmq/amqp091-go/releases)
- [Changelog](https://github.com/rabbitmq/amqp091-go/blob/main/CHANGELOG.md)
- [Commits](https://github.com/rabbitmq/amqp091-go/compare/v1.8.1...v1.9.0)

---
updated-dependencies:
- dependency-name: github.com/rabbitmq/amqp091-go
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 2 +-
 go.sum | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/go.mod b/go.mod
index 0309275ff..9452f7c7f 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/gorilla/websocket v1.5.0
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.0
-	github.com/rabbitmq/amqp091-go v1.8.1
+	github.com/rabbitmq/amqp091-go v1.9.0
 	github.com/rs/cors v1.10.1
 	github.com/slntopp/nocloud-proto v0.0.0-20230928084001-11a2827103dc
 	github.com/spf13/viper v1.16.0
diff --git a/go.sum b/go.sum
index 11191edcc..532c69b83 100644
--- a/go.sum
+++ b/go.sum
@@ -192,8 +192,8 @@ github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qR
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/rabbitmq/amqp091-go v1.8.1 h1:RejT1SBUim5doqcL6s7iN6SBmsQqyTgXb1xMlH0h1hA=
-github.com/rabbitmq/amqp091-go v1.8.1/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc=
+github.com/rabbitmq/amqp091-go v1.9.0 h1:qrQtyzB4H8BQgEuJwhmVQqVHB9O4+MNDJCCAcpc3Aoo=
+github.com/rabbitmq/amqp091-go v1.9.0/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo=

From f115701476b6e056f044542cb8a1019fb21bf982 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 3 Oct 2023 14:28:30 +0400
Subject: [PATCH 117/123] hide meta in expansion panels

---
 .../src/views/ServicesProvidersCreate.vue     | 27 ++++++++++--------
 admin-ui/src/views/TransactionsCreate.vue     | 28 +++++++++++--------
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/admin-ui/src/views/ServicesProvidersCreate.vue b/admin-ui/src/views/ServicesProvidersCreate.vue
index 0dd7ec98d..39eaa3da1 100644
--- a/admin-ui/src/views/ServicesProvidersCreate.vue
+++ b/admin-ui/src/views/ServicesProvidersCreate.vue
@@ -59,17 +59,22 @@
             </v-col>
           </v-row>
 
-          <v-row>
-            <v-col cols="3">
-              <v-subheader>Meta</v-subheader>
-            </v-col>
-            <v-col cols="9">
-              <json-editor
-                :json="provider.meta"
-                @changeValue="(data) => (provider.meta = data)"
-              />
-            </v-col>
-          </v-row>
+          <v-expansion-panels>
+            <v-expansion-panel>
+              <v-expansion-panel-header color="background-light">
+                <span class="text-h6">Meta</span>
+                <template v-slot:actions>
+                  <v-icon x-large> $expand </v-icon>
+                </template>
+              </v-expansion-panel-header>
+              <v-expansion-panel-content color="background-light">
+                <json-editor
+                  :json="provider.meta"
+                  @changeValue="(data) => (provider.meta = data)"
+                />
+              </v-expansion-panel-content>
+            </v-expansion-panel>
+          </v-expansion-panels>
 
           <v-row align="center">
             <v-col cols="3">
diff --git a/admin-ui/src/views/TransactionsCreate.vue b/admin-ui/src/views/TransactionsCreate.vue
index 5de8dc14c..1fdf45b62 100644
--- a/admin-ui/src/views/TransactionsCreate.vue
+++ b/admin-ui/src/views/TransactionsCreate.vue
@@ -163,18 +163,22 @@
               v-model="transaction.meta.description"
             ></v-textarea>
           </v-row>
-
-          <v-row>
-            <v-col cols="3">
-              <v-subheader>Meta</v-subheader>
-            </v-col>
-            <v-col cols="9">
-              <json-editor
-                :json="transaction.meta"
-                @changeValue="(data) => (transaction.meta = data)"
-              />
-            </v-col>
-          </v-row>
+          <v-expansion-panels class="mt-4">
+            <v-expansion-panel>
+              <v-expansion-panel-header color="background-light">
+                <span class="text-h6">Meta</span>
+                <template v-slot:actions>
+                  <v-icon x-large> $expand </v-icon>
+                </template>
+              </v-expansion-panel-header>
+              <v-expansion-panel-content color="background-light">
+                <json-editor
+                  :json="transaction.meta"
+                  @changeValue="(data) => (transaction.meta = data)"
+                />
+              </v-expansion-panel-content>
+            </v-expansion-panel>
+          </v-expansion-panels>
         </v-col>
       </v-row>
 

From 56e29c75cbc5486eb08e0d990042cf503a1393c9 Mon Sep 17 00:00:00 2001
From: SazukinPavel <sazukinpavelal@gmail.com>
Date: Tue, 3 Oct 2023 14:38:07 +0400
Subject: [PATCH 118/123] redisign billing label

---
 admin-ui/src/components/instance/info.vue   |  8 +++++---
 admin-ui/src/components/ui/billingLabel.vue | 20 +++++++++++---------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/admin-ui/src/components/instance/info.vue b/admin-ui/src/components/instance/info.vue
index d35fb89f9..eb84d807a 100644
--- a/admin-ui/src/components/instance/info.vue
+++ b/admin-ui/src/components/instance/info.vue
@@ -129,11 +129,13 @@
 
     <div
       v-if="billingLabelComponent"
-      style="position: absolute; top: 0; right: 75px"
+      style="position: absolute; top: 0px; right: 5px; z-index: 2"
     >
       <component
-          @update="updateCopy"
-          :is="billingLabelComponent" :template="copyInstance" />
+        @update="updateCopy"
+        :is="billingLabelComponent"
+        :template="copyInstance"
+      />
     </div>
   </v-card>
 </template>
diff --git a/admin-ui/src/components/ui/billingLabel.vue b/admin-ui/src/components/ui/billingLabel.vue
index 7b00a491a..d32cc247e 100644
--- a/admin-ui/src/components/ui/billingLabel.vue
+++ b/admin-ui/src/components/ui/billingLabel.vue
@@ -1,9 +1,6 @@
 <template>
   <v-container>
-    <v-row>
-      <v-col>
-        <v-chip outlined color="primary">Due to date: {{ dueDate }}</v-chip>
-      </v-col>
+    <v-row justify="end">
       <v-col
         style="max-height: 50px"
         class="d-flex justify-end align-start pa-0"
@@ -12,11 +9,13 @@
           hide-details
           dense
           :input-value="template.config.auto_renew"
-          @change="emit('update', { key: 'config.auto_renew', value: !!$event })"
+          @change="
+            emit('update', { key: 'config.auto_renew', value: !!$event })
+          "
           label="Auto"
         />
       </v-col>
-      <v-col>
+      <v-col class="d-flex justify-end" style="max-width: 120px">
         <confirm-dialog
           title="Do you want to renew server?"
           :text="renewTemplate"
@@ -35,13 +34,16 @@
       </v-col>
     </v-row>
     <v-row class="mt-0" align="center" justify="end">
-      <v-col cols="4" class="d-flex justify-end px-0">
+      <v-col class="d-flex justify-end px-1">
+        <instance-state :state="template.state.state" />
+      </v-col>
+      <v-col class="d-flex justify-end px-1">
         <v-chip color="primary" outlined
           >Price: {{ price }} {{ accountCurrency }}</v-chip
         >
       </v-col>
-      <v-col cols="4" class="d-flex justify-end px-0">
-        <instance-state :state="template.state.state" />
+      <v-col class="px-1">
+        <v-chip outlined color="primary">Due to date: {{ dueDate }}</v-chip>
       </v-col>
     </v-row>
   </v-container>

From 1d7a4a950a9b4e1785e6d58fd6228ef31edbd0b0 Mon Sep 17 00:00:00 2001
From: 639852 <sasha.bobyliev@mail.ru>
Date: Thu, 5 Oct 2023 13:05:00 +0400
Subject: [PATCH 119/123] - Fixed opening list of instances from chats

---
 admin-ui/src/App.vue                        | 40 +++++++++++++--------
 admin-ui/src/components/instances_table.vue |  6 ++--
 admin-ui/src/router/index.js                |  8 -----
 admin-ui/src/views/ChatsInstancesPage.vue   | 38 --------------------
 4 files changed, 29 insertions(+), 63 deletions(-)
 delete mode 100644 admin-ui/src/views/ChatsInstancesPage.vue

diff --git a/admin-ui/src/App.vue b/admin-ui/src/App.vue
index b398e1833..bc86a482c 100644
--- a/admin-ui/src/App.vue
+++ b/admin-ui/src/App.vue
@@ -6,7 +6,6 @@
     <v-navigation-drawer
       app
       permanent
-      v-if="$route.name !== 'Instances by account'"
       :color="asideColor"
       :mini-variant="isMenuMinimize"
     >
@@ -276,7 +275,7 @@
             <v-icon>mdi-reload</v-icon>
           </v-btn>
         </v-col>
-        <v-col v-if="$route.name !== 'Instances by account'" class="d-flex justify-end align-center">
+        <v-col class="d-flex justify-end align-center">
           <languages v-if="false" />
           <v-menu offset-y transition="slide-y-transition">
             <template v-slot:activator="{ on, attrs }">
@@ -315,14 +314,22 @@
       <v-spacer></v-spacer>
     </v-app-bar>
 
-    <v-btn
-      color="success"
+    <instances-table-modal
       v-if="overlay.uuid"
-      style="position: absolute; top: 90px; right: 25px; z-index: 100"
-      @click="overlay.onClick(overlay.uuid)"
+      :uuid="overlay.uuid"
+      :visible="overlay.isVisible"
+      @close="() => { overlay.isVisible = false }"
     >
-      {{ overlay.buttonTitle }}
-    </v-btn>
+      <template #activator>
+        <v-btn
+          color="success"
+          style="position: absolute; top: 90px; right: 25px; z-index: 100"
+          @click="overlay.isVisible = true"
+        >
+          {{ overlay.buttonTitle }}
+        </v-btn>
+      </template>
+    </instances-table-modal>
 
     <v-main>
       <router-view />
@@ -339,10 +346,17 @@ import balance from "@/components/balance.vue";
 import languages from "@/components/languages.vue";
 import appSearch from "@/components/search/search.vue";
 import AppSnackbar from "@/components/snackbar.vue";
+import instancesTableModal from "@/components/instances_table_modal.vue";
 
 export default {
   name: "App",
-  components: { AppSnackbar, balance, appSearch, languages },
+  components: {
+    AppSnackbar,
+    balance,
+    appSearch,
+    languages,
+    instancesTableModal
+  },
   data: () => ({
     isMenuMinimize: true,
     isMouseOnMenu: false,
@@ -350,13 +364,9 @@ export default {
     config,
     navTitles: config.navTitles ?? {},
     overlay: {
+      isVisible: false,
       buttonTitle: '',
-      uuid: '',
-      onClick(uuid) {
-        const params = `scrollbars=no,status=no,location=no,toolbar=no,menubar=no,popup=yes width=768,height=540,left=100,top=100`;
-
-        window.open(`/admin/instances/account/${uuid}`, 'overlay', params);
-      }
+      uuid: ''
     }
   }),
   methods: {
diff --git a/admin-ui/src/components/instances_table.vue b/admin-ui/src/components/instances_table.vue
index 26bf0b565..c0c026528 100644
--- a/admin-ui/src/components/instances_table.vue
+++ b/admin-ui/src/components/instances_table.vue
@@ -4,7 +4,7 @@
     class="mt-4"
     :value="value"
     :items="instances"
-    :headers="headers"
+    :headers="instancesHeaders"
     :loading="isLoading"
     :custom-sort="sortInstances"
     :footer-error="fetchError"
@@ -154,6 +154,7 @@ export default {
   mixins: [searchMixin],
   props: {
     value: { type: Array, required: true },
+    headers: { type: Array, default: null },
     selected: { type: Object, default: null },
     showSelect: { type: Boolean, default: true },
     items: { type: Array, default: () => [] },
@@ -485,7 +486,8 @@ export default {
     accounts() {
       return this.$store.getters["accounts/all"];
     },
-    headers() {
+    instancesHeaders() {
+      if (this.headers) return this.headers;
       const headers = [
         { text: "ID", value: "id" },
         { text: "Title", value: "title" },
diff --git a/admin-ui/src/router/index.js b/admin-ui/src/router/index.js
index 1867fc5c0..3eac37709 100644
--- a/admin-ui/src/router/index.js
+++ b/admin-ui/src/router/index.js
@@ -49,14 +49,6 @@ const routes = [
       requireLogin: true,
     },
   },
-  {
-    path: "/instances/account/:uuid",
-    name: "Instances by account",
-    component: () => import("../views/ChatsInstancesPage.vue"),
-    meta: {
-      requireLogin: true,
-    },
-  },
   {
     path: "/sp",
     name: "ServicesProviders",
diff --git a/admin-ui/src/views/ChatsInstancesPage.vue b/admin-ui/src/views/ChatsInstancesPage.vue
deleted file mode 100644
index 9e4db70da..000000000
--- a/admin-ui/src/views/ChatsInstancesPage.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-  <v-card elevation="0" color="background" class="pa-4">
-    <instances-table
-      :value="null"
-      :items="accountInstances"
-      :show-select="false"
-    />
-  </v-card>
-</template>
-
-<script setup>
-import { computed } from 'vue'
-import store from '@/store'
-import router from '@/router'
-import instancesTable from '@/components/instances_table.vue'
-
-const namespaces = computed(() =>
-  store.getters['namespaces/all'] ?? []
-)
-
-const instances = computed(() =>
-  store.getters['services/getInstances'] ?? []
-)
-
-const accountInstances = computed(() => {
-  const namespace = namespaces.value.find(({ access }) => 
-    access.namespace === router.currentRoute.params.uuid
-  )
-
-  if (!namespace) return []
-  return instances.value.filter(({ access }) =>
-    access.namespace === namespace.uuid
-  )
-})
-
-store.dispatch('services/fetch')
-store.dispatch('namespaces/fetch')
-</script>

From 9006da46e8c56dcb55d7cbcd145d016ebef2391e Mon Sep 17 00:00:00 2001
From: 639852 <sasha.bobyliev@mail.ru>
Date: Thu, 5 Oct 2023 13:16:52 +0400
Subject: [PATCH 120/123] - Added file instances_table_modal.vue

---
 .../src/components/instances_table_modal.vue  | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 admin-ui/src/components/instances_table_modal.vue

diff --git a/admin-ui/src/components/instances_table_modal.vue b/admin-ui/src/components/instances_table_modal.vue
new file mode 100644
index 000000000..a372ff32c
--- /dev/null
+++ b/admin-ui/src/components/instances_table_modal.vue
@@ -0,0 +1,57 @@
+<template>
+  <v-dialog max-width="1280" :value="visible" @input="$emit('close')">
+    <template v-slot:activator="{ on, attrs }">
+      <slot v-on="on" v-bind="attrs" name="activator" />
+    </template>
+    <v-card elevation="0" color="background" class="pa-4">
+      <instances-table
+        class="mt-0"
+        :value="null"
+        :headers="headers"
+        :items="accountInstances"
+        :show-select="false"
+      />
+    </v-card>
+  </v-dialog>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+import store from '@/store'
+import instancesTable from '@/components/instances_table.vue'
+
+const props = defineProps({
+  uuid: { type: String, required: true },
+  visible: { type: Boolean, required: true }
+})
+
+const headers = [
+  { text: "Title", value: "title" },
+  { text: "Due date", value: "dueDate" },
+  { text: "Status", value: "state" },
+  { text: "Tariff", value: "product" },
+  { text: "Price", value: "accountPrice" },
+]
+
+const namespaces = computed(() =>
+  store.getters['namespaces/all'] ?? []
+)
+
+const instances = computed(() =>
+  store.getters['services/getInstances'] ?? []
+)
+
+const accountInstances = computed(() => {
+  const namespace = namespaces.value.find(({ access }) => 
+    access.namespace === props.uuid
+  )
+
+  if (!namespace) return []
+  return instances.value.filter(({ access }) =>
+    access.namespace === namespace.uuid
+  )
+})
+
+store.dispatch('services/fetch')
+store.dispatch('namespaces/fetch')
+</script>

From d2dce5a44ab02e3b2317a9f5d11a9583fb0547e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Oct 2023 20:55:07 +0200
Subject: [PATCH 121/123] Bump golang.org/x/crypto from 0.13.0 to 0.14.0
 (#1161)

---
 go.mod | 4 ++--
 go.sum | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index 9452f7c7f..6366bc646 100644
--- a/go.mod
+++ b/go.mod
@@ -20,7 +20,7 @@ require (
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75
 	github.com/wI2L/jsondiff v0.4.0
 	go.uber.org/zap v1.26.0
-	golang.org/x/crypto v0.13.0
+	golang.org/x/crypto v0.14.0
 	golang.org/x/oauth2 v0.12.0
 	google.golang.org/grpc v1.58.2
 	google.golang.org/protobuf v1.31.0
@@ -55,7 +55,7 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/sys v0.12.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
diff --git a/go.sum b/go.sum
index 532c69b83..483e00c99 100644
--- a/go.sum
+++ b/go.sum
@@ -263,8 +263,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.13.0 h1:mvySKfSWJ+UKUii46M40LOvyWfN0s2U+46/jDd0e6Ck=
-golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -395,8 +395,8 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
-golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

From 89ea04d3c12063bbcb372297872cc1dc676dac4e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 11:10:11 +0200
Subject: [PATCH 122/123] Bump github.com/spf13/viper from 1.16.0 to 1.17.0
 (#1164)

Bumps [github.com/spf13/viper](https://github.com/spf13/viper) from 1.16.0 to 1.17.0.
- [Release notes](https://github.com/spf13/viper/releases)
- [Commits](https://github.com/spf13/viper/compare/v1.16.0...v1.17.0)

---
updated-dependencies:
- dependency-name: github.com/spf13/viper
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 15 +++++++++------
 go.sum | 34 ++++++++++++++++++++--------------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/go.mod b/go.mod
index 6366bc646..b9b1d0a83 100644
--- a/go.mod
+++ b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/rabbitmq/amqp091-go v1.9.0
 	github.com/rs/cors v1.10.1
 	github.com/slntopp/nocloud-proto v0.0.0-20230928084001-11a2827103dc
-	github.com/spf13/viper v1.16.0
+	github.com/spf13/viper v1.17.0
 	github.com/stoewer/go-strcase v1.3.0
 	github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75
 	github.com/wI2L/jsondiff v0.4.0
@@ -29,12 +29,16 @@ require (
 require (
 	cloud.google.com/go/compute v1.23.0 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
+	github.com/sagikazarmark/locafero v0.3.0 // indirect
+	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
+	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
 	golang.org/x/net v0.15.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
+	google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
 )
 
 require (
@@ -49,9 +53,8 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.1.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/spf13/afero v1.9.5 // indirect
+	github.com/spf13/afero v1.10.0 // indirect
 	github.com/spf13/cast v1.5.1 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
diff --git a/go.sum b/go.sum
index 483e00c99..c3b7f53ac 100644
--- a/go.sum
+++ b/go.sum
@@ -62,8 +62,8 @@ github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnht
 github.com/cskr/pubsub v1.0.2 h1:vlOzMhl6PFn60gRlTQQsIfVwaPB/B/8MziK8FhEPt/0=
 github.com/cskr/pubsub v1.0.2/go.mod h1:/8MzYXk/NJAz782G8RPkFzXTZVu63VotefPnR9TIRis=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
@@ -189,8 +189,8 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/rabbitmq/amqp091-go v1.9.0 h1:qrQtyzB4H8BQgEuJwhmVQqVHB9O4+MNDJCCAcpc3Aoo=
 github.com/rabbitmq/amqp091-go v1.9.0/go.mod h1:+jPrT9iY2eLjRaMSRHUhc3z14E/l85kv/f+6luSD3pc=
@@ -198,22 +198,26 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8=
 github.com/rs/cors v1.10.1 h1:L0uuZVXIKlI1SShY2nhFfo44TYvDPQ1w4oFkUJNfhyo=
 github.com/rs/cors v1.10.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
+github.com/sagikazarmark/locafero v0.3.0 h1:zT7VEGWC2DTflmccN/5T1etyKvxSxpHsjb9cJvm4SvQ=
+github.com/sagikazarmark/locafero v0.3.0/go.mod h1:w+v7UsPNFwzF1cHuOajOOzoq4U7v/ig1mpRjqV+Bu1U=
+github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
+github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/slntopp/nocloud-proto v0.0.0-20230928084001-11a2827103dc h1:wGiOebdVhsFpv1hPDJTMn8yq8//qewSsEFP8IkX3SyY=
 github.com/slntopp/nocloud-proto v0.0.0-20230928084001-11a2827103dc/go.mod h1:4Hsf0e2WQQOWaZj6sC1vVq4oCdu30asV+JzWk/xAlIg=
-github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
-github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
+github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
+github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
+github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY=
+github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
 github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA=
 github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48=
-github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
-github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc=
-github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg=
+github.com/spf13/viper v1.17.0 h1:I5txKw7MJasPL/BrfkbA0Jyo/oELqVmux4pR/UxOMfI=
+github.com/spf13/viper v1.17.0/go.mod h1:BmMMMLQXSbcHK6KAOiFLz0l5JHrU89OdIRHvsk0+yVI=
 github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs=
 github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -275,6 +279,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g=
+golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
@@ -529,12 +535,12 @@ google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6D
 google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d h1:VBu5YqKPv6XiJ199exd8Br+Aetz+o08F+PLMnwJQHAY=
-google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4=
-google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q=
-google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
+google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb h1:XFBgcDwm7irdHTbz4Zk2h7Mh+eis4nfJEFQFYzJzuIA=
+google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb/go.mod h1:yZTlhN0tQnXo3h00fuXNCxJdLdIdnVFVBaRJ5LWBbw4=
+google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb h1:lK0oleSc7IQsUxO3U5TjL9DWlsxpEBemh+zpB7IqhWI=
+google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 h1:N3bU/SQDCDyD6R528GJ/PwW9KjYcJA3dgyH+MovAkIM=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13/go.mod h1:KSqppvjFjtoCI+KGd4PELB0qLNxdJHRGqRI09mB6pQA=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=

From f4c3b001ffbf323cd68db6ff3e0ac0521410f9a8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 11:39:14 +0200
Subject: [PATCH 123/123] Bump golang.org/x/oauth2 from 0.12.0 to 0.13.0
 (#1163)

Bumps [golang.org/x/oauth2](https://github.com/golang/oauth2) from 0.12.0 to 0.13.0.
- [Commits](https://github.com/golang/oauth2/compare/v0.12.0...v0.13.0)

---
updated-dependencies:
- dependency-name: golang.org/x/oauth2
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 go.mod | 4 ++--
 go.sum | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index b9b1d0a83..8291e361b 100644
--- a/go.mod
+++ b/go.mod
@@ -21,7 +21,7 @@ require (
 	github.com/wI2L/jsondiff v0.4.0
 	go.uber.org/zap v1.26.0
 	golang.org/x/crypto v0.14.0
-	golang.org/x/oauth2 v0.12.0
+	golang.org/x/oauth2 v0.13.0
 	google.golang.org/grpc v1.58.2
 	google.golang.org/protobuf v1.31.0
 )
@@ -34,7 +34,7 @@ require (
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
-	golang.org/x/net v0.15.0 // indirect
+	golang.org/x/net v0.16.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect
diff --git a/go.sum b/go.sum
index c3b7f53ac..42cb66fe2 100644
--- a/go.sum
+++ b/go.sum
@@ -337,8 +337,8 @@ golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211123203042-d83791d6bcd9/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.15.0 h1:ugBLEUaxABaB5AJqW9enI0ACdci2RUd4eP51NTBvuJ8=
-golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.16.0 h1:7eBu7KsSvFDtSXUIDbh3aqlK4DPsZ1rByC8PFfBThos=
+golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -348,8 +348,8 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4=
-golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4=
+golang.org/x/oauth2 v0.13.0 h1:jDDenyj+WgFtmV3zYVoi8aE2BwtXFLWOA67ZfNWftiY=
+golang.org/x/oauth2 v0.13.0/go.mod h1:/JMhi4ZRXAf4HG9LiNmxvk+45+96RUlVThiH8FzNBn0=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=