Added check for user availabe in the campaign and then taking sipid value

@@ -80,7 +80,7 @@ class PredictiveCallHangUp extends Command {
 
 
 				$this->updateCrmCallEntry($callId);
 				$this->updateCrmCallEntry($callId);
 			}
 			}
-			elseif($dialline->status == 'AutoCall' && $lastUpdatedTime > ($avgringsec+$breathingTime)) {
+			elseif($dialline->status == 'AutoCall' && $lastUpdatedTime > ($avgringsec+$breathingTime) && $dialline->src_channel != "") {
 				$newqueue->hangupChannelS($dialline->src_channel,$dialline->server);
 				$newqueue->hangupChannelS($dialline->src_channel,$dialline->server);
 
 
 				$this->updateCrmCallEntry($callId);
 				$this->updateCrmCallEntry($callId);

@@ -1481,27 +1481,30 @@ class KPAMIListen implements IEventListener
 					$crmcalldata=json_decode($crmcall->data,true);			
 					$crmcalldata=json_decode($crmcall->data,true);			
 					if(!isset($crmcalldata["userbusyfile"]))$crmcalldata["userbusyfile"]=0;
 					if(!isset($crmcalldata["userbusyfile"]))$crmcalldata["userbusyfile"]=0;
 
 
-					if($dialline->status == $status[1])$this->checkMobileNumberExist($crmcall);
-
-					$sipids=array();
+					$sipid=array();
 
 
 					if($dialline->status == $status[0])
 					if($dialline->status == $status[0])
 					{
 					{
 						$mode = "Predictive";
 						$mode = "Predictive";
 
 
+						$campaignUserIds = User::where('sel_campaign', '=', $dialline->regexstr)->select('id')->get()->toArray();
+
 						$sipid=Sipid::where('server', '=', $this->sipip)
 						$sipid=Sipid::where('server', '=', $this->sipip)
+						->whereIn("user", $campaignUserIds)
 						->where("status", "=", "1")
 						->where("status", "=", "1")
 						->where("ready", "=", "1")
 						->where("ready", "=", "1")
 						->where("prepare_call", "=", "1")
 						->where("prepare_call", "=", "1")
 						->orderBy("updated_at", "asc")
 						->orderBy("updated_at", "asc")
 						->first();
 						->first();
-
 					}
 					}
 					else if($dialline->status == $status[1])
 					else if($dialline->status == $status[1])
 					{
 					{
 						$mode = "Incoming";
 						$mode = "Incoming";
 
 
+						$this->checkMobileNumberExist($crmcall);
+
 						$sipid=Sipid::where('server', '=', $this->sipip)
 						$sipid=Sipid::where('server', '=', $this->sipip)
+						->where("user", "!=", "0")
 						->where("status", "=", "1")
 						->where("status", "=", "1")
 						->where("ready", "=", "1")
 						->where("ready", "=", "1")
 						->orderBy("updated_at", "ssc")
 						->orderBy("updated_at", "ssc")
@@ -1512,12 +1515,6 @@ class KPAMIListen implements IEventListener
 					{
 					{
 						echo "sipids found ";
 						echo "sipids found ";
 
 
-						$userEntry = User::find($sipid->user);
-
-						if(!empty($userEntry)){
-							if($userEntry->current_dialmode != $mode || $sipid->ready != 1) continue;
-						}
-
 						$this->connectToAvailableSip($sipid, $dialline, $crmcall, $mode);
 						$this->connectToAvailableSip($sipid, $dialline, $crmcall, $mode);
 					}
 					}
 				}
 				}
@@ -1592,59 +1589,58 @@ class KPAMIListen implements IEventListener
 				$dialline->channel="";
 				$dialline->channel="";
 				$dialline->regexstr="";
 				$dialline->regexstr="";
 				$dialline->save();
 				$dialline->save();
-
-				return;
-			}	
-
-			$recfile=$crmcall->newRecFilePath();
+			}
+			else
+			{
+				$recfile=$crmcall->newRecFilePath();
 
 
             //start recording
             //start recording
-			$newqueue=new Kqueue();
-			$newqueue->recordChannel($dialline->server,$dialline->channel,$recfile);
+				$newqueue=new Kqueue();
+				$newqueue->recordChannel($dialline->server,$dialline->channel,$recfile);
 
 
-			$newqueue=new Kqueue();
-			$newqueue->userToConf($sipid);
+				$newqueue=new Kqueue();
+				$newqueue->userToConf($sipid);
 
 
-			$newqueue=new Kqueue();
-			$newqueue->channelRedirectToExten($sipid->server,$dialline->channel,"1000".$sipid->id,"kstychDialer","1");
+				$newqueue=new Kqueue();
+				$newqueue->channelRedirectToExten($sipid->server,$dialline->channel,"1000".$sipid->id,"kstychDialer","1");
 
 
-			$dialline->user_id	= $sipid->user;
-			$dialline->conf		= "1000".$sipid->id;
-			$dialline->save();
+				$dialline->user_id	= $sipid->user;
+				$dialline->conf		= "1000".$sipid->id;
+				$dialline->save();
 
 
-			$sipid->ready=0;
-			if($mode == "Predictive")$sipid->prepare_call=0;
-			$sipid->patched=1;
-			$sipid->save();
+				$sipid->ready=0;
+				if($mode == "Predictive")$sipid->prepare_call=0;
+				$sipid->patched=1;
+				$sipid->save();
 
 
-			$userlog=UserLog::where('user_id','=',$sipid->user)->orderBy("id","DESC")->first();
-			$ts_Wait=$userlog->getLastTs($sipid->id,$nowts);
-			$userlog->save();
+				$userlog=UserLog::where('user_id','=',$sipid->user)->orderBy("id","DESC")->first();
+				$ts_Wait=$userlog->getLastTs($sipid->id,$nowts);
+				$userlog->save();
 
 
-			$crmcall->user_id=$sipid->user;
-			$crmcall->sipid_id=$sipid->id;
+				$crmcall->user_id=$sipid->user;
+				$crmcall->sipid_id=$sipid->id;
 
 
-			if($ts_Wait<=$crmcall->ts_Wait) //user waiting
-			{
-				$crmcall->ts_Wait=$ts_Wait;
-				$crmcall->setTs('ts_Talk',$nowts);
-			}
-			else //call waiting
-			{
-				$crmcall->ts_Wait-=($nowts-$ts_Wait);
-				$crmcall->setTs('ts_Talk',$nowts);
-			}
+				if($ts_Wait<=$crmcall->ts_Wait) //user waiting
+				{
+					$crmcall->ts_Wait=$ts_Wait;
+					$crmcall->setTs('ts_Talk',$nowts);
+				}
+				else //call waiting
+				{
+					$crmcall->ts_Wait-=($nowts-$ts_Wait);
+					$crmcall->setTs('ts_Talk',$nowts);
+				}
 
 
-			$crmcall->setTs('ts_Recstart',$nowts);
-			$crmcall->save();
+				$crmcall->setTs('ts_Recstart',$nowts);
+				$crmcall->save();
 
 
-			$newqueue=new Kqueue();
-			$newqueue->sipNotify($sipid,"incomingCall",$crmcall->id,$crmcall->crm_id,$crmcall->number."@".$dialline->channel);
+				$newqueue=new Kqueue();
+				$newqueue->sipNotify($sipid,"incomingCall",$crmcall->id,$crmcall->crm_id,$crmcall->number."@".$dialline->channel);
 
 
-			if($crmcall->crm_id>0){
-				DB::table('records')->where('id',$crmcall->crm_id)->update(['filter_condition'=>'3','usr_id'=>$sipid->user]);
+				if($crmcall->crm_id>0){
+					DB::table('records')->where('id',$crmcall->crm_id)->update(['filter_condition'=>'3','usr_id'=>$sipid->user]);
+				}
 			}
 			}
-
 		}
 		}
 	}
 	}