Merge pull request #1938 from slntopp/dev

Dev
slntopp · Dec 16, 2024 · bb3cb00 · bb3cb00
2 parents 57dfb7c + c54d9c4
commit bb3cb00
Show file tree

Hide file tree

Showing 35 changed files with 245 additions and 97 deletions.
diff --git a/admin-ui/src/components/account/info.vue b/admin-ui/src/components/account/info.vue
@@ -69,7 +69,7 @@
         <hint-btn hint="Create transaction/invoice">
           <v-chip @click="openTransaction" class="ma-1" color="primary" outlined
             >Balance: {{ account.balance?.toFixed(2) || 0 }}
-            {{ account.currency?.title }}</v-chip
+            {{ account.currency?.code }}</v-chip
           >
         </hint-btn>
       </div>
@@ -509,7 +509,7 @@ export default {
       );
     },
     isCurrencyReadonly() {
-      return this.account.currency && this.account.currency.title !== "NCU";
+      return this.account.currency && this.account.currency.code !== "NCU";
     },
     isLocked() {
       return this.account.status !== "ACTIVE";

diff --git a/admin-ui/src/components/dialogs/editPriceModel.vue b/admin-ui/src/components/dialogs/editPriceModel.vue
@@ -40,15 +40,15 @@
         </v-col>
         <v-col v-if="accountRate">
           <v-text-field
-            :suffix="accountCurrency?.title"
+            :suffix="accountCurrency?.code"
             readonly
             :value="isSelectedPlanAvailable ? accountPrice : null"
             label="account price"
           />
         </v-col>
         <v-col>
           <v-text-field
-            :suffix="defaultCurrency?.title"
+            :suffix="defaultCurrency?.code"
             readonly
             :value="isSelectedPlanAvailable ? fullProduct?.price : null"
             label="price"

diff --git a/admin-ui/src/components/instancesTable.vue b/admin-ui/src/components/instancesTable.vue
@@ -152,7 +152,7 @@
 
     <template v-slot:[`item.estimate`]="{ item }">
       <template v-if="item.estimate">
-        {{ item.estimate }} {{ defaultCurrency?.title }}
+        {{ item.estimate }} {{ defaultCurrency?.code }}
       </template>
       <template v-else> - </template>
     </template>
@@ -166,7 +166,7 @@
               getAccount(item.account)?.currency
             )
           }}
-          {{ getAccount(item.account)?.currency?.title }}
+          {{ getAccount(item.account)?.currency?.code }}
         </template>
         <template v-else> - </template>
       </span>
@@ -175,15 +175,11 @@
     </template>
 
     <template v-slot:[`item.balance`]="{ item }">
-      <span v-if="!isAccountsLoading">
-        {{
-          formatPrice(
-            getAccount(item.account)?.balance || 0,
-            getAccount(item.account)?.currency
-          )
-        }}
-        {{ getAccount(item.account)?.currency?.title }}
-      </span>
+      <balance
+        v-if="!isAccountsLoading"
+        :currency="getAccount(item.account)?.currency"
+        :value="getAccount(item.account)?.balance || 0"
+      />
 
       <v-skeleton-loader type="text" v-else />
     </template>
@@ -209,6 +205,7 @@ import LoginInAccountIcon from "@/components/ui/loginInAccountIcon.vue";
 import InstanceState from "@/components/ui/instanceState.vue";
 import useCurrency from "@/hooks/useCurrency";
 import AccountsAutocomplete from "@/components/ui/accountsAutocomplete.vue";
+import Balance from "./balance.vue";
 import useSearch from "@/hooks/useSearch";
 import { UpdateRequest } from "nocloud-proto/proto/es/instances/instances_pb";
 

diff --git a/admin-ui/src/components/invoiceItemsTable.vue b/admin-ui/src/components/invoiceItemsTable.vue
@@ -11,7 +11,7 @@
         type="number"
         :rules="!readonly ? generalRule : []"
         :readonly="readonly"
-        :suffix="accountCurrency?.title"
+        :suffix="accountCurrency?.code"
         v-model.number="item.price"
       />
     </template>

diff --git a/admin-ui/src/components/invoicesTable.vue b/admin-ui/src/components/invoicesTable.vue
@@ -40,7 +40,7 @@
       <v-chip :color="getTotalColor(item)" abs>
         {{
           `${formatPrice(item.total, item.currency)} ${
-            item.currency?.title || defaultCurrency.title
+            item.currency?.code || defaultCurrency.code
           }`
         }}
       </v-chip>

diff --git a/admin-ui/src/components/modules/cpanel/billingInfo.vue b/admin-ui/src/components/modules/cpanel/billingInfo.vue
@@ -88,13 +88,13 @@
             <v-text-field
               class="mr-2"
               v-model="item.price"
-              :suffix="defaultCurrency?.title"
+              :suffix="defaultCurrency?.code"
               @input="updatePrice(item, false)"
               append-icon="mdi-pencil"
             />
             <v-text-field
               class="ml-2"
