diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index 784efd3c..8cf2f985 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -79,7 +79,6 @@ class Fees_status_model extends CI_Model * */ public function getStudentFeesStructure($student=null){ - $this->db->select('CF.ID,CF.Sem_Year,CF.ProgramType,SFS.FeesID,SFS.CourseID,SFS.CourseFees,SFS.STFOrWR,SFS.Waiver,SFS.Others,SFS.RollNo,CU.PC,CU.TC,CU.DC,CU.MC,CU.OtherFees,SM.SessionName as SessionName,SM1.SessionName as ToSessionName'); $this->db->from(STUDENTS_FEES_STATUS.' as SFS'); $this->db->join(SESSIONMASTER.' as SM', 'SM.SessionID = SFS.SessionName'); @@ -431,13 +430,21 @@ class Fees_status_model extends CI_Model $result['paidStatus'] = false; $result['message'] = "This bill number is already exist!"; } else { + + $this->db->select('ReceiptNo'); + $this->db->where('ReceiptNo', $feesPaidDetails['ReceiptNo']); + if($this->db->get(STUDENTS_FEES_PAID)->first_row()){ + $result['paidStatus'] = false; + $result['message'] = "This receipt number is already exist!"; + } + else{ $this->db->insert(STUDENTS_FEES_PAID, $feesPaidDetails); if ($this->db->affected_rows() == '1') { $result['paidStatus'] = true; $result['message'] = "Successfully fees details added"; - $feesPayedID = $this->db->insert_id(); - // $entryOfCallTrack = $this->updateInCallTrack($trackDetails); + $feesPayedID = $this->db->insert_id(); + // $entryOfCallTrack = $this->updateInCallTrack($trackDetails); // day book entry if($feesPaidDetails['BillAmount']!='0'){ @@ -450,6 +457,9 @@ class Fees_status_model extends CI_Model $result['paidStatus'] = false; $result['message'] = "Something went wrong.please try again"; } + } + + } @@ -883,8 +893,13 @@ class Fees_status_model extends CI_Model $this->db->where('SFS.StudentID',$student['StudentID']); $paidAmount = $this->db->get()->result(); - if($feesAmount[0]->CourseFees+$feesAmount[0]->STFOrWR+$feesAmount[0]->Others-$feesAmount[0]->Waiver <= $paidAmount[0]->PaidAmount AND $feesAmount[0]->CourseFees !='0'){ - // get default course fees + if($feesAmount[0]->CourseFees+$feesAmount[0]->STFOrWR+$feesAmount[0]->Others-$feesAmount[0]->Waiver <= $paidAmount[0]->PaidAmount AND $feesAmount[0]->CourseFees !='0'){ + $valid=1; + } + else{ + $valid=0; + } + // get default course fees with paid $this->db->select('CourseID,CourseName,PC,TC,DC,MC,OtherFees'); $this->db->where('CourseID',$student['CourseID']); $endFeesDetails = $this->db->get(COURSE); @@ -913,6 +928,7 @@ class Fees_status_model extends CI_Model $existFeesDetails = $this->db->get(STUDENTS_FEES_STATUS); if($existData=$existFeesDetails->result()){ + $fetchData['Valid']=$valid; $fetchData['ExistValue']=1; $fetchData['ID']=$row1['Sem_Year']; $fetchData['CourseID']=$row1['CourseID']; @@ -945,6 +961,8 @@ class Fees_status_model extends CI_Model } else{ + $fetchData['Valid']=$valid; + $fetchData['ExistValue']=0; $fetchData['ID']=$row1['Sem_Year']; @@ -973,10 +991,10 @@ class Fees_status_model extends CI_Model else { return false; } - } + /* } else{ return false; - } + }*/