diff --git a/DB/demodatabase.sql b/DB/demodatabase.sql index 60776b55f..68284ba4d 100644 --- a/DB/demodatabase.sql +++ b/DB/demodatabase.sql @@ -2036,10 +2036,10 @@ CREATE TABLE IF NOT EXISTS `ticket_priority` ( -- INSERT INTO `ticket_priority` (`priority_id`, `priority`, `priority_desc`, `priority_color`, `priority_urgency`, `ispublic`, `status`, `is_default`) VALUES -(1, 'Low', 'Low', '#80ff00', 4, 1, 0, NULL), -(2, 'Normal', 'Normal', '#367FA9', 3, 1, 1, NULL), -(3, 'High', 'High', '#ffff00', 2, 1, 0, NULL), -(4, 'Emergency', 'Emergency', '#ff6666', 1, 1, 0, NULL); +(1, 'Low', 'Low', '#00a65a', 4, 1, 0, NULL), +(2, 'Normal', 'Normal', '#00bfef', 3, 1, 1, NULL), +(3, 'High', 'High', '#f39c11', 2, 1, 0, NULL), +(4, 'Emergency', 'Emergency', '#dd4b38', 1, 1, 0, NULL); -- -------------------------------------------------------- diff --git a/DB/dummy-data.sql b/DB/dummy-data.sql index 60776b55f..68284ba4d 100644 --- a/DB/dummy-data.sql +++ b/DB/dummy-data.sql @@ -2036,10 +2036,10 @@ CREATE TABLE IF NOT EXISTS `ticket_priority` ( -- INSERT INTO `ticket_priority` (`priority_id`, `priority`, `priority_desc`, `priority_color`, `priority_urgency`, `ispublic`, `status`, `is_default`) VALUES -(1, 'Low', 'Low', '#80ff00', 4, 1, 0, NULL), -(2, 'Normal', 'Normal', '#367FA9', 3, 1, 1, NULL), -(3, 'High', 'High', '#ffff00', 2, 1, 0, NULL), -(4, 'Emergency', 'Emergency', '#ff6666', 1, 1, 0, NULL); +(1, 'Low', 'Low', '#00a65a', 4, 1, 0, NULL), +(2, 'Normal', 'Normal', '#00bfef', 3, 1, 1, NULL), +(3, 'High', 'High', '#f39c11', 2, 1, 0, NULL), +(4, 'Emergency', 'Emergency', '#dd4b38', 1, 1, 0, NULL); -- -------------------------------------------------------- diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index 6842d2e2b..b8a52c02c 100644 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -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 = ''; + $prio = ''; } else { $prio = ''; } diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 430446a7c..44d09fd9a 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -215,10 +215,10 @@ class DatabaseSeeder extends Seeder Ticket_status::create(['name' => 'Request Approval', 'state' => 'unverified', 'mode' => '3', 'message' => 'Approval requested by', 'flags' => '0', 'sort' => '7', 'properties' => 'Ticket will be approve after Admin verifies this ticket']); /* Ticket priority */ - Ticket_priority::create(['priority' => 'Low', 'status' => 1, 'priority_desc' => 'Low', 'priority_color' => '#80ff00', 'priority_urgency' => '4', 'ispublic' => '1']); - Ticket_priority::create(['priority' => 'Normal', 'status' => 1, 'priority_desc' => 'Normal', 'priority_color' => '#367FA9', 'priority_urgency' => '3', 'ispublic' => '1', 'is_default' => '1']); - Ticket_priority::create(['priority' => 'High', 'status' => 1, 'priority_desc' => 'High', 'priority_color' => '#ffff00', 'priority_urgency' => '2', 'ispublic' => '1']); - Ticket_priority::create(['priority' => 'Emergency', 'status' => 1, 'priority_desc' => 'Emergency', 'priority_color' => '#ff6666', 'priority_urgency' => '1', 'ispublic' => '1']); + Ticket_priority::create(['priority' => 'Low', 'status' => 1, 'priority_desc' => 'Low', 'priority_color' => '#00a65a', 'priority_urgency' => '4', 'ispublic' => '1']); + Ticket_priority::create(['priority' => 'Normal', 'status' => 1, 'priority_desc' => 'Normal', 'priority_color' => '#00bfef', 'priority_urgency' => '3', 'ispublic' => '1', 'is_default' => '1']); + Ticket_priority::create(['priority' => 'High', 'status' => 1, 'priority_desc' => 'High', 'priority_color' => '#f39c11', 'priority_urgency' => '2', 'ispublic' => '1']); + Ticket_priority::create(['priority' => 'Emergency', 'status' => 1, 'priority_desc' => 'Emergency', 'priority_color' => '#dd4b38', 'priority_urgency' => '1', 'ispublic' => '1']); /* Approval */ Approval::create(['name' => 'approval', 'status' => '0']); diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php index bcab50ae5..4b34db387 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php @@ -200,7 +200,7 @@ if ($thread->title != "") { priority_id)->first(); ?> -
+
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);