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

comm-priority-complite

Browse Source
This commit is contained in:
arindam85
2016-11-04 16:14:15 +05:30
parent 43af1ef280
commit c05917583b
5 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Client/helpdesk/FormController.php
View File

@@ -93,7 +93,10 @@ class FormController extends Controller
* @return type string
*/
public function postForm($id, Help_topic $topic)
{
if ($id != 0) {
$helptopic = $topic->where('id', '=', $id)->first();
$custom_form = $helptopic->custom_form;
@@ -146,6 +149,7 @@ class FormController extends Controller
*/
public function postedForm(User $user, ClientRequest $request, Ticket $ticket_settings, Ticket_source $ticket_source, Ticket_attachments $ta, CountryCode $code)
{
$form_extras = $request->except('Name', 'Phone', 'Email', 'Subject', 'Details', 'helptopic', '_wysihtml5_mode', '_token', 'mobile', 'Code');
$name = $request->input('Name');
$phone = $request->input('Phone');

14
database/seeds/DatabaseSeeder.php
View File

@@ -278,7 +278,7 @@ class DatabaseSeeder extends Seeder
Company::create(['id' => '1']);
Email::create(['id' => '1', 'template' => 'default', 'email_fetching' => '1', 'notification_cron' => '1', 'all_emails' => '1', 'email_collaborator' => '1', 'attachment' => '1']);
Responder::create(['id' => '1', 'new_ticket' => '1', 'agent_new_ticket' => '1']);
// System::create(array('id' => '1', 'status' => '1', 'department' => '1', 'date_time_format' => '1', 'time_zone' => '32'));
System::create(array('id' => '1', 'status' => '1', 'department' => '1', 'date_time_format' => '1', 'time_zone' => '32'));
Ticket::create(['num_format' => '$$$$-####-####', 'num_sequence' => 'sequence', 'collision_avoid' => '2', 'priority' => '1', 'sla' => '2', 'help_topic' => '1', 'status' => '1']);
/* Ticket source */
Ticket_source::create(['name' => 'web', 'value' => 'Web']);
@@ -2025,12 +2025,12 @@ class DatabaseSeeder extends Seeder
/*
* All the common settings will be listed here
*/
CommonSettings::create(['id' => '1', 'option_name' => 'ticket_token_time_duration', 'option_value' => '1']);
CommonSettings::create(['id' => '2', 'option_name' => 'enable_rtl', 'option_value' => '']);
CommonSettings::create(['id' => '3', 'option_name' => 'user_set_ticket_status', 'status' => 1]);
CommonSettings::create(['id' => '4', 'option_name' => 'send_otp', 'status' => 0]);
CommonSettings::create(['id' => '5', 'option_name' => 'email_mandatory', 'status' => 1]);
CommonSettings::create(['id' => '6', 'option_name' => 'user_priority', 'status' => 0]);
CommonSettings::create([ 'option_name' => 'ticket_token_time_duration', 'option_value' => '1']);
CommonSettings::create(['option_name' => 'enable_rtl', 'option_value' => '']);
CommonSettings::create(['option_name' => 'user_set_ticket_status', 'status' => 1]);
CommonSettings::create(['option_name' => 'send_otp', 'status' => 0]);
CommonSettings::create(['option_name' => 'email_mandatory', 'status' => 1]);
CommonSettings::create(['option_name' => 'user_priority', 'status' => 0]);
/*
* Ratings

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

@@ -721,7 +721,7 @@ if ($thread->title != "") {
@if(isset($ticket_form_datas))
<br/>
<table class="table table-bordered">
<table class="table table-bordered" style="display: none;">
<tbody>
@foreach($ticket_form_datas as $ticket_form_data)
<tr>
@@ -729,7 +729,9 @@ if ($thread->title != "") {
<td>{!! $ticket_form_data->content !!}</td>
</tr>
@endforeach
</tbody></table>
</tbody>
</table>
@endif
@endif

11
resources/views/themes/default1/client/helpdesk/ckeckticket.blade.php
View File

@@ -89,7 +89,8 @@ $thread = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', \Cryp
<?php
$priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id', '=', $tickets->priority_id)->first();
?>
<div class="callout callout-default ">
<div class="callout callout-{{$priority->priority_color}}" style = 'background-color:{{$priority->priority_color}}; color:#F9F9F9'>
<!-- <div class="callout callout-default "> -->
<div class="row">
<div class="col-md-3">
<?php
@@ -135,13 +136,15 @@ $thread = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', \Cryp
<tr><td><b>{!! Lang::get('lang.priority') !!}:</b></td> <?php $priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id', '=', $tickets->priority_id)->first(); ?>
@if($priority->priority_id == 1)
<td title="{{$priority->priority_desc}}" style="color:green">{{$priority->priority_desc}}</td>
<!-- {{$priority->priority}} -->
<td title="{{$priority->priority}}">{{$priority->priority}}</td>
<!-- @if($priority->priority_id == 1)
<td title="{{$priority->priority_color}}"style = 'background-color:{{$priority->priority_color}}; color:#F9F9F9'></td>
@elseif($priority->priority_id == 2)
<td title="{{$priority->priority_desc}}" style="color:orange">{{$priority->priority_desc}}</td>
@elseif($priority->priority_id == 3)
<td title="{{$priority->priority_desc}}" style="color:red">{{$priority->priority_desc}}</td>
@endif
@endif -->
</tr>
<tr><td><b>{!! Lang::get('lang.department') !!}:</b></td>

10
resources/views/themes/default1/client/helpdesk/form.blade.php
View File

@@ -174,8 +174,12 @@ class = "active"
$user_Priority=$Priority->status;
?>
@if($user_Priority == 1)
@if(Auth::user()->active == '1')
@if(Auth::user())
@if(Auth::user()->active == 1)
@if($user_Priority == 1)
<div class="col-md-12 form-group">
<div class="row">
<div class="col-md-1">
@@ -188,7 +192,7 @@ class = "active"
</div>
</div>
@endif
@endif
@endif
<div class="col-md-12 form-group {{ $errors->has('Subject') ? 'has-error' : '' }}">
{!! Form::label('Subject',Lang::get('lang.subject')) !!}<span class="text-red"> *</span>