From df14836985db6bc04e4615677a792c7612dcfd86 Mon Sep 17 00:00:00 2001
From: Manish Verma <manish.verma@ladybirdweb.com>
Date: Wed, 21 Dec 2016 16:29:55 +0530
Subject: [PATCH] bug-fix-patch-6

# Fixed search input hieght in user directory for all browsers
# Showing agents by ascending name order in ticket assign modal pop ups
---
 app/Http/Controllers/Agent/helpdesk/UserController.php          | 2 +-
 .../themes/default1/agent/helpdesk/ticket/timeline.blade.php    | 2 +-
 .../views/themes/default1/agent/helpdesk/user/index.blade.php   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php
index b2b9bf358..ccc0a6896 100644
--- a/app/Http/Controllers/Agent/helpdesk/UserController.php
+++ b/app/Http/Controllers/Agent/helpdesk/UserController.php
@@ -1074,7 +1074,7 @@ class UserController extends Controller
 
     public function getAgentDetails()
     {
-        $users = User::where('role', '<>', 'user')->where('active', '=', 1)->get();
+        $users = User::where('role', '<>', 'user')->where('active', '=', 1)->orderBy('first_name')->get();
         foreach ($users as $user) {
             echo "<option value='user_$user->id'>".$user->name().'</option>';
         }
diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
index 3a9d33bc6..41abed0af 100644
--- a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
@@ -1054,7 +1054,7 @@ alert(h+20);
                             <p>{!! Lang::get('lang.whome_do_you_want_to_assign_ticket') !!}?</p>
                             <select id="asssign" class="form-control" name="assign_to">
                                 <?php
-                                $assign = App\User::where('role', '!=', 'user')->where('active', '=', '1')->get();
+                                $assign = App\User::where('role', '!=', 'user')->where('active', '=', '1')->orderBy('first_name')->get();
                                 $count_assign = count($assign);
                                 $teams = App\Model\helpdesk\Agent\Teams::where('status', '=', '1')->get();
                                 $count_teams = count($teams);
diff --git a/resources/views/themes/default1/agent/helpdesk/user/index.blade.php b/resources/views/themes/default1/agent/helpdesk/user/index.blade.php
index e3d8edce5..0bbf17195 100644
--- a/resources/views/themes/default1/agent/helpdesk/user/index.blade.php
+++ b/resources/views/themes/default1/agent/helpdesk/user/index.blade.php
@@ -42,7 +42,7 @@ class="active"
                 <div class="col-md-5">
                     <div class="box-tools" style="width: 235px">
                         <div class="has-feedback">
-                            <input type="text" class="form-control input-sm" id="search-text" name="search" placeholder="{{Lang::get('lang.search')}}">
+                            <input type="text" class="form-control input-sm" id="search-text" name="search" placeholder="{{Lang::get('lang.search')}}" style="height:30px">
                             <span class="fa fa-search form-control-feedback"></span>
                         </div>
                     </div><!-- /.box-tools -->