diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index 92fcc0d7..166cce84 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -1153,6 +1153,13 @@ class Fees_status_model extends CI_Model * */ public function setFees($details=null,$jsonData=null){ + + // print_r($details); + //print_r($jsonData); + //die(); + + + $this->db->select('FeesID'); $this->db->where('CourseID', $details['CourseID']); $this->db->where('StudentID', $details['StudentID']); @@ -1252,6 +1259,42 @@ class Fees_status_model extends CI_Model $result['message'] = "Successfully fees details is added."; } + +$fromd= date("d-m-Y",strtotime($details['CreatedOn'])); + + +if(($details['FeesType']=='PC') || ($details['FeesType']=='TC')|| ($details['FeesType']=='MC') + || ($details['FeesType'] == 'DC')) +{ + + $this->db->select('ListCode'); + $this->db->from('T_PickListDetails'); + $this->db->where('ListName','EXPECTED'); + $this->db->where('BranchCode',$details['BranchCode']); + + $searchDetails = $this->db->get(); + $getId=$searchDetails->result(); + + $listcode=''; + + foreach($getId as $ge) + { + $listcode=$ge->ListCode; + } + + $appstatus['StudentID'] = $details['StudentID']; + $appstatus['CourseID'] = $details['CourseID']; + $appstatus['BranchCode'] = $details['BranchCode']; + $appstatus['ListCode'] = $listcode; + $appstatus['AppDate'] = $fromd; + $appstatus['Comments'] = 'Fees for the student has been set'; + $appstatus['CreatedBy']= $details['CreatedBy']; + $appstatus['CreatedOn'] = $details['CreatedOn']; + $appstatus['CertificationType'] =$details['FeesType']; + $this->db->insert('T_ApplicationStatus', $appstatus); + + + } // update registration details if($jsonData){ $this->updateRegistrationDetails($details,$installmentFeesID); @@ -1374,6 +1417,21 @@ $REGID=''; $upappform['CreatedOn']=$details['CreatedOn']; $upappform['Comments']='Fees for the student has been set'; $this->db->insert('T_ApplicationFormStatus', $upappform); + + + + + + // $appstatus['StudentID'] = $details['StudentID']; + // $appstatus['CourseID'] = $details['CourseID']; + // $appstatus['BranchCode'] = $details['BranchCode']; + // $appstatus['ListCode'] = $listcode; + // $appstatus['AppDate'] = $fromd; + // $appstatus['Comments'] = 'Fees for the student has been set'; + // $appstatus['CreatedBy']= $details['CreatedBy']; + // $appstatus['CreatedOn'] = $details['CreatedOn']; + // $appstatus['CertificationType'] =$details['FeesType']; + // $this->db->insert('T_ApplicationStatus', $appstatus); diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 4394b8fb..637870c6 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -513,6 +513,9 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n * created by kms * */ $scope.saveFees = function (myModel, form,updateModel, loading) { + + + // alert('save');return false; $scope.currentBalance = 0; if(parseInt(updateModel.feesType.BalanceAmount) >= parseInt(updateModel.billAmount)){ $scope.currentBalance = parseInt(updateModel.feesType.BalanceAmount)-parseInt(updateModel.billAmount); @@ -622,6 +625,8 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n * set fees for student * */ $scope.submitFeesForStudent = function (myModel,form,updateModel,loading) { + + //alert('set fee page');return false; var firstError = null; if (form.$invalid) {