diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 1186af9..f1fbc12 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,7 +1,7 @@ { - "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=9d41bd8d991d67dc5aca", - "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=66508c2fd5ce92d2e1fa", - "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=1c06e1143737f86f5941", - "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=6ad848b6a54b25f9f62e", - "/js/vue/User/app.js": "/js/vue/User/app.js?id=58adfc6b944d170b62eb" + "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=e917cec88302ac6e7538", + "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=a7e19db897af3390eb04", + "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=a3cdb90cf4d1d0922a9d", + "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=25ab416183e2c4cc0213", + "/js/vue/User/app.js": "/js/vue/User/app.js?id=1357eb15c5132a364515" } diff --git a/resources/js/Global/mixins/global.js b/resources/js/Global/mixins/global.js index af91663..61ab213 100644 --- a/resources/js/Global/mixins/global.js +++ b/resources/js/Global/mixins/global.js @@ -26,7 +26,6 @@ const global = { //Permission $_hasPermission(permission, owner = false) { - return true; let currentModule = globalStore.state.common.current_module; let permissions = authStore.state.auth.permissions; let multiPermission = permission.split("|"); @@ -39,7 +38,7 @@ const global = { owner || (permission && permissions[currentModule] && - permissions[currentModule].includes(permission)) + Object.values(permissions[currentModule]).includes(permission)) ) { return true; } diff --git a/resources/js/Global/utils/Permissions/list.js b/resources/js/Global/utils/Permissions/list.js index e609438..b3b670a 100644 --- a/resources/js/Global/utils/Permissions/list.js +++ b/resources/js/Global/utils/Permissions/list.js @@ -1,66 +1,66 @@ export default { - indexTask: 'index-task', - storeTask: 'store-task', - receiveTask: 'receive-task', - updateTask: 'update-task', - destroyTask: 'destroy-task', + indexTask: "index-task", + storeTask: "store-task", + receiveTask: "receive-task", + updateTask: "update-task", + destroyTask: "destroy-task", - indexTaskCategory: 'index-task-category', - storeTaskCategory: 'store-task-category', - updateTaskCategory: 'update-task-category', - destroyTaskCategory: 'destroy-task-category', + indexTaskCategory: "index-task-category", + storeTaskCategory: "store-task-category", + updateTaskCategory: "update-task-category", + destroyTaskCategory: "destroy-task-category", - indexTaskStatus: 'index-task-status', - storeTaskStatus: 'store-task-status', - updateTaskStatus: 'update-task-status', - destroyTaskStatus: 'destroy-task-status', + indexTaskStatus: "index-task-status", + storeTaskStatus: "store-task-status", + updateTaskStatus: "update-task-status", + destroyTaskStatus: "destroy-task-status", - indexEvent: 'index-event', - storeEvent: 'store-event', - updateEvent: 'update-event', - destroyEvent: 'destroy-event', + indexEvent: "index-event", + storeEvent: "store-event", + updateEvent: "update-event", + destroyEvent: "destroy-event", - indexEventCategory: 'index-event-category', - storeEventCategory: 'store-event-category', - updateEventCategory: 'update-event-category', - destroyEventCategory: 'destroy-event-category', + indexEventCategory: "index-event-category", + storeEventCategory: "store-event-category", + updateEventCategory: "update-event-category", + destroyEventCategory: "destroy-event-category", - indexComment: 'index-comment', - storeComment: 'store-comment', - updateComment: 'update-comment', - destroyComment: 'destroy-comment', + indexComment: "index-comment", + storeComment: "store-comment", + updateComment: "update-comment", + destroyComment: "destroy-comment", - indexClient: 'index-client', - storeClient: 'store-client', - updateClient: 'update-client', - destroyClient: 'destroy-client', - - indexClientCategory: 'index-client-category', - storeClientCategory: 'store-client-category', - updateClientCategory: 'update-client-category', - destroyClientCategory: 'destroy-client-category', + indexClient: "index-client", + storeClient: "store-client", + updateClient: "update-client", + destroyClient: "destroy-client", - indexClientStatus: 'index-client-status', - storeClientStatus: 'store-client-status', - updateClientStatus: 'update-client-status', - destroyClientStatus: 'destroy-client-status', + indexClientCategory: "index-client-category", + storeClientCategory: "store-client-category", + updateClientCategory: "update-client-category", + destroyClientCategory: "destroy-client-category", - indexUser: 'index-user', - storeUser: 'store-user', - updateUser: 'update-user', - destroyUser: 'destroy-user', + indexClientStatus: "index-client-status", + storeClientStatus: "store-client-status", + updateClientStatus: "update-client-status", + destroyClientStatus: "destroy-client-status", - indexDepartment: 'index-department', - storeDepartment: 'store-department', - updateDepartment: 'update-department', - destroyDepartment: 'destroy-department', + indexUser: "index-user", + storeUser: "store-user", + updateUser: "update-user", + destroyUser: "destroy-user", - indexRole: 'assign-role', - assignRole: 'assign-role', - storeRole: 'store-role', - updateRole: 'update-role', - destroyRole: 'destroy-role', + indexDepartment: "index-department", + storeDepartment: "store-department", + updateDepartment: "update-department", + destroyDepartment: "destroy-department", - sendEmail: 'send-email', - sendSMS: 'send-sms', -} \ No newline at end of file + indexRole: "assign-role", + assignRole: "assign-role", + storeRole: "store-role", + updateRole: "update-role", + destroyRole: "destroy-role", + + sendEmail: "send-email", + sendSMS: "send-sms" +};