update v1.0.6

This commit is contained in:
sujitprasad
2016-02-16 22:42:08 +05:30
parent e6b579d67b
commit 073a49a8af
587 changed files with 21487 additions and 22766 deletions

View File

@@ -66,10 +66,10 @@ class="active"
{!! Form::label('ban',Lang::get('lang.ban_status')) !!}
<div class="row">
<div class="col-xs-3">
{!! Form::radio('ban',1) !!}{{Lang::get('lang.active')}}
{!! Form::radio('ban',1) !!} {{Lang::get('lang.active')}}
</div>
<div class="col-xs-3">
{!! Form::radio('ban',0) !!}{{Lang::get('lang.disabled')}}
{!! Form::radio('ban',0) !!} {{Lang::get('lang.disabled')}}
</div>
</div>
</div>

View File

@@ -46,10 +46,10 @@ class="active"
{!! Form::label('ban',Lang::get('lang.ban_status')) !!}
<div class="row">
<div class="col-xs-3">
{!! Form::radio('ban',1) !!}{{Lang::get('lang.active')}}
{!! Form::radio('ban',1) !!} {{Lang::get('lang.active')}}
</div>
<div class="col-xs-3">
{!! Form::radio('ban',0) !!}{{Lang::get('lang.disabled')}}
{!! Form::radio('ban',0) !!} {{Lang::get('lang.disabled')}}
</div>
</div>
</div>

View File