-              :suffix="accountCurrency?.title"
+              :suffix="accountCurrency?.code"
               style="color: var(--v-primary-base)"
               v-model="item.accountPrice"
               @input="updatePrice(item, true)"
@@ -136,14 +136,14 @@
                   {{
                     [
                       formatPrice(totalPrice, defaultCurrency),
-                      defaultCurrency?.title,
+                      defaultCurrency?.code,
                     ].join(" ")
                   }}
                   /
                   {{
                     [
                       formatPrice(totalAccountPrice, accountCurrency),
-                      accountCurrency?.title,
+                      accountCurrency?.code,
                     ].join(" ")
                   }}
                 </v-chip>

diff --git a/admin-ui/src/components/modules/empty/billingInfo.vue b/admin-ui/src/components/modules/empty/billingInfo.vue
@@ -108,13 +108,13 @@
                 <v-text-field
                   class="mr-2"
                   v-model="item.price"
-                  :suffix="defaultCurrency?.title"
+                  :suffix="defaultCurrency?.code"
                   @input="updatePrice(item, false)"
                   append-icon="mdi-pencil"
                 />
                 <v-text-field
                   class="ml-2"
-                  :suffix="accountCurrency?.title"
+                  :suffix="accountCurrency?.code"
                   style="color: var(--v-primary-base)"
                   v-model="item.accountPrice"
                   @input="updatePrice(item, true)"
@@ -161,14 +161,14 @@
                       {{
                         [
                           formatPrice(totalPrice, defaultCurrency),
-                          defaultCurrency?.title,
+                          defaultCurrency?.code,
                         ].join(" ")
                       }}
                       /
                       {{
                         [
                           formatPrice(totalAccountPrice, accountCurrency),
-                          accountCurrency?.title,
+                          accountCurrency?.code,
                         ].join(" ")
                       }}
                     </v-chip>

diff --git a/admin-ui/src/components/modules/ione/billingInfo.vue b/admin-ui/src/components/modules/ione/billingInfo.vue
@@ -87,7 +87,7 @@
           <div class="d-flex">
             <v-text-field
               class="mr-2"
-              :suffix="defaultCurrency?.title"
+              :suffix="defaultCurrency?.code"
               v-model="item.price"
               type="number"
               @input="updatePrice(item, false)"
@@ -97,7 +97,7 @@
               style="color: var(--v-primary-base)"
               class="ml-2"
               type="number"
-              :suffix="accountCurrency?.title"
+              :suffix="accountCurrency?.code"
               v-model="item.accountPrice"
               @input="updatePrice(item, true)"
               append-icon="mdi-pencil"
@@ -109,9 +109,9 @@
         </template>
         <template v-slot:[`item.total`]="{ item }">
           {{ formatPrice(totalPrices[item.name], defaultCurrency) }}
-          {{ defaultCurrency?.title }} /
+          {{ defaultCurrency?.code }} /
           {{ formatPrice(totalAccountPrices[item.name], accountCurrency) }}
-          {{ accountCurrency?.title }}
+          {{ accountCurrency?.code }}
         </template>
         <template v-slot:body.append>
           <tr>
@@ -146,8 +146,8 @@
             <td>
               <v-chip color="primary" outlined>
                 {{ totalPrice }}
-                {{ defaultCurrency?.title }} / {{ totalAccountPrice }}
-                {{ accountCurrency?.title }}
+                {{ defaultCurrency?.code }} / {{ totalAccountPrice }}
+                {{ accountCurrency?.code }}
               </v-chip>
             </td>
           </tr>

diff --git a/admin-ui/src/components/modules/keyweb/billingInfo.vue b/admin-ui/src/components/modules/keyweb/billingInfo.vue
@@ -81,13 +81,13 @@
             <v-text-field
               class="mr-2"
               v-model="item.price"
-              :suffix="defaultCurrency?.title"
+              :suffix="defaultCurrency?.code"
               @input="updatePrice(item, false)"
               append-icon="mdi-pencil"
             />
             <v-text-field
               class="ml-2"
-              :suffix="accountCurrency?.title"
+              :suffix="accountCurrency?.code"
               style="color: var(--v-primary-base)"
               v-model="item.accountPrice"
               @input="updatePrice(item, true)"
@@ -129,14 +129,14 @@
                   {{
                     [
                       formatPrice(totalPrice, defaultCurrency),
-                      defaultCurrency?.title,
+                      defaultCurrency?.code,
                     ].join(" ")
                   }}
                   /
                   {{
                     [
                       formatPrice(totalAccountPrice, accountCurrency),
-                      accountCurrency?.title,
+                      accountCurrency?.code,
                     ].join(" ")
                   }}
                 </v-chip>

diff --git a/admin-ui/src/components/modules/openai/billingInfo.vue b/admin-ui/src/components/modules/openai/billingInfo.vue
@@ -56,15 +56,15 @@
       >
         <template v-slot:[`item.price`]="{ item }">
           <v-text-field
