Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec
This commit is contained in:
commit
2b3a546587
@ -409,7 +409,7 @@ class Calltracking_model extends CI_Model {
|
|||||||
$todayFollowupDate=$now->format('d-m-Y');
|
$todayFollowupDate=$now->format('d-m-Y');
|
||||||
|
|
||||||
$todayDateTime=$now->format('Y-m-d');
|
$todayDateTime=$now->format('Y-m-d');
|
||||||
$follouwpDetails=$this->todayFollowupDetails($todayFollowupDate,CLOSE,'1');
|
/* $follouwpDetails=$this->todayFollowupDetails($todayFollowupDate,CLOSE,'1');
|
||||||
if($follouwpDetails){
|
if($follouwpDetails){
|
||||||
$result_array['todayStatus']=true;
|
$result_array['todayStatus']=true;
|
||||||
$result_array['todayFolloupDetails']=$follouwpDetails;
|
$result_array['todayFolloupDetails']=$follouwpDetails;
|
||||||
@ -418,7 +418,7 @@ class Calltracking_model extends CI_Model {
|
|||||||
$result_array['todayStatus']=false;
|
$result_array['todayStatus']=false;
|
||||||
$result_array['todayFolloupDetails']="";
|
$result_array['todayFolloupDetails']="";
|
||||||
|
|
||||||
}
|
}*/
|
||||||
$follouwpPendingDetails=$this->todayFollowupDetails($todayFollowupDate,CLOSE,'2');
|
$follouwpPendingDetails=$this->todayFollowupDetails($todayFollowupDate,CLOSE,'2');
|
||||||
|
|
||||||
if($follouwpPendingDetails){
|
if($follouwpPendingDetails){
|
||||||
@ -430,7 +430,7 @@ class Calltracking_model extends CI_Model {
|
|||||||
$result_array['PendingFolloupDetails']="";
|
$result_array['PendingFolloupDetails']="";
|
||||||
|
|
||||||
}
|
}
|
||||||
$todayLeadDetails=$this->todayFollowupDetails($todayDateTime,OPEN,'3');
|
/* $todayLeadDetails=$this->todayFollowupDetails($todayDateTime,OPEN,'3');
|
||||||
if($todayLeadDetails){
|
if($todayLeadDetails){
|
||||||
$result_array['todayLeadStatus']=true;
|
$result_array['todayLeadStatus']=true;
|
||||||
$result_array['todayLeadDetails']=$todayLeadDetails;
|
$result_array['todayLeadDetails']=$todayLeadDetails;
|
||||||
@ -439,7 +439,7 @@ class Calltracking_model extends CI_Model {
|
|||||||
$result_array['todayLeadStatus']=false;
|
$result_array['todayLeadStatus']=false;
|
||||||
$result_array['todayLeadDetails']="";
|
$result_array['todayLeadDetails']="";
|
||||||
|
|
||||||
}
|
}*/
|
||||||
|
|
||||||
return $result_array;
|
return $result_array;
|
||||||
|
|
||||||
@ -458,12 +458,15 @@ class Calltracking_model extends CI_Model {
|
|||||||
if($check!='3'){
|
if($check!='3'){
|
||||||
$this->db->where('LT.StatusCode !=',$status);
|
$this->db->where('LT.StatusCode !=',$status);
|
||||||
}
|
}
|
||||||
|
else if($check=='2'){
|
||||||
|
$this->db->where('LT.StatusCode !=',$status);
|
||||||
|
}
|
||||||
else if($check=='3'){
|
else if($check=='3'){
|
||||||
$this->db->like('LD.CreatedOn', $todayDate, 'after');
|
$this->db->like('LD.CreatedOn', $todayDate, 'after');
|
||||||
}
|
}
|
||||||
|
|
||||||
$leadDetails=$this->db->get();
|
$leadDetails=$this->db->get();
|
||||||
if($leadDetails){
|
if($leadDetails->result()){
|
||||||
$result_array = array();
|
$result_array = array();
|
||||||
foreach ($leadDetails->result() as $row){
|
foreach ($leadDetails->result() as $row){
|
||||||
$this->db->select('LTF.TrackingID,LTF.InteractionId');
|
$this->db->select('LTF.TrackingID,LTF.InteractionId');
|
||||||
@ -487,15 +490,18 @@ class Calltracking_model extends CI_Model {
|
|||||||
}
|
}
|
||||||
// check today date based pending followp details
|
// check today date based pending followp details
|
||||||
else if($check=='2'){
|
else if($check=='2'){
|
||||||
$this->db->where('LTF.FollowupOn <= ',$todayDate);
|
// $this->db->where('LTF.FollowupOn >',$todayDate);
|
||||||
$this->db->where('LT.StatusCode !=',$status);
|
$this->db->where('LT.StatusCode !=',$status);
|
||||||
}
|
}
|
||||||
else if($check=='3'){
|
else if($check=='3'){
|
||||||
$this->db->like('LD.CreatedOn', $todayDate, 'after');
|
$this->db->like('LD.CreatedOn', $todayDate, 'after');
|
||||||
}
|
}
|
||||||
$trackDetails=$this->db->get();
|
$trackDetails=$this->db->get();
|
||||||
|
|
||||||
|
if($trackDetails->result()){
|
||||||
foreach ($trackDetails->result() as $row1)
|
foreach ($trackDetails->result() as $row1)
|
||||||
{
|
{
|
||||||
|
|
||||||
$tracking_array["LeadID"]=$row1->LeadID;
|
$tracking_array["LeadID"]=$row1->LeadID;
|
||||||
$tracking_array["LeadName"]=$row1->LeadName;
|
$tracking_array["LeadName"]=$row1->LeadName;
|
||||||
$tracking_array["MobileNumber"]=$row1->MobileNumber;
|
$tracking_array["MobileNumber"]=$row1->MobileNumber;
|
||||||
@ -505,17 +511,15 @@ class Calltracking_model extends CI_Model {
|
|||||||
$tracking_array["statusListName"]=$row1->statusListName;
|
$tracking_array["statusListName"]=$row1->statusListName;
|
||||||
$tracking_array["ListCode"]=$row1->ListCode;
|
$tracking_array["ListCode"]=$row1->ListCode;
|
||||||
$tracking_array["ListName"]=$row1->ListName;
|
$tracking_array["ListName"]=$row1->ListName;
|
||||||
|
|
||||||
|
|
||||||
$result[]=$tracking_array;
|
$result[]=$tracking_array;
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
$result_array['trackingDetails']=$result;
|
$result_array['trackingDetails']=$result;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
return $result_array;
|
return $result_array;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user