@@ -63,12 +63,12 @@ class="active"
</div>
<div class="row">
<!-- department -->
<!-- department -->
<div class="col-xs-4 form-group {{ $errors->has('department') ? 'has-error' : '' }}">
{!! Form::label('department',Lang::get('lang.department')) !!}
{!! $errors->first('department', '<spam class="help-block">:message</spam>') !!}
{!!Form::select('department', [''=>'Select a Department','departments'=>$departments->lists('name','id')],null,['class' => 'form-control select']) !!}
{!!Form::select('department', [''=>'--System Default--','departments'=>$departments->lists('name','id')],null,['class' => 'form-control select']) !!}
</div>
<!-- Priority -->
@@ -76,7 +76,7 @@ class="active"
{!! Form::label('priority',Lang::get('lang.priority')) !!}
{!! $errors->first('priority', '<spam class="help-block">:message</spam>') !!}
{!!Form::select('priority', [''=>'Select a Priority','Priorities'=>$priority->lists('priority_desc','priority_id')],null,['class' => 'form-control select']) !!}
{!!Form::select('priority', [''=>'--System Default--','Priorities'=>$priority->lists('priority_desc','priority_id')],null,['class' => 'form-control select']) !!}
</div>
<!-- Help topic -->
@@ -84,7 +84,7 @@ class="active"
{!! Form::label('help_topic',Lang::get('lang.help_topic')) !!}
{!! $errors->first('help_topic', '<spam class="help-block">:message</spam>') !!}
{!!Form::select('help_topic', [''=>'Select a Helptopic','Help Topics'=>$helps->lists('topic','id')],null,['class' => 'form-control select']) !!}
{!!Form::select('help_topic', [''=>'--System Default--','Help Topics'=>$helps->lists('topic','id')],null,['class' => 'form-control select']) !!}
</div>
@@ -120,7 +120,7 @@ class="active"
<div class="col-md-6 form-group">
<h4>{!! Lang::get('lang.fetching_email_via_imap_or_pop') !!}</h4>
<h4>{!! Lang::get('lang.fetching_email_via_imap') !!}</h4>
</div>
@@ -134,10 +134,10 @@ class="active"
{!! Form::label('fetching_status',Lang::get('lang.status')) !!}
</div>
<div class="col-xs-2 form-group">
{!! Form::radio('fetching_status','1',true) !!}{{Lang::get('lang.enable')}}
{!! Form::radio('fetching_status','1',true) !!} {{Lang::get('lang.enable')}}
</div>
<div class="col-xs-2 form-group">
{!! Form::radio('fetching_status','0',null) !!}{{Lang::get('lang.disabled')}}
{!! Form::radio('fetching_status','0',null) !!} {{Lang::get('lang.disabled')}}
</div>
</div>
@@ -181,82 +181,92 @@ class="active"
</div>
{{-- <div class="row"> --}}
<hr>
{{-- <div class="col-md-6 form-group"> --}}
<div class="row">
{{-- <h4>Sending Email via SMTP</h4> --}}
<div class="col-md-6 form-group">
{{-- </div> --}}
<h4>Sending Email via SMTP</h4>
{{-- </div> --}}
</div>
{{-- <div class="row"> --}}
</div>
<div class="row">
<!-- status -->
{{-- <div class="form-group"> --}}
<div class="form-group">
{{-- <div class="col-xs-1 form-group"> --}}
{{-- {!! Form::label('sending_status',Lang::get('lang.status')) !!} --}}
{{-- </div> --}}
{{-- <div class="col-xs-2 form-group"> --}}
{{-- {!! Form::radio('sending_status','1',true) !!}{{Lang::get('lang.enable')}} --}}
{{-- </div> --}}
{{-- <div class="col-xs-2 form-group"> --}}
{{-- {!! Form::radio('sending_status','0',null) !!}{{Lang::get('lang.disabled')}} --}}
{{-- </div> --}}
<div class="col-xs-1 form-group">
{!! Form::label('sending_status',Lang::get('lang.status')) !!}
</div>
<div class="col-xs-2 form-group">
{!! Form::radio('sending_status','1',true) !!} {{Lang::get('lang.enable')}}
</div>
<div class="col-xs-2 form-group">
{!! Form::radio('sending_status','0',null) !!} {{Lang::get('lang.disabled')}}
</div>
{{-- </div> --}}
</div>
{{-- </div> --}}
</div>
{{-- <div class="row"> --}}
<!-- sending port -->
{{-- <div class="col-xs-6 form-group {{ $errors->has('sending_port') ? 'has-error' : '' }}"> --}}
{{-- {!! Form::label('sending_port',Lang::get('lang.port_number')) !!} --}}
{{-- {!! $errors->first('sending_port', '<spam class="help-block">:message</spam>') !!} --}}
{{-- {!! Form::text('sending_port',null,['class' => 'form-control']) !!} --}}
{{-- </div> --}}
<div class="row">
<!-- sending hoost -->
{{-- <div class="col-xs-6 form-group {{ $errors->has('sending_host') ? 'has-error' : '' }}"> --}}
<div class="col-xs-4 form-group {{ $errors->has('sending_host') ? 'has-error' : '' }}">
{{-- {!! Form::label('sending_host',Lang::get('lang.host_name')) !!} --}}
{{-- {!! $errors->first('sending_host', '<spam class="help-block">:message</spam>') !!} --}}
{{-- {!! Form::text('sending_host',null,['class' => 'form-control']) !!} --}}
{!! Form::label('sending_host',Lang::get('lang.host_name')) !!}
{!! $errors->first('sending_host', '<spam class="help-block">:message</spam>') !!}
{!! Form::text('sending_host',null,['class' => 'form-control']) !!}
{{-- </div> --}}
</div>
<!-- sending port -->
<div class="col-xs-4 form-group {{ $errors->has('sending_port') ? 'has-error' : '' }}">
{{-- </div> --}}
{!! Form::label('sending_port',Lang::get('lang.port_number')) !!}
{!! $errors->first('sending_port', '<spam class="help-block">:message</spam>') !!}
{!! Form::text('sending_port',null,['class' => 'form-control']) !!}
<div class="row">
</div>
<!-- Encryption -->
<div class="col-xs-4 form-group {{ $errors->has('sending_encryption') ? 'has-error' : '' }}">
{!! Form::label('sending_encryption',Lang::get('lang.encryption')) !!}
{!! $errors->first('sending_encryption', '<spam class="help-block">:message</spam>') !!}
{!!Form::select('sending_encryption',['ssl'=>'SSL','tls'=>'TLS'],null,['class' => 'form-control select']) !!}
</div>
</div>
<!-- <div class="row"> -->
<!-- authentication required -->
{{-- <div class="form-group"> --}}
<!-- <div class="form-group"> -->
{{-- <div class="col-xs-2 form-group"> --}}
{{-- {!! Form::label('authentication',Lang::get('lang.authentication_required')) !!} --}}
{{-- </div> --}}
{{-- <div class="col-xs-2 form-group"> --}}
{{-- {!! Form::radio('authentication','1',true) !!}{{Lang::get('lang.enable')}} --}}
{{-- </div> --}}
{{-- <div class="col-xs-2 form-group"> --}}
{{-- {!! Form::radio('authentication','0',null) !!}{{Lang::get('lang.disabled')}} --}}
{{-- </div> --}}
<!-- <div class="col-xs-2 form-group"> -->
<!-- {!! Form::label('authentication',Lang::get('lang.authentication_required')) !!} -->
<!-- </div> -->
<!-- <div class="col-xs-2 form-group"> -->
<!-- {!! Form::radio('authentication','1',true) !!} {{Lang::get('lang.enable')}} -->
<!-- </div> -->
<!-- <div class="col-xs-2 form-group"> -->
<!-- {!! Form::radio('authentication','0',null) !!} {{Lang::get('lang.disabled')}} -->
<!-- </div> -->
{{-- </div> --}}
<!-- </div> -->
{{-- <div class="form-group"> --}}
<!-- <div class="form-group"> -->
<!-- header snoofing -->
{{-- <div class="col-xs-2"> --}}
<!-- <div class="col-xs-2"> -->
{{-- {!! Form::label('',Lang::get('lang.header_spoofing')) !!} --}}
{{-- {!! Form::checkbox('header_spoofing',1,null,['class' => 'checkbox']) !!} --}}
<!-- // {!! Form::label('',Lang::get('lang.header_spoofing')) !!} -->
<!-- // {!! Form::checkbox('header_spoofing',1,null,['class' => 'checkbox']) !!} -->
{{-- </div> --}}
<!-- </div> -->
{{-- </div> --}}
<!-- </div> -->
</div>
<!-- </div> -->
<!-- Internal notes -->
<div class="form-group">

