From fa3cb93b19681ee3d6a6be664464d4a1499873aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Mon, 29 Nov 2021 08:01:12 +0100
Subject: [PATCH] sorting datatables

---
 public/mix-manifest.json                      | 136 +++++++++++++++---
 .../components/Others/Forms/SwitchInput.vue   |  10 +-
 .../Others/Tables/DatatableWrapper.vue        |   2 +-
 resources/js/views/Admin/Invoices.vue         |   3 +-
 resources/js/views/Admin/Pages.vue            |  70 +--------
 resources/js/views/Admin/Plans.vue            |  24 ++--
 .../Admin/Plans/PlanTabs/PlanSubscribers.vue  |  17 ++-
 resources/js/views/Admin/Subscriptions.vue    |  17 ++-
 resources/js/views/Admin/Users.vue            |   9 +-
 .../Admin/Users/UserTabs/UserInvoices.vue     |   1 +
 resources/js/views/User/Invoices.vue          |   1 +
 11 files changed, 162 insertions(+), 128 deletions(-)

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 9864895e..bde4ea61 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -3,7 +3,7 @@
     "/css/app.css": "/css/app.css",
     "/css/tailwind.css": "/css/tailwind.css",
     "/chunks/admin.js": "/chunks/admin.js?id=6b44ad76c944f71d4bad",
-    "/chunks/admin-account.js": "/chunks/admin-account.js?id=c706acc7bc21ea113660",
+    "/chunks/admin-account.js": "/chunks/admin-account.js?id=05778da6d941e367997d",
     "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js?id=b6966627bd253eda63ba",
     "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.js?id=d7a8e5b5b913858da427",
     "/chunks/admin~chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-item~9b68162c.js": "/chunks/admin~chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-item~9b68162c.js?id=5841d65172536a8a9bdc",
@@ -20,14 +20,14 @@
     "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js": "/chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chunks/app-others~chunks~8cc7d96f.js?id=87266e580e0abf1170c5",
     "/chunks/app-billings.js": "/chunks/app-billings.js?id=714f7a9f33e15fe89b4a",
     "/chunks/app-email.js": "/chunks/app-email.js?id=7419fedbf3228988067e",
-    "/chunks/app-index.js": "/chunks/app-index.js?id=344ea83ba3aa8f3ae970",
-    "/chunks/app-language.js": "/chunks/app-language.js?id=b3e66600fb1c378c5512",
+    "/chunks/app-index.js": "/chunks/app-index.js?id=8e09b186490477bb7d78",
+    "/chunks/app-language.js": "/chunks/app-language.js?id=b5ed591875b434bb2f6e",
     "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.js?id=3cbb19b80e635b3524e5",
     "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~c80ea79c.js": "/chunks/app-language~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pages~chunks/plan~chunk~c80ea79c.js?id=625c65b01d8f3f5635ec",
-    "/chunks/app-others.js": "/chunks/app-others.js?id=fa7246494a7bc0c815f3",
-    "/chunks/app-payments.js": "/chunks/app-payments.js?id=8f4efc8ee29baf23b846",
+    "/chunks/app-others.js": "/chunks/app-others.js?id=e18b8e1513d09e3691a3",
+    "/chunks/app-payments.js": "/chunks/app-payments.js?id=2641da97cdb98b89345b",
     "/chunks/app-settings.js": "/chunks/app-settings.js?id=2a96295eef59bd6c8921",
-    "/chunks/app-setup.js": "/chunks/app-setup.js?id=c8d1d79a1311936f1a6f",
+    "/chunks/app-setup.js": "/chunks/app-setup.js?id=1b7698981735d7173309",
     "/chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/database~chunks/email-veri~5d0bfc57.js": "/chunks/app-setup~chunks/billings-detail~chunks/create-new-password~chunks/database~chunks/email-veri~5d0bfc57.js?id=107a78323eef0c1d4c81",
     "/chunks/billings-detail.js": "/chunks/billings-detail.js?id=90001da58614ded6d2dc",
     "/chunks/contact-us.js": "/chunks/contact-us.js?id=3d0bbcd0c36d74bf739a",
@@ -49,18 +49,18 @@
     "/chunks/homepage.js": "/chunks/homepage.js?id=b89dd81804b8a0bd3f0b",
     "/chunks/installation-disclaimer.js": "/chunks/installation-disclaimer.js?id=1579259e826aa89fb00a",
     "/chunks/invitation.js": "/chunks/invitation.js?id=c9cd3541ee362ae8d5f7",
-    "/chunks/invoices.js": "/chunks/invoices.js?id=1590f8c2408a33901f5a",
+    "/chunks/invoices.js": "/chunks/invoices.js?id=1095ec877cce49622246",
     "/chunks/my-shared-items.js": "/chunks/my-shared-items.js?id=ea129760157c8e44f324",
     "/chunks/not-found.js": "/chunks/not-found.js?id=034287ee0ecb036320d3",
