From 72d37d2a8438682b4be9b6321431fe0f5bb08a9d Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 23 Aug 2018 10:43:46 +0530 Subject: [PATCH] fees status model changes for DMC status update --- Apollo/api/application/models/Fees_status_model.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Apollo/api/application/models/Fees_status_model.php b/Apollo/api/application/models/Fees_status_model.php index 9b330645..5914596d 100755 --- a/Apollo/api/application/models/Fees_status_model.php +++ b/Apollo/api/application/models/Fees_status_model.php @@ -537,7 +537,7 @@ class Fees_status_model extends CI_Model } // Entry for all status screen except fees - $this->entryForAllStatus($feesPaidDetails,$courseID); + $this->entryForAllStatus($feesPaidDetails,$courseID,substr($feesName,0,3)); } else{ @@ -1701,11 +1701,17 @@ class Fees_status_model extends CI_Model * Entry for all status update * created by kms * */ - public function entryForAllStatus($feesDetails=null,$courseID=null){ + public function entryForAllStatus($feesDetails=null,$courseID=null,$feesName=null){ $singleFeesDetails=["SEM 1","SEM 2","SEM 3","SEM 4","SEM 5","SEM 6","SEM 7","SEM 8"]; // get pick list expected status $this->db->select('ListCode,ListName'); - $this->db->where('ListName','EXPECTED'); + if(strtoupper($feesName)==DMC_CONST){ + $this->db->where('ListName','NOT APPLICABLE'); + } + else{ + $this->db->where('ListName','EXPECTED'); + } + $this->db->where('BranchCode',$feesDetails['UpdatedBy']); $this->db->where('IsActive','1'); $existStatusDetails = $this->db->get(PICK_LIST_DETAILS)->last_row();