cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #352 from ladybirdweb/analysis-8jJKQr

Browse Source 
Apply fixes from StyleCI
This commit is contained in:
Manish Verma
2016-12-21 12:38:06 +05:30
committed by GitHub
parent 92df1e0654 d9a2e97c22
commit a3c6467e34
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Http/Controllers/Agent/helpdesk/UserController.php
View File

@@ -32,6 +32,7 @@ use App\Model\helpdesk\Utility\Otp;
use App\User; use App\User;
// classes // classes
use Auth; use Auth;
use Datatables;
use DateTime; use DateTime;
use DB; use DB;
use Exception; use Exception;
@@ -41,7 +42,6 @@ use Illuminate\Http\Request;
use Input; use Input;
use Lang; use Lang;
use Redirect; use Redirect;
use Datatables;
/** /**
* UserController * UserController
@@ -137,15 +137,15 @@ class UserController extends Controller
$users = $users->select('user_name', 'email', 'mobile', 'active', 'updated_at', 'role', 'id', 'last_name', 'country_code', 'phone_number'); $users = $users->select('user_name', 'email', 'mobile', 'active', 'updated_at', 'role', 'id', 'last_name', 'country_code', 'phone_number');
if ($search !== '') { if ($search !== '') {
$users = $users->where(function($query) use ($search){ $users = $users->where(function ($query) use ($search) {
$query->where('user_name', 'LIKE', '%'.$search.'%'); $query->where('user_name', 'LIKE', '%'.$search.'%');
$query->orWhere('email', 'LIKE', '%'.$search.'%'); $query->orWhere('email', 'LIKE', '%'.$search.'%');
$query->orWhere('first_name', 'LIKE', '%'.$search.'%'); $query->orWhere('first_name', 'LIKE', '%'.$search.'%');
$query->orWhere('last_name', 'LIKE', '%'.$search.'%'); $query->orWhere('last_name', 'LIKE', '%'.$search.'%');
$query->orWhere('mobile', 'LIKE', '%'.$search.'%'); $query->orWhere('mobile', 'LIKE', '%'.$search.'%');
$query->orWhere('updated_at', 'LIKE', '%'.$search.'%'); $query->orWhere('updated_at', 'LIKE', '%'.$search.'%');
$query->orWhere('country_code', 'LIKE', '%'.$search.'%'); $query->orWhere('country_code', 'LIKE', '%'.$search.'%');
}); });
} }
// displaying list of users with chumper datatables // displaying list of users with chumper datatables
// return \Datatable::collection(User::where('role', "!=", "admin")->get()) // return \Datatable::collection(User::where('role', "!=", "admin")->get())