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

student fees changes done

Browse Source
This commit is contained in:
gandhimathi 2018-04-23 18:21:42 +05:30
parent 07af9a6d44
commit 093b82a47d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Apollo/api/application/models/Fees_status_model.php
View File

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