Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes : ps

Browse Source
This commit is contained in:
Sanjeev 2020-12-28 12:25:03 +05:30
parent a8c8e56fc4
commit 7928228ff2
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Apollo/api/application/models/DayBook_model.php
View File

@ -1215,7 +1215,7 @@ class DayBook_model extends CI_Model
where ".$where." Status!=? and T_DayBookMaster.BranchCode=? and (case when ListName = 'Income' then T_DayBookMaster.ModeOfPayment != 'WAIVER' and T_DayBookMaster.ModeOfPayment != 'REFERRAL'and T_DayBookMaster.Status !='Pending' and T_Income_Outcome_Master.TypeName NOT LIKE '%BY CASH%' where ".$where." Status!=? and T_DayBookMaster.BranchCode=? and (case when ListName = 'Income' then T_DayBookMaster.ModeOfPayment != 'WAIVER' and T_DayBookMaster.ModeOfPayment != 'REFERRAL'and T_DayBookMaster.Status !='Pending' and T_Income_Outcome_Master.TypeName NOT LIKE '%BY CASH%'
when ListName = 'Expense' then T_DayBookMaster.Status !='Pending' and T_Income_Outcome_Master.TypeName != 'FEES' and T_Income_Outcome_Master.TypeName NOT LIKE '%CASH TO%' end) group by Type,Name"; when ListName = 'Expense' then T_DayBookMaster.Status !='Pending' and T_Income_Outcome_Master.TypeName != 'FEES' and T_Income_Outcome_Master.TypeName NOT LIKE '%CASH TO%' end) group by Type,Name";
$query = $this->db->query($subQuery,array('Cancel',$branch)); $query = $this->db->query($subQuery,array('Cancel',$branch));
// print_r($subQuery);die();
$expense = $query->result(); $expense = $query->result();

8
Apollo/api/application/models/Reports_model.php
View File

@ -1004,7 +1004,7 @@ APFS.ID AS id,
IFNULL(STU_COUR.Status, '-') AS StuCourStatus, IFNULL(STU_COUR.Status, '-') AS StuCourStatus,
BALFEE.totalpayable AS CourseFees, BALFEE.totalpayable AS CourseFees,
BALFEE.totalpaid AS paidAmount, BALFEE.totalpaid AS paidAmount,
BALFEE.balpayable AS balance,CFD.ID BALFEE.balpayable AS balance,CFD.ID,sfs.CreatedOn as Created,sfs.UpdatedOn as Updated
FROM T_Students_Fees_Status AS sfs FROM T_Students_Fees_Status AS sfs
LEFT JOIN T_Registration_Details AS RD ON sfs.FeesID = RD.Student_Fee_Status_Id AND sfs.StudentID = RD.StudentID LEFT JOIN T_Registration_Details AS RD ON sfs.FeesID = RD.Student_Fee_Status_Id AND sfs.StudentID = RD.StudentID
LEFT JOIN T_ApplicationFormStatus AS APFS on APFS.Registration_Details_ID = RD.ID AND APFS.ListCode != 'S033' LEFT JOIN T_ApplicationFormStatus AS APFS on APFS.Registration_Details_ID = RD.ID AND APFS.ListCode != 'S033'
@ -1108,15 +1108,15 @@ WHERE
} }
if ($from != ''){ if ($from != ''){
$fromd= date("Y-m-d",strtotime($from)); $fromd= date("Y-m-d",strtotime($from));
$sql.="and STR_TO_DATE(BALFEE.CreatedOn,'%d-%m-%Y') >= '".$fromd."'"; $sql.="and STR_TO_DATE(sfs.CreatedOn,'%d-%m-%Y') >= '".$fromd."'";
} }
if ($to != ''){ if ($to != ''){
$tod=date("Y-m-d",strtotime($to)); $tod=date("Y-m-d",strtotime($to));
$sql.=" and STR_TO_DATE(BALFEE.CreatedOn,'%d-%m-%Y') <= '".$tod."'"; $sql.=" and STR_TO_DATE(sfs.CreatedOn,'%d-%m-%Y') <= '".$tod."'";
} }
if ($udate != ''){ if ($udate != ''){
$ud=date("Y-m-d",strtotime($udate)); $ud=date("Y-m-d",strtotime($udate));
$sql.=" and STR_TO_DATE(APFS.AppFormDate,'%d-%m-%Y') = '".$ud."'"; $sql.=" and STR_TO_DATE(sfs.UpdatedOn,'%d-%m-%Y') = '".$ud."'";
} }