Merge branch 'master' of https://bitbucket.org/venbainformationtechnology/apollodec
This commit is contained in:
resicovenba
commit
d67ff2173e
@ -118,7 +118,7 @@ class Fees_Status_Controller extends REST_Controller {
|
||||
$now->setTimezone(new DateTimezone('Asia/Kolkata'));
|
||||
/*for track purpose*/
|
||||
|
||||
$trackDetails['MobileNumber'] = $this->post('mobileNumber');
|
||||
/* $trackDetails['MobileNumber'] = $this->post('mobileNumber');
|
||||
$trackDetails['LeadName'] = $this->post('studentName');
|
||||
$trackDetails['University'] = $this->post('university');
|
||||
$trackDetails['Course'] = $this->post('course');
|
||||
@ -126,7 +126,7 @@ class Fees_Status_Controller extends REST_Controller {
|
||||
$trackDetails['FollowupOn'] = $now->format('d-m-Y');
|
||||
$trackDetails['FollowupComments'] = $this->post('commentsForStudent');
|
||||
$trackDetails['CreatedBy'] = $this->post('createdBy');
|
||||
$trackDetails['CreatedOn'] = $now->format('Y-m-d H:i:s');
|
||||
$trackDetails['CreatedOn'] = $now->format('Y-m-d H:i:s');*/
|
||||
|
||||
/*track array end*/
|
||||
|
||||
@ -142,7 +142,7 @@ class Fees_Status_Controller extends REST_Controller {
|
||||
$detailsChild['CreatedOn'] = $now->format('Y-m-d H:i:s');
|
||||
$detailsChild['UpdatedBy'] = $this->post('requestedBranch');
|
||||
|
||||
$updateDetails = $this->Fees_model->updateFees($detailsChild,$trackDetails);// Check if the users data store contains users (in case the database result returns NULL)
|
||||
$updateDetails = $this->Fees_model->updateFees($detailsChild);// Check if the users data store contains users (in case the database result returns NULL)
|
||||
if ($updateDetails)
|
||||
{
|
||||
$updateDetails['status'] = REST_Controller::HTTP_OK;
|
||||
|
||||
@ -87,7 +87,6 @@ class Fees_status_model extends CI_Model
|
||||
if($enrolledFeesDetails->result()){
|
||||
$result_array['feesStatus']=true;
|
||||
foreach ($enrolledFeesDetails->result() as $row) {
|
||||
|
||||
$fetchData['ID'] = $row->ID;
|
||||
$fetchData['FeesID'] = $row->FeesID;
|
||||
$fetchData['CourseID'] = $row->CourseID;
|
||||
@ -118,8 +117,17 @@ class Fees_status_model extends CI_Model
|
||||
|
||||
$CourseFeesArray[]=$fetchData;
|
||||
}
|
||||
$result_array['feesDetails']=$CourseFeesArray;
|
||||
$result_array['getFeesUpdateStatus']=$this->getFeesUpdateStatus(FEESUPDATE);
|
||||
|
||||
$getDefaultCourseFees = $this->getDefaultCourseFees($student);
|
||||
if($getDefaultCourseFees!=false){
|
||||
$result_array['feesDetails']=array_merge($CourseFeesArray,$getDefaultCourseFees);
|
||||
}
|
||||
else{
|
||||
$result_array['feesDetails']=$CourseFeesArray;
|
||||
}
|
||||
|
||||
|
||||
// $result_array['getFeesUpdateStatus']=$this->getFeesUpdateStatus(FEESUPDATE);
|
||||
$result_array['getExistStudentFeesDetails']=$this->existStudentFeesDetails($student);
|
||||
|
||||
}
|
||||
@ -129,61 +137,7 @@ class Fees_status_model extends CI_Model
|
||||
|
||||
}
|
||||
return $result_array;
|
||||
/* $this->db->where('CourseID',$student['CourseID']);
|
||||
$feesDetails = $this->db->get(COURSE_FEES);
|
||||
if($feesDetails->result()){
|
||||
|
||||
$result_array['feesStatus']=true;
|
||||
foreach ($feesDetails->result() as $row){
|
||||
|
||||
|
||||
$this->db->select('CourseFees,STFOrWR,Waiver,Others');
|
||||
$this->db->where('StudentID',$student['StudentID']);
|
||||
$this->db->where('CourseID',$student['CourseID']);
|
||||
$this->db->where('FeesType',$row->ID);
|
||||
$existFeesDetails = $this->db->get(STUDENTS_FEES_STATUS);
|
||||
if($existData=$existFeesDetails->result()){
|
||||
$fetchData['ID']=$row->ID;
|
||||
$fetchData['CourseID']=$row->CourseID;
|
||||
$fetchData['Sem_Year']=$row->Sem_Year;
|
||||
$fetchData['ActualFees']=$row->FeesAmount;
|
||||
$fetchData['PayableFees']=$row->FeesAmount;
|
||||
$fetchData['PendingFees']=$row->FeesAmount;
|
||||
$fetchData['STFOrWR']=$existData[0]->STFOrWR;
|
||||
$fetchData['Waiver']=$existData[0]->Waiver;
|
||||
$fetchData['Others']=$existData[0]->Others;
|
||||
|
||||
$CourseFeesArray[]=$fetchData;
|
||||
|
||||
}
|
||||
else{
|
||||
$fetchData['ID']=$row->ID;
|
||||
$fetchData['CourseID']=$row->CourseID;
|
||||
$fetchData['Sem_Year']=$row->Sem_Year;
|
||||
$fetchData['ActualFees']=$row->FeesAmount;
|
||||
$fetchData['PayableFees']=0;
|
||||
|
||||
$fetchData['PendingFees']=$row->FeesAmount;
|
||||
$fetchData['STFOrWR']=0;
|
||||
$fetchData['Waiver']=0;
|
||||
$fetchData['Others']=0;
|
||||
|
||||
$CourseFeesArray[]=$fetchData;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
$result_array['feesDetails']=$CourseFeesArray;
|
||||
$result_array['getFeesUpdateStatus']=$this->getFeesUpdateStatus(FEESUPDATE);
|
||||
$result_array['getExistStudentFeesDetails']=$this->existStudentFeesDetails($student);
|
||||
|
||||
}
|
||||
|
||||
else{
|
||||
$result_array['feesStatus']=false;
|
||||
}
|
||||
|
||||
return $result_array;*/
|
||||
}
|
||||
/*
|
||||
* get fees update status
|
||||
@ -202,12 +156,71 @@ class Fees_status_model extends CI_Model
|
||||
$status = $this->db->get();
|
||||
return $status->result();
|
||||
}
|
||||
/*
|
||||
* get default course fees for bill
|
||||
* creted by kms
|
||||
* */
|
||||
public function getDefaultCourseFees($student=null)
|
||||
{
|
||||
$serachArray = ["PC","TC","DC","MC","OTHER"];
|
||||
|
||||
$this->db->select('SFS.FeesID,SFS.FeesType,SFS.CourseID,SFS.CourseFees,SFS.STFOrWR,SFS.Waiver,SFS.Others,SFS.SessionName,SFS.RollNo,CU.PC,CU.TC,CU.DC,CU.MC,CU.OtherFees');
|
||||
$this->db->from(STUDENTS_FEES_STATUS . ' as SFS');
|
||||
//$this->db->join(COURSE_FEES.' as CF', 'CF.ID = SFS.FeesType');
|
||||
$this->db->join(COURSE . ' as CU', 'CU.CourseID = SFS.CourseID');
|
||||
$this->db->where('SFS.CourseID', $student['CourseID']);
|
||||
$this->db->where('SFS.StudentID', $student['StudentID']);
|
||||
$this->db->where_in('SFS.FeesType', $serachArray);
|
||||
$enrolledFeesDetails = $this->db->get();
|
||||
|
||||
if ($enrolledFeesDetails->result()) {
|
||||
$result_array['feesStatus'] = true;
|
||||
foreach ($enrolledFeesDetails->result() as $row) {
|
||||
$fetchData['ID'] = $row->FeesType;
|
||||
$fetchData['FeesID'] = $row->FeesID;
|
||||
$fetchData['CourseID'] = $row->CourseID;
|
||||
$fetchData['Sem_Year'] = $row->FeesType;
|
||||
$fetchData['ActualFees'] = $row->CourseFees;
|
||||
$fetchData['STFOrWR'] = $row->STFOrWR;
|
||||
$fetchData['Waiver'] = $row->Waiver;
|
||||
$fetchData['Others'] = $row->Others;
|
||||
$fetchData['SessionName'] = $row->SessionName;
|
||||
$fetchData['RollNo'] = $row->RollNo;
|
||||
$fetchData['PayableFees'] = $row->CourseFees + $row->STFOrWR + $row->Others - $row->Waiver;
|
||||
|
||||
$this->db->select('ifnull(SUM((BillAmount)),0) as PaidBillAmount');
|
||||
$this->db->where('FeesId', $row->FeesID);
|
||||
$paidBillAmount = $this->db->get(STUDENTS_FEES_PAID)->result();
|
||||
if ($paidBillAmount[0]->PaidBillAmount > $fetchData['PayableFees']) {
|
||||
$fetchData['BalanceAmount'] = 0;
|
||||
|
||||
} else {
|
||||
$fetchData['BalanceAmount'] = $fetchData['PayableFees'] - $paidBillAmount[0]->PaidBillAmount;
|
||||
}
|
||||
$fetchData['PC'] = $row->PC;
|
||||
$fetchData['TC'] = $row->TC;
|
||||
$fetchData['DC'] = $row->DC;
|
||||
$fetchData['MC'] = $row->MC;
|
||||
$fetchData['OtherFees'] = $row->OtherFees;
|
||||
|
||||
$CourseFeesArray[] = $fetchData;
|
||||
}
|
||||
|
||||
return $CourseFeesArray;
|
||||
|
||||
}
|
||||
else{
|
||||
return false;
|
||||
|
||||
}
|
||||
}
|
||||
/*
|
||||
* get exist student fees details
|
||||
* created by kms
|
||||
* */
|
||||
|
||||
public function existStudentFeesDetails($student=null){
|
||||
|
||||
$this->db->distinct();
|
||||
$this->db->select('SFS.FeesID,SFS.FeesType,SFS.SessionName,SFS.RollNo,ifnull(SFS.CourseFees,0) as CourseFees,ifnull(SFS.STFOrWR,0) as STFOrWR,ifnull(SFS.Waiver,0) as Waiver,ifnull(SFS.Others,0) as Others,ST.Firstname,ST.MobileNumber,ST.Fathername,CU.CourseName,CU.CourseID,CF.Sem_Year,STC.EnrollmentID,US.UniversityName');
|
||||
$this->db->from(STUDENTS_FEES_PAID.' as SFP');
|
||||
@ -263,9 +276,14 @@ class Fees_status_model extends CI_Model
|
||||
$mergeResult[]=$storePaidDetails;
|
||||
|
||||
}
|
||||
$existDefaultFees = $this->existStudentCourseDefaultFees($student);
|
||||
if($existDefaultFees != false){
|
||||
return array_merge($mergeResult,$existDefaultFees);
|
||||
}
|
||||
else{
|
||||
return $mergeResult;
|
||||
}
|
||||
|
||||
|
||||
return $mergeResult;
|
||||
}
|
||||
else {
|
||||
return false;
|
||||
@ -273,12 +291,84 @@ class Fees_status_model extends CI_Model
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* get exist student default fees details
|
||||
* created by kms
|
||||
* */
|
||||
|
||||
public function existStudentCourseDefaultFees($student=null){
|
||||
$serachArray = ["PC","TC","DC","MC","OTHER"];
|
||||
$this->db->distinct();
|
||||
$this->db->select('SFS.FeesID,SFS.FeesType,SFS.SessionName,SFS.RollNo,ifnull(SFS.CourseFees,0) as CourseFees,ifnull(SFS.STFOrWR,0) as STFOrWR,ifnull(SFS.Waiver,0) as Waiver,ifnull(SFS.Others,0) as Others,ST.Firstname,ST.MobileNumber,ST.Fathername,CU.CourseName,CU.CourseID,STC.EnrollmentID,US.UniversityName');
|
||||
$this->db->from(STUDENTS_FEES_PAID.' as SFP');
|
||||
$this->db->join(STUDENTS_FEES_STATUS.' as SFS','SFP.FeesId = SFS.FeesID');
|
||||
$this->db->join(STUDENTS.' as ST', 'ST.StudentID = SFS.StudentID');
|
||||
$this->db->join(COURSE.' as CU', 'CU.CourseID = SFS.CourseID');
|
||||
//$this->db->join(COURSE_FEES.' as CF', 'CF.ID = SFS.FeesType');
|
||||
$this->db->join(STUDENTCOURSE.' as STC', 'STC.CourseID = SFS.CourseID');
|
||||
$this->db->join(UNIVERSITY.' as US', 'US.UniversityID = STC.UniversityID');
|
||||
$this->db->where('SFS.CourseID', $student['CourseID']);
|
||||
$this->db->where('SFS.StudentID', $student['StudentID']);
|
||||
$this->db->where('STC.StudentID', $student['StudentID']);
|
||||
$this->db->where('SFP.StudentID', $student['StudentID']);
|
||||
$this->db->where_in('SFS.FeesType', $serachArray);
|
||||
$this->db->order_by('SFP.ID', 'DESC');
|
||||
$getFeeDetails = $this->db->get();
|
||||
if($getFeeDetails->result()){
|
||||
foreach ($getFeeDetails->result() as $feeRow){
|
||||
$storePaidDetails['FeesID'] = $feeRow->FeesID;
|
||||
$storePaidDetails['FeesName'] = $feeRow->FeesType;
|
||||
$storePaidDetails['CourseFees'] = $feeRow->CourseFees;
|
||||
$storePaidDetails['SessionName'] = $feeRow->SessionName;
|
||||
$storePaidDetails['RollNo'] = $feeRow->RollNo;
|
||||
$storePaidDetails['STFOrWR'] = $feeRow->STFOrWR;
|
||||
$storePaidDetails['Waiver'] = $feeRow->Waiver;
|
||||
$storePaidDetails['Others'] = $feeRow->Others;
|
||||
$storePaidDetails['PayableAmount'] = $feeRow->CourseFees+$feeRow->STFOrWR+$feeRow->Others-$feeRow->Waiver;
|
||||
$storePaidDetails['Firstname'] = $feeRow->Firstname;
|
||||
$storePaidDetails['MobileNumber'] = $feeRow->MobileNumber;
|
||||
$storePaidDetails['Fathername'] = $feeRow->Fathername;
|
||||
$storePaidDetails['EnrollmentID'] = $feeRow->EnrollmentID;
|
||||
$storePaidDetails['CourseName'] = $feeRow->CourseName;
|
||||
$storePaidDetails['UniversityName'] = $feeRow->UniversityName;
|
||||
$this->db->select('ifnull(SUM((BillAmount)),0) as PaidBillAmount');
|
||||
$this->db->where('FeesId',$feeRow->FeesID);
|
||||
$paidBillAmount = $this->db->get(STUDENTS_FEES_PAID)->result();
|
||||
$storePaidDetails['PaidBillAmount']=$paidBillAmount[0]->PaidBillAmount;
|
||||
if($paidBillAmount[0]->PaidBillAmount > $storePaidDetails['PayableAmount']){
|
||||
$storePaidDetails['BalanceAmount']=0;
|
||||
|
||||
}
|
||||
else{
|
||||
$storePaidDetails['BalanceAmount']=$storePaidDetails['PayableAmount'] - $paidBillAmount[0]->PaidBillAmount;
|
||||
}
|
||||
|
||||
// for get paid bill details
|
||||
$this->db->select('ifnull(SUM((BillAmount)),0) as BillAmount,BillNO,BillDate,ModeOfPayment,BR.BranchName');
|
||||
$this->db->from(STUDENTS_FEES_PAID.' as SFP');
|
||||
$this->db->join(BRANCH.' as BR','BR.BranchCode = SFP.UpdatedBy','left');
|
||||
$this->db->where('FeesId',$feeRow->FeesID);
|
||||
$this->db->order_by('ID',"ASC");
|
||||
$this->db->group_by('BillNO');
|
||||
$storePaidDetails['paidDetails']=$this->db->get()->result();
|
||||
$mergeResult[]=$storePaidDetails;
|
||||
|
||||
}
|
||||
|
||||
return $mergeResult;
|
||||
}
|
||||
else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* update fees details
|
||||
* created by kms
|
||||
* */
|
||||
|
||||
public function updateFees($feesPaidDetails=null,$trackDetails=null)
|
||||
public function updateFees($feesPaidDetails=null)
|
||||
{
|
||||
$this->db->select('BillNO');
|
||||
$this->db->where('BillNO', $feesPaidDetails['BillNO']);
|
||||
@ -290,7 +380,7 @@ class Fees_status_model extends CI_Model
|
||||
if ($this->db->affected_rows() == '1') {
|
||||
$result['paidStatus'] = true;
|
||||
$result['message'] = "Successfully fees details added";
|
||||
$entryOfCallTrack = $this->updateInCallTrack($trackDetails);
|
||||
// $entryOfCallTrack = $this->updateInCallTrack($trackDetails);
|
||||
|
||||
}
|
||||
else{
|
||||
@ -519,7 +609,17 @@ class Fees_status_model extends CI_Model
|
||||
}
|
||||
|
||||
}
|
||||
$result_array['feesDetails']=$CourseFeesArray;
|
||||
|
||||
$defaultCourseDetails = $this->defaultCourseFeesDetails($student);
|
||||
if($defaultCourseDetails!=false){
|
||||
$result_array['feesDetails']=array_merge($CourseFeesArray,$defaultCourseDetails);
|
||||
}
|
||||
else{
|
||||
$result_array['feesDetails']=$CourseFeesArray;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
else{
|
||||
@ -530,6 +630,85 @@ class Fees_status_model extends CI_Model
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* get default pc,tc,dc,mc,other fees
|
||||
* created by kms
|
||||
* */
|
||||
public function defaultCourseFeesDetails($student=null){
|
||||
// get default course fees
|
||||
$this->db->select('CourseID,CourseName,PC,TC,DC,MC,OtherFees');
|
||||
$this->db->where('CourseID',$student['CourseID']);
|
||||
$endFeesDetails = $this->db->get(COURSE);
|
||||
$myArray = array();
|
||||
if($endFeesDetails->result()){
|
||||
foreach ($endFeesDetails->result() as $value ){
|
||||
$pc_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'PC', 'ActualFees'=>$value->PC);
|
||||
$tc_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'TC', 'ActualFees'=>$value->TC);
|
||||
$dc_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'DC', 'ActualFees'=>$value->DC);
|
||||
$mc_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'MC', 'ActualFees'=>$value->MC);
|
||||
$other_array = array('CourseID'=>$value->CourseID,'Sem_Year'=>'OTHER', 'ActualFees'=>$value->OtherFees);
|
||||
|
||||
array_push($myArray,$pc_array);
|
||||
array_push($myArray,$tc_array);
|
||||
array_push($myArray,$dc_array);
|
||||
array_push($myArray,$mc_array);
|
||||
array_push($myArray,$other_array);
|
||||
}
|
||||
|
||||
// default course fees details in student status
|
||||
foreach ($myArray as $row1){
|
||||
$this->db->select('CourseFees,STFOrWR,Waiver,Others,SessionName,RollNo');
|
||||
$this->db->where('StudentID',$student['StudentID']);
|
||||
$this->db->where('CourseID',$student['CourseID']);
|
||||
$this->db->where('FeesType',$row1['Sem_Year']);
|
||||
$existFeesDetails = $this->db->get(STUDENTS_FEES_STATUS);
|
||||
|
||||
if($existData=$existFeesDetails->result()){
|
||||
$fetchData['ExistValue']=1;
|
||||
$fetchData['ID']=$row1['Sem_Year'];
|
||||
$fetchData['CourseID']=$row1['CourseID'];
|
||||
$fetchData['Sem_Year']=$row1['Sem_Year'];
|
||||
$fetchData['ActualFees']=$existData[0]->CourseFees;
|
||||
$fetchData['STFOrWR']=$existData[0]->STFOrWR;
|
||||
$fetchData['Waiver']=$existData[0]->Waiver;
|
||||
$fetchData['Others']=$existData[0]->Others;
|
||||
$fetchData['SessionName']=$existData[0]->SessionName;
|
||||
$fetchData['RollNo']=$existData[0]->RollNo;
|
||||
$fetchData['PayableFees']=$existData[0]->CourseFees+$existData[0]->STFOrWR+$existData[0]->Others-$existData[0]->Waiver;
|
||||
|
||||
$CourseFeesArray1[]=$fetchData;
|
||||
|
||||
}
|
||||
else{
|
||||
|
||||
$fetchData['ExistValue']=0;
|
||||
|
||||
$fetchData['ID']=$row1['Sem_Year'];
|
||||
|
||||
$fetchData['CourseID']=$row1['CourseID'];
|
||||
$fetchData['Sem_Year']=$row1['Sem_Year'];
|
||||
$fetchData['ActualFees']=$row1['ActualFees'];
|
||||
$fetchData['STFOrWR']="";
|
||||
$fetchData['Waiver']="";
|
||||
$fetchData['Others']="";
|
||||
$fetchData['SessionName']="";
|
||||
$fetchData['RollNo']="";
|
||||
$fetchData['PayableFees']=$row1['ActualFees'];
|
||||
$CourseFeesArray1[]=$fetchData;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return $CourseFeesArray1;
|
||||
}
|
||||
else {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* set fees for student
|
||||
* created by kms
|
||||
|
||||
@ -128,14 +128,78 @@ class Studentview_model extends CI_Model
|
||||
|
||||
}
|
||||
|
||||
$getStudentDefaultFees = $this->getDefaultCourseFees($studentID,$courseID);
|
||||
if($getStudentDefaultFees != false){
|
||||
return array_merge($mergeResult,$getStudentDefaultFees);
|
||||
}
|
||||
else{
|
||||
return$mergeResult;
|
||||
}
|
||||
|
||||
return $mergeResult;
|
||||
}
|
||||
else {
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
/*
|
||||
* get default course details
|
||||
* created by kms
|
||||
* */
|
||||
public function getDefaultCourseFees($studentID=null,$courseID=null){
|
||||
$serachArray = ["PC","TC","DC","MC","OTHER"];
|
||||
$this->db->distinct();
|
||||
$this->db->select('SFS.FeesID,SFS.FeesType,SFS.SessionName,SFS.RollNo,ifnull(SFS.CourseFees,0) as CourseFees,ifnull(SFS.STFOrWR,0) as STFOrWR,ifnull(SFS.Waiver,0) as Waiver,ifnull(SFS.Others,0) as Others');
|
||||
$this->db->from(STUDENTS_FEES_STATUS.' as SFS');
|
||||
$this->db->join(STUDENTS_FEES_PAID.' as SFP','SFP.FeesId = SFS.FeesID','left');
|
||||
//$this->db->join(COURSE_FEES.' as CF', 'CF.ID = SFS.FeesType');
|
||||
$this->db->where('SFS.CourseID', $courseID);
|
||||
$this->db->where('SFS.StudentID', $studentID);
|
||||
$this->db->where_in('SFS.FeesType', $serachArray);
|
||||
$this->db->order_by('SFS.FeesID', 'ASC');
|
||||
$getFeeDetails = $this->db->get();
|
||||
if($getFeeDetails->result()){
|
||||
foreach ($getFeeDetails->result() as $feeRow){
|
||||
$storePaidDetails['FeesID'] = $feeRow->FeesID;
|
||||
$storePaidDetails['FeesName'] = $feeRow->FeesType;
|
||||
$storePaidDetails['CourseFees'] = $feeRow->CourseFees;
|
||||
$storePaidDetails['SessionName'] = $feeRow->SessionName;
|
||||
$storePaidDetails['RollNo'] = $feeRow->RollNo;
|
||||
$storePaidDetails['STFOrWR'] = $feeRow->STFOrWR;
|
||||
$storePaidDetails['Waiver'] = $feeRow->Waiver;
|
||||
$storePaidDetails['Others'] = $feeRow->Others;
|
||||
$storePaidDetails['PayableAmount'] = $feeRow->CourseFees+$feeRow->STFOrWR+$feeRow->Others-$feeRow->Waiver;
|
||||
|
||||
$this->db->select('ifnull(SUM((BillAmount)),0) as PaidBillAmount');
|
||||
$this->db->where('FeesId',$feeRow->FeesID);
|
||||
$paidBillAmount = $this->db->get(STUDENTS_FEES_PAID)->result();
|
||||
$storePaidDetails['PaidBillAmount']=$paidBillAmount[0]->PaidBillAmount;
|
||||
if($paidBillAmount[0]->PaidBillAmount > $storePaidDetails['PayableAmount']){
|
||||
$storePaidDetails['BalanceAmount']=0;
|
||||
|
||||
}
|
||||
else{
|
||||
$storePaidDetails['BalanceAmount']=$storePaidDetails['PayableAmount'] - $paidBillAmount[0]->PaidBillAmount;
|
||||
}
|
||||
|
||||
// for get paid bill details
|
||||
$this->db->select('ifnull(SUM((BillAmount)),0) as BillAmount,BillNO,BillDate,ModeOfPayment');
|
||||
$this->db->where('FeesId',$feeRow->FeesID);
|
||||
$this->db->order_by('ID',"ASC");
|
||||
$this->db->group_by('BillNO');
|
||||
$storePaidDetails['paidDetails']=$this->db->get(STUDENTS_FEES_PAID)->result();
|
||||
$mergeResult[]=$storePaidDetails;
|
||||
|
||||
}
|
||||
|
||||
return $mergeResult;
|
||||
}
|
||||
else {
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/*
|
||||
* get student study material details
|
||||
* created by kms
|
||||
|
||||
@ -236,7 +236,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n
|
||||
studentName: myModel.Firstname,
|
||||
university: myModel.UniversityName,
|
||||
course: myModel.CourseName,
|
||||
statusCode: updateModel.statusCode,
|
||||
//statusCode: updateModel.statusCode,
|
||||
requestedBranch : JSON.parse(localStorage.getItem('localObj')).localBranchID
|
||||
|
||||
|
||||
|
||||
0
Apollo/assets/views/status-update/setFeesForStudent.html
Normal file → Executable file
0
Apollo/assets/views/status-update/setFeesForStudent.html
Normal file → Executable file
@ -39,12 +39,12 @@
|
||||
Update Fees Status
|
||||
</legend>-->
|
||||
|
||||
<div class="col-md-8">
|
||||
<div class="col-md-12">
|
||||
<fieldset>
|
||||
<legend>Fees Details</legend>
|
||||
<div class="row">
|
||||
|
||||
<div class="col-md-4 form-group"
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.feesType.$dirty && Form.feesType.$invalid, 'has-success':Form.feesType.$valid}">
|
||||
<label>
|
||||
Fees Type <span class="symbol required"></span>
|
||||
@ -58,7 +58,7 @@
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.feesType.$dirty && Form.feesType.$invalid">Fees type is required</span>
|
||||
</div>
|
||||
<div class="col-md-4 form-group"
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.sessionname.$dirty && Form.sessionname.$invalid, 'has-success':Form.sessionname.$valid}">
|
||||
<label>
|
||||
Session Name <span class="symbol required"></span>
|
||||
@ -74,7 +74,7 @@
|
||||
<!--<span class="success text-small"-->
|
||||
<!--ng-if="Form.stopname.$valid">Thank You!</span>-->
|
||||
</div>
|
||||
<div class="col-md-4 form-group"
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.rollNo.$dirty && Form.rollNo.$invalid, 'has-success':Form.rollNo.$valid}">
|
||||
<label>
|
||||
Roll Number <span class="symbol required"></span>
|
||||
@ -91,11 +91,7 @@
|
||||
<!--ng-if="Form.stopname.$valid">Thank You!</span>-->
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4 form-group"
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.feesAmount.$dirty && Form.feesAmount.$invalid,'has-success':Form.feesAmount.$valid}">
|
||||
<label>
|
||||
Course Fees <span class="symbol required"></span>
|
||||
@ -111,7 +107,7 @@
|
||||
ng-if="Form.feesAmount.$error.maxlength || Form.feesAmount.$error.pattern">Enter a valid amount</span>
|
||||
|
||||
</div>
|
||||
<div class="col-md-4 form-group"
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.STF.$dirty && Form.STF.$invalid}">
|
||||
<label>
|
||||
STF/WR
|
||||
@ -127,7 +123,7 @@
|
||||
ng-if="Form.STF.$error.maxlength || Form.STF.$error.pattern">Enter a valid amount</span>
|
||||
|
||||
</div>
|
||||
<div class="col-md-4 form-group"
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.others.$dirty && Form.others.$invalid}">
|
||||
<label>
|
||||
Others</span>
|
||||
@ -143,9 +139,7 @@
|
||||
ng-if="Form.others.$error.maxlength || Form.others.$error.pattern">Enter a valid amount</span>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-4 form-group"
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.waiver.$dirty && Form.waiver.$invalid}">
|
||||
<label>
|
||||
Waiver</span>
|
||||
@ -161,7 +155,7 @@
|
||||
ng-if="Form.waiver.$error.maxlength || Form.waiver.$error.pattern">Enter a valid amount</span>
|
||||
|
||||
</div>
|
||||
<div class="col-md-4 form-group"
|
||||
<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.total.$dirty && Form.total.$invalid}">
|
||||
<label>
|
||||
Total Payable Fees</span>
|
||||
@ -177,14 +171,14 @@
|
||||
ng-if="Form.total.$error.maxlength || Form.total.$error.pattern">Enter a valid amount</span>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</fieldset>
|
||||
|
||||
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<!--<div class="col-md-4">
|
||||
<fieldset>
|
||||
<legend>Course End Fees</legend>
|
||||
<div class="row">
|
||||
@ -271,7 +265,7 @@
|
||||
</fieldset>
|
||||
|
||||
|
||||
</div>
|
||||
</div>-->
|
||||
<div class="col-md-12">
|
||||
<fieldset>
|
||||
<legend>Bill Details</legend>
|
||||
@ -349,7 +343,7 @@
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.paymentOn.$dirty && Form.paymentOn.$invalid">Payment type is required</span>
|
||||
</div>
|
||||
<div class="col-md-3 form-group"
|
||||
<!--<div class="col-md-3 form-group"
|
||||
ng-class="{'has-error':Form.trackStatus.$dirty && Form.trackStatus.$invalid, 'has-success':Form.trackStatus.$valid}">
|
||||
<label>
|
||||
Status For Track <span class="symbol required"></span>
|
||||
@ -362,14 +356,14 @@
|
||||
</select>
|
||||
<span class="error text-small block"
|
||||
ng-if="Form.trackStatus.$dirty && Form.trackStatus.$invalid">Status is required</span>
|
||||
</div>
|
||||
</div>-->
|
||||
|
||||
<div class="col-md-4 form-group"
|
||||
ng-class="{'has-error':Form.studcomments.$dirty && Form.studcomments.$invalid,'has-success':Form.studcomments.$valid}">
|
||||
<label>
|
||||
Comments For Student <span class="symbol required"></span>
|
||||
</label>
|
||||
<textarea placeholder="Enter Comments" tabindex="18"
|
||||
<textarea placeholder="Enter Comments" tabindex="17"
|
||||
class="form-control textdsc" name="studcomments"
|
||||
ng-model="updateModel.studComments" required></textarea>
|
||||
<span class="error text-small block"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user