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

Bug fixes

Browse Source
This commit is contained in:
Manish Verma
2018-08-15 17:58:20 +05:30
parent 1e9696df64
commit 234bf9cdc0
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Agent/helpdesk/CannedController.php
View File

@@ -156,7 +156,7 @@ class CannedController extends Controller
/* Check whether function success or not */
$canned->delete();
/* redirect to Index page with Success Message */
return redirect()->route('canned.list')->with('success', Lang::get('lang.user_deleted_successfully'));
return redirect()->route('canned.list')->with('success', Lang::get('lang.canned_response_deleted'));
} catch (Exception $e) {
/* redirect to Index page with Fails Message */
return redirect()->route('canned.list')->with('fails', $e->getMessage());

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

@@ -1616,4 +1616,5 @@ return [
'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.',
'canned_response_deleted' => 'Canned response deleted successfully',
];

2
resources/views/themes/default1/admin/helpdesk/settings/notification.blade.php
View File

@@ -75,7 +75,7 @@ class="active"
<form action="{{ url('delete-notification-log') }}" method="post">
{{ csrf_field() }}
<div class="callout callout-default" style="font-style: oblique;">{!! Lang::get('lang.noti_msg2') !!}</div>
<input type="number" class="form-control" name='no_of_days' placeholder="{!! lang::get('lang.enter_no_of_days') !!}">
<input type="number" class="form-control" name='no_of_days' placeholder="{!! lang::get('lang.enter_no_of_days') !!}" min='1'>
<button type="submit" class="btn btn-primary">{!! Lang::get('lang.submit') !!}</button>
</form>
</div>

7
resources/views/themes/default1/agent/helpdesk/canned/index.blade.php
View File

@@ -54,7 +54,7 @@ class="active"
<td>{{$Canned->title }}</td>
<td>
{!! Form::open(['route'=>['canned.destroy', $Canned->id],'method'=>'DELETE']) !!}
<a data-toggle="modal" data-target="#view{!! $Canned->id !!}" href="#" class="btn btn-info btn-xs btn-flat">{!! Lang::get('lang.view') !!}</a>
<a data-toggle="modal" data-target="#view{!! $Canned->id !!}" href="#" class="btn btn-info btn-xs btn-flat" onClick="updateModelTitle('{{$Canned->title}}')">{!! Lang::get('lang.view') !!}</a>
<a href="{!! URL::route('canned.edit',$Canned->id) !!}" class="btn btn-primary btn-xs btn-flat">{!! Lang::get('lang.edit') !!}</a>
{!! Form::button('<i class="fa fa-trash" style="color:black;"> </i> '.Lang::get('lang.delete'),
['type' => 'submit',
@@ -70,7 +70,7 @@ class="active"
<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.surrender') !!}</h4>
<h4 class="modal-title"></h4>
</div>
<div class="modal-body">
<p><pre>{!! $Canned->message !!}</pre></p>
@@ -86,6 +86,9 @@ class="active"
</div>
</div>
<script>
function updateModelTitle(title){
$('.modal-title').html(title);
}
$(function() {
$("#example1").DataTable();
$('#example2').DataTable({