Update v1.0.6.6

app/Http/Controllers/Agent/helpdesk/UserController.php

@@ -38,7 +38,6 @@ class UserController extends Controller
      * 1. authentication
      * 2. user roles
      * 3. roles must be agent.
-     *
      * @return void
      */
     public function __construct()
@@ -51,9 +50,7 @@ class UserController extends Controller
 
     /**
      * Display all list of the users.
-     *
      * @param type User $user
-     *
      * @return type view
      */
     public function index()
@@ -68,15 +65,14 @@ class UserController extends Controller
 
     /**
      * This function is used to display the list of users using chumper datatables.
-     *
      * @return datatable
      */
     public function user_list()
     {
         // displaying list of users with chumper datatables
         return \Datatable::collection(User::where('role', '!=', 'admin')->where('role', '!=', 'agent')->get())
-                        /* searchable column username */
-                        ->searchColumns('user_name')
+                        /* searchable column username and email*/
+                        ->searchColumns('user_name', 'email', 'phone')
                         /* order column username and email */
                         ->orderColumns('user_name', 'email')
                         /* column username */
@@ -85,14 +81,14 @@ class UserController extends Controller
                                 $username = substr($model->user_name, 0, 30);
                                 $username = substr($username, 0, strrpos($username, ' ')).' ...';
                             } else {
-                                $username = $model->user_name;
+                                $username = "<a href='".route('user.edit', $model->id)."'>".$model->user_name."</a>";
                             }
 
                             return $username;
                         })
                         /* column email */
                         ->addColumn('email', function ($model) {
-                            $email = $model->email;
+                            $email = "<a href='".route('user.edit', $model->id)."'>".$model->email."</a>";
 
                             return $email;
                         })
@@ -147,7 +143,6 @@ class UserController extends Controller
 
     /**
      * Show the form for creating a new users.
-     *
      * @return type view
      */
     public function create()
@@ -161,10 +156,8 @@ class UserController extends Controller
 
     /**
      * Store a newly created users in storage.
-     *
      * @param type User            $user
      * @param type Sys_userRequest $request
-     *
      * @return type redirect
      */
     public function store(User $user, Sys_userRequest $request)
@@ -191,10 +184,8 @@ class UserController extends Controller
 
     /**
      * Display the specified users.
-     *
      * @param type int  $id
      * @param type User $user
-     *
      * @return type view
      */
     public function show($id, User $user)
@@ -211,10 +202,8 @@ class UserController extends Controller
 
     /**
      * Show the form for editing the specified resource.
-     *
      * @param type int  $id
      * @param type User $user
-     *
      * @return type Response
      */
     public function edit($id, User $user)
@@ -231,16 +220,13 @@ class UserController extends Controller
 
     /**
      * Update the specified user in storage.
-     *
      * @param type int            $id
      * @param type User           $user
      * @param type Sys_userUpdate $request
-     *
      * @return type Response
      */
     public function update($id, User $user, Sys_userUpdate $request)
     {
-
         /* select the field where id = $id(request Id) */
         $users = $user->whereId($id)->first();
         /* Update the value by selected field  */
@@ -257,7 +243,6 @@ class UserController extends Controller
 
     /**
      * get agent profile page.
-     *
      * @return type view
      */
     public function getProfile()
@@ -272,7 +257,6 @@ class UserController extends Controller
 
     /**
      * get profile edit page.
-     *
      * @return type view
      */
     public function getProfileedit()
@@ -287,10 +271,8 @@ class UserController extends Controller
 
     /**
      * post profile edit.
-     *
      * @param type int            $id
      * @param type ProfileRequest $request
-     *
      * @return type Redirect
      */
     public function postProfileedit(ProfileRequest $request)
@@ -339,10 +321,8 @@ class UserController extends Controller
 
     /**
      * Post profile password.
-     *
      * @param type int             $id
      * @param type ProfilePassword $request
-     *
      * @return type Redirect
      */
     public function postProfilePassword($id, ProfilePassword $request)
@@ -354,7 +334,6 @@ class UserController extends Controller
             $user->password = Hash::make($request->input('new_password'));
             try {
                 $user->save();
-
                 return redirect('profile-edit')->with('success1', 'Password Updated sucessfully');
             } catch (Exception $e) {
                 return redirect('profile-edit')->with('fails', $e->errorInfo[2]);
@@ -366,9 +345,7 @@ class UserController extends Controller
 
     /**
      * Assigning an user to an organization.
-     *
      * @param type $id
-     *
      * @return type boolean
      */
     public function UserAssignOrg($id)
@@ -378,15 +355,12 @@ class UserController extends Controller
         $user_org->org_id = $org;
         $user_org->user_id = $id;
         $user_org->save();
-
         return 1;
     }
 
     /**
      * creating an organization in user profile page via modal popup.
-     *
      * @param type $id
-     *
      * @return type
      */
     public function User_Create_Org($id)