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

Bug fix update

Browse Source 
Fix register page issue

Removed dynamicity in statuses

Removed dynamic status creation and deletion as system does not perform status change functionality correctly accordingly. The feature will only be available in premium versions.

Bug fix in ticket reply from agent panel

Bug fixed in assignment from new inbox
This commit is contained in:
Manish Verma
2018-08-14 17:30:53 +05:30
parent 4d86816ee6
commit 21f783f72b
7 changed files with 78 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/Agent/helpdesk/TicketController.php
View File

@@ -242,11 +242,11 @@ class TicketController extends Controller
public function size()
{
$size = 0;
$files = Input::file('attachment');
if (!$files) {
throw new \Exception('file size exceeded');
return $size;
}
$size = 0;
if (count($files) > 0) {
foreach ($files as $file) {
$size += $file->getSize();

1
resources/lang/en/lang.php
View File

@@ -1615,4 +1615,5 @@ return [
'system-outgoing-incoming-mail-not-configured' => 'You have not configured system mail. Faveo can\'t fetch tickets from mail or send mail to users without it.',
'confihure-the-mail-now' => 'Click here to configure the mail.',
'system-mail-not-configured-agent-message' => 'System incoming and outgoing email settings are not configured. Please contct your system\'s admin and report the problem.',
'ticket-assigned-successfully' => 'Selected tickets have been assigned sucessfully.',
];

2
resources/views/themes/default1/admin/helpdesk/settings/cron/cron-new.blade.php
View File

@@ -50,7 +50,7 @@
<div class="alert alert-dismissable" style="background: #F3F3F3">
<i class="fa fa-info-circle"></i>&nbsp;{!!Lang::get('lang.crone-url-message')!!}
<a href="http://ladybirdweb.com/support/show/cron-job-scheduling" style="color:black" target="blank">{!!Lang::get('lang.click')!!}</a> {!!Lang::get('lang.check-cron-set')!!}
<a href="https://www.support.faveohelpdesk.com/show/cron-job-scheduling" style="color:black" target="blank">{!!Lang::get('lang.click')!!}</a> {!!Lang::get('lang.check-cron-set')!!}
</div>
<div class="col-md-6">
<div class="info-box">

71
resources/views/themes/default1/admin/helpdesk/settings/status-edit.blade.php
View File

@@ -63,12 +63,75 @@ class="active"
<label>{!! Lang::get('lang.display_order') !!}: <span class="text-red"> *</span></label><br>
<input type="number" name="sort" min="1" class="form-control" value="{!! $status->sort !!}">
</div>
</div>
<div class="col-md-4">
</div><div class="col-md-2">
<div class="form-group {{ $errors->has('icon_class') ? 'has-error' : '' }}">
<i class=></i>
<label>{!! Lang::get('lang.icon_class') !!}: <span class="text-red"> *</span></label><br>
{!! Form::text('icon_class',null,['class'=>'form-control'])!!}
</div>
<select class="form-control icons" name="icon_class" style="font-family: FontAwesome, sans-serif;" required>
<option <?php if ($status->icon_class == "fa fa fa-edit") echo 'selected="selected"' ?> value="fa fa-edit">&#xf044</option>
<option <?php if ($status->icon_class == "fa fa-folder-open") echo 'selected="selected"' ?> value="fa fa-folder-open">&#xf07c</option>
<option <?php if ($status->icon_class == "fa fa-minus-circle") echo 'selected="selected"' ?> value="fa fa-minus-circle">&#xe082</option>
<option <?php if ($status->icon_class == "glyphicon glyphicon-alert") echo 'selected="selected"' ?> value="glyphicon glyphicon-alert">&#xe209</option>
<option <?php if ($status->icon_class == "fa fa fa-bars") echo 'selected="selected"' ?> value="fa fa-bars">&#xf0c9</option>
<option <?php if ($status->icon_class == "fa fa-bell-o") echo 'selected="selected"' ?> value="fa fa-bell-o">&#xf0a2</option>
<option <?php if ($status->icon_class == "fa fa-bookmark-o") echo 'selected="selected"' ?> value="fa fa-bookmark-o">&#xf097</option>
<option <?php if ($status->icon_class == "fa fa-bug") echo 'selected="selected"' ?> value="fa fa-bug">&#xf188</option>
<option <?php if ($status->icon_class == "fa fa-bullhorn") echo 'selected="selected"' ?> value="fa fa-bullhorn">&#xf0a1</option>
<option <?php if ($status->icon_class == "fa fa-calendar") echo 'selected="selected"' ?> value="fa fa-calendar">&#xf073</option>
<option <?php if ($status->icon_class == "fa fa-cart-plus") echo 'selected="selected"' ?> value="fa fa-cart-plus">&#xf217</option>
<option <?php if ($status->icon_class == "fa fa-check") echo 'selected="selected"' ?> value="fa fa-check">&#xf00c</option>
<option <?php if ($status->icon_class == "fa fa-check-circle") echo 'selected="selected"' ?> value="fa fa-check-circle">&#xf058</option>
<option <?php if ($status->icon_class == "fa fa-check-circle-o") echo 'selected="selected"' ?> value="fa fa-check-circle-o">&#xf05d</option>
<option <?php if ($status->icon_class == "fa fa-check-square") echo 'selected="selected"' ?> value="fa fa-check-square">&#xf14a</option>
<option <?php if ($status->icon_class == "fa fa-check-square-o") echo 'selected="selected"' ?> value="fa fa-check-square-o">&#xf046</option>
<option <?php if ($status->icon_class == "fa fa-circle-o-notch") echo 'selected="selected"' ?> value="fa fa-circle-o-notch">&#xf1ce</option>
<option <?php if ($status->icon_class == "fa fa-clock-o") echo 'selected="selected"' ?> value="fa fa-clock-o">&#xf017</option>
<option <?php if ($status->icon_class == "fa fa-close") echo 'selected="selected"' ?> value="fa fa-close">&#xf00d</option>
<option <?php if ($status->icon_class == "fa fa-code") echo 'selected="selected"' ?> value="fa fa-code">&#xf121</option>
<option <?php if ($status->icon_class == "fa fa-hand-paper-o") echo 'selected="selected"' ?> value="fa fa-hand-paper-o">&#xf256</option>
<option <?php if ($status->icon_class == "fa fa-hourglass-half") echo 'selected="selected"' ?> value="fa fa-hourglass-half">&#xf252</option>
<option <?php if ($status->icon_class == "fa fa-cog") echo 'selected="selected"' ?> value="fa fa-cog">&#xf013</option>
<option <?php if ($status->icon_class == "fa fa-cogs") echo 'selected="selected"' ?> value="fa fa-cogs">&#xf085</option>
<option <?php if ($status->icon_class == "fa fa-comment") echo 'selected="selected"' ?> value="fa fa-comment">&#xf075</option>
<option <?php if ($status->icon_class == "fa fa-comment-o") echo 'selected="selected"' ?> value="fa fa-comment-o">&#xf0e5</option>
<option <?php if ($status->icon_class == "fa fa-commenting") echo 'selected="selected"' ?> value="fa fa-commenting">&#xf27a</option>
<option <?php if ($status->icon_class == "fa fa-commenting-o") echo 'selected="selected"' ?> value="fa fa-commenting-o">&#xf27b</option>
<option <?php if ($status->icon_class == "fa fa-comments") echo 'selected="selected"' ?> value="fa fa-comments">&#xf086</option>
<option <?php if ($status->icon_class == "fa fa-comments-o") echo 'selected="selected"' ?> value="fa fa-comments-o">&#xf0e6</option>
<option <?php if ($status->icon_class == "fa fa-edit") echo 'selected="selected"' ?> value="fa fa-edit">&#xf044</option>
<option <?php if ($status->icon_class == "fa fa-envelope-o") echo 'selected="selected"' ?> value="fa fa-envelope-o">&#xf003</option>
<option <?php if ($status->icon_class == "fa fa-exchange") echo 'selected="selected"' ?> value="fa fa-exchange">&#xf0ec</option>
<option <?php if ($status->icon_class == "fa fa-exclamation") echo 'selected="selected"' ?> value="fa fa-exclamation">&#xf12a</option>
<option <?php if ($status->icon_class == "fa fa-exclamation-triangle") echo 'selected="selected"' ?> value="fa fa-exclamation-triangle">&#xf071</option>
<option <?php if ($status->icon_class == "fa fa-external-link") echo 'selected="selected"' ?> value="fa fa-external-link">&#xf08e</option>
<option <?php if ($status->icon_class == "fa fa-eye") echo 'selected="selected"' ?> value="fa fa-eye">&#xf06e</option>
<option <?php if ($status->icon_class == "fa fa-feed") echo 'selected="selected"' ?> value="fa fa-feed">&#xf09e</option>
<option <?php if ($status->icon_class == "fa fa-flag-o") echo 'selected="selected"' ?> value="fa fa-flag-o">&#xf11d</option>
<option <?php if ($status->icon_class == "fa fa-flash") echo 'selected="selected"' ?> value="fa fa-flash">&#xf0e7</option>
<option <?php if ($status->icon_class == "fa fa-folder-o") echo 'selected="selected"' ?> value="fa fa-folder-o">&#xf114</option>
<option <?php if ($status->icon_class == "fa fa-folder-open-o") echo 'selected="selected"' ?> value="fa fa-folder-open-o">&#xf115</option>
<option <?php if ($status->icon_class == "fa fa-group") echo 'selected="selected"' ?> value="fa fa-group">&#xf0c0</option>
<option <?php if ($status->icon_class == "fa fa-info") echo 'selected="selected"' ?> value="fa fa-info">&#xf129</option>
<option <?php if ($status->icon_class == "fa fa-life-ring") echo 'selected="selected"' ?> value="fa fa-life-ring">&#xf1cd</option>
<option <?php if ($status->icon_class == "fa fa-line-chart") echo 'selected="selected"' ?> value="fa fa-line-chart">&#xf201</option>
<option <?php if ($status->icon_class == "fa fa-location-arrow") echo 'selected="selected"' ?> value="fa fa-location-arrow">&#xf124</option>
<option <?php if ($status->icon_class == "fa fa-lock") echo 'selected="selected"' ?> value="fa fa-lock">&#xf023</option>
<option <?php if ($status->icon_class == "fa fa-mail-forward") echo 'selected="selected"' ?> value="fa fa-mail-forward">&#xf064</option>
<option <?php if ($status->icon_class == "fa fa-mail-reply") echo 'selected="selected"' ?> value="fa fa-mail-reply">&#xf112</option>
<option <?php if ($status->icon_class == "fa fa-mail-reply-all") echo 'selected="selected"' ?> value="fa fa-mail-reply-all">&#xf122</option>
<option <?php if ($status->icon_class == "fa fa-times") echo 'selected="selected"' ?> value="fa fa-times">&#xf00d</option>
<option <?php if ($status->icon_class == "fa fa-trash-o") echo 'selected="selected"' ?> value="fa fa-trash-o">&#xf014</option>
<option <?php if ($status->icon_class == "fa fa-user") echo 'selected="selected"' ?> value="fa fa-user">&#xf007</option>
<option <?php if ($status->icon_class == "fa fa-user-plus") echo 'selected="selected"' ?> value="fa fa-user-plus">&#xf234</option>
<option <?php if ($status->icon_class == "fa fa-user-secret") echo 'selected="selected"' ?> value="fa fa-user-secret">&#xf21b</option>
<option <?php if ($status->icon_class == "fa fa-user-times") echo 'selected="selected"' ?> value="fa fa-user-times">&#xf235</option>
<option <?php if ($status->icon_class == "fa fa-users") echo 'selected="selected"' ?> value="fa fa-users">&#xf0c0</option>
<option <?php if ($status->icon_class == "fa fa-wrench") echo 'selected="selected"' ?> value="fa fa-wrench">&#xf0ad</option>
<option <?php if ($status->icon_class == "fa fa-circle-o-notch") echo 'selected="selected"' ?> value="fa fa-circle-o-notch">&#xf1ce</option>
<option <?php if ($status->icon_class == "fa fa-refresh") echo 'selected="selected"' ?> value="fa fa-refresh">&#xf021</option>
<option <?php if ($status->icon_class == "fa fa-spinner") echo 'selected="selected"' ?> value="fa fa-spinner">&#xf110</option>
</select>
</div>
</div>
</div>
<div class="form-group">

112
resources/views/themes/default1/admin/helpdesk/settings/status.blade.php
View File

@@ -21,9 +21,6 @@ class="active"
<div class="box box-primary">
<div class="box-header with-border">
<h3 class="box-title">{!! Lang::get('lang.list_of_status') !!}</h3>
<div class="box-tools pull-right">
<button class="btn btn-box-tool" data-toggle="modal" data-target="#2create" id="create" title="{!! Lang::get('lang.create') !!}"><i class="fa fa-plus-circle fa-2x"></i></button>
</div>
</div><!-- /.box-header -->
<div class="box-body">
@@ -58,24 +55,6 @@ class="active"
<td>{!! $status->sort !!}</td>
<td>
<a href="{!! route('status.edit',$status->id) !!}"><button class="btn btn-info btn-sm">{!! Lang::get('lang.edit_details') !!}</button></a>
<button class="btn btn-danger btn-sm" data-toggle="modal" data-target="#{{$status->id}}delete">{!! Lang::get('lang.delete') !!}</button>
<div class="modal fade" id="{{$status->id}}delete">
<div class="modal-dialog">
<div class="modal-content">
<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.delete') !!}</h4>
</div>
<div class="modal-body">
<p>{!! Lang::get('lang.are_you_sure_you_want_to_delete') !!} ?</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default pull-left" data-dismiss="modal">Close</button>
{!! link_to_route('statuss.delete',Lang::get('lang.delete'),[$status->id],['id'=>'delete','class'=>'btn btn-danger btn-sm']) !!}
</div>
</div>
</div>
</div>
</td>
</tr>
@endforeach
@@ -84,95 +63,4 @@ class="active"
</div><!-- /.box-body -->
</div>
<!-- create modal -->
<div class="modal fade" id="2create">
<div class="modal-dialog">
<div class="modal-content">
{!! Form::open(['route'=>'statuss.create']) !!}
<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') !!}</h4>
</div>
<div class="modal-body">
@if(Session::has('errors'))
<script type="text/javascript">
$(document).ready(function() {
$("#create").click();
});
</script>
<div class="alert alert-danger alert-dismissable">
<i class="fa fa-ban"></i>
<b>{!! Lang::get('lang.alert') !!}!</b>
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<br/>
@foreach ($errors->all() as $error)
<li class="error-message-padding">{{ $error }}</li>
@endforeach
</div>
@endif
<div class="row">
<div class="col-md-6">
<div class="form-group {{ $errors->has('name') ? 'has-error' : '' }}">
<label for="title">{!! Lang::get('lang.name') !!}: <span class="text-red"> *</span></label><br>
{!! Form::text('name',null,['class'=>'form-control'])!!}
</div>
</div>
<div class="col-md-6">
<div class="form-group {{ $errors->has('sort') ? 'has-error' : '' }}">
<label for="title">{!! Lang::get('lang.display_order') !!}: <span class="text-red"> *</span></label><br>
{!! Form::text('sort',null,['class'=>'form-control'])!!}
</div>
</div>
<div class="col-md-6">
<div class="form-group {{ $errors->has('icon_class') ? 'has-error' : '' }}">
<label for="title">{!! Lang::get('lang.icon_class') !!}: <span class="text-red"> *</span></label><br>
{!! Form::text('icon_class',null,['class'=>'form-control'])!!}
</div>
</div>
</div>
<div class="form-group">
{!! Form::label('gender',Lang::get('lang.resolved_status')) !!}
<div class="callout callout-default" style="font-style: oblique;">{!! Lang::get('lang.status_msg3') !!}</div>
<div class="row">
<div class="col-xs-3">
{!! Form::radio('state','closed') !!} {{Lang::get('lang.yes')}}
</div>
<div class="col-xs-3">
{!! Form::radio('state','open') !!} {{Lang::get('lang.no')}}
</div>
</div>
</div>
<div class="form-group">
{!! Form::label('gender',Lang::get('lang.deleted_status')) !!}
<div class="callout callout-default" style="font-style: oblique;">{!! Lang::get('lang.status_msg2') !!}</div>
<div class="row">
<div class="col-xs-3">
{!! Form::radio('delete','yes') !!} {{Lang::get('lang.yes')}}
</div>
<div class="col-xs-3">
{!! Form::radio('delete','no') !!} {{Lang::get('lang.no')}}
</div>
</div>
</div>
<div class="form-group">
{!! Form::label('gender',Lang::get('lang.notify_user')) !!}
<div class="callout callout-default" style="font-style: oblique;">{!! Lang::get('lang.status_msg1') !!}</div>
<div class="row">
<div class="col-xs-3">
{!! Form::radio('email_user','yes') !!} {{Lang::get('lang.yes')}}
</div>
<div class="col-xs-3">
{!! Form::radio('email_user','no') !!} {{Lang::get('lang.no')}}
</div>
</div>
</div>
</div>
<div class="modal-footer">
{!! Form::submit(Lang::get('lang.create_status'),['class'=>'btn btn-primary'])!!}
<button type="button" class="btn btn-default pull-left" data-dismiss="modal">{!! Lang::get('lang.close') !!}</button>
</div>
{!! Form::close() !!}
</div>
</div>
</div>
@stop

8
resources/views/themes/default1/agent/helpdesk/ticket/more/tickets-options-script.blade.php
View File

@@ -305,12 +305,16 @@ var filterClick = 0;
$('#assign-form').on('submit', function() {
var t_id = "";
$("input[name='select_all[]']:checked:enabled").each(function() {
t_id = $(this).val() + "," + t_id;
if(t_id == "") {
t_id = $(this).val();
} else {
t_id = $(this).val() + "," + t_id;
}
});
//var t_id = $("input[name='select_all[]']").val();
$.ajax({
type: "PATCH",
url: "{{url('ticket/assign')}}",
url: "{{url('ticket/assign')}}/"+t_id,
dataType: "html",
data: $(this).serialize() + '&ticket_id=' + t_id,
beforeSend: function() {

1
routes/web.php
View File

@@ -14,6 +14,7 @@ Route::group(['middleware' => ['web']], function () {
Route::group(['middleware' => 'update', 'middleware' => 'install'], function () {
Auth::routes();
Route::post('login', ['uses' => 'Auth\AuthController@postLogin', 'as' => 'post.login']);
Route::post('auth/register', ['uses' => 'Auth\AuthController@postRegister', 'as' => 'post.register']);
Route::get('auth/logout', ['uses' => 'Auth\AuthController@getLogout', 'as' => 'get.logout']);
Route::get('social/login/redirect/{provider}/{redirect?}', ['uses' => 'Auth\AuthController@redirectToProvider', 'as' => 'social.login']);
Route::get('social/login/{provider}', ['as'=>'social.login.callback', 'uses'=>'Auth\AuthController@handleProviderCallback']);