Merge remote-tracking branch 'refs/remotes/origin/master'

public/mix-manifest.json

@@ -1,7 +1,7 @@
 {
-    "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=9d41bd8d991d67dc5aca",
+    "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=7eb5970dedabdeeb82ff",
-    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=66508c2fd5ce92d2e1fa",
+    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=313676bbd1a2d3e3603e",
-    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=1c06e1143737f86f5941",
+    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=eaf0b0cf4dce5f9e40ae",
-    "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=6ad848b6a54b25f9f62e",
+    "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=cd88e1d41255e646c6f5",
-    "/js/vue/User/app.js": "/js/vue/User/app.js?id=58adfc6b944d170b62eb"
+    "/js/vue/User/app.js": "/js/vue/User/app.js?id=977febd311dbdc7edfd0"
 }

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;
                 }

resources/js/Global/utils/Permissions/list.js

@@ -1,66 +1,67 @@
 export default {
-    indexTask: 'index-task',
+    indexTask: "index-task",
-    storeTask: 'store-task',
+    storeTask: "store-task",
-    receiveTask: 'receive-task',
+    receiveTask: "receive-task",
-    updateTask: 'update-task',
+    updateTask: "update-task",
-    destroyTask: 'destroy-task',
+    deleteTask: "delete-task",
 
-    indexTaskCategory: 'index-task-category',
+    indexTaskCategory: "index-task-category",
-    storeTaskCategory: 'store-task-category',
+    storeTaskCategory: "store-task-category",
-    updateTaskCategory: 'update-task-category',
+    updateTaskCategory: "update-task-category",
-    destroyTaskCategory: 'destroy-task-category',
+    deleteTaskCategory: "delete-task-category",
 
-    indexTaskStatus: 'index-task-status',
+    indexTaskStatus: "index-task-status",
-    storeTaskStatus: 'store-task-status',
+    storeTaskStatus: "store-task-status",
-    updateTaskStatus: 'update-task-status',
+    updateTaskStatus: "update-task-status",
-    destroyTaskStatus: 'destroy-task-status',
+    deleteTaskStatus: "delete-task-status",
 
-    indexEvent: 'index-event',
+    indexEvent: "index-event",
-    storeEvent: 'store-event',
+    storeEvent: "store-event",
-    updateEvent: 'update-event',
+    updateEvent: "update-event",
-    destroyEvent: 'destroy-event',
+    deleteEvent: "delete-event",
 
-    indexEventCategory: 'index-event-category',
+    indexEventCategory: "index-event-category",
-    storeEventCategory: 'store-event-category',
+    storeEventCategory: "store-event-category",
-    updateEventCategory: 'update-event-category',
+    updateEventCategory: "update-event-category",
-    destroyEventCategory: 'destroy-event-category',
+    deleteEventCategory: "delete-event-category",
 
-    indexComment: 'index-comment',
+    indexComment: "index-comment",
-    storeComment: 'store-comment',
+    storeComment: "store-comment",
-    updateComment: 'update-comment',
+    updateComment: "update-comment",
-    destroyComment: 'destroy-comment',
+    deleteComment: "delete-comment",
 
-    indexClient: 'index-client',
+    indexClient: "index-client",
-    storeClient: 'store-client',
+    storeClient: "store-client",
-    updateClient: 'update-client',
+    updateClient: "update-client",
-    destroyClient: 'destroy-client',
+    deleteClient: "delete-client",
-    
-    indexClientCategory: 'index-client-category',
-    storeClientCategory: 'store-client-category',
-    updateClientCategory: 'update-client-category',
-    destroyClientCategory: 'destroy-client-category',
 
-    indexClientStatus: 'index-client-status',
+    indexClientCategory: "index-client-category",
-    storeClientStatus: 'store-client-status',
+    storeClientCategory: "store-client-category",
-    updateClientStatus: 'update-client-status',
+    updateClientCategory: "update-client-category",
-    destroyClientStatus: 'destroy-client-status',
+    deleteClientCategory: "delete-client-category",
 
-    indexUser: 'index-user',
+    indexClientStatus: "index-client-status",
-    storeUser: 'store-user',
+    storeClientStatus: "store-client-status",
-    updateUser: 'update-user',
+    updateClientStatus: "update-client-status",
-    destroyUser: 'destroy-user',
+    deleteClientStatus: "delete-client-status",
 
-    indexDepartment: 'index-department',
+    indexUser: "index-user",
-    storeDepartment: 'store-department',
+    showUser: "show-user",
-    updateDepartment: 'update-department',
+    storeUser: "store-user",
-    destroyDepartment: 'destroy-department',
+    updateUser: "update-user",
+    deleteUser: "delete-user",
 
-    indexRole: 'assign-role',
+    indexDepartment: "index-department",
-    assignRole: 'assign-role',
+    storeDepartment: "store-department",
-    storeRole: 'store-role',
+    updateDepartment: "update-department",
-    updateRole: 'update-role',
+    deleteDepartment: "delete-department",
-    destroyRole: 'destroy-role',
 
-    sendEmail: 'send-email',
+    indexRole: "assign-role",
-    sendSMS: 'send-sms',
+    assignRole: "assign-role",
-}
+    storeRole: "store-role",
+    updateRole: "update-role",
+    deleteRole: "delete-role",
+
+    sendEmail: "send-email",
+    sendSMS: "send-sms"
+};

resources/js/Home/views/Home.vue

@@ -4,7 +4,7 @@
             <a
                 :href="module.href"
                 :class="'flex ' + module.main_class"
-                v-for="( module ,key ) in modules"
+                v-for="( module ,key ) in getModules"
                 :key="key"
             >
                 <wm-tile
@@ -34,32 +34,6 @@ import Tile from "@Global/components/Tiles/Tile";
 import { mapGetters, mapActions } from 'vuex';
 export default {
     data: () => ({
-        modules: [
-            {
-                href: "/CRM/Home",
-                title_class: "Inline LTR Padd10",
-                main_class: "lg8 xs12",
-                title_en: "CRM",
-                title_fa: " مدیریت ارتباط با مشتری ",
-                description: " کالاها، خدمات، تخفیفات، فروش وِیژه و ... ",
-                gradient_begin: "d6e7de",
-                gradient_end: "fff2f3",
-                img_url: "Members.png",
-                img_height: "220px"
-            },
-            {
-                href: "/Reservation/Home",
-                title_class: "Padd10",
-                main_class: "lg4 xs12",
-                title_en: "Reservations",
-                title_fa: " سیستم رزرو وقت ",
-                description: " کالاها، خدمات، تخفیفات، فروش وِیژه و ... ",
-                gradient_begin: "fff",
-                gradient_end: "f7f7f7",
-                img_url: "Clock.png",
-                img_height: "150px"
-            }
-        ]
     }),
     components: {
         "wm-tile": Tile