update v1.0.5

This commit is contained in:
sujitprasad
2016-01-25 20:45:35 +05:30
parent 0b8ebb9c70
commit e7149e34e4
252 changed files with 9008 additions and 3152 deletions

View File

@@ -57,7 +57,7 @@ class="active"
</thead>
<tbody>
<?php
$forms =App\Model\helpdesk\Form\Forms::all();
$forms = App\Model\helpdesk\Form\Forms::all();
?>
@foreach($forms as $form)

View File

@@ -94,7 +94,7 @@ class="active"
{!! Form::label('custom_form',Lang::get('lang.custom')) !!}
{!! $errors->first('custom_form', '<spam class="help-block">:message</spam>') !!}
{!!Form::select('custom_form', [''=>'Select a Form','Custom Forms'=>$forms->lists('formname','name')],1,['class' => 'form-control']) !!}
{!!Form::select('custom_form', [''=>'Select a Form','Custom Forms'=>$forms->lists('formname','id')],1,['class' => 'form-control']) !!}
</div>
</div>
@@ -128,7 +128,7 @@ class="active"
{!! Form::label('sla_plan',Lang::get('lang.SLA_plan')) !!}
{!! $errors->first('sla_plan', '<spam class="help-block">:message</spam>') !!}
{!!Form::select('sla_plan', [''=>'Select a SLA Plan','SLA Plans'=>$slas->lists('name','name')],1,['class' => 'form-control']) !!}
{!!Form::select('sla_plan', [''=>'Select a SLA Plan','SLA Plans'=>$slas->lists('name','id')],1,['class' => 'form-control']) !!}
</div>
</div>
@@ -139,7 +139,7 @@ class="active"
{!! Form::label('auto_assign',Lang::get('lang.auto_assign')) !!}
{!! $errors->first('auto_assign', '<spam class="help-block">:message</spam>') !!}
{!!Form::select('auto_assign', [''=>'Select an Agent','Agents'=>$agents->lists('user_name','user_name')],null,['class' => 'form-control']) !!}
{!!Form::select('auto_assign', [''=>'Select an Agent','Agents'=>$agents->lists('user_name','id')],null,['class' => 'form-control']) !!}
</div>
</div>
</div>

View File

@@ -127,7 +127,7 @@ class="active"
{!! Form::label('auto_assign',Lang::get('lang.auto_assign')) !!}
{!! $errors->first('auto_assign', '<spam class="help-block">:message</spam>') !!}
{!!Form::select('auto_assign', [''=>'Select an Agent','Agents'=>$agents->lists('user_name','user_name')],null,['class' => 'form-control']) !!}
{!!Form::select('auto_assign', [''=>'Select an Agent','Agents'=>$agents->lists('user_name','id')],null,['class' => 'form-control']) !!}
</div>
</div>
</div>

View File

@@ -32,7 +32,7 @@ class="active"
<div class="form-group">
<div class="box-header">
<h2 class="box-title">{{Lang::get('lang.help_topic')}}</h2><a href="{{route('helptopic.create')}}" class="btn btn-primary pull-right">{{Lang::get('lang.create_help_topic')}}</a></div>
<div class="box-body table-responsive no-padding">
<div class="box-body table-responsive">
<!-- check whether success or not -->
@@ -41,7 +41,7 @@ class="active"
<i class="fa fa-check-circle"></i>
<b>Success!</b>
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
{{Session::get('success')}}
{!! Session::get('success') !!}
</div>
@endif
<!-- failure message -->
@@ -50,11 +50,11 @@ class="active"
<i class="fa fa-ban"></i>
<b>Fail!</b>
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
{{Session::get('fails')}}
{!! Session::get('fails') !!}
</div>
@endif
<table class="table table-hover" style="overflow:hidden;">
<table class="table table-bordered dataTable" style="overflow:hidden;">
<tr>
<th width="100px">{{Lang::get('lang.topic')}}</th>
@@ -65,12 +65,31 @@ class="active"
<th width="100px">{{Lang::get('lang.last_updated')}}</th>
<th width="100px">{{Lang::get('lang.action')}}</th>
</tr>
<?php
$default_helptopic = App\Model\helpdesk\Settings\Ticket::where('id','=','1')->first();
$default_helptopic = $default_helptopic->help_topic;
?>
<!-- Foreach @var$topics as @var topic -->
@foreach($topics as $topic)
<tr style="padding-bottom:-30px">
<!-- topic Name with Link to Edit page along Id -->
<td><a href="{{route('helptopic.edit',$topic->id)}}">{!! $topic->topic !!}</a></td>
<td><a href="{{route('helptopic.edit',$topic->id)}}">{!! $topic->topic !!}
@if($topic->id == $default_helptopic)
( Default )
<?php
$disable = 'disabled';
?>
@else
<?php
$disable = '';
?>
@endif
</a></td>
<!-- topic Status : if status==1 active -->
<td>
@@ -94,8 +113,13 @@ class="active"
<?php $priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id','=',$topic->priority)->first(); ?>
<td>{!! $priority->priority_desc !!}</td>
<!-- Department -->
<?php $dept = App\Model\helpdesk\Agent\Department::where('id', '=', $topic->department)->first(); ?>
<td>{!! $dept->name !!}</td>
@if($topic->department != null)
<?php $dept = App\Model\helpdesk\Agent\Department::where('id', '=', $topic->department)->first();
$dept = $dept->name; ?>
@elseif($topic->department == null)
<?php $dept = ""; ?>
@endif
<td> {!! $dept !!} </td>
<!-- Last Updated -->
<td> {!! UTC::usertimezone($topic->updated_at) !!} </td>
<!-- Deleting Fields -->
@@ -105,12 +129,10 @@ class="active"
<!-- To pop up a confirm Message -->
{!! Form::button('<i class="fa fa-trash" style="color:black;"> </i> Delete',
['type' => 'submit',
'class'=> 'btn btn-warning btn-xs btn-flat',
'class'=> 'btn btn-warning btn-xs btn-flat '.$disable,
'onclick'=>'return confirm("Are you sure?")'])
!!}
</div>
{!! Form::close() !!}
</td>
@endforeach

