Skip to content

flexydial_v3 / fullerton

Go to a project
Toggle navigation
Toggle navigation pinning
1f012e00 by Nitesh
Options

Resolved issue in dual load task

1 parent 99e600e3
Inline Side-by-side
Showing 2 changed files with 13 additions and 26 deletions
app/Http/Controllers/DialerController.php
......@@ -1647,7 +1647,7 @@ class DialerController extends Controller
if (!empty($users)) {
if (sizeof($users) >= 1) {
if ($redial!="redial") {
$searchresult = "<div style='clear:both'></div><div id=divworking></div><div style='clear:both'></div><script>showRecruit(\"" . $users[0]['id'] . "\",\"" . $enable . "\");</script>";
$searchresult .= "<script>kSetDData('C','crmid','" . $users[0]['id'] . "');kSetDData('C','callnumber','$callnumber');</script>";
......@@ -1656,7 +1656,7 @@ class DialerController extends Controller
doAjax('record?action=quicksearch','maintextsearch_1_txt=" . $users[0]['clientinternalid'] . "&maintextsearch_1_span=InternalID','internalid_matchlist','searchMutex', 'searchxhr','POST',function(retstr){
if(retstr.responseText.indexOf('No Records Found!')>-1)$('#internalid_matchlist').html('');
});</script>";
}
$searchresult .="<script>doAjax('dialer?action=agentcall&users=" . urlencode(json_encode($users)) . "&callnumber=" . $callnumber . "&client=" . $client . "&mDialerState=" . $kstychDialer_mDialerState ."&kstychDialerphone=" . $kstychDialer_phone . "','','', 'ajax_manualdial','singlefail','POST',function(retstr){
if(retstr.responseText=='hangup_agentcall'){
kSetDData('C','callid','hangup_agentcall');
......
public/assets/js/dialer.js
......@@ -634,17 +634,11 @@ function incomingPopupAlert(var1,var2,var3)
kDesktopNotification("",var1,var2,1500);
}
function outgoingCall(redial='')
function outgoingCall()
{
var dialersearchresults='';
if (redial!="redial") {
var dialersearchresults='dialersearchresults';
$("#dialersearchresults").html("");
}else{
var displaydata=$("#dialersearchresults").html();
}
kSetDData('C','callnumber',$("#manualdialnumber_txt").val());
var datastr="kstychCall="+JSON.stringify(kstychCall);
......@@ -656,10 +650,8 @@ function outgoingCall(redial='')
{
if(kstychCall['callnumber']!="")
{
doAjax('dialer?action=newcall&client='+client+'&redial='+redial,datastr,dialersearchresults, 'ajax_manualdial','singlefail','POST', function(retstr){
if (redial=="redial"){
$("#dialersearchresults").html(displaydata);
}
doAjax('dialer?action=newcall&client='+client,datastr,'dialersearchresults', 'ajax_manualdial','singlefail','POST', function(retstr){
if(kstychCall['crmid']!="")
{
kSetDData('C','mCallState','Call');
......@@ -686,10 +678,8 @@ function outgoingCall(redial='')
if(kstychDialer['mDialerState']=="DialNext")
{
doAjax('dialer?action=newcall&client='+client,datastr,dialersearchresults, 'ajax_manualdial','singlefail','POST', function(retstr){
if (redial=="redial"){
$("#dialersearchresults").html(displaydata);
}
doAjax('dialer?action=newcall&client='+client,datastr,'dialersearchresults', 'ajax_manualdial','singlefail','POST', function(retstr){
if(kstychCall['crmid']!="")
{
kSetDData('C','mCallState','Call');
......@@ -709,10 +699,8 @@ function outgoingCall(redial='')
if(kstychDialer['mDialerState']=="Progressive")
{
doAjax('dialer?action=newcall&client='+client+'&redial='+redial,datastr,dialersearchresults, 'ajax_manualdial','singlefail','POST', function(retstr){
if (redial=="redial"){
$("#dialersearchresults").html(displaydata);
}
doAjax('dialer?action=newcall&client='+client,datastr,'dialersearchresults', 'ajax_manualdial','singlefail','POST', function(retstr){
if(kstychCall['crmid']!="")
{
kSetDData('C','mCallState','Call');
......@@ -982,7 +970,7 @@ function resetDialer()
kSetDData('C','ts_Dispo',0);
kSetDData('C','ts_Close',0);
updateDialerState("action","dialnext","redial");
updateDialerState("action","dialnext");
return;
}
......@@ -1146,8 +1134,7 @@ function updateDialerState(objstr,key,val,key2,val2)
outgoingCall(val);
}
if(key=="dialnext" && val== ""){
}else if(key=="dialnext"){
outgoingCall();
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!