From d0be55ade201e94376a34936f43c160a14de5b6d Mon Sep 17 00:00:00 2001 From: diashalabi Date: Tue, 6 Jul 2021 18:12:30 +0300 Subject: [PATCH 1/2] #4231 Heavy Machinery Project --- addons/default/visiosoft/base-theme/resources/js/visiosoft.js | 4 ++-- .../visiosoft/defaultadmin-theme/resources/js/visiosoft.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/default/visiosoft/base-theme/resources/js/visiosoft.js b/addons/default/visiosoft/base-theme/resources/js/visiosoft.js index 52283e3c1..a783faa29 100644 --- a/addons/default/visiosoft/base-theme/resources/js/visiosoft.js +++ b/addons/default/visiosoft/base-theme/resources/js/visiosoft.js @@ -1,4 +1,4 @@ -function crudAjax(params, url, type, callback = () => {}, async = false) { +function crudAjax(params, url, type = 'GET', callback = () => {}, async = false) { return $.ajax({ type: type, data: params, @@ -8,4 +8,4 @@ function crudAjax(params, url, type, callback = () => {}, async = false) { callback(response); }, }); -} \ No newline at end of file +} diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/js/visiosoft.js b/addons/default/visiosoft/defaultadmin-theme/resources/js/visiosoft.js index 80c116700..a783faa29 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/js/visiosoft.js +++ b/addons/default/visiosoft/defaultadmin-theme/resources/js/visiosoft.js @@ -1,4 +1,4 @@ -function crudAjax(params, url, type, callback, async = false) { +function crudAjax(params, url, type = 'GET', callback = () => {}, async = false) { return $.ajax({ type: type, data: params, @@ -8,4 +8,4 @@ function crudAjax(params, url, type, callback, async = false) { callback(response); }, }); -} \ No newline at end of file +} From dda2db1b10d85731a1368d7869953239b96a60dd Mon Sep 17 00:00:00 2001 From: diashalabi Date: Thu, 8 Jul 2021 11:24:08 +0300 Subject: [PATCH 2/2] #4231 Heavy Machinery Project --- .../base-theme/resources/js/visiosoft.js | 17 ++++++++++------- .../resources/js/visiosoft.js | 17 ++++++++++------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/addons/default/visiosoft/base-theme/resources/js/visiosoft.js b/addons/default/visiosoft/base-theme/resources/js/visiosoft.js index a783faa29..e9d9af8a0 100644 --- a/addons/default/visiosoft/base-theme/resources/js/visiosoft.js +++ b/addons/default/visiosoft/base-theme/resources/js/visiosoft.js @@ -1,11 +1,14 @@ -function crudAjax(params, url, type = 'GET', callback = () => {}, async = false) { +function crudAjax(params, url, type = 'GET', callback = () => {}, async = true, options = {}) { return $.ajax({ - type: type, - data: params, - async: async, - url: url, - success: function (response) { - callback(response); + ...{ + type: type, + data: params, + async: async, + url: url, + success: function (response) { + callback(response); + }, }, + ...options }); } diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/js/visiosoft.js b/addons/default/visiosoft/defaultadmin-theme/resources/js/visiosoft.js index a783faa29..e9d9af8a0 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/js/visiosoft.js +++ b/addons/default/visiosoft/defaultadmin-theme/resources/js/visiosoft.js @@ -1,11 +1,14 @@ -function crudAjax(params, url, type = 'GET', callback = () => {}, async = false) { +function crudAjax(params, url, type = 'GET', callback = () => {}, async = true, options = {}) { return $.ajax({ - type: type, - data: params, - async: async, - url: url, - success: function (response) { - callback(response); + ...{ + type: type, + data: params, + async: async, + url: url, + success: function (response) { + callback(response); + }, }, + ...options }); }