-    "/chunks/page-edit.js": "/chunks/page-edit.js?id=eedfd9e519057b807694",
-    "/chunks/pages.js": "/chunks/pages.js?id=32b25e76505ca1006934",
+    "/chunks/page-edit.js": "/chunks/page-edit.js?id=1e2d7bc6ab341abd870c",
+    "/chunks/pages.js": "/chunks/pages.js?id=7db66df0453135bf4e51",
     "/chunks/plan.js": "/chunks/plan.js?id=4fa6f87c04a875875d36",
     "/chunks/plan-create.js": "/chunks/plan-create.js?id=356baaa5a3526092427f",
     "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=58b35ab28597da974535",
-    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=c07a2a970dc5414a7d51",
-    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=5151a942550b58d3ba69",
-    "/chunks/plans.js": "/chunks/plans.js?id=0aa91553ed338315d39a",
-    "/chunks/platform.js": "/chunks/platform.js?id=e9399ef559a202138950",
+    "/chunks/plan-settings.js": "/chunks/plan-settings.js?id=f1a8b8ae7c82d2f69d5e",
+    "/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=9f6d3dfa1ada1a6c3134",
+    "/chunks/plans.js": "/chunks/plans.js?id=7f262c68655989372d3c",
+    "/chunks/platform.js": "/chunks/platform.js?id=0abdf0d5d38084f7aaa7",
     "/chunks/platform~chunks/shared.js": "/chunks/platform~chunks/shared.js?id=e64e3b67ccb89de9dd55",
     "/chunks/platform~chunks/shared~chunks/shared-with-me~chunks/team-folders.js": "/chunks/platform~chunks/shared~chunks/shared-with-me~chunks/team-folders.js?id=7d983dfdc91de607d737",
     "/chunks/profile.js": "/chunks/profile.js?id=8688d9c7ff850e6989e6",
@@ -68,14 +68,14 @@
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=f8b2619e393a5823bf29",
     "/chunks/recent-uploads.js": "/chunks/recent-uploads.js?id=22f629caf127051898e9",
     "/chunks/settings.js": "/chunks/settings.js?id=c6ae9f37599df4c129f4",
-    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=ebe216f521fadd86078d",
-    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=ffbecee4f54c774adadb",
+    "/chunks/settings-create-payment-methods.js": "/chunks/settings-create-payment-methods.js?id=cef8e687b3c107706b7d",
+    "/chunks/settings-invoices.js": "/chunks/settings-invoices.js?id=aa32489d4652f18b4a8c",
     "/chunks/settings-password.js": "/chunks/settings-password.js?id=4ed19fa578c63c0c50ce",
     "/chunks/settings-payment-methods.js": "/chunks/settings-payment-methods.js?id=3a88e55341d1f1ffe12d",
     "/chunks/settings-storage.js": "/chunks/settings-storage.js?id=c1a4036392db4eea190f",
     "/chunks/settings-storage~chunks/settings-subscription~chunks/user-storage~chunks/user-subscription.js": "/chunks/settings-storage~chunks/settings-subscription~chunks/user-storage~chunks/user-subscription.js?id=ea97ac1cb976ca635778",
     "/chunks/settings-subscription.js": "/chunks/settings-subscription.js?id=fd27d71eb4f6b2194715",
-    "/chunks/settings~chunks/settings-password.js": "/chunks/settings~chunks/settings-password.js?id=d6249b995bc889847a5d",
+    "/chunks/settings~chunks/settings-password.js": "/chunks/settings~chunks/settings-password.js?id=c33cd2341b9b04a732e5",
     "/chunks/setup-wizard.js": "/chunks/setup-wizard.js?id=651d5accf401908724c5",
     "/chunks/shared.js": "/chunks/shared.js?id=6230d050545cd1bd9b87",
     "/chunks/shared-with-me.js": "/chunks/shared-with-me.js?id=11188f25ddf9a240cc4f",
@@ -98,11 +98,11 @@
     "/chunks/user-create.js": "/chunks/user-create.js?id=1d58b3cf93c7b3b90d9d",
     "/chunks/user-delete.js": "/chunks/user-delete.js?id=c0ea5194b4a4de8189dd",
     "/chunks/user-detail.js": "/chunks/user-detail.js?id=a55ae1a545a65b92511d",
-    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=d029415204757a2d6ea1",
+    "/chunks/user-invoices.js": "/chunks/user-invoices.js?id=0f755c7e07ffb441ac72",
     "/chunks/user-password.js": "/chunks/user-password.js?id=ce6c12a5b038f5481bd1",
     "/chunks/user-storage.js": "/chunks/user-storage.js?id=71b90f0987d1ebe7ead6",
     "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=82038ce92ca5e1c9ae05",
-    "/chunks/users.js": "/chunks/users.js?id=5d94a7373e00c8f27ae6",
+    "/chunks/users.js": "/chunks/users.js?id=308dfaebb01c05f5bed5",
     "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~24b428d3.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~24b428d3.js?id=ee89932f7ee76e74483e",
     "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~b505e62a.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~b505e62a.js?id=8163e0eab55c50f8afb8",
     "/vendors~chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunk~40ccbae3.js": "/vendors~chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunk~40ccbae3.js?id=37ce1e1ab9968c100712",
