diff --git a/addons/default/visiosoft/advs-module/resources/js/edit_cats.js b/addons/default/visiosoft/advs-module/resources/js/edit_cats.js
index d33461e58..29a350703 100644
--- a/addons/default/visiosoft/advs-module/resources/js/edit_cats.js
+++ b/addons/default/visiosoft/advs-module/resources/js/edit_cats.js
@@ -1,29 +1,17 @@
-function crud(params, url, type, callback) {
- $.ajax({
- type: type,
- async: false,
- data: params,
- url: url,
- success: function (response) {
- callback(response);
- },
- });
-}
-
var level = 0;
var selected;
var all_categories = {};
var promiseForCategory = new Promise(function (resolve) {
if (categories.length != 0) {
$.each(categories, function (index, value) {
- crud({'level': level, "cat": categories['cat' + level]}, '/class/ajaxCategory', 'POST', function (callback) {
+ crudAjax({'level': level, "cat": categories['cat' + level]}, '/class/ajaxCategory', 'POST', function (callback) {
// console.log('cat' + (level + 1), categories['cat' + level], callback)
all_categories['cat' + (level + 1)] = callback;
})
level++;
});
} else {
- crud({'level': level, "cat": ""}, '/class/ajaxCategory', 'POST', function (callback) {
+ crudAjax({'level': level, "cat": ""}, '/class/ajaxCategory', 'POST', function (callback) {
all_categories['cat' + (level + 1)] = callback;
})
level++;
@@ -100,7 +88,7 @@ function selectedValue() {
scroolToSelect(all_category_box)
- crud({"cat": value[0], 'level': level}, '/class/ajaxCategory', 'POST', function (callback) {
+ crudAjax({"cat": value[0], 'level': level}, '/class/ajaxCategory', 'POST', function (callback) {
if (callback.length <= 0) {
$('.category-row').append(completedField());
} else {
diff --git a/addons/default/visiosoft/advs-module/resources/js/filter_modal.js b/addons/default/visiosoft/advs-module/resources/js/filter_modal.js
index 19d78bae4..0f371ad38 100644
--- a/addons/default/visiosoft/advs-module/resources/js/filter_modal.js
+++ b/addons/default/visiosoft/advs-module/resources/js/filter_modal.js
@@ -7,18 +7,6 @@ $('.edit-category-filter-modal').on('click', function () {
$('#categoryModal').modal('toggle');
})
-function crud(params, url, type, callback) {
- $.ajax({
- type: type,
- async: false,
- data: params,
- url: url,
- success: function (response) {
- callback(response);
- },
- });
-}
-
var level = 0;
var id_list = categories;
var selected;
@@ -27,7 +15,7 @@ var all_categories = {};
var promiseForCategory = new Promise(function (resolve) {
if (categories.length != 0) {
$.each(categories, function (index, value) {
- crud({
+ crudAjax({
'level': level,
"cat": categories['cat' + level]
}, '/class/ajaxCategory', 'POST', function (callback) {
@@ -36,7 +24,7 @@ var promiseForCategory = new Promise(function (resolve) {
level++;
});
} else {
- crud({'level': level, "cat": ""}, '/class/ajaxCategory', 'POST', function (callback) {
+ crudAjax({'level': level, "cat": ""}, '/class/ajaxCategory', 'POST', function (callback) {
all_categories['cat' + (level + 1)] = callback;
})
level++;
@@ -59,7 +47,7 @@ promiseForCategory.then(function (categories_list) {
});
});
level++;
- crud({
+ crudAjax({
'level': level,
"cat": id_list['cat' + Object.keys(id_list).length]
}, '/class/ajaxCategory', 'POST', function (callback) {
@@ -112,7 +100,7 @@ function selectedValue() {
}
- crud({"cat": value, 'level': level}, '/class/ajaxCategory', 'POST', function (callback) {
+ crudAjax({"cat": value, 'level': level}, '/class/ajaxCategory', 'POST', function (callback) {
if (callback.length > 0) {
$('.category-row').append(CategoryField('cat' + level, level));
$.each(callback, function (index, value) {
diff --git a/addons/default/visiosoft/advs-module/resources/js/location.js b/addons/default/visiosoft/advs-module/resources/js/location.js
index 01f383464..ec86ee154 100644
--- a/addons/default/visiosoft/advs-module/resources/js/location.js
+++ b/addons/default/visiosoft/advs-module/resources/js/location.js
@@ -210,7 +210,7 @@ function editMarket() {
}
function getCountries() {
- crud('', '/ajax/getCountry', 'GET', function (callback) {
+ crudAjax('', '/ajax/getCountry', 'GET', function (callback) {
$.each(callback, function (index, value) {
$('select[name="country"]').append("");
});
diff --git a/addons/default/visiosoft/base-theme/resources/js/theme/initialize.js b/addons/default/visiosoft/base-theme/resources/js/theme/initialize.js
index 89838e6d4..be480dac4 100644
--- a/addons/default/visiosoft/base-theme/resources/js/theme/initialize.js
+++ b/addons/default/visiosoft/base-theme/resources/js/theme/initialize.js
@@ -3,15 +3,3 @@
// Go!
})(window, document);
-
-function crud(params, url, type, callback) {
- $.ajax({
- type: type,
- async: false,
- data: params,
- url: url,
- success: function (response) {
- callback(response);
- },
- });
-}
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/js/visiosoft.js b/addons/default/visiosoft/base-theme/resources/js/visiosoft.js
new file mode 100644
index 000000000..80c116700
--- /dev/null
+++ b/addons/default/visiosoft/base-theme/resources/js/visiosoft.js
@@ -0,0 +1,11 @@
+function crudAjax(params, url, type, callback, async = false) {
+ return $.ajax({
+ type: type,
+ data: params,
+ async: async,
+ url: url,
+ success: function (response) {
+ callback(response);
+ },
+ });
+}
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig
index 8f51c0847..a811222ed 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig
@@ -18,6 +18,7 @@
{{ asset_add("theme.css", "visiosoft.theme.base::css/intlTelInput.css") }}
+{{ asset_script('visiosoft.theme.base::js/visiosoft.js') }}
{{ asset_style("theme.css") }}
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/js/users/filterLocation.js b/addons/default/visiosoft/defaultadmin-theme/resources/js/users/filterLocation.js
index b3c31aa8d..affc42db7 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/js/users/filterLocation.js
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/js/users/filterLocation.js
@@ -28,7 +28,7 @@ new Promise(function (resolve, reject) {
});
function getCities(country) {
- crud('id=' + country, '/ajax/getCities', 'POST', function (callback) {
+ crudAjax('id=' + country, '/ajax/getCities', 'POST', function (callback) {
cities = callback;
$('select[name="city"]').html("");
$.each(cities, function (index, value) {
@@ -41,7 +41,7 @@ function getCities(country) {
}
function getDistricts(city) {
- crud('id=' + city, '/ajax/getDistricts', 'POST', function (callback) {
+ crudAjax('id=' + city, '/ajax/getDistricts', 'POST', function (callback) {
cities = callback;
$('select[name="district"]').html("");
$.each(cities, function (index, value) {
@@ -53,7 +53,7 @@ function getDistricts(city) {
}
function getNeighborhoods(district) {
- crud('id=' + district, '/ajax/getNeighborhoods', 'POST', function (callback) {
+ crudAjax('id=' + district, '/ajax/getNeighborhoods', 'POST', function (callback) {
cities = callback;
$('select[name="neighborhood"]').html("");
$.each(cities, function (index, value) {
@@ -73,16 +73,4 @@ $(document).on('change', 'select[name="city"]', function () {
$(document).on('change', 'select[name="district"]', function () {
getNeighborhoods($(this).val())
-});
-
-function crud(params, url, type, callback) {
- $.ajax({
- type: type,
- data: params,
- async: false,
- url: url,
- success: function (response) {
- callback(response);
- },
- });
-}
\ No newline at end of file
+});
\ 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 d9b02e199..80c116700 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/js/visiosoft.js
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/js/visiosoft.js
@@ -1,5 +1,5 @@
function crudAjax(params, url, type, callback, async = false) {
- $.ajax({
+ return $.ajax({
type: type,
data: params,
async: async,
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/assets.twig b/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/assets.twig
index ff25424d3..ace297095 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/assets.twig
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/assets.twig
@@ -10,5 +10,4 @@
{% for script in asset_inlines("scripts.js") %}
{{ script|raw }}
{% endfor %}
-
-{{ asset_script('visiosoft.theme.defaultadmin::js/visiosoft.js') }}
+
\ No newline at end of file
diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/metadata.twig b/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/metadata.twig
index aaf7aa187..8ee91da2c 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/metadata.twig
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/views/partials/metadata.twig
@@ -60,6 +60,7 @@
{{ asset_add("theme.js", "visiosoft.theme.base::js/intlTelInput.min.js") }}
{{ asset_add("theme.js", "visiosoft.theme.base::js/utils.js") }}
{{ asset_add("theme.js", "visiosoft.theme.base::js/phonefield.js") }}
+{{ asset_script('visiosoft.theme.defaultadmin::js/visiosoft.js') }}