Skip to content

flexydial_v3 / fullerton

Go to a project
Toggle navigation
Toggle navigation pinning
c1717535 by Nitesh
Options

stop dual load on calling

1 parent 8126045c
Inline Side-by-side
Showing 2 changed files with 31 additions and 6 deletions
app/Http/Controllers/DialerController.php
This diff could not be displayed because it is too large.
public/assets/js/dialer.js
......@@ -634,9 +634,17 @@ function incomingPopupAlert(var1,var2,var3)
kDesktopNotification("",var1,var2,1500);
}
function outgoingCall()
function outgoingCall(redial='')
{
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);
......@@ -648,7 +656,10 @@ function outgoingCall()
{
if(kstychCall['callnumber']!="")
{
doAjax('dialer?action=newcall&client='+client,datastr,'dialersearchresults', 'ajax_manualdial','singlefail','POST', function(retstr){
doAjax('dialer?action=newcall&client='+client+'&redial='+redial,datastr,dialersearchresults, 'ajax_manualdial','singlefail','POST', function(retstr){
if (redial=="redial"){
$("#dialersearchresults").html(displaydata);
}
if(kstychCall['crmid']!="")
{
kSetDData('C','mCallState','Call');
......@@ -675,7 +686,10 @@ function outgoingCall()
if(kstychDialer['mDialerState']=="DialNext")
{
doAjax('dialer?action=newcall&client='+client,datastr,'dialersearchresults', 'ajax_manualdial','singlefail','POST', function(retstr){
doAjax('dialer?action=newcall&client='+client,datastr,dialersearchresults, 'ajax_manualdial','singlefail','POST', function(retstr){
if (redial=="redial"){
$("#dialersearchresults").html(displaydata);
}
if(kstychCall['crmid']!="")
{
kSetDData('C','mCallState','Call');
......@@ -695,7 +709,10 @@ function outgoingCall()
if(kstychDialer['mDialerState']=="Progressive")
{
doAjax('dialer?action=newcall&client='+client,datastr,'dialersearchresults', 'ajax_manualdial','singlefail','POST', function(retstr){
doAjax('dialer?action=newcall&client='+client+'&redial='+redial,datastr,dialersearchresults, 'ajax_manualdial','singlefail','POST', function(retstr){
if (redial=="redial"){
$("#dialersearchresults").html(displaydata);
}
if(kstychCall['crmid']!="")
{
kSetDData('C','mCallState','Call');
......@@ -965,7 +982,7 @@ function resetDialer()
kSetDData('C','ts_Dispo',0);
kSetDData('C','ts_Close',0);
updateDialerState("action","dialnext");
updateDialerState("action","dialnext","redial");
return;
}
......@@ -1124,9 +1141,17 @@ function updateDialerState(objstr,key,val,key2,val2)
if(objstr=="action")
{
if(key=="dialnext")
if(key=="dialnext" && val== "redial")
{
alert(val+"1");
outgoingCall(val);
}
if(key=="dialnext" && val== ""){
alert(val+"2");
outgoingCall();
}
if(key=="hangupall")
{
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!