update v1.0.7.9 R.C.

This is a Release Candidate. We are still testing.
This commit is contained in:
Sujit Prasad
2016-08-03 20:04:36 +05:30
parent 8b6b924d09
commit ffa56a43cb
3830 changed files with 181529 additions and 495353 deletions

View File

@@ -16,9 +16,11 @@ $thread = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', \Cryp
</div>
<div class="col-md-3">
<div class="pull-right">
<!-- <button type="button" class="btn btn-default"><i class="fa fa-edit" style="color:green;"> </i> Edit</button> -->
{{-- <button type="button" class="btn btn-default"><i class="fa fa-print" style="color:blue;"> </i> {!! link_to_route('ticket.print','Print',[$tickets->id]) !!}</button> --}}
<!-- </div> -->
@if( $common_setting->status == '1')
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"><i class="fa fa-exchange" style="color:teal;"> </i>
{!! Lang::get('lang.change_status') !!} <span class="caret"></span>
@@ -30,7 +32,7 @@ $thread = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', \Cryp
<li><a href="#" id="close"><i class="fa fa-check" style="color:#15F109;"> </i>{!! Lang::get('lang.close') !!}</a></li>
<li><a href="#" id="resolved"><i class="fa fa-check-circle " style="color:#0EF1BE;"> </i> {!! Lang::get('lang.resolved') !!}</a></li>
</ul>
</div>
</div>@endif
{!! Form::close() !!}
</div>
</div>
@@ -451,7 +453,7 @@ foreach ($conversations as $conversation) {
//Add text editor
$("textarea").wysihtml5();
});
@if( $common_setting->status == '1')
jQuery(document).ready(function() {
// Close a ticket
$('#close').on('click', function(e) {
@@ -538,6 +540,8 @@ foreach ($conversations as $conversation) {
})
return false;
});
@endif
});
</script>
@stop

View File

