1f012e00 by Nitesh

Resolved issue in dual load task

1 parent 99e600e3
...@@ -1647,7 +1647,7 @@ class DialerController extends Controller ...@@ -1647,7 +1647,7 @@ class DialerController extends Controller
1647 1647
1648 if (!empty($users)) { 1648 if (!empty($users)) {
1649 if (sizeof($users) >= 1) { 1649 if (sizeof($users) >= 1) {
1650 if ($redial!="redial") { 1650
1651 $searchresult = "<div style='clear:both'></div><div id=divworking></div><div style='clear:both'></div><script>showRecruit(\"" . $users[0]['id'] . "\",\"" . $enable . "\");</script>"; 1651 $searchresult = "<div style='clear:both'></div><div id=divworking></div><div style='clear:both'></div><script>showRecruit(\"" . $users[0]['id'] . "\",\"" . $enable . "\");</script>";
1652 1652
1653 $searchresult .= "<script>kSetDData('C','crmid','" . $users[0]['id'] . "');kSetDData('C','callnumber','$callnumber');</script>"; 1653 $searchresult .= "<script>kSetDData('C','crmid','" . $users[0]['id'] . "');kSetDData('C','callnumber','$callnumber');</script>";
...@@ -1656,7 +1656,7 @@ class DialerController extends Controller ...@@ -1656,7 +1656,7 @@ class DialerController extends Controller
1656 doAjax('record?action=quicksearch','maintextsearch_1_txt=" . $users[0]['clientinternalid'] . "&maintextsearch_1_span=InternalID','internalid_matchlist','searchMutex', 'searchxhr','POST',function(retstr){ 1656 doAjax('record?action=quicksearch','maintextsearch_1_txt=" . $users[0]['clientinternalid'] . "&maintextsearch_1_span=InternalID','internalid_matchlist','searchMutex', 'searchxhr','POST',function(retstr){
1657 if(retstr.responseText.indexOf('No Records Found!')>-1)$('#internalid_matchlist').html(''); 1657 if(retstr.responseText.indexOf('No Records Found!')>-1)$('#internalid_matchlist').html('');
1658 });</script>"; 1658 });</script>";
1659 } 1659
1660 $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){ 1660 $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){
1661 if(retstr.responseText=='hangup_agentcall'){ 1661 if(retstr.responseText=='hangup_agentcall'){
1662 kSetDData('C','callid','hangup_agentcall'); 1662 kSetDData('C','callid','hangup_agentcall');
......
...@@ -634,17 +634,11 @@ function incomingPopupAlert(var1,var2,var3) ...@@ -634,17 +634,11 @@ function incomingPopupAlert(var1,var2,var3)
634 kDesktopNotification("",var1,var2,1500); 634 kDesktopNotification("",var1,var2,1500);
635 } 635 }
636 636
637 function outgoingCall(redial='') 637 function outgoingCall()
638 { 638 {
639 var dialersearchresults=''; 639
640 if (redial!="redial") {
641 var dialersearchresults='dialersearchresults';
642 $("#dialersearchresults").html(""); 640 $("#dialersearchresults").html("");
643 }else{ 641
644
645 var displaydata=$("#dialersearchresults").html();
646
647 }
648 kSetDData('C','callnumber',$("#manualdialnumber_txt").val()); 642 kSetDData('C','callnumber',$("#manualdialnumber_txt").val());
649 643
650 var datastr="kstychCall="+JSON.stringify(kstychCall); 644 var datastr="kstychCall="+JSON.stringify(kstychCall);
...@@ -656,10 +650,8 @@ function outgoingCall(redial='') ...@@ -656,10 +650,8 @@ function outgoingCall(redial='')
656 { 650 {
657 if(kstychCall['callnumber']!="") 651 if(kstychCall['callnumber']!="")
658 { 652 {
659 doAjax('dialer?action=newcall&client='+client+'&redial='+redial,datastr,dialersearchresults, 'ajax_manualdial','singlefail','POST', function(retstr){ 653 doAjax('dialer?action=newcall&client='+client,datastr,'dialersearchresults', 'ajax_manualdial','singlefail','POST', function(retstr){
660 if (redial=="redial"){ 654
661 $("#dialersearchresults").html(displaydata);
662 }
663 if(kstychCall['crmid']!="") 655 if(kstychCall['crmid']!="")
664 { 656 {
665 kSetDData('C','mCallState','Call'); 657 kSetDData('C','mCallState','Call');
...@@ -686,10 +678,8 @@ function outgoingCall(redial='') ...@@ -686,10 +678,8 @@ function outgoingCall(redial='')
686 678
687 if(kstychDialer['mDialerState']=="DialNext") 679 if(kstychDialer['mDialerState']=="DialNext")
688 { 680 {
689 doAjax('dialer?action=newcall&client='+client,datastr,dialersearchresults, 'ajax_manualdial','singlefail','POST', function(retstr){ 681 doAjax('dialer?action=newcall&client='+client,datastr,'dialersearchresults', 'ajax_manualdial','singlefail','POST', function(retstr){
690 if (redial=="redial"){ 682
691 $("#dialersearchresults").html(displaydata);
692 }
693 if(kstychCall['crmid']!="") 683 if(kstychCall['crmid']!="")
694 { 684 {
695 kSetDData('C','mCallState','Call'); 685 kSetDData('C','mCallState','Call');
...@@ -709,10 +699,8 @@ function outgoingCall(redial='') ...@@ -709,10 +699,8 @@ function outgoingCall(redial='')
709 699
710 if(kstychDialer['mDialerState']=="Progressive") 700 if(kstychDialer['mDialerState']=="Progressive")
711 { 701 {
712 doAjax('dialer?action=newcall&client='+client+'&redial='+redial,datastr,dialersearchresults, 'ajax_manualdial','singlefail','POST', function(retstr){ 702 doAjax('dialer?action=newcall&client='+client,datastr,'dialersearchresults', 'ajax_manualdial','singlefail','POST', function(retstr){
713 if (redial=="redial"){ 703
714 $("#dialersearchresults").html(displaydata);
715 }
716 if(kstychCall['crmid']!="") 704 if(kstychCall['crmid']!="")
717 { 705 {
718 kSetDData('C','mCallState','Call'); 706 kSetDData('C','mCallState','Call');
...@@ -982,7 +970,7 @@ function resetDialer() ...@@ -982,7 +970,7 @@ function resetDialer()
982 kSetDData('C','ts_Dispo',0); 970 kSetDData('C','ts_Dispo',0);
983 kSetDData('C','ts_Close',0); 971 kSetDData('C','ts_Close',0);
984 972
985 updateDialerState("action","dialnext","redial"); 973 updateDialerState("action","dialnext");
986 974
987 return; 975 return;
988 } 976 }
...@@ -1146,8 +1134,7 @@ function updateDialerState(objstr,key,val,key2,val2) ...@@ -1146,8 +1134,7 @@ function updateDialerState(objstr,key,val,key2,val2)
1146 1134
1147 outgoingCall(val); 1135 outgoingCall(val);
1148 1136
1149 } 1137 }else if(key=="dialnext"){
1150 if(key=="dialnext" && val== ""){
1151 1138
1152 1139
1153 outgoingCall(); 1140 outgoingCall();
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!