@@ -414,8 +414,8 @@
     "/js/main.17934f490347147190f4.hot-update.js": "/js/main.17934f490347147190f4.hot-update.js",
     "/chunks/admin~chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-item~29d9eb92.js": "/chunks/admin~chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-item~29d9eb92.js?id=695251c38c0884b45b81",
     "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~3edf9278.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~3edf9278.js?id=c2a7d990d48dd8155cb3",
-    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~43d0932c.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~43d0932c.js?id=d89ebe03a6c9d01fe126",
-    "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=5e90cd0bfdcbf4c9b38d",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~43d0932c.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~43d0932c.js?id=d9a6801ee22065f47498",
+    "/chunks/subscriptions.js": "/chunks/subscriptions.js?id=8d69c0dc75318818492a",
     "/chunks/admin.182bab58ce8679f77c46.hot-update.js": "/chunks/admin.182bab58ce8679f77c46.hot-update.js",
     "/chunks/subscriptions.d68fcf7fd76ca845594c.hot-update.js": "/chunks/subscriptions.d68fcf7fd76ca845594c.hot-update.js",
     "/chunks/admin.36e4bde4e0f466b7928a.hot-update.js": "/chunks/admin.36e4bde4e0f466b7928a.hot-update.js",
@@ -519,7 +519,7 @@
     "/chunks/plans.dc2012c97675151e2414.hot-update.js": "/chunks/plans.dc2012c97675151e2414.hot-update.js",
     "/js/main.7550b7ad7b345c7d0503.hot-update.js": "/js/main.7550b7ad7b345c7d0503.hot-update.js",
     "/chunks/dashboard.7550b7ad7b345c7d0503.hot-update.js": "/chunks/dashboard.7550b7ad7b345c7d0503.hot-update.js",
-    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/subscriptions.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/subscriptions.js?id=3e02dadbcc6a138f8ab2",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/subscriptions.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/subscriptions.js?id=95b32230258beb6391ed",
     "/chunks/invoices.7550b7ad7b345c7d0503.hot-update.js": "/chunks/invoices.7550b7ad7b345c7d0503.hot-update.js",
     "/chunks/pages.7550b7ad7b345c7d0503.hot-update.js": "/chunks/pages.7550b7ad7b345c7d0503.hot-update.js",
     "/chunks/plans.7550b7ad7b345c7d0503.hot-update.js": "/chunks/plans.7550b7ad7b345c7d0503.hot-update.js",
@@ -715,5 +715,97 @@
     "/chunks/settings-storage~chunks/settings-subscription~chunks/user-storage~chunks/user-subscription.0807aebeb087f95cf512.hot-update.js": "/chunks/settings-storage~chunks/settings-subscription~chunks/user-storage~chunks/user-subscription.0807aebeb087f95cf512.hot-update.js",
     "/chunks/settings-storage~chunks/settings-subscription~chunks/user-storage~chunks/user-subscription.8172b6b81629c01a534c.hot-update.js": "/chunks/settings-storage~chunks/settings-subscription~chunks/user-storage~chunks/user-subscription.8172b6b81629c01a534c.hot-update.js",
     "/chunks/settings-storage~chunks/settings-subscription~chunks/user-storage~chunks/user-subscription.0c31c340ecce86b6f29e.hot-update.js": "/chunks/settings-storage~chunks/settings-subscription~chunks/user-storage~chunks/user-subscription.0c31c340ecce86b6f29e.hot-update.js",
