diff --git a/Apollo/api/application/models/Login_model.php b/Apollo/api/application/models/Login_model.php index de74d783..5dac5f9d 100755 --- a/Apollo/api/application/models/Login_model.php +++ b/Apollo/api/application/models/Login_model.php @@ -143,7 +143,7 @@ class Login_model extends CI_Model // echo 'no _if';die(); // print_r($loginDetails);die(); - $this->db->select('LO.MobileNumber, LO.ListCode, LO.ID, ST.IsActive,LO.StaffID,ST.BranchCode,SC.CallModuleAccess'); + $this->db->select('LO.MobileNumber, LO.ListCode, LO.ID, ST.IsActive,LO.StaffID,ST.BranchCode,SC.CallModuleAccess,SC.FinanceModuleAccess'); $this->db->from('' . LOGIN . ' as LO'); $this->db->join('' . STAFF . ' as ST', 'LO.StaffID = ST.StaffID'); $this->db->join('' . STAFF_BRANCH . ' as SC', 'SC.StaffID = ST.StaffID'); diff --git a/Apollo/assets/js/controllers/feesStatusCtrl.js b/Apollo/assets/js/controllers/feesStatusCtrl.js index 867ce216..799b3168 100755 --- a/Apollo/assets/js/controllers/feesStatusCtrl.js +++ b/Apollo/assets/js/controllers/feesStatusCtrl.js @@ -20,6 +20,11 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n * updateModel default value * */ + + //console.log(JSON.parse(localStorage.getItem('localObj')).localType) + + //console.log(JSON.parse(localStorage.getItem('localObj')).is_DayBookApproval_Access) + $scope.updateModel = { "feesType": "", "date": "", @@ -47,7 +52,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n /* * get payment options * */ - + if(JSON.parse(localStorage.getItem('localObj')).localType=='R002' && JSON.parse(localStorage.getItem('localObj')).is_DayBookApproval_Access==0){ $scope.paymentOptions = [ { @@ -116,7 +121,7 @@ app.controller('feesStatusCtrl', ["$scope","$rootScope","toaster", "$filter", "n - +console.log($scope.paymentOptions); $scope.isTrainee = false; var localUserType = JSON.parse(localStorage.getItem('localObj')).localType; diff --git a/Apollo/assets/views/status-update/updateFeesStatus.html b/Apollo/assets/views/status-update/updateFeesStatus.html index fdfcb2fb..34c2de93 100755 --- a/Apollo/assets/views/status-update/updateFeesStatus.html +++ b/Apollo/assets/views/status-update/updateFeesStatus.html @@ -299,12 +299,18 @@ + +
+ +
+ + Payment type is required