From b507941d8082109d813b91b9020d23d7709430e5 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 30 Aug 2018 16:40:54 +0530 Subject: [PATCH] commit changes --- .../Receive_Enrolment_Fees_Univ_Controller.php | 6 ++---- .../models/Receive_Enrolment_Fees_Univ_model.php | 12 ++++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php index b5be32e6..08bbe12e 100644 --- a/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php +++ b/Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php @@ -131,16 +131,14 @@ class Receive_Enrolment_Fees_Univ_Controller extends REST_Controller { $formData['EnrolmentNo'] = $this->post('enrolmentId');; $getDetails = $this->receive_model->getFormIDFeeDetails($formData); - if ($getDetails['Status']=true) + if ($getDetails['status']=true) { - $getDetails['status'] =true; // Set the response and exit $this->response($getDetails, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code } - else if($getDetails['Status']=false){ + else if($getDetails['status']=false){ $this->response([ 'message' => $getDetails['Message'], - 'status' => false ], REST_Controller::HTTP_OK); // NOT_FOUND (404) being the HTTP response code } else diff --git a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php index de8b2e71..991ee3cb 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -808,7 +808,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $this->db->where('SFP.IsActive','1'); $feesDetails = $this->db->get()->last_row(); if($feesDetails){ - $feesArray['Status']=true; + $feesArray['status']=true; $feesArray['Message']="Fees paid both student and university"; $feesArray['Type']=$fetchRow->Sem_Year; $feesArray['UniversityPaidAmount']=$fetchRow->UniversityPaidAmount; @@ -816,7 +816,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { break; } else{ - $feesArray['Status']=true; + $feesArray['status']=true; $feesArray['Message']="University fees paid and student fees pending"; $feesArray['Type']=$fetchRow->Sem_Year; $feesArray['UniversityPaidAmount']=$fetchRow->UniversityPaidAmount; @@ -837,7 +837,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $this->db->where('SFP.IsActive','1'); $feesDetails = $this->db->get()->last_row(); if($feesDetails){ - $feesArray['Status']=true; + $feesArray['status']=true; $feesArray['Message']="Fees paid both student and university"; $feesArray['Type']=$fetchRow->Sem_Year; $feesArray['UniversityPaidAmount']=$fetchRow->UniversityPaidAmount; @@ -845,7 +845,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { break; } else{ - $feesArray['Status']=true; + $feesArray['status']=true; $feesArray['Message']="University fees paid and student fees pending"; $feesArray['Type']=$fetchRow->Sem_Year; $feesArray['UniversityPaidAmount']=$fetchRow->UniversityPaidAmount; @@ -855,14 +855,14 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { } } else{ - $feesArray['Status']=false; + $feesArray['status']=false; $feesArray['Message']="Student record is mismatch because of enrolment number is not registered in student course details"; } } else{ - $feesArray['Status']=false; + $feesArray['status']=false; $feesArray['Message']="Please check form id"; } return $feesArray;