Skip to content

flexydial / hdfc-beu-v2

Go to a project
Toggle navigation
Toggle navigation pinning
613cf374 by G Manojkumar
Options

called Extension only get ring

1 parent 207e0cdb
Inline Side-by-side
Showing 3 changed files with 47 additions and 12 deletions
application/app/Jobs/KPAMIListen.php
......@@ -497,7 +497,7 @@ class KPAMIListen implements IEventListener
if($crmcall->type=="Inbound"&&$crmcall->user_id==0)//InboundDROP
{
$userslist=User::where('exten','like' ,'%'.$crmcall->did.'%')->get();
$userslist=User::where('exten','like' ,'%'.$crmcall->did.'%')->where('status','=','Active')->get();
foreach ($userslist as $ulist) {
$crmcall->user_id=$ulist->id;
}
......@@ -665,7 +665,6 @@ class KPAMIListen implements IEventListener
$dialline->channel=$dchannel;
$dialline->save();
}
//Log::info("DialBegin".$dialline->channel." ^ ".$dialline->dchannel." ^ ".$dialline->status);
$tsip=Sipid::find($crmcall->sipid_id);
$newqueue=new Kqueue();
......@@ -997,10 +996,14 @@ class KPAMIListen implements IEventListener
$tdata=array();
$tdata['uniqueid']=$uniqueid;
$tdata['inboundchannel']=$channel;
//Log::useFiles(storage_path().'inbound_log_'.date("Y-m-d").'.log');
// Log::info("inboundNumber ".$crmcall->number);
$crmcall->data=json_encode($tdata);
$crmcall->save();
if($crmcall->did=='46130234'){
// Log::useFiles(storage_path().'inbound_log_'.date("Y-m-d").'.log');
Log::info("inboundNumber ".$crmcall->number);
}
$userStatus=User::where("updated_at",">",date("Y-m-d"))->where("exten","like","%".substr($exten,-4)."%")->where("usertype","!=","Admin")->where('presence', '=', '1')->select('*')->get();
if($userStatus=="[]")
......@@ -1058,7 +1061,6 @@ class KPAMIListen implements IEventListener
if(!empty($users))
{
$ppldata=unserialize($users[0]['peopledata']);
$crmcall->crm_id=$users[0]['id'];
$crmcall->number=$users[0]['mobile'];
$crmcall->client=($ppldata['client']?$ppldata['client']:"");
......@@ -1076,8 +1078,15 @@ class KPAMIListen implements IEventListener
echo "User Not Found!!\n";
}
$crmcall->save();
// Log::useFiles(storage_path().'inbound_log_'.date("Y-m-d").'.log');
//if($crmcall->did=='46130234'){
// Log::info("inbound 1".$crmcall->crm_id." ~ ".$crmcall->number." ~ ".$crmcall->did);
//}
}
// Log::useFiles(storage_path().'inbound_log_'.date("Y-m-d").'.log');
if($crmcall->did=='46130234'){
Log::info("inbound ".$crmcall->crm_id." ~ ".$crmcall->number." ~ ".$crmcall->did);
}
$sipids=array();
if($crmcall->client!="")
{
......@@ -1197,7 +1206,7 @@ class KPAMIListen implements IEventListener
foreach($allsipids as $tsip)
{
$newqueue=new Kqueue();
$newqueue->sipNotify($tsip,"popupalert"," Incoming Calls",$crmcall->number."|".$crmcall->client,"");
$newqueue->sipNotify($tsip,"popupalert"," Incoming Calls",$crmcall->number."|".$crmcall->client,$crmcall->did);
}
}
else
......
application/public/assets/js/dialer.js
......@@ -143,6 +143,8 @@ function kcallHasConnection(number)
function dialerQuickOpen(varid,num,state,substate,autorun)
{
resetCallArray();
console.log("Manojquick");
if(kstychCall['mCallState']=="Wait")
{
var oldpreviewid=kstychCall['previewcrmid'];
......@@ -280,6 +282,7 @@ function kCallAction(num,action)
function dialerDispNumberClick()
{
var lastnumber=$("#spandialer_num").html();
console.log(lastnumber);
kstychCall['callWrapupTime']=300;
if(kstychCall['mCallState']=="Dispo")
......@@ -325,7 +328,9 @@ function dialerAddConfCall()
function incomingCall(calllog,crmid,numnchn)
{
//document.getElementById("hangup").play();
stopRingTone();
//stopRingTone();
console.log("incoming 1");
resetCallArray();
$("#dialersearchresults").html('<div id=divworking></div><div style="clear:both"></div>');
var number = numnchn.substring(0, numnchn.indexOf('@'));
......@@ -337,10 +342,11 @@ function incomingCall(calllog,crmid,numnchn)
kSetDData('C','callid',calllog);
kSetDData('C','crmid',crmid);
console.log(crmid);
if(crmid>0)showRecruit(crmid);
else
{
console.log("incoming else");
createSearchRecordDiv('dialersearchresults');
}
......@@ -356,6 +362,7 @@ function incomingCall(calllog,crmid,numnchn)
function dialerUIUpdate(var1,var2,var3)
{
console.log("UIupdate");
var3parts=var3.split("~");
var3parts[2]=atob(var3parts[2]);
if(var1=="dialstart")
......@@ -424,10 +431,17 @@ function dialerUIUpdate(var1,var2,var3)
function incomingPopupAlert(var1,var2,var3)
{
var loginRoleArray=["R14306"];
var fullexten = $('#userExtension').val();
console.log(fullexten);
var exten =fullexten.split(':')[0];
console.log("exten1 "+exten);
//var incomingnotify=growlSNotify(var1,var2,"top-right");
//setTimeout(function(){$.gritter.remove(incomingnotify, {fade: true,speed: 'slow'});incomingnotify=0;},1500);
if($('#userLoginRole').val()=="Supervisor")startRingTone();
//console.log($('#userLoginRole').val());
if((kstychCall['ts_Talk']===0 && kstychCall['ts_Call']===0)){
if($.inArray($('#userLoginRole').val(), loginRoleArray)>-1 && (var3===exten))startRingTone();
}
console.log(var1+"Var 1"+"Var 2"+var2+"Var 3"+var3);
$.titleAlert(var1+" "+var2, {
requireBlur:true,
stopOnFocus:true,
......@@ -902,7 +916,16 @@ function updateDialerState(objstr,key,val,key2,val2)
{
resetCallArray();
}
console.log("manojstatechanged");
if(val=="Manual"){
console.log("Manoj");
resetCallArray();
}
if(val2=="Incoming"){
console.log("Manoj Incoming");
resetCallArray();
}
$("#dialersearchresults").html("");
......@@ -921,7 +944,8 @@ function updateDialerState(objstr,key,val,key2,val2)
function(retstr){
if(kstychCall['previewcrmid']!="")
{
kSetDData('C','previewcrmid',"");
console.log("manojpreview");
//kSetDData('C','previewcrmid',"");
updateDialerState();
}
else
......
application/resources/views/layout/main_menu.blade.php
......@@ -242,6 +242,8 @@ foreach($tmodules as $mname=>$marr)
<?php } ?>
<div><a href="#" class="btn btn-primary" onclick="menuAction('message');return false;"><i class="fa fa-list"></i> <span>View all messages <?php if($messagescount>0)echo "($messagescount)"; ?></span></a></div>
</ul>
<input type="hidden" id="userLoginRole" value="{{Auth::user()->username}}">
<input type="hidden" id="userExtension" value="{{isset(Auth::user()->exten)?(Auth::user()->exten):'0'}}">
</li>
<li class="dropdown notif" style='height:35px'>
<a href="#" class="dropdown-toggle" data-toggle="dropdown" style='height:35px' onclick='$("#topmenunotifucount").html("");'><i class="notif-block fa fa-bell"></i><span class="badge badge-info" id=topmenunotifucount><?php if(isset($meta['ncnt'])&&$meta['ncnt']>0)echo $meta['ncnt']; ?></span></a>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!