-    "/chunks/settings-storage~chunks/settings-subscription~chunks/user-storage~chunks/user-subscription.741328da3f2f341fadc5.hot-update.js": "/chunks/settings-storage~chunks/settings-subscription~chunks/user-storage~chunks/user-subscription.741328da3f2f341fadc5.hot-update.js"
+    "/chunks/settings-storage~chunks/settings-subscription~chunks/user-storage~chunks/user-subscription.741328da3f2f341fadc5.hot-update.js": "/chunks/settings-storage~chunks/settings-subscription~chunks/user-storage~chunks/user-subscription.741328da3f2f341fadc5.hot-update.js",
+    "/chunks/invoices.c106615783984a5fa324.hot-update.js": "/chunks/invoices.c106615783984a5fa324.hot-update.js",
+    "/chunks/invoices.6cd3e63d00a560606332.hot-update.js": "/chunks/invoices.6cd3e63d00a560606332.hot-update.js",
+    "/chunks/user-invoices.fb8f469bacb610a60400.hot-update.js": "/chunks/user-invoices.fb8f469bacb610a60400.hot-update.js",
+    "/chunks/settings-invoices.6f13ea38e9d1d81745e5.hot-update.js": "/chunks/settings-invoices.6f13ea38e9d1d81745e5.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~43d0932c.d8205edb58b07417a7ef.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plan-subscribers~chunks/plans~chunks/settings-i~43d0932c.d8205edb58b07417a7ef.hot-update.js",
+    "/chunks/plans.0ed17456fe0300b24cc2.hot-update.js": "/chunks/plans.0ed17456fe0300b24cc2.hot-update.js",
+    "/chunks/plans.afcd8c9b37f347f857b2.hot-update.js": "/chunks/plans.afcd8c9b37f347f857b2.hot-update.js",
+    "/chunks/plans.0930587dacb928d2e162.hot-update.js": "/chunks/plans.0930587dacb928d2e162.hot-update.js",
+    "/chunks/plans.488956a8c9e4f5b59dd0.hot-update.js": "/chunks/plans.488956a8c9e4f5b59dd0.hot-update.js",
+    "/chunks/plans.50f86ae963b28b62e52c.hot-update.js": "/chunks/plans.50f86ae963b28b62e52c.hot-update.js",
+    "/chunks/plans.2462dd9f91729fa2596b.hot-update.js": "/chunks/plans.2462dd9f91729fa2596b.hot-update.js",
+    "/chunks/plans.89a07cf058866f5490bb.hot-update.js": "/chunks/plans.89a07cf058866f5490bb.hot-update.js",
+    "/chunks/plans.6a2e1f0a4209a0eb86e2.hot-update.js": "/chunks/plans.6a2e1f0a4209a0eb86e2.hot-update.js",
+    "/chunks/plans.1b0bbe39d54498907e5c.hot-update.js": "/chunks/plans.1b0bbe39d54498907e5c.hot-update.js",
+    "/chunks/admin-account.d1bb03066f0aa76c3e89.hot-update.js": "/chunks/admin-account.d1bb03066f0aa76c3e89.hot-update.js",
+    "/chunks/app-index.d1bb03066f0aa76c3e89.hot-update.js": "/chunks/app-index.d1bb03066f0aa76c3e89.hot-update.js",
+    "/chunks/app-language.d1bb03066f0aa76c3e89.hot-update.js": "/chunks/app-language.d1bb03066f0aa76c3e89.hot-update.js",
+    "/chunks/app-others.d1bb03066f0aa76c3e89.hot-update.js": "/chunks/app-others.d1bb03066f0aa76c3e89.hot-update.js",
+    "/chunks/app-payments.d1bb03066f0aa76c3e89.hot-update.js": "/chunks/app-payments.d1bb03066f0aa76c3e89.hot-update.js",
+    "/chunks/app-setup.d1bb03066f0aa76c3e89.hot-update.js": "/chunks/app-setup.d1bb03066f0aa76c3e89.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/subscriptions.d1bb03066f0aa76c3e89.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/subscriptions.d1bb03066f0aa76c3e89.hot-update.js",
+    "/chunks/page-edit.d1bb03066f0aa76c3e89.hot-update.js": "/chunks/page-edit.d1bb03066f0aa76c3e89.hot-update.js",
+    "/chunks/plan-settings.d1bb03066f0aa76c3e89.hot-update.js": "/chunks/plan-settings.d1bb03066f0aa76c3e89.hot-update.js",
+    "/chunks/platform.d1bb03066f0aa76c3e89.hot-update.js": "/chunks/platform.d1bb03066f0aa76c3e89.hot-update.js",
+    "/chunks/settings-create-payment-methods.d1bb03066f0aa76c3e89.hot-update.js": "/chunks/settings-create-payment-methods.d1bb03066f0aa76c3e89.hot-update.js",
+    "/chunks/settings~chunks/settings-password.d1bb03066f0aa76c3e89.hot-update.js": "/chunks/settings~chunks/settings-password.d1bb03066f0aa76c3e89.hot-update.js",
+    "/chunks/admin-account.ca367b8cf88bcf1e9991.hot-update.js": "/chunks/admin-account.ca367b8cf88bcf1e9991.hot-update.js",
+    "/chunks/app-index.ca367b8cf88bcf1e9991.hot-update.js": "/chunks/app-index.ca367b8cf88bcf1e9991.hot-update.js",
+    "/chunks/app-language.ca367b8cf88bcf1e9991.hot-update.js": "/chunks/app-language.ca367b8cf88bcf1e9991.hot-update.js",
+    "/chunks/app-others.ca367b8cf88bcf1e9991.hot-update.js": "/chunks/app-others.ca367b8cf88bcf1e9991.hot-update.js",
+    "/chunks/app-payments.ca367b8cf88bcf1e9991.hot-update.js": "/chunks/app-payments.ca367b8cf88bcf1e9991.hot-update.js",
+    "/chunks/app-setup.ca367b8cf88bcf1e9991.hot-update.js": "/chunks/app-setup.ca367b8cf88bcf1e9991.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/subscriptions.ca367b8cf88bcf1e9991.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/subscriptions.ca367b8cf88bcf1e9991.hot-update.js",
+    "/chunks/page-edit.ca367b8cf88bcf1e9991.hot-update.js": "/chunks/page-edit.ca367b8cf88bcf1e9991.hot-update.js",
+    "/chunks/plan-settings.ca367b8cf88bcf1e9991.hot-update.js": "/chunks/plan-settings.ca367b8cf88bcf1e9991.hot-update.js",
+    "/chunks/platform.ca367b8cf88bcf1e9991.hot-update.js": "/chunks/platform.ca367b8cf88bcf1e9991.hot-update.js",
+    "/chunks/settings-create-payment-methods.ca367b8cf88bcf1e9991.hot-update.js": "/chunks/settings-create-payment-methods.ca367b8cf88bcf1e9991.hot-update.js",
+    "/chunks/settings~chunks/settings-password.ca367b8cf88bcf1e9991.hot-update.js": "/chunks/settings~chunks/settings-password.ca367b8cf88bcf1e9991.hot-update.js",
+    "/chunks/admin-account.23a9820672d74408f86b.hot-update.js": "/chunks/admin-account.23a9820672d74408f86b.hot-update.js",
+    "/chunks/app-index.23a9820672d74408f86b.hot-update.js": "/chunks/app-index.23a9820672d74408f86b.hot-update.js",
+    "/chunks/app-language.23a9820672d74408f86b.hot-update.js": "/chunks/app-language.23a9820672d74408f86b.hot-update.js",
+    "/chunks/app-others.23a9820672d74408f86b.hot-update.js": "/chunks/app-others.23a9820672d74408f86b.hot-update.js",
+    "/chunks/app-payments.23a9820672d74408f86b.hot-update.js": "/chunks/app-payments.23a9820672d74408f86b.hot-update.js",
+    "/chunks/app-setup.23a9820672d74408f86b.hot-update.js": "/chunks/app-setup.23a9820672d74408f86b.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/subscriptions.23a9820672d74408f86b.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/subscriptions.23a9820672d74408f86b.hot-update.js",
+    "/chunks/page-edit.23a9820672d74408f86b.hot-update.js": "/chunks/page-edit.23a9820672d74408f86b.hot-update.js",
+    "/chunks/plan-settings.23a9820672d74408f86b.hot-update.js": "/chunks/plan-settings.23a9820672d74408f86b.hot-update.js",
+    "/chunks/platform.23a9820672d74408f86b.hot-update.js": "/chunks/platform.23a9820672d74408f86b.hot-update.js",
+    "/chunks/settings-create-payment-methods.23a9820672d74408f86b.hot-update.js": "/chunks/settings-create-payment-methods.23a9820672d74408f86b.hot-update.js",
+    "/chunks/settings~chunks/settings-password.23a9820672d74408f86b.hot-update.js": "/chunks/settings~chunks/settings-password.23a9820672d74408f86b.hot-update.js",
+    "/chunks/admin-account.0c78abfc08f0b6233200.hot-update.js": "/chunks/admin-account.0c78abfc08f0b6233200.hot-update.js",
+    "/chunks/app-index.0c78abfc08f0b6233200.hot-update.js": "/chunks/app-index.0c78abfc08f0b6233200.hot-update.js",
+    "/chunks/app-language.0c78abfc08f0b6233200.hot-update.js": "/chunks/app-language.0c78abfc08f0b6233200.hot-update.js",
+    "/chunks/app-others.0c78abfc08f0b6233200.hot-update.js": "/chunks/app-others.0c78abfc08f0b6233200.hot-update.js",
+    "/chunks/app-payments.0c78abfc08f0b6233200.hot-update.js": "/chunks/app-payments.0c78abfc08f0b6233200.hot-update.js",
+    "/chunks/app-setup.0c78abfc08f0b6233200.hot-update.js": "/chunks/app-setup.0c78abfc08f0b6233200.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/subscriptions.0c78abfc08f0b6233200.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/subscriptions.0c78abfc08f0b6233200.hot-update.js",
+    "/chunks/page-edit.0c78abfc08f0b6233200.hot-update.js": "/chunks/page-edit.0c78abfc08f0b6233200.hot-update.js",
+    "/chunks/plan-settings.0c78abfc08f0b6233200.hot-update.js": "/chunks/plan-settings.0c78abfc08f0b6233200.hot-update.js",
+    "/chunks/platform.0c78abfc08f0b6233200.hot-update.js": "/chunks/platform.0c78abfc08f0b6233200.hot-update.js",
+    "/chunks/settings-create-payment-methods.0c78abfc08f0b6233200.hot-update.js": "/chunks/settings-create-payment-methods.0c78abfc08f0b6233200.hot-update.js",
+    "/chunks/settings~chunks/settings-password.0c78abfc08f0b6233200.hot-update.js": "/chunks/settings~chunks/settings-password.0c78abfc08f0b6233200.hot-update.js",
+    "/chunks/admin-account.5fb054fd748f9b83f8b9.hot-update.js": "/chunks/admin-account.5fb054fd748f9b83f8b9.hot-update.js",
+    "/chunks/app-index.5fb054fd748f9b83f8b9.hot-update.js": "/chunks/app-index.5fb054fd748f9b83f8b9.hot-update.js",
+    "/chunks/app-language.5fb054fd748f9b83f8b9.hot-update.js": "/chunks/app-language.5fb054fd748f9b83f8b9.hot-update.js",
+    "/chunks/app-others.5fb054fd748f9b83f8b9.hot-update.js": "/chunks/app-others.5fb054fd748f9b83f8b9.hot-update.js",
+    "/chunks/app-payments.5fb054fd748f9b83f8b9.hot-update.js": "/chunks/app-payments.5fb054fd748f9b83f8b9.hot-update.js",
+    "/chunks/app-setup.5fb054fd748f9b83f8b9.hot-update.js": "/chunks/app-setup.5fb054fd748f9b83f8b9.hot-update.js",
+    "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/subscriptions.5fb054fd748f9b83f8b9.hot-update.js": "/chunks/dashboard~chunks/invoices~chunks/pages~chunks/plans~chunks/subscriptions.5fb054fd748f9b83f8b9.hot-update.js",
+    "/chunks/page-edit.5fb054fd748f9b83f8b9.hot-update.js": "/chunks/page-edit.5fb054fd748f9b83f8b9.hot-update.js",
+    "/chunks/plan-settings.5fb054fd748f9b83f8b9.hot-update.js": "/chunks/plan-settings.5fb054fd748f9b83f8b9.hot-update.js",
+    "/chunks/platform.5fb054fd748f9b83f8b9.hot-update.js": "/chunks/platform.5fb054fd748f9b83f8b9.hot-update.js",
+    "/chunks/settings-create-payment-methods.5fb054fd748f9b83f8b9.hot-update.js": "/chunks/settings-create-payment-methods.5fb054fd748f9b83f8b9.hot-update.js",
+    "/chunks/settings~chunks/settings-password.5fb054fd748f9b83f8b9.hot-update.js": "/chunks/settings~chunks/settings-password.5fb054fd748f9b83f8b9.hot-update.js",
+    "/chunks/plans.e260728797ee33dce4da.hot-update.js": "/chunks/plans.e260728797ee33dce4da.hot-update.js",
+    "/chunks/plan-subscribers.bd747600be7d989e33e0.hot-update.js": "/chunks/plan-subscribers.bd747600be7d989e33e0.hot-update.js",
+    "/chunks/plan-subscribers.1eeaad870b550273727f.hot-update.js": "/chunks/plan-subscribers.1eeaad870b550273727f.hot-update.js",
+    "/chunks/plan-subscribers.e1a37a856d7d7f4298bf.hot-update.js": "/chunks/plan-subscribers.e1a37a856d7d7f4298bf.hot-update.js",
+    "/chunks/subscriptions.adb70eb91a6ba3050596.hot-update.js": "/chunks/subscriptions.adb70eb91a6ba3050596.hot-update.js",
+    "/chunks/subscriptions.1fddeae7fe49926e20bb.hot-update.js": "/chunks/subscriptions.1fddeae7fe49926e20bb.hot-update.js",
+    "/chunks/subscriptions.25b987103250525df45b.hot-update.js": "/chunks/subscriptions.25b987103250525df45b.hot-update.js",
+    "/chunks/users.1521fafb5ee6e45c8564.hot-update.js": "/chunks/users.1521fafb5ee6e45c8564.hot-update.js",
+    "/chunks/users.2d4abed50b08c9ef1f61.hot-update.js": "/chunks/users.2d4abed50b08c9ef1f61.hot-update.js",
+    "/chunks/users.bdde85464845cfe97621.hot-update.js": "/chunks/users.bdde85464845cfe97621.hot-update.js",
+    "/chunks/users.da8fda17cae2e04e6fa3.hot-update.js": "/chunks/users.da8fda17cae2e04e6fa3.hot-update.js",
+    "/chunks/users.fbc97d2fb0a93e39565d.hot-update.js": "/chunks/users.fbc97d2fb0a93e39565d.hot-update.js",
+    "/chunks/users.e5e82fbbce21d5b7aa20.hot-update.js": "/chunks/users.e5e82fbbce21d5b7aa20.hot-update.js",
+    "/chunks/users.cb5ef20640b487b4bfbe.hot-update.js": "/chunks/users.cb5ef20640b487b4bfbe.hot-update.js",
+    "/chunks/pages.681bd843b57b20486704.hot-update.js": "/chunks/pages.681bd843b57b20486704.hot-update.js",
+    "/chunks/pages.b733cf8453c0ca52732b.hot-update.js": "/chunks/pages.b733cf8453c0ca52732b.hot-update.js",
+    "/chunks/pages.55b39e18d484e6b183e3.hot-update.js": "/chunks/pages.55b39e18d484e6b183e3.hot-update.js",
+    "/chunks/pages.e914202a922b631ce078.hot-update.js": "/chunks/pages.e914202a922b631ce078.hot-update.js"
 }
