From a296b225c0891d494d698b11a25b4289e4c03d91 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Mon, 5 Oct 2020 15:13:10 +0300
Subject: [PATCH 1/4] change filter country design

---
 .../ads-list/partials/location-fields.twig    | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

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 a02584122..f4977f721 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
@@ -1,25 +1,30 @@
 <div class="row w-100 px-2 m-0">
-    <div class="col-12 px-0 py-1 px-2">
-        <b>
-            <span class="float-left">{{ trans('visiosoft.module.location::field.address.name') }}</span>
-        </b>
-        {% set defaultCountry = setting_value('visiosoft.module.location::default_country') %}
-        {% set selectedCountry =  app.request.get('country') %}
-        <a href="#" class="a-sahibinden-type selected-country filter-country-btn float-right">
-            {% set countryValue = '' %}
-            {% if selectedCountry %}
-                {% set countryName = getCountry(selectedCountry).name %}
-                {% set countryValue = defaultCountry == selectedCountry ? '' : selectedCountry %}
-            {% elseif defaultCountry %}
-                {% set countryName = getCountry(defaultCountry).name %}
-                {% set countryValue = defaultCountry %}
-            {% else %}
-                {% set countryName = trans("visiosoft.module.location::field.country.name") %}
-            {% endif %}
+    {% set defaultCountry = setting_value('visiosoft.module.location::default_country') %}
+    {% set selectedCountry =  app.request.get('country') %}
+
+    <div class="col-12 px-0 py-1">
+        <button type="button" class="btn btn-default border border-1 w-100 selected-country filter-country-btn"
+                data-toggle="modal">
+            <span class="float-left">{{ trans("visiosoft.module.location::field.country.name") }}</span>
+            <i class="fas fa-sort-down float-right"></i>
+        </button>
+        {% set countryValue = '' %}
+        {% if selectedCountry %}
+            {% set countryName = getCountry(selectedCountry).name %}
+            {% set countryValue = defaultCountry == selectedCountry ? '' : selectedCountry %}
+        {% elseif defaultCountry %}
+            {% set countryName = getCountry(defaultCountry).name %}
+            {% set countryValue = defaultCountry %}
+        {% else %}
+            {% set countryName = trans("visiosoft.module.location::field.country.name") %}
+        {% endif %}
+        <div class="text-muted selected-country">
             <small>{{ countryName }}</small>
-        </a>
+        </div>
         <input name="country" value="{{ countryValue }}" type="hidden">
     </div>
+
+
     <div class="col-12 px-0 py-1">
         <button type="button" class="btn btn-default border border-1 w-100 filter-city-btn" data-toggle="modal"
                 data-parent="">

From 42014c52b6fd4b25c891281fe64795f76ed064b0 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Tue, 6 Oct 2020 09:52:54 +0300
Subject: [PATCH 2/4] country name design

---
 .../ads-list/partials/location-fields.twig    | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

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 f4977f721..c86d0e9a5 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
@@ -2,29 +2,30 @@
     {% set defaultCountry = setting_value('visiosoft.module.location::default_country') %}
     {% set selectedCountry =  app.request.get('country') %}
 
+    {% set countryValue = '' %}
+    {% if selectedCountry %}
+        {% set countryName = getCountry(selectedCountry).name %}
+        {% set countryValue = defaultCountry == selectedCountry ? '' : selectedCountry %}
+    {% elseif defaultCountry %}
+        {% set countryName = getCountry(defaultCountry).name %}
+        {% set countryValue = defaultCountry %}
+    {% else %}
+        {% set countryName = trans("visiosoft.module.location::field.country.name") %}
+    {% endif %}
     <div class="col-12 px-0 py-1">
         <button type="button" class="btn btn-default border border-1 w-100 selected-country filter-country-btn"
                 data-toggle="modal">
-            <span class="float-left">{{ trans("visiosoft.module.location::field.country.name") }}</span>
+            <span class="float-left">
+                {{ trans("visiosoft.module.location::field.country.name") }}
+                    <small class="text-muted selected-country">{{ countryName }}</small>
+            </span>
             <i class="fas fa-sort-down float-right"></i>
         </button>
-        {% set countryValue = '' %}
-        {% if selectedCountry %}
-            {% set countryName = getCountry(selectedCountry).name %}
-            {% set countryValue = defaultCountry == selectedCountry ? '' : selectedCountry %}
-        {% elseif defaultCountry %}
-            {% set countryName = getCountry(defaultCountry).name %}
-            {% set countryValue = defaultCountry %}
-        {% else %}
-            {% set countryName = trans("visiosoft.module.location::field.country.name") %}
-        {% endif %}
-        <div class="text-muted selected-country">
-            <small>{{ countryName }}</small>
-        </div>
         <input name="country" value="{{ countryValue }}" type="hidden">
     </div>
 
 
+
     <div class="col-12 px-0 py-1">
         <button type="button" class="btn btn-default border border-1 w-100 filter-city-btn" data-toggle="modal"
                 data-parent="">

From a97f5ecb5d9fe7e4b05b540465532a21987afd8d Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Tue, 6 Oct 2020 10:41:51 +0300
Subject: [PATCH 3/4] country name design

---
 addons/default/visiosoft/advs-module/resources/css/list.css   | 4 ++++
 .../visiosoft/location-module/resources/js/filterLocation.js  | 1 +
 2 files changed, 5 insertions(+)

diff --git a/addons/default/visiosoft/advs-module/resources/css/list.css b/addons/default/visiosoft/advs-module/resources/css/list.css
index 3e790ce9b..cc6bb4d82 100644
--- a/addons/default/visiosoft/advs-module/resources/css/list.css
+++ b/addons/default/visiosoft/advs-module/resources/css/list.css
@@ -212,4 +212,8 @@ a.sort-by-open-dropdown:hover {
 .sort-by-item:hover {
     text-decoration: underline;
     cursor: pointer;
+}
+
+.filter-section .countries input[type=checkbox] {
+    display: none;
 }
\ No newline at end of file
diff --git a/addons/default/visiosoft/location-module/resources/js/filterLocation.js b/addons/default/visiosoft/location-module/resources/js/filterLocation.js
index 880aa297b..6da03fde9 100644
--- a/addons/default/visiosoft/location-module/resources/js/filterLocation.js
+++ b/addons/default/visiosoft/location-module/resources/js/filterLocation.js
@@ -198,6 +198,7 @@ function SelectOnClick() {
         var id = $(this).attr('data-id');
 
         if ($(this).attr('data-field') == "country") {
+            $('.filter-location-modal,.filter-location-back,.filter-location-modal .countries').hide();
             $('input[name="country"]').val(id)
             text_html.html(input_text)
             $(".filter-location-body input[type='checkbox']").prop('checked', false);

From 3982221e3074c722848cb3d99426ca7b66b1cbc2 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Tue, 6 Oct 2020 13:25:06 +0300
Subject: [PATCH 4/4] remove spaces

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

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 c86d0e9a5..ae7403f6a 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
@@ -24,8 +24,6 @@
         <input name="country" value="{{ countryValue }}" type="hidden">
     </div>
 
-
-
     <div class="col-12 px-0 py-1">
         <button type="button" class="btn btn-default border border-1 w-100 filter-city-btn" data-toggle="modal"
                 data-parent="">