diff --git a/addons/default/visiosoft/location-module/resources/js/filterLocation.js b/addons/default/visiosoft/location-module/resources/js/filterLocation.js index 3b2153e02..a7c9d9149 100644 --- a/addons/default/visiosoft/location-module/resources/js/filterLocation.js +++ b/addons/default/visiosoft/location-module/resources/js/filterLocation.js @@ -19,8 +19,7 @@ $('.filter-country-btn').on('click', function () { $('.filter-location-modal .countries').html(null_msg); else if ($('input[name="country"]').val() != ""){ $.each(selected__country_request.split(','), function (index, value){ - console.log(value.trim()) - $(".filter-location-body .countries li[data-id='" + value.trim() + "'] input[type='checkbox']") + $(".filter-location-body .countries li[data-id='" + value.trim() + "'] input[type='checkbox']").prop('checked', true); }) } resolve(); @@ -205,8 +204,8 @@ function SelectOnClick() { if ($(this).attr('data-field') == "country") { $('.selected-city').html(''); $('input[name="city[]"]').val(''); - text_html.html(input_text) - $(".filter-location-body li[data-id='" + id + "'] input[type='checkbox']").prop('checked', true); + // text_html.html(input_text) + // $(".filter-location-body li[data-id='" + id + "'] input[type='checkbox']").prop('checked', true); } if (input_val != "") { @@ -258,7 +257,7 @@ function item(field_name, id, value, abv = '') { } else { return '
  • \n' + ' \n' + '
  • '; diff --git a/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig b/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig index f001abaf2..48771252c 100644 --- a/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig +++ b/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig @@ -6,6 +6,10 @@ {% if selectedCountry %} {% set countryName = getCountry(selectedCountry).name %} {% set countryValue = defaultCountry == selectedCountry ? '' : selectedCountry %} + {% set selected_countries_name = [] %} + {% for selectedCountry in selectedCountry[0]|split(',') %} + {% set selected_countries_name = selected_countries_name|merge([getCountry(selectedCountry|trim(',')).name]) %} + {% endfor %} {% elseif defaultCountry %} {% set countryName = getCountry(defaultCountry).name %} {% set countryValue = defaultCountry %} @@ -17,7 +21,7 @@ data-toggle="modal"> {{ trans("visiosoft.module.location::field.country.name") }} - {{ countryName }} + {{ countryName }} {{ selected_countries_name|join(',') }} diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig b/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig index 0d76779e4..bc4fac965 100644 --- a/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig +++ b/addons/default/visiosoft/profile-module/resources/views/profile/detail.twig @@ -122,7 +122,7 @@ - {{ profileForm.fields.gsm_phone.input|raw }} + {{ profileForm.fields.gsm_phone.setAttributes({'maxlength': '14'}).input|raw }}
    @@ -130,7 +130,7 @@ - {{ profileForm.fields.office_phone.input|raw }} + {{ profileForm.fields.office_phone.setAttributes({'maxlength': '14'}).input|raw }}
    @@ -138,7 +138,7 @@ - {{ profileForm.fields.land_phone.input|raw }} + {{ profileForm.fields.land_phone.setAttributes({'maxlength': '14'}).input|raw }}
    @@ -146,7 +146,7 @@ - {{ profileForm.fields.birthday.configSet('date_format','Y-m-d').setPlaceholder(now|date('Y-m-d')).input|raw }} + {{ profileForm.fields.birthday.configSet('date_format','d.m.Y').setPlaceholder(now|date('d.m.Y')).input|raw }}