diff --git a/resources/js/components/Others/Forms/SwitchInput.vue b/resources/js/components/Others/Forms/SwitchInput.vue
index 3db61d89..7d6bb6fa 100644
--- a/resources/js/components/Others/Forms/SwitchInput.vue
+++ b/resources/js/components/Others/Forms/SwitchInput.vue
@@ -8,7 +8,7 @@
         <div class="switch-content text-right">
             <div
                     class="switch"
-                    :class="{ active: isSwitched }"
+                    :class="{ active: state }"
                     @click="changeState"
             >
                 <div class="switch-button"></div>
@@ -20,7 +20,13 @@
 <script>
     export default {
         name:'SwitchInput',
-        props: ['label', 'name', 'state', 'info'],
+        props: [
+			'label',
+			'name',
+			'state',
+			'info',
+			'input',
+		],
         data() {
             return {
                 isSwitched: undefined
diff --git a/resources/js/components/Others/Tables/DatatableWrapper.vue b/resources/js/components/Others/Tables/DatatableWrapper.vue
index 318d84e6..0d65a8d4 100644
--- a/resources/js/components/Others/Tables/DatatableWrapper.vue
+++ b/resources/js/components/Others/Tables/DatatableWrapper.vue
@@ -8,7 +8,7 @@
 						v-for="(column, index) in columns"
 						@click="sort(column.field, column.sortable)"
 						:key="index"
-						:class="{ 'sortable': column.sortable, 'text-right': (Object.values(columns).length - 1) === index }"
+						:class="{ 'sortable cursor-pointer': column.sortable, 'text-right': (Object.values(columns).length - 1) === index }"
 						v-if="! column.hidden"
 					>
 						<span class="dark:text-gray-500 text-gray-400 text-xs">
diff --git a/resources/js/views/Admin/Invoices.vue b/resources/js/views/Admin/Invoices.vue
index 7125d781..a6d6ed64 100644
--- a/resources/js/views/Admin/Invoices.vue
+++ b/resources/js/views/Admin/Invoices.vue
@@ -139,7 +139,7 @@
 					},
 					{
 						label: this.$t('User'),
-						field: 'user',
+						field: 'user_id',
 						sortable: true
 					},
 					{
@@ -159,6 +159,7 @@
 					},
 					{
 						label: this.$t('Service'),
+						field: 'driver',
 						sortable: true
 					},
 				],
diff --git a/resources/js/views/Admin/Pages.vue b/resources/js/views/Admin/Pages.vue
index 0f37282c..59e736cb 100644
--- a/resources/js/views/Admin/Pages.vue
+++ b/resources/js/views/Admin/Pages.vue
@@ -17,7 +17,7 @@
 							</td>
 							<td>
 								<span class="text-sm font-bold">
-									<SwitchInput @input="changeStatus($event, row.data.attributes.slug)" class="switch" :state="row.data.attributes.visibility"/>
+									<SwitchInput @input="$updateText(`/admin/pages/${row.data.id}`, 'visibility', row.data.attributes.visibility)" v-model="row.data.attributes.visibility" :state="row.data.attributes.visibility" class="switch"/>
 								</span>
 							</td>
 							<td>
@@ -95,73 +95,5 @@
                 ],
             }
         },
