From 72d37d2a8438682b4be9b6321431fe0f5bb08a9d Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 23 Aug 2018 10:43:46 +0530 Subject: [PATCH 1/3] 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(); From fb0c8d9881663242eaf0a77898f6e2c4e04add3e Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 23 Aug 2018 10:44:00 +0530 Subject: [PATCH 2/3] DMC constant added --- Apollo/api/application/config/constants.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Apollo/api/application/config/constants.php b/Apollo/api/application/config/constants.php index 7554fb19..00f8fd93 100755 --- a/Apollo/api/application/config/constants.php +++ b/Apollo/api/application/config/constants.php @@ -163,6 +163,8 @@ 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'); +// define DMC constant name +defined('DMC_CONST') OR define('DMC_CONST','DMC'); @@ -171,3 +173,4 @@ defined('RE_REGISTRATION_CONST') OR define('RE_REGISTRATION_CONST','Re-registrat //encripted password -> md5 defined('ENCR_PASSWORD') OR define('ENCR_PASSWORD','e99a18c428cb38d5f260853678922e03'); //end of encripted password + From 741048da71b9f161390dfc47bf5b99e97269a59c Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 23 Aug 2018 11:00:15 +0530 Subject: [PATCH 3/3] dmc chnages in constant --- Apollo/api/application/config/constants.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Apollo/api/application/config/constants.php b/Apollo/api/application/config/constants.php index 7554fb19..1ac086c5 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,11 +167,14 @@ 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 + +