@@ -238,7 +238,7 @@ foreach ($conversations as $conversation) {
<footer class="comment-meta"<?php if($role->role == "user") { ?> style="background-color: hsla(100, 100%, 51%, 0.15)" <?php } else { ?> style="background-color:#FFFCB3" <?php } ?> >
<div class="comment-author">
@if($role->profile_pic)
<img src="{{asset('lb-faveo/media/profilepic')}}{{'/'}}{{$role->profile_pic}}"alt="" height="50" width="50" class="avatar" <?php if($role->role == "user") { ?>style="box-shadow: 0 1px 3px #00FF26;" <?php } else { ?> style="box-shadow: 0 1px 3px #FFEC00;" <?php } ?> >
<img src="{{asset('uploads/profilepic')}}{{'/'}}{{$role->profile_pic}}"alt="" height="50" width="50" class="avatar" <?php if($role->role == "user") { ?>style="box-shadow: 0 1px 3px #00FF26;" <?php } else { ?> style="box-shadow: 0 1px 3px #FFEC00;" <?php } ?> >
@else
<img src="{{ Gravatar::src($role->email) }}" alt="" height="50" width="50" class="avatar" <?php if($role->role == "user") { ?>style="box-shadow: 0 1px 3px #00FF26;" <?php } else { ?> style="box-shadow: 0 1px 3px #FFEC00;" <?php } ?> >
@endif

View File

@@ -34,13 +34,9 @@ class = "active"
@endif
<div class="banner-content text-center">
{!! Form::open(['url' => 'checkmyticket' , 'method' => 'POST'] )!!}
{!! Form::label('email',Lang::get('lang.email')) !!}<span class="text-red"> *</span>
{!! Form::text('email_address',null,['class' => 'form-control']) !!}
{!! Form::label('ticket_number',Lang::get('lang.ticket_number')) !!}<span class="text-red">*</span>
{!! Form::text('ticket_number',null,['class' => 'form-control']) !!}
<br/><input type="submit" value="{!! Lang::get('lang.check_ticket_status') !!}" class="btn btn-info">
{!! Form::close() !!}
@@ -57,7 +53,6 @@ class = "active"
{!! Session::get('message') !!}
</div>
@endif
@if (count($errors) > 0)
@if(Session::has('check'))
<?php goto a; ?>
@@ -74,7 +69,6 @@ class = "active"
</div>
<?php a: ?>
@endif
<!-- open a form -->
{{-- <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.0.2/jquery.min.js"></script> --}}
<script src="{{asset("lb-faveo/js/jquery2.0.2.min.js")}}" type="text/javascript"></script>
@@ -99,87 +93,87 @@ class = "active"
{!! $errors->first('help_topic', '<spam class="help-block">:message</spam>') !!}
<?php
$forms = App\Model\helpdesk\Form\Forms::get();
$helptopic = App\Model\helpdesk\Manage\Help_topic::get();
$helptopic = App\Model\helpdesk\Manage\Help_topic::where('status', '=', 1)->get();
?>
<select name="helptopic" class="form-control" id="selectid">
<?php
$system_default_department = App\Model\helpdesk\Settings\System::where('id', '=', 1)->first();
if ($system_default_department->department) {
if (isset($system_default_department->department)) {
$department_relation_helptopic = App\Model\helpdesk\Manage\Help_topic::where('department', '=', $system_default_department->department)->first();
$default_helptopic = $department_relation_helptopic->id;
} else {
$default_helptopic = 0;
}
?>
?>
@foreach($helptopic as $topic)
<option value="{!! $topic->id !!}">{!! $topic->topic !!}</option>
@endforeach
</select>
</div>
<div class="col-md-12 form-group {{ $errors->has('Name') ? 'has-error' : '' }}">
@if(Auth::user())
{!! Form::hidden('Name',Auth::user()->user_name,['class' => 'form-control']) !!}
@else
<div class="col-md-12 form-group {{ $errors->has('Name') ? 'has-error' : '' }}">
{!! Form::label('Name',Lang::get('lang.name')) !!}<span class="text-red"> *</span>
{!! Form::text('Name',null,['class' => 'form-control']) !!}
</div>
@endif
{!! Form::label('Name',Lang::get('lang.name')) !!}<span class="text-red"> *</span>
@if(Auth::user())
{!! Form::hidden('Email',Auth::user()->email,['class' => 'form-control']) !!}
@else
<div class="col-md-12 form-group {{ $errors->has('Email') ? 'has-error' : '' }}">
{!! Form::label('Email',Lang::get('lang.email')) !!}<span class="text-red"> *</span>
{!! Form::text('Email',null,['class' => 'form-control']) !!}
</div>
@endif
{!! Form::text('Name',null,['class' => 'form-control']) !!}
</div>
<div class="col-md-12 form-group {{ $errors->has('Email') ? 'has-error' : '' }}">
{!! Form::label('Email',Lang::get('lang.email')) !!}<span class="text-red"> *</span>
{!! Form::text('Email',null,['class' => 'form-control']) !!}
</div>
@if(!Auth::user())
<div class="col-md-2 form-group {{ Session::has('country_code_error') ? 'has-error' : '' }}">
{!! Form::label('Code',Lang::get('lang.country-code')) !!}
{!! Form::text('Code',null,['class' => 'form-control', 'placeholder' => $phonecode, 'title' => Lang::get('lang.enter-country-phone-code')]) !!}
</div>
<div class="col-md-5 form-group {{ $errors->has('Phone') ? 'has-error' : '' }}">
{!! Form::label('Mobile',Lang::get('lang.mobile_number')) !!}
{!! Form::text('Mobile',null,['class' => 'form-control']) !!}
</div>
<div class="col-md-5 form-group {{ $errors->has('Phone') ? 'has-error' : '' }}">
{!! Form::label('Phone',Lang::get('lang.phone')) !!}
{!! Form::text('Phone',null,['class' => 'form-control']) !!}
</div>
<div class="col-md-5 form-group {{ $errors->has('Phone') ? 'has-error' : '' }}">
{!! Form::label('Subject',Lang::get('lang.subject')) !!}
{!! Form::text('Subject',null,['class' => 'form-control']) !!}
</div>
@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>
{!! Form::text('Subject',null,['class' => 'form-control']) !!}
</div>
<div class="col-md-12 form-group {{ $errors->has('Details') ? 'has-error' : '' }}">
{!! Form::label('Details',Lang::get('lang.message')) !!}<span class="text-red"> *</span>
{!! Form::textarea('Details',null,['class' => 'form-control']) !!}
</div>
<div class="col-md-12 form-group">
<div class="btn btn-default btn-file"><i class="fa fa-paperclip"> </i> {!! Lang::get('lang.attachment') !!}<input type="file" name="attachment[]" multiple/></div><br/>
{!! Lang::get('lang.max') !!}. 10MB
</div>
{{-- Event fire --}}
<?php Event::fire(new App\Events\ClientTicketForm()); ?>
<div class="col-md-12" id="response"> </div>
<div id="ss" class="xs-md-6 form-group {{ $errors->has('') ? 'has-error' : '' }}"> </div>
<div class="col-md-12 form-group">{!! Form::submit(Lang::get('lang.Send'),['class'=>'form-group btn btn-info pull-left'])!!}</div>
</div>
<div class="col-md-12" id="response"> </div>
<div id="ss" class="xs-md-6 form-group {{ $errors->has('') ? 'has-error' : '' }}"> </div>
</div>
{!! Form::close() !!}
</div>
@@ -189,7 +183,6 @@ class = "active"
|====================================================
-->
<script type="text/javascript">
$('#selectid').on('change', function() {
var value = $('#selectid').val();
$.ajax({
@@ -198,7 +191,7 @@ $('#selectid').on('change', function() {
data: value,
success: function(data) {
$('#response').html(data);
//location.reload();
var wysihtml5Editor = $('#unique-textarea').wysihtml5().data("wysihtml5").editor;
}
});
});
@@ -207,7 +200,5 @@ $(function() {
//Add text editor
$("textarea").wysihtml5();
});
</script>
@stop

View File

@@ -33,12 +33,18 @@
</a>
</span>
@endif
@if(App\Model\helpdesk\Settings\System::first()->status == 1)
<span onclick="javascript: window.location.href='{!! URL::route('form') !!}';">
<a href="{!! URL::route('form') !!}" class="widgetrowitem defaultwidget" style="background-image: URL('lb-faveo/media/images/submitticket.png');">
<span class="widgetitemtitle">{!! Lang::get('lang.submit_a_ticket') !!}</span>
</a>
</span>
<?php $system = App\Model\helpdesk\Settings\System::where('id', '=', '1')->first();
?>
@if($system != null)
@if($system->status)
@if($system->status == 1)
<span onclick="javascript: window.location.href='{!! URL::route('form') !!}';">
<a href="{!! URL::route('form') !!}" class="widgetrowitem defaultwidget" style="background-image: URL('lb-faveo/media/images/submitticket.png');">
<span class="widgetitemtitle">{!! Lang::get('lang.submit_a_ticket') !!}</span>
</a>
</span>
@endif
@endif
@endif
<span onclick="javascript: window.location.href='{{url('mytickets')}}';">
<a href="{{url('mytickets')}}" class="widgetrowitem defaultwidget" style="background-image: URL('lb-faveo/media/images/news.png');">
@@ -53,7 +59,7 @@
</div>
</div>
<script type="text/javascript"> $(function(){ $('.dialogerror, .dialoginfo, .dialogalert').fadeIn('slow');$("form").bind("submit", function(e){$(this).find("input:submit").attr("disabled", "disabled");});});</script>
<script type="text/javascript" >try {if (top.location.hostname != self.location.hostname) { throw 1; }} catch (e) { top.location.href = self.location.href; }</script>
<script type="text/javascript" >try {if (top.location.hostname != self.location.hostname) { throw 1; }} catch (e) { top.location.href = self.location.href; }</script>
</div>
@stop

View File

@@ -77,7 +77,9 @@ class="active"
$stringCut = substr($string, 0, 40);
$string = substr($stringCut, 0, strrpos($stringCut, ' ')) . ' ...';
}
$TicketData = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)->max('id');
$TicketData = App\Model\helpdesk\Ticket\Ticket_Thread::where('ticket_id', '=', $ticket->id)
->where('user_id', '!=' , null)
->max('id');
$TicketDatarow = App\Model\helpdesk\Ticket\Ticket_Thread::where('id', '=', $TicketData)->first();
$LastResponse = App\User::where('id', '=', $TicketDatarow->user_id)->first();
if ($LastResponse->role == "user") {
@@ -90,7 +92,7 @@ class="active"
$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)->where('is_internal', '=', 0)->get();
$count = count($titles);
foreach ($titles as $title) {
$title = $title;
@@ -177,7 +179,7 @@ class="active"
$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)->where("is_internal", "=", 0)->get();
$count = count($titles);
foreach ($titles as $title) {
$title = $title;