diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 7b72a47..ae44050 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,6 +1,6 @@ { - "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=0792ffd7217143c46a77", - "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=41b7adb225049bb18a64", - "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=827cddb7746c2a2510d1", - "/js/vue/User/app.js": "/js/vue/User/app.js?id=c593ac79fc42fa89a05f" + "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=4a97d3cd44ce20271b16", + "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=0fc1eb446e4231363537", + "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=2419a17ce1593f647b46", + "/js/vue/User/app.js": "/js/vue/User/app.js?id=5032dd9ac7897eeb6f48" } diff --git a/resources/js/Global/mixins/global.js b/resources/js/Global/mixins/global.js index 426d8ac..3802b9b 100644 --- a/resources/js/Global/mixins/global.js +++ b/resources/js/Global/mixins/global.js @@ -5,26 +5,36 @@ import permissionList from "@Global/utils/Permissions/list"; import { UserService } from "@Global/services/storage.services"; const global = { methods: { - $_getPath(subPath = '') { - const path = process.env.MIX_PUSHER_APP_PUBLIC_PATH ? process.env.MIX_PUSHER_APP_PUBLIC_PATH : '/'; + $_getPath(subPath = "") { + const path = process.env.MIX_PUSHER_APP_PUBLIC_PATH + ? process.env.MIX_PUSHER_APP_PUBLIC_PATH + : "/"; return path + subPath; }, //Modal - ...mapActions("modal", ["$_openModal", "$_closeModal", "$_openModalCallback", "$_closeModalCallback", "$_dialog", "$_openModalStack", "$_closeModalStack"]), + ...mapActions("modal", [ + "$_openModal", + "$_closeModal", + "$_openModalCallback", + "$_closeModalCallback", + "$_dialog", + "$_openModalStack", + "$_closeModalStack" + ]), //Permission $_hasPermission(permission, owner = false) { let currentModule = globalStore.state.common.current_module; let permissions = authStore.state.auth.permissions; let multiPermission = permission.split("|"); - let siteOwner = !!UserService.get().is_owner; + let siteOwner = UserService.get().is_owner == "true"; for (const iterator of multiPermission) { if (iterator == "") { return true; } - permission = permissionList[iterator]; + permission = permissionList[iterator]; if ( siteOwner || owner || diff --git a/resources/js/Global/plugins/auth.js b/resources/js/Global/plugins/auth.js index f740619..c87549c 100644 --- a/resources/js/Global/plugins/auth.js +++ b/resources/js/Global/plugins/auth.js @@ -9,7 +9,7 @@ if (TokenService.getToken()) { if (PermissionService.get()) { store.commit('auth/SET_AUTH_PERMISSIONS', PermissionService.get()) -} else if (TokenService.getToken() && UserService.get() && UserService.get().is_owner == false) { +} else if (TokenService.getToken() && UserService.get() && UserService.get().is_owner == 'false') { store.dispatch('auth/loadAuthPermissions'); } diff --git a/resources/js/Global/utils/Permissions/list.js b/resources/js/Global/utils/Permissions/list.js index f15b104..cb160fa 100644 --- a/resources/js/Global/utils/Permissions/list.js +++ b/resources/js/Global/utils/Permissions/list.js @@ -41,6 +41,11 @@ export default { updateClientCategory: "update-client-category", deleteClientCategory: "delete-client-category", + indexClientTitle: "index-client-title", + storeClientTitle: "store-client-title", + updateClientTitle: "update-client-title", + deleteClientTitle: "delete-client-title", + indexClientStatus: "index-client-status", storeClientStatus: "store-client-status", updateClientStatus: "update-client-status",