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

bug-fix-patch

Browse Source 
# Counting only authenticated user's notification
# Agents were not able to select canned resposne while replying
This commit is contained in:
Manish Verma
2016-12-19 15:47:17 +05:30
parent 7855ba7a97
commit 77c88cc229
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Common/NotificationController.php
View File

@@ -164,7 +164,7 @@ class NotificationController extends Controller
}, 'notification.model' => function ($query) { }, 'notification.model' => function ($query) {
$query->select('id', 'ticket_number'); $query->select('id', 'ticket_number');
}, },
]); ])->where('id', '=', \Auth::user()->id);
return $notifications; return $notifications;
} }

19
resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php
View File

@@ -397,14 +397,14 @@ if ($thread->title != "") {
<label>{!! Lang::get('lang.response') !!}</label> <label>{!! Lang::get('lang.response') !!}</label>
</div> </div>
<div class="col-md-10"> <div class="col-md-10">
<select class="form-control" style="width:55%" id="select"> <select class="form-control" style="width:55%" id="select" onchange="addCannedResponse()">
<?php <?php
$canneds = App\Model\helpdesk\Agent_panel\Canned::where('user_id', '=', Auth::user()->id)->get(); $canneds = App\Model\helpdesk\Agent_panel\Canned::where('user_id', '=', Auth::user()->id)->get();
?> ?>
<option value="zzz">{!! Lang::get('lang.select_a_canned_response') !!}</option> <option value="zzz">{!! Lang::get('lang.select_a_canned_response') !!}</option>
@foreach($canneds as $canned) @foreach($canneds as $canned)
<option value="{!! $canned->id !!}" >{!! $canned->title !!}</option> <option value="{!! $canned->message !!}" >{!! $canned->title !!}</option>
@endforeach @endforeach
{{-- <option>Last Message</option> --}} {{-- <option>Last Message</option> --}}
</select> </select>
@@ -2210,5 +2210,20 @@ echo $ticket_data->title;
$(this).html($('<span />').width(Math.max(0, (Math.min(5, parseFloat($(this).html())))) * 16)); $(this).html($('<span />').width(Math.max(0, (Math.min(5, parseFloat($(this).html())))) * 16));
}); });
} }
function addCannedResponse() {
var selectedResponse = document.getElementById( "select" );
var response = selectedResponse.options[selectedResponse.selectedIndex ].value;
if (response == 'zzz') {
for ( instance in CKEDITOR.instances ){
CKEDITOR.instances[instance].updateElement();
CKEDITOR.instances[instance].setData('');
}
} else {
for ( instance in CKEDITOR.instances ) {
CKEDITOR.instances[instance].insertHtml(response);
}
}
}
</script> </script>
@stop @stop