From a472ac2eefe91730790e2c534b18a38672ac4836 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Wed, 19 Feb 2020 15:13:00 +0300
Subject: [PATCH 1/6] #920 [core] When you select photos with ads after
 searhing it disappers

---
 .../resources/views/list/partials/list-filter.twig   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig
index bd079cce5..9dd474609 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig
@@ -97,14 +97,22 @@
                                  style="max-height: 300px;">
                                 <div class="row p-3 m-0">
                                     <div class="form-check py-1">
-                                        <input class="form-check-input" type="checkbox" value="true" name="photo"
+                                        <input class="form-check-input" type="checkbox"
+                                            {% if app.request.get('photo') == true %}
+                                                checked
+                                            {% endif %}
+                                               value="true" name="photo"
                                                id="photo">
                                         <label class="form-check-label" for="photo">
                                             {{ trans("visiosoft.module.advs::field.ads_with_photo.name") }}
                                         </label>
                                     </div>
                                     <div class="form-check py-1">
-                                        <input class="form-check-input" type="checkbox" value="true" name="video"
+                                        <input class="form-check-input" type="checkbox"
+                                               {% if app.request.get('video') == true %}
+                                                   checked
+                                               {% endif %}
+                                               value="true" name="video"
                                                id="video">
                                         <label class="form-check-label" for="video">
                                             {{ trans("visiosoft.module.advs::field.ads_with_video.name") }}

From 8f245f94675a9d6b0bcaebb8e9b6a8660c808076 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Thu, 20 Feb 2020 09:46:15 +0300
Subject: [PATCH 2/6] celep bug fixes

---
 addons/default/visiosoft/advs-module/src/Adv/AdvModel.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
index 942708feb..dcb572cb0 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
@@ -160,7 +160,8 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
 
     public function popularAdvs()
     {
-        return $this->getAdv()->orderBy('count_show_ad', 'desc')->limit(10)->get();
+        return $this->getAdv()->where('status', 'approved')
+            ->orderBy('count_show_ad', 'desc')->limit(10)->get();
     }
 
     public function advsofDay()

From 594cd7bfdb5e2b54d16202e5e9d79580cb137d08 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Thu, 20 Feb 2020 10:32:57 +0300
Subject: [PATCH 3/6] fixed const error

---
 addons/default/visiosoft/advs-module/resources/js/cats.js       | 2 +-
 addons/default/visiosoft/advs-module/resources/js/list.js       | 2 +-
 addons/default/visiosoft/advs-module/resources/js/new-create.js | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/js/cats.js b/addons/default/visiosoft/advs-module/resources/js/cats.js
index 19552e8c0..41d28a71d 100644
--- a/addons/default/visiosoft/advs-module/resources/js/cats.js
+++ b/addons/default/visiosoft/advs-module/resources/js/cats.js
@@ -13,7 +13,7 @@ $(document).ready(function () {
         $(this).val(all[all.length-1])
     })
 
-    const filter = {};
+    var filter = {};
     filter.getCats = (catId, divId) => {
         $.ajax({
             type: 'get',
diff --git a/addons/default/visiosoft/advs-module/resources/js/list.js b/addons/default/visiosoft/advs-module/resources/js/list.js
index c0d926667..7df92d54b 100644
--- a/addons/default/visiosoft/advs-module/resources/js/list.js
+++ b/addons/default/visiosoft/advs-module/resources/js/list.js
@@ -1,4 +1,4 @@
-const filter = {};
+var filter = {};
 
 filter.checkUser = () => {
     $.ajax({
diff --git a/addons/default/visiosoft/advs-module/resources/js/new-create.js b/addons/default/visiosoft/advs-module/resources/js/new-create.js
index fb3a28e88..76c0d7741 100644
--- a/addons/default/visiosoft/advs-module/resources/js/new-create.js
+++ b/addons/default/visiosoft/advs-module/resources/js/new-create.js
@@ -7,7 +7,7 @@ function hideLoader() {
 }
 
 
-const filter = {};
+var filter = {};
 
 // TODO will be unified
 

From 7e30f8672685725ded762a9e50d79ec0fa63a7e9 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Thu, 20 Feb 2020 10:34:57 +0300
Subject: [PATCH 4/6] add category filter mobile

---
 .../resources/views/ads-list/partials/location-fields.twig      | 2 +-
 1 file changed, 1 insertion(+), 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 f674df48a..5f6910264 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
@@ -82,7 +82,7 @@
     <div class="modal-header">
         <input type="text" id="searchLocation" class="form-control"
                placeholder="{{ trans('visiosoft.module.location::message.placeholder') }}">
-        <button type="button" class="close filter-modal-close" data-dismiss="modal" aria-label="Close">
+        <button type="button" class="close filter-modal-close">
             <span aria-hidden="true">&times;</span>
         </button>
     </div>

From 0fbfe520c7e87b94a16641fe4d66c53bc2cf1879 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Thu, 20 Feb 2020 12:32:30 +0300
Subject: [PATCH 5/6] currency symbol added && remove twig add override

---
 .../advs-module/resources/views/list/partials/list-filter.twig  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig
index 9dd474609..4d22cad4e 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig
@@ -185,7 +185,7 @@
                                             {% for currency in active_currencies %}
                                                 <option {% if app.request.get('currency') == currency %}
                                                         selected
-                                                        {% endif %}value="{{ currency }}">{{ currency }}</option>
+                                                        {% endif %}value="{{ currency }}">{{ currency_symbol(currency) }}</option>
                                             {% endfor %}
                                         </select>
                                     </div>

From ddf47f636b9e3509efec6bb32229fdb8f003c11b Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Thu, 20 Feb 2020 13:43:16 +0300
Subject: [PATCH 6/6] #949 cats trash doesn't work

---
 .../src/Http/Controller/Admin/CategoryController.php        | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php b/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php
index 64ba11f6d..9001e58f3 100644
--- a/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php
+++ b/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php
@@ -47,7 +47,11 @@ class CategoryController extends AdminController
             $this->messages->error('Selected category has no sub-categories.');
             return back();
         }
-        $table->setTableEntries($categories);
+        if($request->view != "trash")
+        {
+            $table->setTableEntries($categories);
+        }
+
         return $table->render();
     }