From 96996d318067518884eda3239b7eb0c6d0f0c6ed Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Thu, 23 Apr 2020 11:03:18 +0300
Subject: [PATCH 1/2] #1279 sort by email and sort by created_at

---
 .../src/Listener/AddGsmFilter.php             | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddGsmFilter.php b/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddGsmFilter.php
index 48240d46c..ffbb8ca40 100644
--- a/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddGsmFilter.php
+++ b/addons/default/visiosoft/defaultadmin-theme/src/Listener/AddGsmFilter.php
@@ -1,6 +1,7 @@
 <?php namespace Visiosoft\DefaultadminTheme\Listener;
 
-use Anomaly\Streams\Platform\Support\Collection;
+use Anomaly\Streams\Platform\Ui\Table\Component\Header\Header;
+use Illuminate\Support\Collection;
 use Anomaly\Streams\Platform\Ui\Table\Component\Filter\Type\SearchFilter;
 use Anomaly\Streams\Platform\Ui\Table\Event\TableIsQuerying;
 use Anomaly\UsersModule\User\Contract\UserRepositoryInterface;
@@ -52,16 +53,36 @@ class AddGsmFilter
         $builder->setColumns([
                 'email',
                 'gsm_phone',
+                'created_at' => [
+                    'value' => 'entry.created_at'
+                ],
                 'status' => [
                     'value' => 'entry.status_label',
                 ],]
         );
-        $c = Collection::make([
-            ['heading' => 'anomaly.module.users::field.email.name'],
-            ['heading' => 'visiosoft.module.profile::field.gsm_phone.name'],
-            ['heading' => 'anomaly.module.users::field.status.name'],
+        $builder->setOptions([
+            'order_by' =>
+                [
+                    'email' => 'DESC'
+                ],
         ]);
-        $builder->getTable()->setHeaders($c);
+
+        $collection = new Collection();
+        $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();
+        $header_gsm_phone = $header_phone->setBuilder($builder)->setHeading('visiosoft.module.profile::field.gsm_phone.name');
+        $header_created_at = new Header();
+        $header_created_at = $header_created_at->setBuilder($builder)->setHeading('streams::entry.created_at')->setSortColumn('created_at')->setSortable(true);
+        $header_status = new Header();
+        $header_status = $header_status->setBuilder($builder)->setHeading('anomaly.module.users::field.status.name');
+
+        $collection = $collection->add($header_email);
+        $collection = $collection->add($header_gsm_phone);
+        $collection = $collection->add($header_created_at);
+        $collection = $collection->add($header_status);
+
+        $builder->getTable()->setHeaders($collection);
     }
 
     /**

From 71f7ee5fa2d305f7625059ff13545e2826648478 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Thu, 23 Apr 2020 11:12:19 +0300
Subject: [PATCH 2/2] #1279 auto login added

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

diff --git a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
index afad09739..18c85ad96 100644
--- a/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
+++ b/addons/default/visiosoft/profile-module/src/Profile/Register2/Register2FormHandler.php
@@ -7,6 +7,7 @@ use Anomaly\UsersModule\User\UserActivator;
 use Illuminate\Contracts\Config\Repository;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Support\Facades\Auth;
 
 /**
  * Class RegisterFormHandler
@@ -70,5 +71,6 @@ class Register2FormHandler
         $activator->force($user);
 
         $events->dispatch(new UserHasRegistered($user));
+        Auth::login($user);
     }
 }