Merge branch 'master' of https://github.com/openclassify/openclassify

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('<option value="">' + chooseOptionTrans + '</option>');
+            $('select[name="' + name + '"]').append(`<option value="">${chooseOptionTrans}</option>`);
             $.each(msg, function (key, value) {
-                $('select[name="' + name + '"]').append('<option value="' + value.id + '">' + value.name + '</option>');
+                $(`select[name="${name}"]`).append(`<option value="${value.id}">${capFirst(value.name)}</option>`);
             });
         }
     }).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);

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 %}

addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php

@@ -47,7 +47,14 @@ class AdvTableColumns
             ],
 
             'country' => [
-                'class' => 'advs-country',
+                'class' => 'text-center',
+                'wrapper' => '<strong><span class="text-muted">{value.city}</span><br>{value.country}</strong>',
+                'value' => [
+                    'city' => function (EntryInterface $entry) {
+                        return $entry->getCity();
+                    },
+                    'country' => 'country',
+                ]
             ],
             'created_by' => [
                 'value' => 'entry.created_by.name',

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 '<li class="px-2" data-id="' + id + '">\n' +
             '                    <label class="w-100">\n' +
-            '                        <input type="checkbox" data-field="' + field_name + '" data-id="' + id + '" '+ selected +'>\n' +
+            '                        <input' +
+            ' type="checkbox" data-field="' + field_name + '" data-id="' + id + '" '+ selected +'>\n' +
             '                                <span class="flag ml-1 flag-' + abv + '">\n' +
             '                    </span>\n' +
             '                        <small>' + value + '</small>\n' +
             '                    </label>\n' +
             '                </li>';
-
     } else {
         return '<li class="px-2" data-id="' + id + '">\n' +
             '                    <label class="w-100">\n' +

addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormFields.php

@@ -74,6 +74,7 @@ class Register2FormFields
                                 1 => 'visiosoft.module.profile::field.personal.name',
                                 2 => 'visiosoft.module.profile::field.corporate.name'
                             ],
+	                        "default_value" => 1,
 	                        "mode" => "radio",
                         ],
                     ],