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

update v1.0.5.2

Browse Source
This commit is contained in:
sujitprasad
2016-01-29 12:49:45 +05:30
parent b1d1ebbbef
commit 0bcbc04f92
28 changed files with 1981 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/Agent/helpdesk/OrganizationController.php
View File

@@ -69,7 +69,14 @@ class OrganizationController extends Controller {
->orderColumns('name', 'website')
/* column name */
->addColumn('name', function ($model) {
return $model->name;
// return $model->name;
if(strlen($model->name) > 20) {
$orgname = substr($model->name, 0, 25);
$orgname = substr($orgname, 0, strrpos($orgname, ' ')).' ...';
} else {
$orgname = $model->name;
}
return $orgname;
})
/* column website */
->addColumn('website', function ($model) {

24
app/Http/Controllers/Agent/helpdesk/TicketController.php
View File

@@ -73,7 +73,7 @@ class TicketController extends Controller {
if(Auth::user()->role=="admin"){
$tickets = Tickets::where('status','=',1)->get();;
} else {
$dept = DB::table('department')->where('name','=',Auth::user()->primary_dpt)->first();
$dept = DB::table('department')->where('id','=',Auth::user()->primary_dpt)->first();
$tickets = Tickets::where('status',1)->where('dept_id', '=', $dept->id)->get();
}
return \Datatable::collection(new Collection($tickets))
@@ -178,7 +178,7 @@ class TicketController extends Controller {
// $dept = DB::table('department')->where('name','=',Auth::user()->primary_dpt)->first();
// $tickets = Tickets::where('status',1)->where('dept_id', '=', $dept->id)->get();
$dept = Department::where('name','=',Auth::user()->primary_dpt)->first();
$dept = Department::where('id','=',Auth::user()->primary_dpt)->first();
$tickets = Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->where('assigned_to', '=', 0)->where('dept_id','=',$dept->id)->get();
}
return \Datatable::collection(new Collection($tickets))
@@ -286,7 +286,7 @@ class TicketController extends Controller {
// $dept = Department::where('name','=',Auth::user()->primary_dpt)->first();
// $tickets = Tickets::where('status', '=', 1)->where('assigned_to', '=', Auth::user()->id)->get();
$dept = Department::where('name','=',Auth::user()->primary_dpt)->first();
$dept = Department::where('id','=',Auth::user()->primary_dpt)->first();
$tickets = Tickets::where('status', '=', 1)->where('isanswered', '=', 1)->where('dept_id','=',$dept->id)->get();
}
@@ -389,7 +389,7 @@ class TicketController extends Controller {
if(Auth::user()->role=="admin"){
$tickets = Tickets::where('status', '=', 1)->where('assigned_to', '=', Auth::user()->id)->get();
} else {
$dept = Department::where('name','=',Auth::user()->primary_dpt)->first();
$dept = Department::where('id','=',Auth::user()->primary_dpt)->first();
$tickets = Tickets::where('status', '=', 1)->where('assigned_to', '=', Auth::user()->id)->get();
}
return \Datatable::collection(new Collection($tickets))
@@ -497,7 +497,7 @@ class TicketController extends Controller {
if(Auth::user()->role=="admin"){
$tickets = Tickets::where('status', '>', 1)->where('status', '<', 4)->get();
} else {
$dept = Department::where('name','=',Auth::user()->primary_dpt)->first();
$dept = Department::where('id','=',Auth::user()->primary_dpt)->first();
$tickets = Tickets::where('status', '>', 1)->where('dept_id','=',$dept->id)->where('status', '<', 4)->get();
}
return \Datatable::collection(new Collection($tickets))
@@ -595,7 +595,7 @@ class TicketController extends Controller {
if(Auth::user()->role=="admin"){
$tickets = Tickets::where('status', '=', 1)->where('assigned_to', '>', 0)->get();
} else {
$dept = Department::where('name','=',Auth::user()->primary_dpt)->first();
$dept = Department::where('id','=',Auth::user()->primary_dpt)->first();
$tickets = Tickets::where('status', '=', 1)->where('assigned_to', '>', 0)->where('dept_id','=',$dept->id)->get();
}
return \Datatable::collection(new Collection($tickets))
@@ -737,7 +737,7 @@ class TicketController extends Controller {
if($lock->lock_by == Auth::user()->id || $lock->lock_at < date('Y-m-d H:i:s', strtotime('-3 minutes', strtotime($lock->lock_at)))) {
if(Auth::user()->role == 'agent'){
$dept = Department::where('name','=',Auth::user()->primary_dpt)->first();
$dept = Department::where('id','=',Auth::user()->primary_dpt)->first();
$tickets = Tickets::where('id', '=', $id)->where('dept_id','=', $dept->id)->first();
} else {
@@ -1736,7 +1736,7 @@ class TicketController extends Controller {
// $tickets = Tickets::where('assigned_to', '=', null)->where('status','1')->get();
} else {
$dept = Department::where('name','=',Auth::user()->primary_dpt)->first();
$dept = Department::where('id','=',Auth::user()->primary_dpt)->first();
$tickets = Tickets::where('status', '=', 5)->where('dept_id','=',$dept->id)->get();
// $dept = Department::where('name','=',Auth::user()->primary_dpt)->first();
@@ -1847,7 +1847,7 @@ class TicketController extends Controller {
$tickets = Tickets::where('assigned_to', '=', null)->where('status','1')->get();
} else {
$dept = Department::where('name','=',Auth::user()->primary_dpt)->first();
$dept = Department::where('id','=',Auth::user()->primary_dpt)->first();
$tickets = Tickets::where('assigned_to', '=', null)->where('dept_id','=',$dept->id)->get();
// $dept = Department::where('name','=',Auth::user()->primary_dpt)->first();
@@ -2139,7 +2139,7 @@ class TicketController extends Controller {
public function deptopen($id) {
$dept = Department::where('name','=',$id)->first();
if(Auth::user()->role == 'agent') {
if(Auth::user()->primary_dpt == $dept->name) {
if(Auth::user()->primary_dpt == $dept->id) {
return view('themes.default1.agent.helpdesk.dept-ticket.open',compact('id'));
} else {
return redirect()->back()->with('fails','Unauthorised!');
@@ -2156,7 +2156,7 @@ class TicketController extends Controller {
public function deptclose($id) {
$dept = Department::where('name','=',$id)->first();
if(Auth::user()->role == 'agent') {
if(Auth::user()->primary_dpt == $dept->name) {
if(Auth::user()->primary_dpt == $dept->id) {
return view('themes.default1.agent.helpdesk.dept-ticket.closed',compact('id'));
} else {
return redirect()->back()->with('fails','Unauthorised!');
@@ -2173,7 +2173,7 @@ class TicketController extends Controller {
public function deptinprogress($id) {
$dept = Department::where('name','=',$id)->first();
if(Auth::user()->role == 'agent') {
if(Auth::user()->primary_dpt == $dept->name) {
if(Auth::user()->primary_dpt == $dept->id) {
return view('themes.default1.agent.helpdesk.dept-ticket.inprogress',compact('id'));
} else {
return redirect()->back()->with('fails','Unauthorised!');

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

@@ -76,7 +76,13 @@ class UserController extends Controller {
->orderColumns('user_name', 'email')
/* column username */
->addColumn('user_name', function ($model) {
return $model->user_name;
if(strlen($model->user_name) > 20) {
$username = substr($model->user_name, 0, 30);
$username = substr($username, 0, strrpos($username, ' ')).' ...';
} else {
$username = $model->user_name;
}
return $username;
})
/* column email */
->addColumn('email', function ($model) {
@@ -96,7 +102,7 @@ class UserController extends Controller {
$phone = $phone ."&nbsp;&nbsp;&nbsp;". $mobile;
return $phone;
})
/* column status */
/* column account status */
->addColumn('status', function ($model) {
$status = $model->active;
if($status == 1) {
@@ -106,6 +112,16 @@ class UserController extends Controller {
}
return $stat;
})
/* column ban status */
->addColumn('ban', function ($model) {
$status = $model->ban;
if($status == 1) {
$stat = '<button class="btn btn-danger btn-xs">Banned</button>';
} else {
$stat = '<button class="btn btn-success btn-xs">Active</button>';
}
return $stat;
})
/* column last login date */
->addColumn('lastlogin', function ($model) {
$t = $model->updated_at;