From 061866fea3a3b54b1f60b0682c563cb9f31d0eaf Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Tue, 22 Dec 2020 10:59:36 +0300
Subject: [PATCH 1/8] #2967 [advs-module] Capitalize only first letter of each
 word

---
 .../visiosoft/advs-module/resources/js/location.js       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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('<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);

From 057dabfba3ddf4c78a13d76a39cf24bef02f3e21 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Wed, 23 Dec 2020 11:57:50 +0300
Subject: [PATCH 2/8] maden bug fixed on slack channel

---
 .../location-module/resources/js/filterLocation.js     | 10 +++++++---
 .../views/ads-list/partials/location-fields.twig       |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/addons/default/visiosoft/location-module/resources/js/filterLocation.js b/addons/default/visiosoft/location-module/resources/js/filterLocation.js
index a7c9d9149..f6bc09b42 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,7 +247,11 @@ 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' +
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 48771252c..bb8d515cd 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
@@ -48,6 +48,7 @@
             {% endfor %}
         {% endif %}
         <div class="text-muted selected-city">
+            <div>asd</div>
             <small>{{ selected_cities_name|join(',') }}</small>
         </div>
         <input name="city[]" id="listCityFilter" type="hidden"

From 8b1d76a904b1e9fbe402399bd478f7085692ce91 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Wed, 23 Dec 2020 14:11:03 +0300
Subject: [PATCH 3/8] =?UTF-8?q?#2943=20franchise=20yap=C4=B1lacaklar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../advs-module/resources/views/new-ad/new-create.twig          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From 106746c13aa573460ae048738ad75f3801fbec61 Mon Sep 17 00:00:00 2001
From: muammertop <muammertop@outlook.com>
Date: Wed, 23 Dec 2020 23:00:56 +0300
Subject: [PATCH 4/8] #2745 admin advs list show city instead of country

---
 .../advs-module/src/Adv/Table/AdvTableColumns.php      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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..d8a624265 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php
@@ -2,6 +2,7 @@
 
 use Anomaly\Streams\Platform\Entry\Contract\EntryInterface;
 use Visiosoft\CatsModule\Category\CategoryModel;
+use function foo\func;
 
 class AdvTableColumns
 {
@@ -47,7 +48,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',

From 426aee671339a7358cf636439c89385c93627a5c Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Thu, 24 Dec 2020 10:02:57 +0300
Subject: [PATCH 5/8] unnecessary div removed

---
 .../resources/views/ads-list/partials/location-fields.twig       | 1 -
 1 file changed, 1 deletion(-)

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 bb8d515cd..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
@@ -48,7 +48,6 @@
             {% endfor %}
         {% endif %}
         <div class="text-muted selected-city">
-            <div>asd</div>
             <small>{{ selected_cities_name|join(',') }}</small>
         </div>
         <input name="city[]" id="listCityFilter" type="hidden"

From 5211539e1c3de2f0dc3bf47e39d588c832b9eb44 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Thu, 24 Dec 2020 10:06:23 +0300
Subject: [PATCH 6/8] unnecessary spaces removed

---
 .../visiosoft/location-module/resources/js/filterLocation.js  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/addons/default/visiosoft/location-module/resources/js/filterLocation.js b/addons/default/visiosoft/location-module/resources/js/filterLocation.js
index f6bc09b42..f6a4c1c24 100644
--- a/addons/default/visiosoft/location-module/resources/js/filterLocation.js
+++ b/addons/default/visiosoft/location-module/resources/js/filterLocation.js
@@ -248,16 +248,12 @@ function item(field_name, id, value, abv = '') {
         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' +
             '                                <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' +

From 3f609f3c2cf607030c7eea75b9db42851b98db2e Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Thu, 24 Dec 2020 11:54:59 +0300
Subject: [PATCH 7/8] #2973 corporate register fixed

---
 .../src/Profile/Register2/Register2FormFields.php              | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormFields.php b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormFields.php
index ba35ec24c..57bb9cd3d 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormFields.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormFields.php
@@ -74,7 +74,8 @@ class Register2FormFields
                                 1 => 'visiosoft.module.profile::field.personal.name',
                                 2 => 'visiosoft.module.profile::field.corporate.name'
                             ],
-                            "mode" => "radio",
+	                        "default_value" => 1,
+	                        "mode" => "radio",
                         ],
                     ],
                     'username' => [

From 1f4ca845b8c4929bddb44398de66079ac3731cf3 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Thu, 24 Dec 2020 11:56:49 +0300
Subject: [PATCH 8/8] fix

---
 .../visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php      | 1 -
 1 file changed, 1 deletion(-)

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 d8a624265..2854914eb 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php
@@ -2,7 +2,6 @@
 
 use Anomaly\Streams\Platform\Entry\Contract\EntryInterface;
 use Visiosoft\CatsModule\Category\CategoryModel;
-use function foo\func;
 
 class AdvTableColumns
 {