diff --git a/Apollo/api/application/config/constants.php b/Apollo/api/application/config/constants.php index 1ff64846..780ff423 100755 --- a/Apollo/api/application/config/constants.php +++ b/Apollo/api/application/config/constants.php @@ -113,6 +113,10 @@ defined('OTHER') OR define('OTHER','OTHER'); // define default payment type defined('WAIVER') OR define('WAIVER','WAIVER'); defined('REFERRAL') OR define('REFERRAL','REFERRAL'); +defined('CASH') OR define('CASH','CASH'); +defined('CHEQUE') OR define('CHEQUE','CHEQUE'); +defined('ONLINETRANSACTION') OR define('ONLINETRANSACTION','ONLINE TRANSACTION'); +defined('CreditDebitCard') OR define('CreditDebitCard','Credit/Debit Card'); //encript database table name defined('LOGIN') OR define('LOGIN','T_Login'); @@ -163,20 +167,15 @@ defined('APPLICATION_CONST') OR define('APPLICATION_CONST','APPLICATION'); // registration type constant defined('NEWREGISTRATION_CONST') OR define('NEWREGISTRATION_CONST','New Registration'); defined('RE_REGISTRATION_CONST') OR define('RE_REGISTRATION_CONST','Re-registration'); +defined('DMC_CONST') OR define('DMC_CONST','DMC'); -//end of database table name +//end of database table name //encripted password -> md5 defined('ENCR_PASSWORD') OR define('ENCR_PASSWORD','e99a18c428cb38d5f260853678922e03'); //end of encripted password -//transaxtion methods -defined('CASH') OR define('CASH','CASH'); -defined('CHEQUE') OR define('CHEQUE','CHEQUE'); -defined('ONLINETRANSACTION') OR define('ONLINETRANSACTION','ONLINE TRANSACTION'); -defined('CreditDebitCard') OR define('CreditDebitCard','Credit/Debit Card'); -//end of transaction 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();