diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index d55c5cdd..f161e616 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -91,6 +91,7 @@ class Fees_status_model extends CI_Model $this->db->where('SFS.CourseID',$student['CourseID']); $this->db->where('SFS.StudentID',$student['StudentID']); $this->db->where('BA.BranchCode',$student['BranchCode']); + $this->db->order_by('SFS.FeesID','DESC'); $enrolledFeesDetails = $this->db->get(); if($enrolledFeesDetails->result()){ $result_array['feesStatus']=true; @@ -139,7 +140,7 @@ class Fees_status_model extends CI_Model $getDefaultCourseFees = $this->getDefaultCourseFees($student); if($getDefaultCourseFees!=false){ - $result_array['feesDetails']=array_merge($CourseFeesArray,$getDefaultCourseFees); + $result_array['feesDetails']=array_merge($getDefaultCourseFees,$CourseFeesArray); } else{ $result_array['feesDetails']=$CourseFeesArray; @@ -190,6 +191,7 @@ class Fees_status_model extends CI_Model $this->db->where('SFS.CourseID', $student['CourseID']); $this->db->where('SFS.StudentID', $student['StudentID']); $this->db->where_in('SFS.FeesType', $serachArray); + $this->db->order_by('SFS.FeesID','DESC'); $enrolledFeesDetails = $this->db->get(); if ($enrolledFeesDetails->result()) { @@ -303,7 +305,9 @@ class Fees_status_model extends CI_Model $storePaidDetails['PaidBillAmount']=$paidBillAmount[0]->PaidBillAmount; if($paidBillAmount[0]->PaidBillAmount > $storePaidDetails['PayableAmount']){ - $storePaidDetails['BalanceAmount']=0; + //$storePaidDetails['BalanceAmount']=0; + $storePaidDetails['BalanceAmount']=$storePaidDetails['PayableAmount'] - $paidBillAmount[0]->PaidBillAmount; + } else{ @@ -329,7 +333,7 @@ class Fees_status_model extends CI_Model $storePaidDetails['StudentPaidAmount']=$studentPaidAmount[0]->StudentPaidAmount; // for get paid bill details - $this->db->select('ifnull(SUM((BillAmount)),0) as BillAmount,BillNO,BillDate,ModeOfPayment,ReceiptNo,BR.BranchName,BR.Address,BR.LogoPath,BR.FeesReceiptTitle,STF.Firstname as ReceivedBy'); + $this->db->select('ifnull(SUM((BillAmount)),0) as BillAmount,BillNO,BillDate,ModeOfPayment,ReceiptNo,BR.BranchName,BR.Address,BR.LogoPath,BR.FeesReceiptTitle,STF.Firstname as ReceivedBy,SFP.CommentsForStudent,SFP.InternalComments'); $this->db->from(STUDENTS_FEES_PAID.' as SFP'); $this->db->join(BRANCH.' as BR','BR.BranchCode = SFP.UpdatedBy','left'); $this->db->join(LOGIN.' as LO','LO.ID = SFP.CreatedBy'); @@ -344,7 +348,7 @@ class Fees_status_model extends CI_Model } $existDefaultFees = $this->existStudentCourseDefaultFees($student); if($existDefaultFees != false){ - return array_merge($mergeResult,$existDefaultFees); + return array_merge($existDefaultFees,$mergeResult); } else{ return $mergeResult; @@ -410,7 +414,9 @@ class Fees_status_model extends CI_Model $paidBillAmount = $this->db->get(STUDENTS_FEES_PAID)->result(); $storePaidDetails['PaidBillAmount']=$paidBillAmount[0]->PaidBillAmount; if($paidBillAmount[0]->PaidBillAmount > $storePaidDetails['PayableAmount']){ - $storePaidDetails['BalanceAmount']=0; + //$storePaidDetails['BalanceAmount']=0; + $storePaidDetails['BalanceAmount']=$storePaidDetails['PayableAmount'] - $paidBillAmount[0]->PaidBillAmount; + } else{