From ca0c8c45f85784bab1bd78241bf4f5b2b7348437 Mon Sep 17 00:00:00 2001
From: muammertop <muammertop@outlook.com>
Date: Tue, 11 May 2021 11:37:43 +0300
Subject: [PATCH 1/2] #3981 igamkoop requests

---
 .../resources/views/list/gallery.twig          |  4 +++-
 .../resources/views/list/partials/ads.twig     | 18 +++++++++++++-----
 .../views/list/partials/mobile-list.twig       |  4 +++-
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig
index 1c1f67dce..56a91f3ab 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig
@@ -40,7 +40,9 @@
                             <p class="location-data">{{ adv.country_name }} / {{ adv.city_name }}</p>
                         {% endif %}
                         {% if setting_value('visiosoft.module.advs::market_place') %}
-                            <p class="date-data">{{ adv.publish_at.value|date('d/m/Y') }}</p>
+                            {% if showDate %}
+                                <p class="date-data">{{ adv.publish_at.value|date('d/m/Y') }}</p>
+                            {% endif %}
                         {% endif %}
                     </div>
                 </div>
diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig
index 0a58caf83..adf4a8fbb 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig
@@ -1,11 +1,12 @@
 {% set hideStandard = setting_value('visiosoft.module.advs::hide_listing_standard_price') %}
 {% set listLocation = setting_value('visiosoft.module.location::list_page_location') %}
+{% set showDate = setting_value('visiosoft.theme.base::date_fields') %}
 
 <div id="listing" class="w-100 table-responsive">
     <table class="w-100 text-center">
         <thead>
         <tr class="text-white">
-            <th class="text-nowrap" colspan="3">{{ trans('visiosoft.module.advs::field.ad_title') }}</th>
+            <th class="text-nowrap" colspan="2">{{ trans('visiosoft.module.advs::field.ad_title') }}</th>
 
             {% for cF in listingCFs %}
                 <th class="text-nowrap">{{ cF.name }}</th>
@@ -17,6 +18,11 @@
                     / {{ trans('visiosoft.module.advs::field.district.name') }}
                 </th>
             {% endif %}
+            {% if setting_value('visiosoft.module.advs::market_place') %}
+                {% if showDate %}
+                    <th class="text-nowrap">{{ trans('visiosoft.module.advs::field.date.name') }}</th>
+                {% endif %}
+            {% endif %}
             <th class="text-nowrap">{{ trans('visiosoft.module.advs::field.price.name') }}</th>
         </tr>
         </thead>
@@ -59,10 +65,12 @@
                     </td>
                 {% endif %}
                 {% if setting_value('visiosoft.module.advs::market_place') %}
-                    <td class="date-data">
-                        <p>{{ adv.publish_at.value|date('d/m') }}</p>
-                        <p>{{ adv.publish_at.value|date('Y') }}</p>
-                    </td>
+                    {% if showDate %}
+                        <td class="date-data">
+                            <p>{{ adv.publish_at.value|date('d/m') }}</p>
+                            <p>{{ adv.publish_at.value|date('Y') }}</p>
+                        </td>
+                    {% endif %}
                 {% endif %}
                 <td class="price-data">
                     {% if not hideStandard %}
diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-list.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-list.twig
index dda91aa5a..5dc3e5db5 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-list.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-list.twig
@@ -30,7 +30,9 @@
                 <img src="{{ adv.cover_photo }}" alt="{{ adv.name }}" class="rounded-sm">
                 <div class="ml-3 mt-1">
                     <h6 class="mb-1">{{ adv.name }}</h6>
-                    <p class="mb-1">{{ adv.country_name }} / {{ adv.city_name }}</p>
+                    {% if listLocation %}
+                        <p class="mb-1">{{ adv.country_name }} / {{ adv.city_name }}</p>
+                    {% endif %}
                     <p>{{ adv.price != '0' ? currency_format(adv.price,adv.currency) : trans('visiosoft.module.advs::field.free') }}</p>
                 </div>
             </a>

From c183a96902413ca10f6af793c24f70d45a939925 Mon Sep 17 00:00:00 2001
From: muammertop <muammertop@outlook.com>
Date: Tue, 11 May 2021 12:02:59 +0300
Subject: [PATCH 2/2] #3981 igamkoop requests

---
 .../resources/views/list/gallery.twig          |  4 +---
 .../resources/views/list/partials/ads.twig     | 18 +++++++-----------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig
index 56a91f3ab..dc6086f92 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig
@@ -39,10 +39,8 @@
                         {% if showLocation %}
                             <p class="location-data">{{ adv.country_name }} / {{ adv.city_name }}</p>
                         {% endif %}
-                        {% if setting_value('visiosoft.module.advs::market_place') %}
-                            {% if showDate %}
+                        {% if setting_value('visiosoft.module.advs::market_place') and showDate %}
                                 <p class="date-data">{{ adv.publish_at.value|date('d/m/Y') }}</p>
-                            {% endif %}
                         {% endif %}
                     </div>
                 </div>
diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig
index adf4a8fbb..5763937b5 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig
@@ -18,10 +18,8 @@
                     / {{ trans('visiosoft.module.advs::field.district.name') }}
                 </th>
             {% endif %}
-            {% if setting_value('visiosoft.module.advs::market_place') %}
-                {% if showDate %}
-                    <th class="text-nowrap">{{ trans('visiosoft.module.advs::field.date.name') }}</th>
-                {% endif %}
+            {% if setting_value('visiosoft.module.advs::market_place') and showDate %}
+                <th class="text-nowrap">{{ trans('visiosoft.module.advs::field.date.name') }}</th>
             {% endif %}
             <th class="text-nowrap">{{ trans('visiosoft.module.advs::field.price.name') }}</th>
         </tr>
@@ -64,13 +62,11 @@
                         <p>{{ adv.city_name }}</p>
                     </td>
                 {% endif %}
-                {% if setting_value('visiosoft.module.advs::market_place') %}
-                    {% if showDate %}
-                        <td class="date-data">
-                            <p>{{ adv.publish_at.value|date('d/m') }}</p>
-                            <p>{{ adv.publish_at.value|date('Y') }}</p>
-                        </td>
-                    {% endif %}
+                {% if setting_value('visiosoft.module.advs::market_place') and showDate%}
+                    <td class="date-data">
+                        <p>{{ adv.publish_at.value|date('d/m') }}</p>
+                        <p>{{ adv.publish_at.value|date('Y') }}</p>
+                    </td>
                 {% endif %}
                 <td class="price-data">
                     {% if not hideStandard %}