student fees changes done

This commit is contained in:
gandhimathi 2018-04-23 18:21:42 +05:30
parent 07af9a6d44
commit 093b82a47d

View File

@ -718,7 +718,6 @@ class Fees_status_model extends CI_Model
* created by kms
* */
public function getFeesStructureAssign($student=null){
$this->db->select('ID,CourseID,ProgramType,FeesAmount,Sem_Year');
$this->db->where('CourseID',$student['CourseID']);
$this->db->order_by('ProgramType');
@ -773,7 +772,7 @@ class Fees_status_model extends CI_Model
}
$batchDetails = $this->getBatchDetails($existData[0]->BatchCode,$student['CourseID'],$student['StudentID'],$row->ID);
$batchDetails = $this->getBatchDetails($existData[0]->BatchCode,$student['CourseID'],$student['StudentID'],$row->ID,$student['BranchCode']);
if($batchDetails!=false){
$fetchData['batchDetails']=$batchDetails;
}
@ -804,7 +803,7 @@ class Fees_status_model extends CI_Model
$fetchData['PayableFees']=$row->FeesAmount;
// for installment details
$fetchData['InstallmentDetails']="";
$batchDetails = $this->getBatchDetails('',$student['CourseID'],$student['StudentID'],'');
$batchDetails = $this->getBatchDetails('',$student['CourseID'],$student['StudentID'],'',$student['BranchCode']);
if($batchDetails!=false){
$fetchData['batchDetails']=$batchDetails;
}
@ -861,7 +860,7 @@ class Fees_status_model extends CI_Model
* get batch details
* created by kms
* */
public function getBatchDetails($batchCode=null,$courseID=null,$studentID=null,$feesType=null){
public function getBatchDetails($batchCode=null,$courseID=null,$studentID=null,$feesType=null,$branchCode=null){
if($batchCode=='' OR $batchCode==null){
$this->db->select('BA.BatchCode,BA.BatchName,BA.BatchDate,BA.IsDefault,US.UniversityID,US.UniversityName,BA.IsActive');
$this->db->from(COURSE.' as CU');
@ -870,6 +869,9 @@ class Fees_status_model extends CI_Model
$this->db->order_by('BA.CreatedOn','DESC');
$this->db->where('CU.CourseID',$courseID);
$this->db->where('BA.IsActive','1');
$this->db->where('BA.BranchCode',$branchCode);
$this->db->where('US.BranchCode',$branchCode);
$batchDetails = $this->db->get();
if($batchDetails->result()){
@ -892,6 +894,8 @@ class Fees_status_model extends CI_Model
$this->db->where('CU.CourseID',$courseID);
$this->db->where('STF.StudentID',$studentID);
$this->db->where('STF.FeesType',$feesType);
$this->db->where('BA.BranchCode',$branchCode);
$this->db->where('US.BranchCode',$branchCode);
$batchDetails = array();
/* $this->db->or_where('BA.IsActive','1');
@ -1610,6 +1614,8 @@ class Fees_status_model extends CI_Model
// $this->db->order_by('CU.CreatedOn','DESC');
$this->db->order_by('SM.SessionID','DESC');
$this->db->where('CU.CourseID',$details['CourseID']);
$this->db->where('US.BranchCode',$details['BranchCode']);
$this->db->where('SM.BranchCode',$details['BranchCode']);
// $this->db->group_by('SM.SessionName','DESC');
$sessionDetails = $this->db->get();
if($sessionDetails->result()){