From ddd4c7c5409a4041bbc6f7ca7c805a68ad5bdbde Mon Sep 17 00:00:00 2001 From: Sanjeev Date: Thu, 18 Feb 2021 15:23:39 +0530 Subject: [PATCH] Delete Issues fixed --- Apollo/api/application/models/Fees_status_model.php | 3 ++- Apollo/assets/js/config.router.js | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index 38b27c1d..d4035ef4 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -835,7 +835,8 @@ class Fees_status_model extends CI_Model // count the total paid fees details $this->db->select('FeesId'); $this->db->where('FeesId',$existData[0]->FeesID); - // $this->db->where('IsActive','1'); + //by sanjeev due to daybook details cancel status + $this->db->where('IsActive','1'); $countExistPaid = $this->db->get(STUDENTS_FEES_PAID); if($countExistPaid->num_rows()<=0){ $fetchData['PaidStatus']=0; diff --git a/Apollo/assets/js/config.router.js b/Apollo/assets/js/config.router.js index 206c78e8..17b4f365 100755 --- a/Apollo/assets/js/config.router.js +++ b/Apollo/assets/js/config.router.js @@ -68,6 +68,8 @@ app.config(['$stateProvider', '$urlRouterProvider', '$controllerProvider', '$com abstract: true }).state('app.dashboard', { url: "/dashboard", + templateUrl: "assets/views/dashboard.html", + resolve: loadSequence('spin', 'ladda', 'angular-ladda', 'dashboardCtrl','ngTable'), title: 'Dashboard', ncyBreadcrumb: { label: 'Dashboard'