-            :suffix="defaultCurrency?.title"
+            :suffix="defaultCurrency?.code"
             v-model="item.price"
             @input="updatePrice(item, false)"
             append-icon="mdi-pencil"
           />
         </template>
         <template v-slot:[`item.accountPrice`]="{ item }">
           <v-text-field
-            :suffix="accountCurrency?.title"
+            :suffix="accountCurrency?.code"
             style="color: var(--v-primary-base)"
             v-model="item.accountPrice"
             @input="updatePrice(item, true)"

diff --git a/admin-ui/src/components/modules/openai/billingLabel.vue b/admin-ui/src/components/modules/openai/billingLabel.vue
@@ -11,7 +11,7 @@
           outlined
           v-for="price in pricesPerToken"
           :key="price.name"
-          >{{ price.name }} : {{ price.price }} {{ accountCurrency?.title }}</v-chip
+          >{{ price.name }} : {{ price.price }} {{ accountCurrency?.code }}</v-chip
         >
       </v-col>
     </v-row>

diff --git a/admin-ui/src/components/modules/opensrs/billingInfo.vue b/admin-ui/src/components/modules/opensrs/billingInfo.vue
@@ -73,7 +73,7 @@
           <div class="d-flex">
             <v-text-field
               class="mr-2"
-              :suffix="defaultCurrency?.title"
+              :suffix="defaultCurrency?.code"
               v-model="item.price"
               type="number"
               @input="updatePrice(item, false)"
@@ -83,7 +83,7 @@
               style="color: var(--v-primary-base)"
               class="ml-2"
               type="number"
-              :suffix="accountCurrency?.title"
+              :suffix="accountCurrency?.code"
               v-model="item.accountPrice"
               @input="updatePrice(item, true)"
               append-icon="mdi-pencil"
@@ -92,9 +92,9 @@
         </template>
         <template v-slot:[`item.total`]="{ item }">
           {{ formatPrice(totalPrices[item.name], defaultCurrency) }}
-          {{ defaultCurrency?.title }} /
+          {{ defaultCurrency?.code }} /
           {{ formatPrice(totalAccountPrices[item.name], accountCurrency) }}
-          {{ accountCurrency?.title }}
+          {{ accountCurrency?.code }}
         </template>
         <template v-slot:body.append>
           <tr>
@@ -109,9 +109,9 @@
               <div class="d-flex justify-end">
                 <v-chip color="primary" outlined>
                   {{ formatPrice(totalPrice, defaultCurrency) }}
-                  {{ defaultCurrency?.title }} /
+                  {{ defaultCurrency?.code }} /
                   {{ formatPrice(totalAccountPrice, accountCurrency) }}
-                  {{ accountCurrency?.title }}
+                  {{ accountCurrency?.code }}
                 </v-chip>
               </div>
             </td>

diff --git a/admin-ui/src/components/modules/ovh/billingInfo.vue b/admin-ui/src/components/modules/ovh/billingInfo.vue
@@ -84,7 +84,7 @@
               class="mr-2"
               v-model="item.price"
               @change="onUpdatePrice(item, false)"
-              :suffix="defaultCurrency?.title"
+              :suffix="defaultCurrency?.code"
               type="number"
               append-icon="mdi-pencil"
             ></v-text-field>
@@ -93,7 +93,7 @@
               style="color: var(--v-primary-base)"
               v-model="item.accountPrice"
               @change="onUpdatePrice(item, true)"
-              :suffix="accountCurrency?.title"
+              :suffix="accountCurrency?.code"
               type="number"
               append-icon="mdi-pencil"
             ></v-text-field>
@@ -140,14 +140,14 @@
                   {{
                     [
                       formatPrice(totalNewPrice, defaultCurrency),
-                      defaultCurrency?.title,
+                      defaultCurrency?.code,
                     ].join(" ")
                   }}
                   /
                   {{
                     [
                       formatPrice(accountTotalNewPrice, accountCurrency),
-                      accountCurrency?.title,
+                      accountCurrency?.code,
                     ].join(" ")
                   }}
                 </v-chip>

diff --git a/admin-ui/src/components/plan/cloudTable.vue b/admin-ui/src/components/plan/cloudTable.vue
@@ -39,14 +39,14 @@
           <template v-slot:[`item.endPrice`]="{ item }">
             <v-text-field
               style="width: 200px"
-              :suffix="defaultCurrency?.title"
+              :suffix="defaultCurrency?.code"
               v-model.number="item.endPrice"
               type="number"
             />
           </template>
           <template v-slot:[`item.price`]="{ value }">
             {{ formatPrice(value, defaultCurrency) }}
-            {{ defaultCurrency?.title }}
+            {{ defaultCurrency?.code }}
           </template>
           <template v-slot:[`item.gpu.model`]="{ item }">
             <template v-if="item.gpu.model !== ''">