View File

@@ -68,7 +68,7 @@ class="active"
{!! Form::label('department',Lang::get('lang.department')) !!}
{!! $errors->first('department', '<spam class="help-block">:message</spam>') !!}
{!!Form::select('department', [''=>'Select a Department','departments'=>$departments->lists('name','id')],null,['class' => 'form-control select']) !!}
{!!Form::select('department', [''=>'--System Default--','departments'=>$departments->lists('name','id')],null,['class' => 'form-control select']) !!}
</div>
<!-- priority -->
@@ -76,7 +76,7 @@ class="active"
{!! Form::label('priority',Lang::get('lang.priority')) !!}
{!! $errors->first('priority', '<spam class="help-block">:message</spam>') !!}
{!!Form::select('priority', [''=>'Select a Priority','Priorities'=>$priority->lists('priority_desc','priority_id')],null,['class' => 'form-control select']) !!}
{!!Form::select('priority', [''=>'--System Default--','Priorities'=>$priority->lists('priority_desc','priority_id')],null,['class' => 'form-control select']) !!}
</div>
<!-- help topic -->
@@ -84,7 +84,7 @@ class="active"
{!! Form::label('help_topic',Lang::get('lang.help_topic')) !!}
{!! $errors->first('help_topic', '<spam class="help-block">:message</spam>') !!}
{!!Form::select('help_topic', [''=>'Select a Helptopic','Help Topics'=>$helps->lists('topic','id')],null,['class' => 'form-control select']) !!}
{!!Form::select('help_topic', [''=>'--System Default--','Help Topics'=>$helps->lists('topic','id')],null,['class' => 'form-control select']) !!}
</div>
</div>
@@ -127,7 +127,7 @@ class="active"
<div class="col-md-6 form-group">
<h4>{!! Lang::get('lang.fetching_email_via_imap_or_pop') !!}</h4>
<h4>{!! Lang::get('lang.fetching_email_via_imap') !!}</h4>
</div>
@@ -141,10 +141,10 @@ class="active"
{!! Form::label('fetching_status',Lang::get('lang.status')) !!}
</div>
<div class="col-xs-2 form-group">
{!! Form::radio('fetching_status','1',true) !!}{{Lang::get('lang.enable')}}
{!! Form::radio('fetching_status','1',true) !!} {{Lang::get('lang.enable')}}
</div>
<div class="col-xs-2 form-group">
{!! Form::radio('fetching_status','0',null) !!}{{Lang::get('lang.disabled')}}
{!! Form::radio('fetching_status','0',null) !!} {{Lang::get('lang.disabled')}}
</div>
</div>
@@ -178,6 +178,69 @@ class="active"
<!-- imap config -->
</div>
<hr>
<div class="row">
<div class="col-md-6 form-group">
<h4>Sending Email via SMTP</h4>
</div>
</div>
<div class="row">
<!-- status -->
<div class="form-group">
<div class="col-xs-1 form-group">
{!! Form::label('sending_status',Lang::get('lang.status')) !!}
</div>
<div class="col-xs-2 form-group">
{!! Form::radio('sending_status','1',true) !!} {{Lang::get('lang.enable')}}
</div>
<div class="col-xs-2 form-group">
{!! Form::radio('sending_status','0',null) !!} {{Lang::get('lang.disabled')}}
</div>
</div>
</div>
<div class="row">
<!-- sending hoost -->
<div class="col-xs-4 form-group {{ $errors->has('sending_host') ? 'has-error' : '' }}">
{!! Form::label('sending_host',Lang::get('lang.host_name')) !!}
{!! $errors->first('sending_host', '<spam class="help-block">:message</spam>') !!}
{!! Form::text('sending_host',null,['class' => 'form-control']) !!}
</div>
<!-- sending port -->
<div class="col-xs-4 form-group {{ $errors->has('sending_port') ? 'has-error' : '' }}">
{!! Form::label('sending_port',Lang::get('lang.port_number')) !!}
{!! $errors->first('sending_port', '<spam class="help-block">:message</spam>') !!}
{!! Form::text('sending_port',null,['class' => 'form-control']) !!}
</div>
<!-- Encryption -->
<div class="col-xs-4 form-group {{ $errors->has('sending_encryption') ? 'has-error' : '' }}">
{!! Form::label('sending_encryption',Lang::get('lang.encryption')) !!}
{!! $errors->first('sending_encryption', '<spam class="help-block">:message</spam>') !!}
{!!Form::select('sending_encryption',['ssl'=>'SSL','tls'=>'TLS'],null,['class' => 'form-control select']) !!}
</div>
</div>
<!-- internal notes -->
<div class="form-group">

