From 39c2eaf31a68e1ef15247d75b2bb64ef2428d119 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 26 Feb 2019 15:33:58 +0530 Subject: [PATCH] issue no:1663 --- Apollo/api/application/models/Dashboard_model.php | 4 +++- Apollo/api/application/models/Reports_model.php | 12 ++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Apollo/api/application/models/Dashboard_model.php b/Apollo/api/application/models/Dashboard_model.php index 61a5a499..ffe5ac41 100755 --- a/Apollo/api/application/models/Dashboard_model.php +++ b/Apollo/api/application/models/Dashboard_model.php @@ -814,9 +814,11 @@ $sql="select sum(TotalBalance) as total FROM (select (sum(totalpayable) - sum(to $results['lList'] = false; $results['message'] = 'No record found'; } - +//print_r($this->db->last_query());die(); return $results; } + + //and list.ListName like 'PENDING' public function followupsToday($branchId = null, $requestedBy = null, $logintype = null){ $sql = "select InteractionID,ifnull(date_format(ltf.CreatedOn,'%d-%m-%Y'),'-') as date,ltf.TrackingID as TrackingId,ifnull(ltf.FollowupOn,'-') as FollowUpDate,ld.LeadName as name,ifnull(ld.MobileNumber,'-') as mobileNo,lt.University as university,lt.Course as course,list.ListName as status,ltf.FollowupComments as cmnts,ifnull(am.ActivityName,'-') as activity,sd.FirstName as AssignTo diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index d40c2e60..dd90e9e6 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -966,6 +966,9 @@ where std.active = 1 and sms.branch = '".$br."' $results['balfeeList'] = false; $results['message'] = 'No record found'; } + + + // print_r($this->db->last_query());die(); return $results; @@ -1158,13 +1161,18 @@ WHERE T_Registration_Details.RegistrationType = '".$regconst."' and T_Registrati // $fromd= date("Y-m-d",strtotime($from)); //and str_to_date(DOJ,?)>=? - $subQuery.=" and str_to_date(T_Registration_Details.CreatedOn,'%Y-%m-%d')>='".$fromd."'"; + // $subQuery.=" and str_to_date(T_Registration_Details.CreatedOn,'%Y-%m-%d')>='".$fromd."'"; + + $subQuery.=" and str_to_date(T_Students_Fees_PaidDetails.CreatedOn,'%Y-%m-%d')>='".$fromd."'"; } if ($tod != ''){ // $tod=date("Y-m-d",strtotime($to)); - $subQuery.="and str_to_date(T_Registration_Details.CreatedOn,'%Y-%m-%d')<='".$tod."'"; + /// $subQuery.="and str_to_date(T_Registration_Details.CreatedOn,'%Y-%m-%d')<='".$tod."'"; + + $subQuery.="and str_to_date(T_Students_Fees_PaidDetails.CreatedOn,'%Y-%m-%d')<='".$tod."'"; + }