+
-
@@ -50,20 +50,19 @@
+
+
diff --git a/resources/js/views/Admin/Plans/PlanTabs/PlanTransactions.vue b/resources/js/views/Admin/Plans/PlanTabs/PlanTransactions.vue
deleted file mode 100644
index dddc4648..00000000
--- a/resources/js/views/Admin/Plans/PlanTabs/PlanTransactions.vue
+++ /dev/null
@@ -1,304 +0,0 @@
-
-
-
-
-
-
- |
-
- ${{ row.attributes.total }}
-
- |
-
-
-
-
- |
-
-
- {{ row.attributes.created_at_formatted }}
-
- |
-
-
-
-
- |
-
-
-
-
-
-
-
-
-
-
diff --git a/resources/js/views/Admin/Users.vue b/resources/js/views/Admin/Users.vue
index 1e4954f8..26e2045a 100644
--- a/resources/js/views/Admin/Users.vue
+++ b/resources/js/views/Admin/Users.vue
@@ -34,6 +34,14 @@
{{ row.data.attributes.role }}
+
+
+ {{ row.relationships.subscription.data.attributes.name }}
+
+
+ Free
+
+ |
{{ row.relationships.storage.data.attributes.used }}%
@@ -113,6 +121,11 @@
field: 'data.attributes.role',
sortable: true
},
+ {
+ label: 'Subscription Plan',
+ field: 'data.attributes.role',
+ sortable: true
+ },
{
label: this.$t('admin_page_user.table.storage_used'),
field: 'data.attributes.storage.used',
diff --git a/resources/js/views/Admin/Users/User.vue b/resources/js/views/Admin/Users/User.vue
index 305b779d..f421bfdc 100644
--- a/resources/js/views/Admin/Users/User.vue
+++ b/resources/js/views/Admin/Users/User.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/resources/js/views/Admin/Users/UserCreate.vue b/resources/js/views/Admin/Users/UserCreate.vue
index c4381e1b..5795bc9e 100644
--- a/resources/js/views/Admin/Users/UserCreate.vue
+++ b/resources/js/views/Admin/Users/UserCreate.vue
@@ -14,6 +14,7 @@
+
diff --git a/resources/js/views/Admin/Users/UserTabs/UserDelete.vue b/resources/js/views/Admin/Users/UserTabs/UserDelete.vue
index 4663057d..af93e818 100644
--- a/resources/js/views/Admin/Users/UserTabs/UserDelete.vue
+++ b/resources/js/views/Admin/Users/UserTabs/UserDelete.vue
@@ -9,8 +9,8 @@
-
+ name="User name" :rules="'required|is:' + user.data.attributes.name">
+
diff --git a/resources/js/views/Admin/Users/UserTabs/UserDetail.vue b/resources/js/views/Admin/Users/UserTabs/UserDetail.vue
index 569160b2..451be535 100644
--- a/resources/js/views/Admin/Users/UserTabs/UserDetail.vue
+++ b/resources/js/views/Admin/Users/UserTabs/UserDetail.vue
@@ -82,16 +82,16 @@
/>
- |