diff --git a/.gitignore b/.gitignore index 17417ba..198ade7 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ /vendor /modules /development/ +jsconfig.json .env .phpunit.result.cache Homestead.json diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 6e45844..06a928d 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=979ca3cbe3ae6f2f6648", - "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=952eba47f3c87b27c8e4", - "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=2438d0b19611c164de10", - "/js/vue/User/app.js": "/js/vue/User/app.js?id=90b3808d13f34c14baac" + "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=69a485a398e10ecf1480", + "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=7afee120275aa1ba59cf", + "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=c369ba53a87cf86d69ee", + "/js/vue/User/app.js": "/js/vue/User/app.js?id=5b6de9215672f63f22ce" } diff --git a/resources/js/Global/mixins/global.js b/resources/js/Global/mixins/global.js index 7cd82d4..1c48e7c 100644 --- a/resources/js/Global/mixins/global.js +++ b/resources/js/Global/mixins/global.js @@ -12,13 +12,7 @@ const global = { //Modal - ...mapActions("modal", ["openModal", "closeModal", "dialog"]), - $_openModal(options) { - this.openModal(options); - }, - $_closeModal(options) { - this.closeModal(options); - }, + ...mapActions("modal", ["$_openModal", "$_closeModal", "dialog"]), //Alert diff --git a/resources/js/Global/store/modules/modal/actions.js b/resources/js/Global/store/modules/modal/actions.js index 0930912..2e30d9d 100644 --- a/resources/js/Global/store/modules/modal/actions.js +++ b/resources/js/Global/store/modules/modal/actions.js @@ -1,17 +1,23 @@ export default { - openModal: ({ rootState }, modal) => { + $_openModal: ({ rootState }, modal) => { let modalArray = modal.split("/"); if (modalArray.length == 2) { rootState[modalArray[0]]['modal'][modalArray[1]] = true; + // if (typeof rootState[modalArray[0]]['callback_modal'] != "undefined" && typeof rootState[modalArray[0]]['callback_modal'][modalArray[1]] != "undefined") { + + // } } else { rootState.modal[modalArray[0]] = true; } }, - closeModal: ({ state, rootState }, modal) => { + $_closeModal: ({ state, rootState }, modal) => { let modalArray = modal.split("/"); if (modalArray.length == 2) { rootState[modalArray[0]]['modal'][modalArray[1]] = false; + // if (typeof rootState[modalArray[0]]['callback_modal'] != "undefined" && typeof rootState[modalArray[0]]['callback_modal'][modalArray[1]] != "undefined") { + + // } } else { rootState.modal[modalArray[0]] = false; }