hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-02-10 23:36:08 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #800 from openclassify/vedat

Browse Source 
remove crud function && create new function
This commit is contained in:
Fatih Alp 2020-11-17 17:57:55 +03:00 committed by GitHub
commit 907d31fcac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 40 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
addons/default/visiosoft/advs-module/resources/js/edit_cats.js
View File

@ -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 {

20
addons/default/visiosoft/advs-module/resources/js/filter_modal.js
View File

@ -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) {

2
addons/default/visiosoft/advs-module/resources/js/location.js
View File

@ -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("<option value='" + value.id + "'>" + value.name + "</option>");
});

12
addons/default/visiosoft/base-theme/resources/js/theme/initialize.js
View File

@ -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);
},
});
}

11
addons/default/visiosoft/base-theme/resources/js/visiosoft.js Normal file
View File

@ -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);
},
});
}

1
addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig
View File

@ -18,6 +18,7 @@
{{ asset_add("theme.css", "visiosoft.theme.base::css/intlTelInput.css") }}
<script src="{{ asset_path('visiosoft.theme.base::js/vendor/jquery.min.js') }}"></script>
{{ asset_script('visiosoft.theme.base::js/visiosoft.js') }}
{{ asset_style("theme.css") }}

20
addons/default/visiosoft/defaultadmin-theme/resources/js/users/filterLocation.js
View File

@ -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("<option value=''>" + pick_option + "</option>");
$.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("<option value=''>" + pick_option + "</option>");
$.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("<option value=''>" + pick_option + "</option>");
$.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);
},
});
}
});

2
addons/default/visiosoft/defaultadmin-theme/resources/js/visiosoft.js
View File

@ -1,5 +1,5 @@
function crudAjax(params, url, type, callback, async = false) {
$.ajax({
return $.ajax({
type: type,
data: params,
async: async,

3
addons/default/visiosoft/defaultadmin-theme/resources/views/partials/assets.twig
View File

@ -10,5 +10,4 @@
{% for script in asset_inlines("scripts.js") %}
{{ script|raw }}
{% endfor %}
</script>
{{ asset_script('visiosoft.theme.defaultadmin::js/visiosoft.js') }}
</script>

1
addons/default/visiosoft/defaultadmin-theme/resources/views/partials/metadata.twig
View File

@ -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') }}
<style type="text/css">
{{ asset_inline("theme.css") }}
{{ asset_inline("build.css") }}

8
addons/default/visiosoft/location-module/resources/js/addressSelect.js
View File

@ -28,7 +28,7 @@ $('.edit-this-address').on('click', function () {
$("#newAdd-address").attr("action", '/profile/adress/ajaxUpdate/' + edit_address_id);
//Get Address Detail
crud({"id": edit_address_id}, '/profile/adress/ajaxDetail', 'POST', function (callback) {
crudAjax({"id": edit_address_id}, '/profile/adress/ajaxDetail', 'POST', function (callback) {
var address_detail = callback.data;
var address_field = ['adress_name', 'adress_gsm_phone', 'adress_first_name', 'adress_last_name'];
@ -44,13 +44,13 @@ $('.edit-this-address').on('click', function () {
$("#newAdd-address").find('select[name="country"]').val(address_detail.country_id)
//Get City Options
crud('id=' + address_detail.country_id, '/ajax/getCities', 'POST',function (callback){
crudAjax('id=' + address_detail.country_id, '/ajax/getCities', 'POST',function (callback){
setSelectOptions($("#newAdd-address").find('select[name="city"]'),callback,'id','name');
})
//Get District Options
var selectedCity = new Promise(function (resolve) {
crud('id=' + address_detail.city, '/ajax/getDistricts', 'POST',function (callback){
crudAjax('id=' + address_detail.city, '/ajax/getDistricts', 'POST',function (callback){
setSelectOptions($("#newAdd-address").find('select[name="district"]'),callback,'id','name');
});
$("#newAdd-address").find('select[name="city"]').val(address_detail.city)
@ -77,7 +77,7 @@ $("#newAdd-address").submit(function (e) {
e.preventDefault(); // avoid to execute the actual submit of the form.
var form = $(this);
var url = form.attr('action');
crud(form.serialize(), url, "POST", function (response) {
crudAjax(form.serialize(), url, "POST", function (response) {
if (response.status == "updated") {
$('.row-address' + response.data.id).find(".address-title").html(response.data.adress_name)
$('#editAddress').modal('hide');

21
addons/default/visiosoft/location-module/resources/js/settings.js
View File

@ -30,7 +30,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="default_city"]').html("<option>" + pick_option + "</option>");
$.each(cities, function (index, value) {
@ -40,7 +40,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="default_district"]').html("<option>" + pick_option + "</option>");
$.each(cities, function (index, value) {
@ -50,7 +50,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="default_neighborhood"]').html("<option>" + pick_option + "</option>");
$.each(cities, function (index, value) {
@ -70,17 +70,4 @@ $(document).on('change', 'select[name="default_city"]', function () {
$(document).on('change', 'select[name="default_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);
},
});
}
});

13
addons/default/visiosoft/profile-module/resources/assets/js/ads.js
View File

@ -71,19 +71,8 @@ function numPages() {
return Math.ceil(totalAdvs / records_per_page);
}
function crud(params, url, type, callback) {
$.ajax({
type: type,
data: params,
url: url,
success: function (response) {
callback(response);
},
});
}
function getMyAdvs(type) {
crud({'type': type, 'paginate': true, 'page': current_page}, '/ajax/getAdvs', 'GET', function (callback) {
crudAjax({'type': type, 'paginate': true, 'page': current_page}, '/ajax/getAdvs', 'GET', function (callback) {
ads_type = type;
objJson = callback.content.data;
totalAdvs = callback.content.total

2
addons/default/visiosoft/profile-module/resources/assets/js/create.js
View File

@ -54,7 +54,7 @@ phoneMask("input[name='adress_gsm_phone']");
function getCountries() {
crud('', '/ajax/getCountry', 'GET', function (callback) {
crudAjax('', '/ajax/getCountry', 'GET', function (callback) {
$('select[name="country"]').html("<option>" + pick_option + "</option>");
$.each(callback, function (index, value) {
$('select[name="country"]').append("<option value='" + value.id + "'>" + value.name + "</option>");

19
addons/default/visiosoft/profile-module/resources/assets/js/location.js
View File

@ -23,7 +23,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("<option>" + pick_option + "</option>");
$.each(cities, function (index, value) {
@ -33,7 +33,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("<option>" + pick_option + "</option>");
$.each(cities, function (index, value) {
@ -48,17 +48,4 @@ $(document).on('change', 'select[name="country"]', function () {
$(document).on('change', 'select[name="city"]', function () {
getDistricts($(this).val())
});
function crud(params, url, type, callback) {
$.ajax({
type: type,
data: params,
async: false,
url: url,
success: function (response) {
callback(response);
},
});
}
});