diff --git a/Apollo/api/application/models/Calltracking_model.php b/Apollo/api/application/models/Calltracking_model.php index 2220ddbe..f71ad381 100755 --- a/Apollo/api/application/models/Calltracking_model.php +++ b/Apollo/api/application/models/Calltracking_model.php @@ -1386,6 +1386,14 @@ class Calltracking_model extends CI_Model { $result['message'] = "Something went wrong.please try again"; } }else{ + + + if($track_Details['StatusCode'] == 'S020' || $track_Details['StatusCode'] == 'S002'){ + $lead_Details['UpdatedOn'] = date('Y-m-d H:i:s'); + $lead_Details['UpdatedBy'] = $CreatedBy; + $track_Details['UpdatedOn'] = date('Y-m-d H:i:s'); + $track_Details['UpdatedBy'] = $CreatedBy; + } $lead_Details['CreatedOn'] = date('Y-m-d H:i:s'); $followup_Details['CreatedOn'] = date('Y-m-d H:i:s'); $track_Details['CreatedOn'] = date('Y-m-d H:i:s'); diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index c005a636..900277e4 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -177,14 +177,14 @@ from left join T_CertificationMaster cm on cm.CertificationID=app.CertificationType left join T_PickListDetails p on p.ListCode = app.ListCode left join BalFees bal on bal.student=app.StudentID and bal.course=app.CourseID - where CertificateName not like 'APPLICATION%' and app.ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,ListCode,BranchCode,CertificationType) + where CertificateName not like 'APPLICATION%' and app.ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode,CertificationType) group by app.ID union SELECT app.ID,app.StudentID as sid,app.CourseID as cid,app.BranchCode as branch,app.ListCode as lcode,p.ListName as status,AppDate as adate,app.Comments as acmts,CertificationType as ctype,app.CertificationType as certname,sum(bal.balpayable) as balance FROM T_ApplicationStatus as app left join T_PickListDetails p on p.ListCode = app.ListCode left join BalFees bal on bal.student=app.StudentID and bal.course=app.CourseID - where app.CertificationType not like 'CERT%' and app.ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,ListCode,BranchCode,CertificationType) + where app.CertificationType not like 'CERT%' and app.ID IN (SELECT max(ID) FROM T_ApplicationStatus group by StudentID,CourseID,BranchCode,CertificationType) group by app.ID) as sms left join (SELECT FeesID as fid,BatchCode as batch,StudentID as sid,CourseID as cid,FeesType as ftype,sum(CourseFees) as cf,Sum(STFOrWR) as stf,sum(Others) as others