diff --git a/Apollo/api/application/models/DayBook_model.php b/Apollo/api/application/models/DayBook_model.php index 9e85b572..7e8afd6f 100644 --- a/Apollo/api/application/models/DayBook_model.php +++ b/Apollo/api/application/models/DayBook_model.php @@ -75,8 +75,8 @@ class DayBook_model extends CI_Model LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID AND t6.BranchCode = t1.BranchCode LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID AND t7.BranchCode = t1.BranchCode left join ".STUDENTS." as t8 on t8.StudentID = t1.StudentID - WHERE date_format(t1.CreatedOn,'%Y-%m-%d') BETWEEN '$fromDate' - AND '$toDate' AND t1.BranchCode = '$reqpayType' ORDER BY ORDER_ID DESC"; + WHERE STR_TO_DATE(DATE,'%d-%m-%Y') BETWEEN '$fromDate' + AND '$toDate' AND t1.BranchCode = '$reqpayType' AND t1.IsActive ='1'AND t1.Status != 'Cancel' ORDER BY ORDER_ID DESC"; // echo $querys;exit(); // $this->db->where(' STR_TO_DATE(t1.Date, %d-%m-%Y) >=', $fromDate); // $this->db->where(' STR_TO_DATE(t1.Date, %d-%m-%Y) >=', $toDate); @@ -103,7 +103,7 @@ class DayBook_model extends CI_Model LEFT JOIN ".COURSE." as t6 ON t6.CourseID = t1.CourseID AND t6.BranchCode = t1.BranchCode LEFT JOIN ".UNIVERSITY." as t7 ON t7.UniversityID = t6.UniversityID AND t7.BranchCode = t1.BranchCode left join ".STUDENTS." as t8 on t8.StudentID = t1.StudentID - WHERE t1.BranchCode = '$reqpayType' ORDER BY ORDER_ID DESC"; + WHERE t1.BranchCode = '$reqpayType' AND t1.IsActive ='1' ORDER BY ORDER_ID DESC"; } @@ -115,7 +115,8 @@ class DayBook_model extends CI_Model $dayBookDetailsList = $dayBookDetails->result(); $results['dayBookListStatus'] = true; $results['dayBookListDetails'] = $dayBookDetailsList; - //print_r($this->db->last_query());die; + // print_r($this->db->last_query());die; + return $results; } diff --git a/Apollo/api/application/models/Reports_model.php b/Apollo/api/application/models/Reports_model.php index 1ac336e3..043aade0 100755 --- a/Apollo/api/application/models/Reports_model.php +++ b/Apollo/api/application/models/Reports_model.php @@ -1331,20 +1331,11 @@ $query = $this->db->query($subQuery,array('%d-%m-%Y')); $fromd= date("Y-m-d",strtotime($start_date)); $tod=date("Y-m-d",strtotime($end_date)); - $sql="SELECT distinct d.UniversityName,c.UniversityID, -sum(IF(ModeOfPayment ='CASH', BillAmount, 0)) AS Cash, -sum(IF(ModeOfPayment ='CHEQUE', BillAmount, 0)) AS Cheque, -sum(IF(ModeOfPayment ='REFERRAL', BillAmount, 0)) AS Referal, -sum(IF(ModeOfPayment ='ONLINE TRANSACTION', BillAmount, 0)) AS Onlinec, -sum(IF(ModeOfPayment ='WAIVER', BillAmount, 0)) AS WAIVER, -sum(IF(ModeOfPayment ='Credit/Debit Card', BillAmount, 0)) AS Card, a.CreatedOn -FROM T_Students_Fees_PaidDetails a -JOIN T_Students_Fees_Status b ON b.FeesId = a.FeesID and b.StudentID=a.StudentID -LEFT JOIN T_CourseMaster c ON c.CourseID = b.CourseID -left join T_UniversityMaster d on d.UniversityID=c.UniversityID and d.BranchCode = '".$det['branchId']."' - - -WHERE date_format(a.CreatedOn,'%Y-%m-%d') >= '".date('Y-m-d', strtotime($start_date))."' AND date_format(a.CreatedOn,'%Y-%m-%d') <= '".date('Y-m-d', strtotime($end_date))."' AND b.BranchCode = '".$det['branchId']."' AND a.IsActive = '1' "; + $sql="SELECT distinct d.UniversityName,c.UniversityID, sum(IF(ModeOfPayment ='CASH', BillAmount, 0)) AS Cash, sum(IF(ModeOfPayment ='CHEQUE', BillAmount, 0)) AS Cheque, sum(IF(ModeOfPayment ='REFERRAL', BillAmount, 0)) AS Referal, sum(IF(ModeOfPayment ='ONLINE TRANSACTION', BillAmount, 0)) AS Onlinec, sum(IF(ModeOfPayment ='WAIVER', BillAmount, 0)) AS WAIVER, sum(IF(ModeOfPayment ='Credit/Debit Card', BillAmount, 0)) AS Card, a.BillDate FROM T_Students_Fees_PaidDetails a +JOIN T_Students_Fees_Status b ON b.FeesId = a.FeesID and b.StudentID=a.StudentID + LEFT JOIN T_CourseMaster c ON c.CourseID = b.CourseID + left join T_UniversityMaster d on d.UniversityID=c.UniversityID and d.BranchCode = '".$det['branchId']."' +WHERE STR_TO_DATE(a.BillDate,'%d-%m-%Y') >= '".date('Y-m-d', strtotime($start_date))."' AND STR_TO_DATE(a.BillDate,'%d-%m-%Y') <= '".date('Y-m-d', strtotime($end_date))."' AND a.UpdatedBy = '".$det['branchId']."' AND a.IsActive = '1' "; if($det['university']!='') { @@ -1379,8 +1370,8 @@ if($feeDetails) } - //print_r( $this->db->last_query()); - //die(); + // print_r( $this->db->last_query()); + // die(); return $result_array;