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

bug-fix-patch

Browse Source
This commit is contained in:
Manish Verma
2016-10-31 13:06:39 +05:30
parent 6a06167063
commit 91dacdd998
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2537,7 +2537,7 @@ class TicketController extends Controller
}
$priority = DB::table('ticket_priority')->select('priority_desc', 'priority_color')->where('priority_id', '=', $ticket->priority_id)->first();
if ($priority != null) {
$prio = '<button class="btn btn-xs '.$rep.'" style="background-color: '.$priority->priority_color.'">'.ucfirst($priority->priority_desc).'</button>';
$prio = '<button class="btn btn-xs '.$rep.'" style="background-color: '.$priority->priority_color.'; color:#F9F9F9">'.ucfirst($priority->priority_desc).'</button>';
} else {
$prio = '';
}

2
resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
View File

@@ -200,7 +200,7 @@ if ($thread->title != "") {
<?php
$priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id', '=', $tickets->priority_id)->first();
?>
<div class="callout callout-{{$priority->priority_color}}" style = 'background-color:{{$priority->priority_color}}'>
<div class="callout callout-{{$priority->priority_color}}" style = 'background-color:{{$priority->priority_color}}; color:#F9F9F9'>
<div class="row">
<div class="col-md-3">
<?php

7
resources/views/themes/default1/agent/helpdesk/user/show.blade.php
View File

@@ -612,13 +612,10 @@ class="active"
$LastResponse = App\User::where('id', '=', $TicketDatarow->user_id)->first();
if ($LastResponse->role == "user") {
$rep = "#F39C12";
$username = $LastResponse->user_name;
$username = $LastResponse->full_name;
} else {
$rep = "#000";
$username = $LastResponse->first_name . " " . $LastResponse->last_name;
if ($LastResponse->first_name == null || $LastResponse->last_name == null) {
$username = $LastResponse->user_name;
}
$username = $LastResponse->full_name;
}
$titles = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->get();
$count = count($titles);