View File

@@ -55,6 +55,15 @@ class="active"
{{Session::get('fails')}}
</div>
@endif
<?php
$default_system_email = App\Model\helpdesk\Settings\Email::where('id', '=', '1')->first();
if($default_system_email->sys_email) {
$default_email = $default_system_email->sys_email;
} else {
$default_email = null;
}
?>
<!-- table -->
<table class="table table-bordered dataTable" style="overflow:hidden;">
<tr>
@@ -67,26 +76,39 @@ class="active"
</tr>
@foreach($emails as $email)
<tr>
<td><a href="{{route('emails.edit', $email->id)}}"> {{$email -> email_address }}</a></td>
<td><a href="{{route('emails.edit', $email->id)}}"> {{$email -> email_address }}</a>
@if($default_email == $email->id)
( Default )
<?php $disabled = 'disabled'; ?>
@else
<?php $disabled = ''; ?>
@endif
</td>
<?php $priority = App\Model\helpdesk\Ticket\Ticket_Priority::where('priority_id','=',$email->priority)->first(); ?>
<td>{{ ucfirst($priority->priority_desc) }}</td>
@if($email->priority == null)
<?php $priority = "<a href=". url('getticket') .">System Default</a>"; ?>
@else
<?php $priority = ucfirst($priority->priority_desc); ?>
@endif
<td>{!! $priority !!}</td>
@if($email->department !== null)
<?php $department = App\Model\helpdesk\Agent\Department::where('id','=',$email->department)->first();
$dept = $department->name; ?>
@elseif($email->department == null)
<?php $dept = ""; ?>
<?php $dept = "<a href=". url('getsystem') .">System Default</a>"; ?>
@endif
<td>{{ $dept }}</td>
<td>{{ UTC::usertimezone($email->created_at) }}</td>
<td>{{ UTC::usertimezone($email->updated_at) }}</td>
<td>{!! $dept !!}</td>
<td>{!! UTC::usertimezone($email->created_at) !!}</td>
<td>{!! UTC::usertimezone($email->updated_at) !!}</td>
<td>
{!! Form::open(['route'=>['emails.destroy', $email->id],'method'=>'DELETE']) !!}
<a href="{{route('emails.edit', $email->id)}}" class="btn btn-info btn-xs btn-flat"><i class="fa fa-edit" style="color:black;"> </i> Edit</a>
<!-- 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 '. $disabled,
'onclick'=>'return confirm("Are you sure?")'])
!!}
{!! Form::close() !!}
@@ -98,5 +120,4 @@ class="active"
</div>
</div>
</div>
@stop

View File