-        methods: {
-            changeStatus(val, slug) {
-                this.$updateText('/admin/pages/' + slug, 'visibility', val)
-            }
-        },
     }
 </script>
-
-<style lang="scss" scoped>
-    @import '/resources/sass/vuefilemanager/_variables';
-    @import '/resources/sass/vuefilemanager/_mixins';
-
-    .table-tools {
-        background: white;
-        display: flex;
-        justify-content: space-between;
-        padding: 15px 0 10px;
-        position: sticky;
-        top: 40px;
-        z-index: 9;
-    }
-
-    .table {
-
-        .cell-item {
-            @include font-size(15);
-            white-space: nowrap;
-        }
-
-        .name {
-            font-weight: 700;
-            cursor: pointer;
-        }
-    }
-
-    @media only screen and (max-width: 690px) {
-        .table-tools {
-            padding: 0 0 5px;
-        }
-    }
-
-    .dark {
-
-        .table-tools {
-            background: $dark_mode_background;
-        }
-
-        .action-icons {
-
-            .icon {
-                cursor: pointer;
-
-                circle, path, line, polyline {
-                    stroke: $dark_mode_text_primary;
-                }
-            }
-        }
-
-        .user-thumbnail {
-
-            .info {
-
-                .email {
-                    color: $dark_mode_text_secondary;
-                }
-            }
-        }
-    }
-
-</style>
diff --git a/resources/js/views/Admin/Plans.vue b/resources/js/views/Admin/Plans.vue
index a2631ebd..8c759498 100644
--- a/resources/js/views/Admin/Plans.vue
+++ b/resources/js/views/Admin/Plans.vue
@@ -14,7 +14,7 @@
                 <template slot-scope="{ row }">
                     <tr class="border-b dark:border-opacity-5 border-light border-dashed">
 						<td class="py-4">
