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

Merge remote-tracking branch 'refs/remotes/origin/master' into arindam-bug-priority

Browse Source
This commit is contained in:
Manish Verma
2016-10-31 13:14:50 +05:30
parent 6d7db018d3 ed5231a52b
commit 6ff84612b5
6 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
DB/demodatabase.sql
View File

@@ -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 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), (1, 'Low', 'Low', '#00a65a', 4, 1, 0, NULL),
(2, 'Normal', 'Normal', '#367FA9', 3, 1, 1, NULL), (2, 'Normal', 'Normal', '#00bfef', 3, 1, 1, NULL),
(3, 'High', 'High', '#ffff00', 2, 1, 0, NULL), (3, 'High', 'High', '#f39c11', 2, 1, 0, NULL),
(4, 'Emergency', 'Emergency', '#ff6666', 1, 1, 0, NULL); (4, 'Emergency', 'Emergency', '#dd4b38', 1, 1, 0, NULL);
-- -------------------------------------------------------- -- --------------------------------------------------------

8
DB/dummy-data.sql
View File

@@ -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 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), (1, 'Low', 'Low', '#00a65a', 4, 1, 0, NULL),
(2, 'Normal', 'Normal', '#367FA9', 3, 1, 1, NULL), (2, 'Normal', 'Normal', '#00bfef', 3, 1, 1, NULL),
(3, 'High', 'High', '#ffff00', 2, 1, 0, NULL), (3, 'High', 'High', '#f39c11', 2, 1, 0, NULL),
(4, 'Emergency', 'Emergency', '#ff6666', 1, 1, 0, NULL); (4, 'Emergency', 'Emergency', '#dd4b38', 1, 1, 0, NULL);
-- -------------------------------------------------------- -- --------------------------------------------------------

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(); $priority = DB::table('ticket_priority')->select('priority_desc', 'priority_color')->where('priority_id', '=', $ticket->priority_id)->first();
if ($priority != null) { 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 { } else {
$prio = ''; $prio = '';
} }

8
database/seeds/DatabaseSeeder.php
View File

@@ -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_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 */
Ticket_priority::create(['priority' => 'Low', 'status' => 1, 'priority_desc' => 'Low', 'priority_color' => '#80ff00', 'priority_urgency' => '4', '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' => '#367FA9', 'priority_urgency' => '3', 'ispublic' => '1', 'is_default' => '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' => '#ffff00', 'priority_urgency' => '2', 'ispublic' => '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' => '#ff6666', 'priority_urgency' => '1', 'ispublic' => '1']); Ticket_priority::create(['priority' => 'Emergency', 'status' => 1, 'priority_desc' => 'Emergency', 'priority_color' => '#dd4b38', 'priority_urgency' => '1', 'ispublic' => '1']);
/* Approval */ /* Approval */
Approval::create(['name' => 'approval', 'status' => '0']); Approval::create(['name' => 'approval', 'status' => '0']);

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

@@ -200,7 +200,7 @@ if ($thread->title != "") {
<?php <?php
$priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id', '=', $tickets->priority_id)->first(); $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="row">
<div class="col-md-3"> <div class="col-md-3">
<?php <?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(); $LastResponse = App\User::where('id', '=', $TicketDatarow->user_id)->first();
if ($LastResponse->role == "user") { if ($LastResponse->role == "user") {
$rep = "#F39C12"; $rep = "#F39C12";
$username = $LastResponse->user_name; $username = $LastResponse->full_name;
} else { } else {
$rep = "#000"; $rep = "#000";
$username = $LastResponse->first_name . " " . $LastResponse->last_name; $username = $LastResponse->full_name;
if ($LastResponse->first_name == null || $LastResponse->last_name == null) {
$username = $LastResponse->user_name;
}
} }
$titles = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->get(); $titles = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->get();
$count = count($titles); $count = count($titles);