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

bug-fix-patch-7

Browse Source 
# while changing owner of the ticket cheking if the owner already owns
the ticket or not
# fixed showing inactive agents problem in help topic edit and create
pages
This commit is contained in:
Manish Verma
2016-12-22 13:15:16 +05:30
parent df14836985
commit c47b5da890
12 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Admin/helpdesk/HelptopicController.php
View File

@@ -85,7 +85,7 @@ class HelptopicController extends Controller
$departments = $department->get();
$topics = $topic->get();
$forms = $form->get();
$agents = $agent->where('role', '=', 'agent')->get();
$agents = $agent->where('role', '!=', 'user')->where('active', '=', 1)->orderBy('first_name')->get();
$slas = $sla->get();
$priority = Ticket_Priority::where('status', '=', 1)->get();
@@ -143,7 +143,7 @@ class HelptopicController extends Controller
public function edit($id, Ticket_Priority $priority, Department $department, Help_topic $topic, Forms $form, Sla_plan $sla)
{
try {
$agents = User::where('role', '=', 'agent')->get();
$agents = User::where('role', '!=', 'user')->where('active', '=', 1)->orderBy('first_name')->get();
$departments = $department->get();
$topics = $topic->whereId($id)->first();
$forms = $form->get();

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

@@ -2218,6 +2218,9 @@ class TicketController extends Controller
if ($count === 1) {
$user_id = $user->id;
$ticket = Tickets::where('id', '=', $id)->first();
if($user_id === $ticket->user_id) {
return 400;
}
$ticket_number = $ticket->ticket_number;
$ticket->user_id = $user_id;
$ticket->save();