{{ $t('Your current estimated usage:') }}
diff --git a/resources/js/components/Sidebar/SidebarNavigation.vue b/resources/js/components/Sidebar/SidebarNavigation.vue
index d8829cfb..a7e165ea 100644
--- a/resources/js/components/Sidebar/SidebarNavigation.vue
+++ b/resources/js/components/Sidebar/SidebarNavigation.vue
@@ -5,14 +5,14 @@
+
-
-
+
$22,93
@@ -22,19 +22,21 @@
-
+
+
+
+
@@ -84,6 +86,7 @@
computed: {
...mapGetters([
'isDarkMode',
+ 'config',
'user',
]),
navigation() {
diff --git a/resources/js/views/User/BarChart.vue b/resources/js/components/UI/BarChart.vue
similarity index 100%
rename from resources/js/views/User/BarChart.vue
rename to resources/js/components/UI/BarChart.vue
diff --git a/resources/js/routes/routesUser.js b/resources/js/routes/routesUser.js
index bfa16d39..09561796 100644
--- a/resources/js/routes/routesUser.js
+++ b/resources/js/routes/routesUser.js
@@ -38,16 +38,6 @@ const routesUser = [
title: 'routes_title.settings_storage'
},
},
- {
- name: 'Invoice',
- path: '/user/settings/invoices',
- component: () =>
- import(/* webpackChunkName: "chunks/settings-invoices" */ '../views/User/Invoices'),
- meta: {
- requiresAuth: true,
- title: 'routes_title.invoices'
- },
- },
{
name: 'Subscription',
path: '/user/settings/subscription',
diff --git a/resources/js/views/Admin/Users/UserTabs/UserStorage.vue b/resources/js/views/Admin/Users/UserTabs/UserStorage.vue
index fd38d19c..649efd49 100644
--- a/resources/js/views/Admin/Users/UserTabs/UserStorage.vue
+++ b/resources/js/views/Admin/Users/UserTabs/UserStorage.vue
@@ -88,7 +88,7 @@
import ButtonBase from '/resources/js/components/FilesView/ButtonBase'
import SetupBox from '/resources/js/components/Others/Forms/SetupBox'
import {required} from 'vee-validate/dist/rules'
- import BarChart from "../../../User/BarChart"
+ import BarChart from "../../../../components/UI/BarChart"
import {events} from '/resources/js/bus'
import {mapGetters} from "vuex"
import axios from 'axios'
diff --git a/resources/js/views/Profile.vue b/resources/js/views/Profile.vue
index 33862661..f09dfcb2 100644
--- a/resources/js/views/Profile.vue
+++ b/resources/js/views/Profile.vue
@@ -149,17 +149,9 @@
title: this.$t('menu.subscription'),
route: 'Subscription',
},
- {
- title: this.$t('Transactions'),
- route: 'Invoice',
- },
]
let meteredSubscription = [
- {
- title: this.$t('Billing'),
- route: 'MeteredSubscription',
- },
{
title: this.$t('menu.profile'),
route: 'Profile',
@@ -172,12 +164,16 @@
title: this.$t('menu.storage'),
route: 'Storage',
},
+ {
+ title: this.$t('Billing'),
+ route: 'MeteredSubscription',
+ },
]
return {
fixed: fixedSubscription,
metered: meteredSubscription,
- }['metered']
+ }[this.config.subscriptionType]
}
},
data() {
diff --git a/resources/js/views/User/Invoices.vue b/resources/js/views/User/Invoices.vue
deleted file mode 100644
index 00383486..00000000
--- a/resources/js/views/User/Invoices.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
-
-
-
diff --git a/resources/js/views/User/MeteredSubscription.vue b/resources/js/views/User/MeteredSubscription.vue
index 66d224e3..a39c1bdf 100644
--- a/resources/js/views/User/MeteredSubscription.vue
+++ b/resources/js/views/User/MeteredSubscription.vue
@@ -8,7 +8,7 @@
- $52.90
+ {{ user.data.relationships.balance.data.attributes.formatted }}
@@ -47,7 +47,7 @@
-
-
-
-
-
- {{ row.data.attributes.note }}
-
-
-
-
- {{ row.data.attributes.status }}
-
-
-
-
- {{ $getTransactionMark(row.data.attributes.type) + row.data.attributes.price }}
-
-
-
-
- {{ row.data.attributes.created_at }}
-
-
-
- ![]()
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('admin_page_user.invoices.empty') }}
-
-
+
{{ usage.title }}
@@ -205,7 +205,39 @@
usage: '12',
amount: '$1.20',
},
- ]
+ {
+ title: 'Platform Fee',
+ usage: '1',
+ amount: '$2.00',
+ },
+ ],
+ columns: [
+ {
+ label: this.$t('Note'),
+ field: 'note',
+ sortable: true
+ },
+ {
+ label: this.$t('Status'),
+ field: 'status',
+ sortable: true
+ },
+ {
+ label: this.$t('admin_page_invoices.table.total'),
+ field: 'amount',
+ sortable: true
+ },
+ {
+ label: this.$t('Payed At'),
+ field: 'created_at',
+ sortable: true
+ },
+ {
+ label: this.$t('Service'),
+ field: 'driver',
+ sortable: true
+ },
+ ],
}
},
methods: {
diff --git a/resources/js/views/User/Storage.vue b/resources/js/views/User/Storage.vue
index 9884b993..38c76d8b 100644
--- a/resources/js/views/User/Storage.vue
+++ b/resources/js/views/User/Storage.vue
@@ -53,7 +53,7 @@
import FormLabel from '/resources/js/components/Others/Forms/FormLabel'
import PageTab from '/resources/js/components/Others/Layout/PageTab'
import axios from 'axios'
- import BarChart from "./BarChart";
+ import BarChart from "../../components/UI/BarChart";
export default {
name: 'Storage',
diff --git a/resources/js/views/User/Subscription.vue b/resources/js/views/User/Subscription.vue
index 173cad45..2007fd1d 100644
--- a/resources/js/views/User/Subscription.vue
+++ b/resources/js/views/User/Subscription.vue
@@ -62,6 +62,55 @@
+
+
+
+ {{ $t('Transactions') }}
+
+
+
+
+
+
+
+ {{ row.data.attributes.note }}
+
+
+
+
+ {{ row.data.attributes.status }}
+
+
+
+
+ {{ $getTransactionMark(row.data.attributes.type) + row.data.attributes.price }}
+
+
+
+
+ {{ row.data.attributes.created_at }}
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
{{ $t('admin_page_user.invoices.empty') }}
+{{ $t("You don't have any subscription") }}
@@ -71,6 +120,8 @@