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

Update v1.0.6.10

Browse Source
This commit is contained in:
sujitprasad
2016-04-01 11:23:10 +05:30
parent ba8ccf7646
commit d9c68260cb
26 changed files with 1123 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/themes/default1/agent/helpdesk/ticket/inbox.blade.php
View File

@@ -381,8 +381,8 @@ class="active"
if(link) {
link.click();
}
}, 500);
},2000);
}, 100);
},1000);
}

4
resources/views/themes/default1/agent/helpdesk/ticket/open.blade.php
View File

@@ -16,9 +16,9 @@ class="active"
<?php
if(Auth::user()->role == 'agent') {
$dept = App\Model\helpdesk\Agent\Department::where('id','=',Auth::user()->primary_dpt)->first();
$tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->where('assigned_to', '=', 0)->where('dept_id','=',$dept->id)->orderBy('id', 'DESC')->paginate(20);
$tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->where('dept_id','=',$dept->id)->orderBy('id', 'DESC')->paginate(20);
} else {
$tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->where('assigned_to', '=', 0)->orderBy('id', 'DESC')->paginate(20);
$tickets = App\Model\helpdesk\Ticket\Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->orderBy('id', 'DESC')->paginate(20);
}
?>
<!-- Main content -->

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

@@ -8,7 +8,7 @@ class="active"
active
@stop
<?php
<?php
$user = App\User::where('id', '=', $tickets->user_id)->first();
$assignedto = App\User::where('id', '=', $tickets->assigned_to)->first();
$agent_group = Auth::user()->assign_group;
@@ -259,7 +259,6 @@ echo UTC::usertimezone(date_format($time, 'Y-m-d H:i:s'));
<div id="message-success2"></div>
</div>
<div id="alert22" class="alert alert-warning alert-dismissable" style="display:none;">
<button id="dismiss22" type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
<h4><i class="icon fa fa-warning"></i>Alert!</h4>
<div id="message-warning2"></div>
</div>
@@ -1317,10 +1316,11 @@ jQuery(document).ready(function() {
setInterval(function(){
$("#alert11").hide();
setTimeout(function() {
var link = document.querySelector('#load-inbox');
if(link) {
link.click();
}
// var link = document.querySelector('#load-inbox');
// if(link) {
// link.click();
// }
history.go(-1);
}, 500);
},2000);
}
@@ -1347,10 +1347,11 @@ jQuery(document).ready(function() {
$('#message-success1').html(message);
setInterval(function(){$("#alert11").hide();
setTimeout(function() {
var link = document.querySelector('#load-inbox');
if(link) {
link.click();
}
// var link = document.querySelector('#load-inbox');
// if(link) {
// link.click();
// }
history.go(-1);
}, 500);
},2000);
}
@@ -1401,10 +1402,11 @@ jQuery(document).ready(function() {
$('#message-success1').html(message);
setInterval(function(){$("#alert11").hide();
setTimeout(function() {
var link = document.querySelector('#load-inbox');
if(link) {
link.click();
}
// var link = document.querySelector('#load-inbox');
// if(link) {
// link.click();
// }
history.go(-1);
}, 500);
},2000);
}
@@ -1549,6 +1551,7 @@ jQuery(document).ready(function() {
$("#dismis42").trigger("click");
// $("#RefreshAssign").load( "../thread/{{$tickets->id}} #RefreshAssign");
// $("#General").load( "../thread/{{$tickets->id}} #General");
$("#hide2").load("../thread/{{$tickets->id}} #hide2");
$("#refresh").load("../thread/{{$tickets->id}} #refresh");
$("#refresh1").load("../thread/{{$tickets->id}} #refresh1");
$("#refresh3").load("../thread/{{$tickets->id}} #refresh3");
@@ -1581,6 +1584,7 @@ jQuery(document).ready(function() {
$('#add-change-loader').hide();
$('#add-change-body').show();
$("#close101").trigger("click");
$("#hide2").load("../thread/{{$tickets->id}} #hide2");
$("#refresh").load("../thread/{{$tickets->id}} #refresh");
$("#refresh1").load("../thread/{{$tickets->id}} #refresh1");
$("#refresh3").load("../thread/{{$tickets->id}} #refresh3");
@@ -1876,6 +1880,7 @@ jQuery(document).ready(function() {
$("#merge-body-form").hide();
$("#merge_loader").hide();
$("#merge-btn").attr('disabled', true);
$("#hide2").load("../thread/{{$tickets->id}} #hide2");
$("#refresh").load("../thread/{{$tickets->id}} #refresh");
$("#refresh1").load("../thread/{{$tickets->id}} #refresh1");
$("#refresh3").load("../thread/{{$tickets->id}} #refresh3");
@@ -1976,11 +1981,12 @@ function lockAjaxCall(locktime){
$('#message-warning2').html(message);
$('#replybtn').attr('disabled', true);
//setInterval(function(){$("#alert23").hide(); },10000);
} else {
} else if(response == 2) {
// alert(response);
// var message = "{{Lang::get('lang.access-ticket')}}"+locktime/(60*1000)
// +"{{Lang::get('lang.minutes')}}";
$("#alert22").hide();
$("#hide2").load("../thread/{{$tickets->id}} #hide2");
$("#refresh").load("../thread/{{$tickets->id}} #refresh");
$("#refresh1").load("../thread/{{$tickets->id}} #refresh1");
$("#refresh3").load("../thread/{{$tickets->id}} #refresh3");
@@ -1989,6 +1995,19 @@ function lockAjaxCall(locktime){
// $('#message-success2').html(message);
$('#replybtn').attr('disabled', false);
// setInterval(function(){$("#alert21").hide(); },8000);
} else {
// alert(response);
// var message = "{{Lang::get('lang.access-ticket')}}"+locktime/(60*1000)
// +"{{Lang::get('lang.minutes')}}";
$("#alert22").hide();
$("#refresh").load("../thread/{{$tickets->id}} #refresh");
// $("#refresh1").load("../thread/{{$tickets->id}} #refresh1");
$("#refresh3").load("../thread/{{$tickets->id}} #refresh3");
$("#t5").load("../thread/{{$tickets->id}} #t5");
// $("#alert21").show();
// $('#message-success2').html(message);
$('#replybtn').attr('disabled', false);
// setInterval(function(){$("#alert21").hide(); },8000);
}
}
})