From eb1de960aa3b17a7bc051d6179c13f3ab08b6b62 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Thu, 8 Oct 2020 17:05:38 +0300
Subject: [PATCH 1/2] filter-menu fixed

---
 .../advs-module/resources/views/list/partials/list-filter.twig | 3 +--
 1 file changed, 1 insertion(+), 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 0991832e0..d0e4b35e3 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
@@ -40,8 +40,7 @@
                             'villages':villages,
                             'param':param,
                             'categoryId':categoryId,
-                            'cityId':cityId,
-                            '_ORDER_':['visiosoft.module.cats', 'visiosoft.module.location']
+                            'cityId':cityId
                         })|raw }}
 
                         <!-- Price Filter Start -->

From 0bf73f302a6862155455d179b065560b405f9806 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Thu, 8 Oct 2020 17:14:16 +0300
Subject: [PATCH 2/2] =?UTF-8?q?[users]=20Admin=20listelemede=20m=C3=BC?=
 =?UTF-8?q?=C5=9Fteri=20ad=C4=B1=20yazm=C4=B1yor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../defaultadmin-theme/src/Listener/AddGsmFilter.php      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddGsmFilter.php b/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddGsmFilter.php
index ffbb8ca40..bbec40070 100644
--- a/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddGsmFilter.php
+++ b/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddGsmFilter.php
@@ -51,6 +51,8 @@ class AddGsmFilter
 
         $builder->getTable()->addFilter($filter);
         $builder->setColumns([
+        	    'first_name',
+                'last_name',
                 'email',
                 'gsm_phone',
                 'created_at' => [
@@ -68,6 +70,10 @@ class AddGsmFilter
         ]);
 
         $collection = new Collection();
+	    $header_firstname = new Header();
+        $header_firstname = $header_firstname->setBuilder($builder)->setHeading('anomaly.module.users::field.first_name.name');
+        $header_lastname = new Header();
+	    $header_lastname = $header_lastname->setBuilder($builder)->setHeading('anomaly.module.users::field.last_name.name');
         $header_email = new Header();
         $header_email = $header_email->setBuilder($builder)->setHeading('anomaly.module.users::field.email.name')->setSortable(true)->setSortColumn('email');
         $header_phone = new Header();
@@ -77,6 +83,8 @@ class AddGsmFilter
         $header_status = new Header();
         $header_status = $header_status->setBuilder($builder)->setHeading('anomaly.module.users::field.status.name');
 
+        $collection = $collection->add($header_firstname);
+        $collection = $collection->add($header_lastname);
         $collection = $collection->add($header_email);
         $collection = $collection->add($header_gsm_phone);
         $collection = $collection->add($header_created_at);