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 da11fcf0..e1cb468c 100644 --- a/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php +++ b/Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php @@ -760,7 +760,7 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $universityResult=array(); if($universityDetails->result()){ $universityResult['status']=true; - foreach ($universityDetails->result() as $row){ + /* foreach ($universityDetails->result() as $row){ $this->db->select('SM.SessionID,SM.SessionName'); $this->db->order_by('SM.SessionID','DESC'); $this->db->where('SM.IsActive','1'); @@ -778,8 +778,8 @@ class Receive_Enrolment_Fees_Univ_model extends CI_Model { $fetchArray['SessionDetails']=""; } $getResult[]=$fetchArray; - } - $universityResult['details']=$getResult; + }*/ + $universityResult['details']=$universityDetails->result(); } else{ $universityResult['status']=false; diff --git a/Apollo/assets/i18n/en.json b/Apollo/assets/i18n/en.json index 5d2ab428..d1d9fb29 100755 --- a/Apollo/assets/i18n/en.json +++ b/Apollo/assets/i18n/en.json @@ -108,6 +108,7 @@ "STUDENTDETAILSADDEDIT": "Manage Details", "STUDENTFEEDETAILCOMPARE": "University Form Enrolment", "STUDENTFROMIDFEEDETAILS": "Student FormId Fee Details", + "UNIVERSITYFORMPAYMENT": "University Form Payment", "status" : { "MAIN": "Update Status", "STUDYMATERIAL": "Study Material", diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index fd27f560..75e18043 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -308,7 +308,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com label: 'Manage Details' } }).state('app.student.UnivFormEnroment', { - url: '/UnivFormEnrolment', + url: '/univformenrolment', templateUrl: "assets/views/student/studentUnivFeeCompareDetails.html", resolve: loadSequence('ui.select', 'spin', 'ui.mask', 'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'student_university_fee_compareCtrl', 'ngTable'), title: 'University Form Enrolment', @@ -323,6 +323,14 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com ncyBreadcrumb: { label: 'Student FormId Fees Details' } + }).state('app.student.universityformpayment', { + url: '/univformpayment', + templateUrl: "assets/views/student/UnivFormPaymentDetails.html", + resolve: loadSequence('ui.select', 'spin', 'ui.mask', 'monospaced.elastic', 'ladda', 'touchspin-plugin', 'angular-ladda', 'univFormPaymentCtrl', 'ngTable'), + title: 'University Form Payment Details', + ncyBreadcrumb: { + label: 'University Form Payment Details' + } }).state('app.student.status', { url: '/status', template: '