-							<SwitchInput @input="$updateInput(`/subscriptions/admin/plans/${row.data.id}`, 'visible', row.data.attributes.visible)" v-model="row.data.attributes.visible" class="switch" :state="row.data.attributes.visible"/>
+							<SwitchInput @input="$updateInput(`/subscriptions/admin/plans/${row.data.id}`, 'visible', row.data.attributes.visible)" v-model="row.data.attributes.visible" :state="row.data.attributes.visible" class="switch"/>
 						</td>
                         <td>
 							<router-link class="text-sm font-bold" :to="{name: 'PlanSettings', params: {id: row.data.id}}">
@@ -110,7 +110,9 @@
             Spinner,
         },
         computed: {
-            ...mapGetters(['config']),
+            ...mapGetters([
+				'config'
+			]),
             isEmptyPlans() {
                 return ! this.isLoading && this.plans.length === 0 && this.config.stripe_public_key
             },
@@ -128,32 +130,30 @@
                 columns: [
                     {
                         label: this.$t('Visibility'),
-                        field: 'data.attributes.status',
-                        sortable: false
+                        field: 'visible',
+                        sortable: true
                     },
                     {
                         label: this.$t('Name'),
-                        field: 'data.attributes.name',
-                        sortable: false
+                        field: 'name',
+                        sortable: true
                     },
                     {
                         label: this.$t('Price'),
-                        field: 'data.attributes.subscribers',
-                        sortable: false
+                        field: 'amount',
+                        sortable: true
                     },
                     {
                         label: this.$t('Interval'),
-                        field: 'data.attributes.price',
-                        sortable: false
+                        field: 'interval',
+                        sortable: true
                     },
                     {
                         label: this.$t('admin_page_plans.table.subscribers'),
-                        field: 'data.attributes.capacity',
                         sortable: false
                     },
                     {
                         label: this.$t('Storage'),
-                        field: 'data.attributes.capacity',
                         sortable: false
                     },
                     {
diff --git a/resources/js/views/Admin/Plans/PlanTabs/PlanSubscribers.vue b/resources/js/views/Admin/Plans/PlanTabs/PlanSubscribers.vue
index c4644022..46fac4d2 100644
--- a/resources/js/views/Admin/Plans/PlanTabs/PlanSubscribers.vue
+++ b/resources/js/views/Admin/Plans/PlanTabs/PlanSubscribers.vue
@@ -91,30 +91,33 @@
                 columns: [
                     {
                         label: this.$t('admin_page_user.table.name'),
-                        field: 'name',
+                        field: 'user_id',
                         sortable: true
                     },
                     {
                         label: this.$t('Status'),
-                        field: 'used',
-                        sortable: false
+                        field: 'status',
+                        sortable: true
                     },
                     {
                         label: this.$t('Plan'),
-                        field: 'name',
+                        field: 'plan.name',
                         sortable: true
                     },
                     {
                         label: this.$t('Renews At'),
-                        sortable: false
+                        field: 'created_at',
+                        sortable: true
                     },
                     {
                         label: this.$t('Ends At'),
-                        sortable: false
+                        field: 'ends_at',
+                        sortable: true
                     },
                     {
                         label: this.$t('Service'),
-                        sortable: false
+                        field: 'driver',
+                        sortable: true
                     },
                 ],
             }
diff --git a/resources/js/views/Admin/Subscriptions.vue b/resources/js/views/Admin/Subscriptions.vue
index 32a609db..dcddafa7 100644
--- a/resources/js/views/Admin/Subscriptions.vue
+++ b/resources/js/views/Admin/Subscriptions.vue
@@ -133,30 +133,33 @@
 				columns: [
 					{
 						label: this.$t('admin_page_user.table.name'),
-						field: 'name',
+						field: 'user_id',
 						sortable: true
 					},
 					{
 						label: this.$t('Status'),
-						field: 'used',
-						sortable: false
+						field: 'status',
+						sortable: true
 					},
 					{
 						label: this.$t('Plan'),
-						field: 'name',
+						field: 'plan.name',
 						sortable: true
 					},
 					{
 						label: this.$t('Renews At'),
-						sortable: false
+						field: 'created_at',
+						sortable: true
 					},
 					{
 						label: this.$t('Ends At'),
-						sortable: false
+						field: 'created_at',
+						sortable: true
 					},
 					{
 						label: this.$t('Service'),
-						sortable: false
+						field: 'driver.driver',
+						sortable: true
 					},
 				],
             }
diff --git a/resources/js/views/Admin/Users.vue b/resources/js/views/Admin/Users.vue
index 5ddb63a5..96f5d909 100644
--- a/resources/js/views/Admin/Users.vue
+++ b/resources/js/views/Admin/Users.vue
@@ -149,19 +149,15 @@
                 },
                 {
                     label: this.$t('admin_page_user.table.plan'),
-                    field: 'subscription',
                     sortable: false,
-                    hidden: ! this.config.isSaaS,
                 },
                 {
                     label: this.$t('admin_page_user.table.storage_used'),
-                    field: 'used',
-                    sortable: true
+                    sortable: false
                 },
                 {
                     label: this.$t('Max Storage'),
-                    field: 'settings.max_storage_amount',
-                    sortable: true,
+                    sortable: false,
                     hidden: ! this.config.storageLimit,
                 },
                 {
@@ -171,7 +167,6 @@
                 },
                 {
                     label: this.$t('admin_page_user.table.action'),
-                    field: 'data.action',
                     sortable: false
                 },
             ]
diff --git a/resources/js/views/Admin/Users/UserTabs/UserInvoices.vue b/resources/js/views/Admin/Users/UserTabs/UserInvoices.vue
index ab194762..c1015994 100644
--- a/resources/js/views/Admin/Users/UserTabs/UserInvoices.vue
+++ b/resources/js/views/Admin/Users/UserTabs/UserInvoices.vue
@@ -86,6 +86,7 @@
                     },
                     {
                         label: this.$t('Service'),
+						field: 'driver',
                         sortable: true
                     },
                 ],
diff --git a/resources/js/views/User/Invoices.vue b/resources/js/views/User/Invoices.vue
index 8c4c170e..1fcc6145 100644
--- a/resources/js/views/User/Invoices.vue
+++ b/resources/js/views/User/Invoices.vue
@@ -87,6 +87,7 @@
 					},
 					{
 						label: this.$t('Service'),
+						field: 'driver',
 						sortable: true
 					},
 				],