From c587f1b18c8cc493eb638d8651bccbb899cf1d42 Mon Sep 17 00:00:00 2001 From: Saeid Date: Tue, 8 Oct 2019 21:54:56 +0330 Subject: [PATCH] work in office --- public/mix-manifest.json | 8 +- resources/js/Global/mixins/commingSoon.js | 2 +- .../Global/utils/common/CreateFilterObject.js | 33 +++++++- resources/js/Home/views/AddModule.vue | 80 ++++++++++++------- resources/js/Home/views/Home.vue | 7 +- 5 files changed, 92 insertions(+), 38 deletions(-) diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 00f5488..4fa70e4 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=60b0a33dbb353c1d7edc", - "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=9f533af650a307e880c0", - "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=92214a4c3239559ded55", - "/js/vue/User/app.js": "/js/vue/User/app.js?id=f3c9f37079c432adb37c" + "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=b01dcfa845b84da87394", + "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=3d59743a5c1071a14b23", + "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=51954041d9e7136bbadc", + "/js/vue/User/app.js": "/js/vue/User/app.js?id=52b907dbc08d5b945ed6" } diff --git a/resources/js/Global/mixins/commingSoon.js b/resources/js/Global/mixins/commingSoon.js index 43097ce..c89a367 100644 --- a/resources/js/Global/mixins/commingSoon.js +++ b/resources/js/Global/mixins/commingSoon.js @@ -4,7 +4,7 @@ var CommingSoonArray = [ "transaction", "email", "sms", - + "prescription", "crm-setting", // "crm-client-filter", diff --git a/resources/js/Global/utils/common/CreateFilterObject.js b/resources/js/Global/utils/common/CreateFilterObject.js index 27a3133..32c5be8 100644 --- a/resources/js/Global/utils/common/CreateFilterObject.js +++ b/resources/js/Global/utils/common/CreateFilterObject.js @@ -14,8 +14,28 @@ const createFilterObject = filters => { }; window['between'] = function (filter) { var value = null; - if (filter.val1 || filter.val2) { + if (filter.val1 && filter.val2) { value = `<${filter.val1},${filter.val2}>`; + } else if (filter.val1) { + filter.val = filter.val1; + value = greater(filter); + } else if(filter.val2) { + filter.val = filter.val2; + value = less(filter); + } + return value; +} +window['greater'] = function (filter) { + var value = null; + if (filter.val) { + value = `(ge)${filter.val1}`; + } + return value; +} +window['less'] = function (filter) { + var value = null; + if (filter.val) { + value = `(le)${filter.val1}`; } return value; } @@ -27,5 +47,16 @@ window['like'] = function(filter) { } return value; } +window['in'] = function(filter) { + var value = null; + if (filter.val) { + if (Array.isArray(filter.val)) { + value = filter.val.join(','); + } else { + value = `${filter.val}`; + } + } + return value; +} export default createFilterObject; diff --git a/resources/js/Home/views/AddModule.vue b/resources/js/Home/views/AddModule.vue index db9dd4a..3fc89be 100644 --- a/resources/js/Home/views/AddModule.vue +++ b/resources/js/Home/views/AddModule.vue @@ -10,7 +10,7 @@ titleFa=" افزودن بخش جدید " titleEn=" Add a New Section " > -
+
{{index+1}}
@@ -25,32 +25,37 @@ IRT
- - - - fas fa-history - + + + فعالسازی نسخه ی 15 روزه، آزمایشی - + --> @@ -122,17 +127,34 @@ export default { disabled: true } ], + allModules: [], }; }, computed: { - ...mapGetters("role_permission", ["getAllModules"]) + ...mapGetters("role_permission", ["getAllModules", "getModules"]) }, methods: { - ...mapActions("role_permission", ["loadAllModules"]), - ...mapMutations("role_permission", ["SET_CURRENT_MODULE"]), + ...mapActions("role_permission", ["loadAllModules", "loadModules"]), + ...mapMutations("role_permission", ["SET_CURRENT_MODULE"]), + async loadPage() { + await this.loadAllModules({ home_page: true }); + let response = await this.loadModules({ home_page: true }); + if (response && response.status == 200) { + for (const allModule of this.getAllModules) { + let module = this.getModules.find(x => x.id == allModule.id); + if (module) { + allModule['has_module'] = 'yes'; + allModule['is_trial'] = module.is_trial; + } else { + allModule['has_module'] = 'no'; + } + } + } + this.allModules = this.getAllModules; + } }, - created() { - this.loadAllModules({ home_page: true }); + beforeMount() { + this.loadPage(); } }; diff --git a/resources/js/Home/views/Home.vue b/resources/js/Home/views/Home.vue index 63349c2..9ef85f7 100644 --- a/resources/js/Home/views/Home.vue +++ b/resources/js/Home/views/Home.vue @@ -18,7 +18,7 @@ > - + fas fa-plus @@ -37,10 +37,11 @@ export default { "wm-tile": Tile, }, computed: { - ...mapGetters("role_permission", ["getModules"]) + ...mapGetters("role_permission", ["getModules"]), + ...mapGetters("auth", ["getAuthUser"]), }, methods: { - ...mapActions("role_permission", ["loadModules"]) + ...mapActions("role_permission", ["loadModules"]), }, created() { this.loadModules({ home_page: true });