diff --git a/addons/default/visiosoft/advs-module/resources/js/location.js b/addons/default/visiosoft/advs-module/resources/js/location.js index 3c8af3e39..40a36ead5 100644 --- a/addons/default/visiosoft/advs-module/resources/js/location.js +++ b/addons/default/visiosoft/advs-module/resources/js/location.js @@ -87,9 +87,9 @@ function Locations(cat, level, name) { url: "/class/ajax", success: function (msg) { $('select[name="' + name + '"]').find('option').remove(); - $('select[name="' + name + '"]').append(''); + $('select[name="' + name + '"]').append(``); $.each(msg, function (key, value) { - $('select[name="' + name + '"]').append(''); + $(`select[name="${name}"]`).append(``); }); } }).promise().done(function () { @@ -98,6 +98,11 @@ function Locations(cat, level, name) { }); } +function capFirst(value) { + if (!value) return '' + return value.toLowerCase().replace(/(?:^|\s|["'([{])+\S/g, match => match.toUpperCase()); +} + function setLocation(level) { if (level == 1) { $('select[name="' + citySelectName + '"]').val(getCity); diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig index af3e2b57c..aae1f9309 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig @@ -246,6 +246,6 @@ {{ asset_add("scripts.js", "visiosoft.module.advs::js/new-create.js") }} {{ asset_add("scripts.js", "streams::js/form/form.js") }} {{ asset_add("scripts.js", "streams::js/form/translations.js") }} - {{ asset_add("styles.css", "visiosoft.module.advs::css/new-create.js") }} + {{ asset_add("styles.css", "visiosoft.module.advs::css/new-create.css") }} {% endblock %} \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php index dc9968af4..2854914eb 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php @@ -47,7 +47,14 @@ class AdvTableColumns ], 'country' => [ - 'class' => 'advs-country', + 'class' => 'text-center', + 'wrapper' => '{value.city}
{value.country}
', + 'value' => [ + 'city' => function (EntryInterface $entry) { + return $entry->getCity(); + }, + 'country' => 'country', + ] ], 'created_by' => [ 'value' => 'entry.created_by.name', diff --git a/addons/default/visiosoft/location-module/resources/js/filterLocation.js b/addons/default/visiosoft/location-module/resources/js/filterLocation.js index a7c9d9149..f6a4c1c24 100644 --- a/addons/default/visiosoft/location-module/resources/js/filterLocation.js +++ b/addons/default/visiosoft/location-module/resources/js/filterLocation.js @@ -190,7 +190,7 @@ function SelectOnClick() { searchLocationName() $('.loading').hide(); - return $(".filter-location-body input[type='checkbox']").change(function () { + return $(".filter-location-body input[type='checkbox']").on('change', function () { resetValue($(this).attr('data-field'), false, true) @@ -202,7 +202,7 @@ function SelectOnClick() { var id = $(this).attr('data-id'); if ($(this).attr('data-field') == "country") { - $('.selected-city').html(''); + $('.selected-city small').html(''); $('input[name="city[]"]').val(''); // text_html.html(input_text) // $(".filter-location-body li[data-id='" + id + "'] input[type='checkbox']").prop('checked', true); @@ -247,13 +247,13 @@ function item(field_name, id, value, abv = '') { if (field_name === 'country') { return '
  • \n' + ' \n' + '
  • '; - } else { return '
  • \n' + '