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 " > -