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

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

Browse Source 
# Conflicts:

#	resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
This commit is contained in:
Manish Verma
2016-11-06 21:52:57 +05:30
parent 0243ce3711 42b44300e2
commit 42292945f6
7 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
resources/views/themes/default1/admin/helpdesk/manage/ticket_priority/index.blade.php
View File

@@ -55,8 +55,9 @@ class="active"
<!-- <li><a class="right" title="" data-placement="right" data-toggle="tooltip" href="#" data-original-title="Tooltip on right"> sss</a></li> -->
<a class="right" title="" data-placement="right" data-toggle="tooltip" href="#" data-original-title="{{Lang::get('lang.active_user_can_select_the_priority_while_creating_ticket')}}">
<div class="box-header with-border">
<a class="right" title="" data-placement="right" data-toggle="tooltip" href="#" data-original-title="{{Lang::get('lang.active_user_can_select_the_priority_while_creating_ticket')}}">
<span class="lead border-right" >{!! Lang::get('lang.current') !!}{!! Lang::get('lang.user_priority_status') !!}</span>
</a>
@@ -88,10 +89,10 @@ class="active"
<div class="box-footer">
</div>
</div>
<script type="text/javascript">
<!-- <script type="text/javascript">
$('a').tooltip()
</script>
-->
<script>
function confirmDelete(priority_id) {
var r = confirm('Are you sure?');
@@ -106,7 +107,7 @@ class="active"
</script>
<script>
$('#toggle_event_editing button').click(function () {
var user_settings_priority=1;
var user_settings_priority=0;
if ($(this).hasClass('locked_active') ) {

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

@@ -671,7 +671,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>

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

@@ -174,7 +174,12 @@ class = "active"
$user_Priority=$Priority->status;
?>
@if($user_Priority == 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">
@@ -186,8 +191,8 @@ class = "active"
</div>
</div>
</div>
@else
@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>