View File

@@ -62,7 +62,7 @@ class="active"
{!! Form::label('grace_period',Lang::get('lang.grace_period')) !!}
{!! $errors->first('grace_period', '<spam class="help-block">:message</spam>') !!}
{!! Form::select('grace_period',['10'=>'10 Hours','15'=>'15 Hours','20'=>'20 hours','24'=>'One Day'],null,['class' => 'form-control']) !!}
{!! Form::select('grace_period',['6 Hours'=>'6 Hours', '12 Hours'=>'12 Hours', '18 Hours'=>'18 Hours', '24 Hours'=>'24 Hours', '36 Hours'=>'36 Hours', '48 Hours'=>'48 Hours'],null,['class' => 'form-control']) !!}
</div>
</div>

View File

@@ -62,7 +62,7 @@ class="active"
{!! Form::label('grace_period',Lang::get('lang.grace_period')) !!}
{!! $errors->first('grace_period', '<spam class="help-block">:message</spam>') !!}
{!! Form::select('grace_period',['10'=>'10 Hours','15'=>'15 Hours','20'=>'20 hours','24'=>'One Day'],null,['class' => 'form-control']) !!}
{!! Form::select('grace_period',['6 Hours'=>'6 Hours', '12 Hours'=>'12 Hours', '18 Hours'=>'18 Hours', '24 Hours'=>'24 Hours', '36 Hours'=>'36 Hours', '48 Hours'=>'48 Hours'],null,['class' => 'form-control']) !!}
</div>
</div>

View File

@@ -34,7 +34,7 @@ class="active"
<div class="box-header">
<h2 class="box-title">{{Lang::get('lang.SLA_plan')}}</h2><a href="{{route('sla.create')}}" class="btn btn-primary pull-right">{{Lang::get('lang.create_SLA')}}</a></div>
<div class="box-body table-responsive no-padding">
<div class="box-body table-responsive">
<!-- check whether success or not -->
@@ -43,7 +43,7 @@ class="active"
<i class="fa fa-check-circle"></i>
<b>Success!</b>
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
{{Session::get('success')}}
{!! Session::get('success') !!}
</div>
@endif
<!-- failure message -->
@@ -52,11 +52,11 @@ class="active"
<i class="fa fa-ban"></i>
<b>Fail!</b>
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
{{Session::get('fails')}}
{!! Session::get('fails') !!}
</div>
@endif
<table class="table table-hover" style="overflow:hidden;">
<table class="table table-bordered dataTable" style="overflow:hidden;">
<tr>
<th width="100px">{{Lang::get('lang.name')}}</th>
@@ -66,12 +66,28 @@ class="active"
<th width="100px">{{Lang::get('lang.last_updated')}}</th>
<th width="100px">{{Lang::get('lang.action')}}</th>
</tr>
<?php
$default_sla = App\Model\helpdesk\Settings\Ticket::where('id','=','1')->first();
$default_sla = $default_sla->sla;
?>
<!-- Foreach @var$slas as @var sla -->
@foreach($slas as $sla)
<tr>
<!-- sla Name with Link to Edit page along Id -->
<td><a href="{{route('sla.edit',$sla->id)}}">{!! $sla->name !!}</a></td>
<td><a href="{{route('sla.edit',$sla->id)}}">{!! $sla->name !!}
@if($sla->id == $default_sla)
( Default )
<?php
$disable = 'disabled';
?>
@else
<?php
$disable = '';
?>
@endif
</a> </td>
<!-- sla Status : if status==1 active -->
<td>
@if($sla->status=='1')
@@ -93,19 +109,15 @@ class="active"
<!-- To pop up a confirm Message -->
{!! Form::button('<i class="fa fa-trash" style="color:black;"> </i> Delete',
['type' => 'submit',
'class'=> 'btn btn-warning btn-xs btn-flat',
'class'=> 'btn btn-warning btn-xs btn-flat '.$disable,
'onclick'=>'return confirm("Are you sure?")'])
!!}
{!! Form::close() !!}
</td>
@endforeach
</tr>
<!-- Set a link to Create Page -->
</table>
</div>