diff --git a/api/application/config/constants.php b/api/application/config/constants.php
index 636702e6..8c9bbeb8 100644
--- a/api/application/config/constants.php
+++ b/api/application/config/constants.php
@@ -91,7 +91,14 @@ defined('ROUTE_LOGIN')        OR define('ROUTE_LOGIN', 'getPDOfficerCurrentLocat
 
 /*********************AWS resources Constants*************************************************/
 defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic');
+if(ENVIRONMENT == 'development')
+{
 defined('LENDER_BUCKET_NAME_PREFIX') OR define('LENDER_BUCKET_NAME_PREFIX','lender');
+}
+else if(ENVIRONMENT == 'testing')
+{
+	defined('LENDER_BUCKET_NAME_PREFIX') OR define('LENDER_BUCKET_NAME_PREFIX','len');
+}
 
 /*********************END of AWS resources Constants*************************************************/
 
diff --git a/api/application/config/database.php b/api/application/config/database.php
index 6ab0f361..2de0cec6 100644
--- a/api/application/config/database.php
+++ b/api/application/config/database.php
@@ -70,7 +70,15 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 | The $query_builder variables lets you determine whether or not to load
 | the query builder class.
 */
-$active_group = 'dev';
+if(ENVIRONMENT == 'development')
+{
+	$active_group = 'dev';
+}
+else if(ENVIRONMENT == 'testing')
+{
+	$active_group = 'test';
+}
+
 $query_builder = TRUE;
 
 $db['dev'] = array(
diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php
index e033c943..3334cb3e 100644
--- a/api/application/controllers/PD_Controller.php
+++ b/api/application/controllers/PD_Controller.php
@@ -724,11 +724,11 @@ class PD_Controller extends REST_Controller {
 							 
 															
 								$logger = MYLOG::logFunction();
-								$logger->info("CUSTOM SPECIFIC TEMPLATE ".$pd_details['fk_pd_template_id']." CHOOSED",array('PDID' => $pd_details['pd_id'],'Pre-Status' => $res_array[0]['pd_status'],'Current_status' => $pd_details['pd_status']));
+								$logger->info("CUSTOM SPECIFIC TEMPLATE ".$pd_details['fk_pd_template_id']." CHOOSED",array('ENV'=>ENVIORNMENT,'PDID' => $pd_details['pd_id'],'Pre-Status' => $res_array[0]['pd_status'],'Current_status' => $pd_details['pd_status']));
 							
 							
 							
-								$dataToBot = array('Task Name'=>'PD Template Assign','Template Catagory'=>'SPECIFIC Template  - '.$choosed_template_id[0]['fk_template_id'] ,'PDID'=> $pd_details['pd_id'],'Method' => 'UpdatePDMaster','Pre-Status' => $res_array[0]['pd_status'],'Current_status' => $pd_details['pd_status']);
+								$dataToBot = array('ENV'=>ENVIORNMENT,'Task Name'=>'PD Template Assign','Template Catagory'=>'SPECIFIC Template  - '.$choosed_template_id[0]['fk_template_id'] ,'PDID'=> $pd_details['pd_id'],'Method' => 'UpdatePDMaster','Pre-Status' => $res_array[0]['pd_status'],'Current_status' => $pd_details['pd_status']);
 								 MYHTTPCLIENT::sendPOST($dataToBot);
 							
 						 }
@@ -754,11 +754,11 @@ class PD_Controller extends REST_Controller {
 							 
 															
 								$logger = MYLOG::logFunction();
-								$logger->info("GENERIC TEMPLATE ".$pd_details['fk_pd_template_id']." CHOOSED",array('PDID' => $pd_details['pd_id'],'Pre-Status' => $res_array[0]['pd_status'],'Current_status' => $pd_details['pd_status']));
+								$logger->info("GENERIC TEMPLATE ".$pd_details['fk_pd_template_id']." CHOOSED",array('ENV'=>ENVIORNMENT,'PDID' => $pd_details['pd_id'],'Pre-Status' => $res_array[0]['pd_status'],'Current_status' => $pd_details['pd_status']));
 							
 							
 							
-								$dataToBot = array('Task Name'=>'PD Template Assign','Template Catagory'=>'GENERIC TEMPLATE ID - '.$pd_details['fk_pd_template_id'] ,'PDID'=> $pd_details['pd_id'],'Method' => 'UpdatePDMaster','Pre-Status' => $res_array[0]['pd_status'],'Current_status' => $pd_details['pd_status']);
+								$dataToBot = array('ENV'=>ENVIORNMENT,'Task Name'=>'PD Template Assign','Template Catagory'=>'GENERIC TEMPLATE ID - '.$pd_details['fk_pd_template_id'] ,'PDID'=> $pd_details['pd_id'],'Method' => 'UpdatePDMaster','Pre-Status' => $res_array[0]['pd_status'],'Current_status' => $pd_details['pd_status']);
 								MYHTTPCLIENT::sendPOST($dataToBot);
 							
 							 
@@ -2308,7 +2308,7 @@ class PD_Controller extends REST_Controller {
 			$records = $this->saveCoApplicantsFromGeneralInfoForm($records);
 		 }
 		
-		
+		die();
 		 $fields = array('isactive' => 0);
 		 $where_condition_array = array('fk_form_id'=>$formid,'fk_pd_id'=>$pdid);
 			if($company_id != null)
@@ -2516,6 +2516,9 @@ class PD_Controller extends REST_Controller {
 										$temp_array = array('fk_pd_id'=>$records['pdid'],'applicant_name'=>$new_applicant['applicant_name'],'applicant_type'=>0,'applicant_title_name'=>$new_applicant['applicant_title_name']);	
 									}
 									$new_co_appliacant_id = $this->PD_Model->saveRecords($temp_array,PDAPPLICANTSDETAILS);
+								
+								
+								 
 									
 									
 									if($new_co_appliacant_id != null || $new_co_appliacant_id != "")
@@ -2553,6 +2556,21 @@ class PD_Controller extends REST_Controller {
 											}
 										}
 										
+										
+								/*###################  LOGGING #########################*/
+								
+								$logger = MYLOG::logFunction();
+								$temp_array['pd_co_applicant_id'] = $new_co_appliacant_id;
+								$logger->info("APPLICANT ADDED FROM GENERAL FORM - ENV (".ENVIORNMENT.")",$temp_array);
+							
+							
+							
+								$dataToBot = array('ENV'=>ENVIORNMENT,'Task Name'=>'APPLICANT ADDED FROM GENERAL FORM','Method' => 'saveCoApplicantsFromGeneralInfoForm','Data' => $temp_array);
+								 MYHTTPCLIENT::sendPOST($dataToBot);
+								 
+								 
+								 /*###################  LOGGING #########################*/
+										
 									}
 									
 									
@@ -2563,7 +2581,7 @@ class PD_Controller extends REST_Controller {
 							{
 								
 									$temp_array = array();
-									$where_condition_array = array('fk_pd_id'=>$records['pdid']);
+									$where_condition_array = array('pd_co_applicant_id'=>$new_applicant['pd_co_applicant_id']);
 									if($new_applicant['is_person_met'] == true)
 									{
 										$temp_array = array('applicant_name'=>$new_applicant['applicant_name'],'applicant_type'=>3,'applicant_title_name'=>$new_applicant['applicant_title_name']);	
@@ -2579,14 +2597,48 @@ class PD_Controller extends REST_Controller {
 										$temp_array = array('applicant_name'=>$new_applicant['applicant_name'],'applicant_type'=>1,'applicant_title_name'=>$new_applicant['applicant_title_name']);	
 									}
 									$new_co_appliacant_id = $this->PD_Model->updateRecords($temp_array,PDAPPLICANTSDETAILS,$where_condition_array);
+									if($new_co_appliacant_id != "" || $new_co_appliacant_id != null)
+									{
+										
+										/*###################  LOGGING #########################*/
+								
+										$logger = MYLOG::logFunction();
+										$temp_array['pd_co_applicant_id'] = $new_applicant['pd_co_applicant_id'];
+										$logger->info("APPLICANT EDITED FROM GENERAL FORM ENV (".ENVIORNMENT.")",$temp_array);
+									
+									
+									
+										$dataToBot = array('ENV'=>ENVIORNMENT,'Task Name'=>'APPLICANT EDITED FROM GENERAL FORM','Method' => 'saveCoApplicantsFromGeneralInfoForm','Data' => $temp_array);
+										 MYHTTPCLIENT::sendPOST($dataToBot);
+								 
+								 
+								 /*###################  LOGGING #########################*/
+										
+									}
 							}
 							
 							if(array_key_exists('is_active',$new_applicant))
 							{
 								if($new_applicant['is_active'] == false)
 								{
-									$this->db->where('pd_co_applicant_id',$new_applicant['pd_co_applicant_id'])->delete(PDAPPLICANTSDETAILS); 
-									//print_r($this->db->last_query());
+									$rows_afftecd = $this->db->where('pd_co_applicant_id',$new_applicant['pd_co_applicant_id'])->delete(PDAPPLICANTSDETAILS); 
+									
+								if($rows_afftecd != "" && $rows_afftecd != null)
+								{									
+									/*###################  LOGGING #########################*/
+								
+										$logger = MYLOG::logFunction();
+										
+										$logger->info("APPLICANT DELETED FROM GENERAL FORM ENV (".ENVIORNMENT.")",$new_applicant);
+									
+									
+									
+										$dataToBot = array('ENV'=>ENVIORNMENT,'Task Name'=>'APPLICANT DELETED FROM GENERAL FORM','Method' => 'saveCoApplicantsFromGeneralInfoForm','Data' => $new_applicant);
+										 MYHTTPCLIENT::sendPOST($dataToBot);
+								 
+								 
+								 /*###################  LOGGING #########################*/
+								}
 								}
 							}
 							
@@ -2608,6 +2660,22 @@ class PD_Controller extends REST_Controller {
 									
 									$records['companies'][$company_key]['is_new'] = false;
 									$records['companies'][$company_key]['pd_co_applicant_id'] = $new_co_appliacant_id;
+									
+									
+								/*###################  LOGGING #########################*/
+								
+										$logger = MYLOG::logFunction();
+										$temp_array['pd_co_applicant_id'] = $new_co_appliacant_id;
+										$logger->info("COMPANY ADDED AS APPLICANT FROM GENERAL FORM  ENV (". ENVIORNMENT.")",$temp_array);
+									
+									
+									
+										$dataToBot = array('ENV'=>ENVIORNMENT,'Task Name'=>'COMPANY ADDED AS APPLICANT FROM GENERAL FORM','Method' => 'saveCoApplicantsFromGeneralInfoForm','Data' => $temp_array);
+										 MYHTTPCLIENT::sendPOST($dataToBot);
+								 
+								 
+								 /*###################  LOGGING #########################*/	
+									
 							}
 							
 							if(array_key_exists('is_active',$company))
@@ -2616,8 +2684,26 @@ class PD_Controller extends REST_Controller {
 								{
 									
 									
-									$this->db->where('pd_co_applicant_id',$company['pd_co_applicant_id'])->delete(PDAPPLICANTSDETAILS); 
-									//print_r($this->db->last_query());
+									$rows_afftecd = $this->db->where('applicant_name',$company['company_name'])->where('fk_pd_id',$records['pdid'])->delete(PDAPPLICANTSDETAILS); 
+									
+									
+									if($rows_afftecd != "" || $rows_afftecd != null)
+									{
+									/*###################  LOGGING #########################*/
+								
+										$logger = MYLOG::logFunction();
+										$temp_array['pd_co_applicant_id'] = $new_co_appliacant_id;
+										$logger->info("COMPANY(APPLICANT) DELETED FROM GENERAL FORM ENV (". ENVIORNMENT.")",$company);
+									
+									
+									
+										$dataToBot = array('ENV'=>ENVIORNMENT,'Task Name'=>'COMPANY(APPLICANT) DELETED FROM GENERAL FORM','Method' => 'saveCoApplicantsFromGeneralInfoForm','Data' => $company);
+										 MYHTTPCLIENT::sendPOST($dataToBot);
+								 
+								 
+								 /*###################  LOGGING #########################*/	
+									}
+									
 								}
 							}
 						}
@@ -4176,6 +4262,7 @@ class PD_Controller extends REST_Controller {
 	
 	public function codeigniterViewTest_post()
 	{
+		
 		$records = $this->post('records');
 		$pdid = $records['pd_id'];
 		$fk_createdby = $records['fk_createdby'];
diff --git a/api/index.php b/api/index.php
index 732c98ca..ff5d1e16 100644
--- a/api/index.php
+++ b/api/index.php
@@ -53,7 +53,8 @@
  *
  * NOTE: If you change these, also change the error_reporting() code below
  */
-	define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] : 'development');
+	//define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] : 'development');
+	define('ENVIRONMENT','development');
 	date_default_timezone_set('Asia/Kolkata');
 	
 
@@ -73,6 +74,9 @@ switch (ENVIRONMENT)
 	break;
 
 	case 'testing':
+		error_reporting(-1);
+		ini_set('display_errors', 1);
+	break;
 	case 'production':
 		ini_set('display_errors', 0);
 		if (version_compare(PHP_VERSION, '5.3', '>='))