modal

public/mix-manifest.json

@@ -1,6 +1,6 @@
 {
-    "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=debe5c0904ec24cfe30f",
-    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=1ec961066abc3199652a",
-    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=65d0eb056bc9f22c762a",
-    "/js/vue/User/app.js": "/js/vue/User/app.js?id=e26294d6e0c6bab80aad"
+    "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=f54f88ebc7c347422f0d",
+    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=53dee7fd4b1199a45622",
+    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=37e376be640d8b0ffc25",
+    "/js/vue/User/app.js": "/js/vue/User/app.js?id=27eed039af8ffcd4d758"
 }

resources/js/Global/mixins/global.js

@@ -12,13 +12,7 @@ const global = {
 
         //Modal
 
-        ...mapActions("modal", ["$_openModal", "$_closeModal", "$_openModalCallback", "$_closeModalCallback", "dialog", "$_openModalStack", "$_closeModalStack"]),
- 
-        //Alert
-
-        $_dialog(options) {
-            this.dialog(options);
-        },
+        ...mapActions("modal", ["$_openModal", "$_closeModal", "$_openModalCallback", "$_closeModalCallback", "$_dialog", "$_openModalStack", "$_closeModalStack"]),
 
         //Permission
         $_hasPermission(permission, owner = false) {

resources/js/Global/store/modules/modal/actions.js

@@ -33,7 +33,7 @@ export default {
             let module = data.name.split("_");
             
             rootState[module[1]].relation = data.rel ? data.rel : {};
-            rootState[module[1]].currentModel = data.model ? data.model : {};
+            rootState[module[1]].current_model = data.model ? data.model : {};
             rootState[module[1]].page_type = data.page_type ? data.page_type : 'modal';
         }
     },
@@ -45,14 +45,14 @@ export default {
             }
             let module = last_data.name.split("_");
             rootState[module[1]].relation = {};
-            rootState[module[1]].currentModel =  {};
+            rootState[module[1]].current_model =  {};
             rootState[module[1]].page_type = '';
             state.modals.pop();
         }
     },
 
-    dialog:({state, commit}, properties) => {
-        state.dialog = true;
+    $_dialog:({state, commit}, properties) => {
+        state.modal.dialog = true;
         commit('SET_DIALOG_TYPE', properties.type);
         commit('SET_DIALOG_PROPERTIES', properties);
     },