@@ -32,42 +32,10 @@ class="active"
<div class="col-md-12">
<div class="box box-primary">
<div class="box-header">
<!-- <h2 class="box-title">{{Lang::get('lang.templates')}}</h2><a href="{{route('template.create')}}" class="btn btn-primary pull-right">{{Lang::get('lang.create_template')}}</a>-->
<button class="btn btn-primary pull-right" data-toggle="modal" data-target="#createtemp">{{Lang::get('lang.create_template')}}</button>
<div class="modal fade" id="createtemp">
<div class="modal-dialog">
<div class="modal-content">
{!! Form::open(['route'=>'template.createnew']) !!}
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">{{Lang::get('lang.create_template')}}</h4>
</div>
<div class="modal-body">
<div class="form-group {{ $errors->has('title') ? 'has-error' : '' }}">
<h2 class="box-title">{{Lang::get('lang.templates')}}</h2>
</div>
{!! Form::label('folder_name', 'Folder Name:',['style'=>'display: block']) !!}
{!! Form::text('folder_name',null,['class'=>'form-control'])!!}
{!! $errors->first('folder', '<spam class="help-block">:message</spam>') !!}
</div>
</div>
<div class="modal-footer">
<div class="form-group">
{!! Form::submit('Create Folder',['class'=>'btn btn-primary'])!!}
<button type="button" class="btn btn-default pull-left" data-dismiss="modal">Close</button>
</div></div>
{!! Form::close() !!}
</div>
</div>
</div></div>
<div class="box-body table-responsive no-padding">
<div class="box-body table-responsive">
<!-- check whether success or not -->
@@ -89,10 +57,10 @@ class="active"
</div>
@endif
<table class="table table-hover" style="overflow:hidden;">
<table id="example1" class="table table-bordered table-striped">
<tr>
<th width="100px">{{Lang::get('lang.name')}}</th>
<th>{{Lang::get('lang.name')}}</th>
<th>{{Lang::get('lang.description')}}</th>
</tr>
<!-- Foreach @var templates as @var template -->
@@ -100,11 +68,10 @@ class="active"
<?php if ($template === '.' or $template === '..') continue; ?>
<tr>
<!-- Template Name with Link to Edit page along Id -->
<td><a href="{{route('template.read',[$template,$directory])}}">{!! $template !!}</a></td>
<td><a href="{{route('template.read',[$template,$directory])}}"><?php $parts = explode('.',$template); $names = $parts[0]; $name = str_replace('-', ' ', $names); $cname = ucfirst($name); echo $cname?></a></td>
<td>{{ Lang::get('lang.'.$cname) }}</td>
<!-- template Status : if status==1 active -->
<!-- Deleting Fields -->
</tr>
@endforeach
@@ -117,6 +84,21 @@ class="active"
@stop
</div><!-- /.box -->
@section('FooterInclude')
<!-- page script -->
<script type="text/javascript">
$(function() {
$("#example1").dataTable();
$('#example2').dataTable({
"bPaginate": true,
"bLengthChange": false,
"bFilter": false,
"bSort": true,
"bInfo": true,
"bAutoWidth": false
});
});
</script>
@stop
@stop

View File

@@ -31,44 +31,12 @@ class="active"
<div class="row">
<div class="col-md-12">
<div class="box box-primary">
{!! Form::model($contents,['route'=>['template.write', $template,$path],'method'=>'PATCH','files' => true]) !!}
<div class="box-header">
<h2 class="box-title">{{Lang::get('lang.templates')}}</h2><a href="modal" class="btn btn-primary pull-right" data-toggle="modal" data-target="#modal3">Edit Template</a></div>
<div class="modal modal-primary" id="modal3">
<div class="modal-dialog">
<div class="modal-content" style="width:90%">
{!! Form::model($contents,['route'=>['template.write', $template,$path],'method'=>'PATCH','files' => true]) !!}
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">×</span></button>
<h4 class="modal-title">Edit</h4>
</div>
<div class="modal-body">
<!-- <div class="col-lg-12 col-xs-6 col-sm-6" style="margin-top: 3%;"> -->
<div class="form-group">
{!! Form::textarea('templatedata',$contents,['class'=>'form-control'])!!}
</div>
<!-- </div> -->
<!-- </div> -->
<!-- <div class="col-lg-12 col-xs-6 col-sm-6" style="margin-top: 3%;"> -->
<!-- <div class="col-lg-12 col-xs-6 col-sm-6" style="margin-top: 3%;"> -->
<!-- </div> -->
</div>
<div class="modal-footer">
<button type="button" class="btn btn-outline pull-left" data-dismiss="modal">Close</button>
<button type="submit" class="btn btn-outline">Save changes</button>
</div>
{!! Form::close() !!}
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div>
<div class="box-body table-responsive no-padding">
<h2 class="box-title">{{Lang::get('lang.edit_template')}}: <b><?php $parts = explode('.',$template); $names = $parts[0]; $name = str_replace('-', ' ', $names); $cname = ucfirst($name); echo $cname?></b></h2><button type="submit" class="btn btn-primary pull-right">Save changes</button>
</div>
<div class="box-body table-responsive">
<!-- check whether success or not -->
@@ -90,12 +58,12 @@ class="active"
</div>
@endif
<div class="box-body" style="background-color: #f3f3f3; height: 410px;">
<!-- <div class="box-body"> -->
{!! nl2br($contents) !!}
</div>
{!! Form::textarea('templatedata',$contents,['class'=>'form-control'])!!}
<!-- </div> -->
{!! Form::close() !!}
@stop
</div><!-- /.box -->
@section('FooterInclude')