diff --git a/api/application/composer.json b/api/application/composer.json
index d5ea17b9..44abf358 100644
--- a/api/application/composer.json
+++ b/api/application/composer.json
@@ -21,7 +21,8 @@
 		"dompdf/dompdf" : "0.8.2",
 		"tecnickcom/tcpdf": "^6.2",
 		"phpmailer/phpmailer": "^6.0",
-		"php-curl-class/php-curl-class": "^8.5"
+		"php-curl-class/php-curl-class": "^8.5",
+		"guzzlehttp/guzzle": "^6.3"
 		
 	},
 	"suggest": {
diff --git a/api/application/composer.lock b/api/application/composer.lock
index f69f909e..55c782bf 100644
--- a/api/application/composer.lock
+++ b/api/application/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "85528eeb9ef1cc95bba8240e50127495",
+    "content-hash": "fc220b8435596093210dababb4b092ef",
     "packages": [
         {
             "name": "amphp/amp",
diff --git a/api/application/config/autoload.php b/api/application/config/autoload.php
index 746c2e22..71c7fb73 100644
--- a/api/application/config/autoload.php
+++ b/api/application/config/autoload.php
@@ -89,7 +89,7 @@ $autoload['drivers'] = array();
 |
 |	$autoload['helper'] = array('url', 'file');
 */
-$autoload['helper'] = array('url','file','form', 'jwt', 'authorization', 'date','mylog','myocr','mydb','pdalerts');
+$autoload['helper'] = array('url','file','form', 'jwt', 'authorization', 'date','mylog','myocr','mydb','pdalerts','myuitil','myhttpclient');
 
 /*
 | -------------------------------------------------------------------
diff --git a/api/application/config/constants.php b/api/application/config/constants.php
index 5540e8fc..bb6c02f7 100644
--- a/api/application/config/constants.php
+++ b/api/application/config/constants.php
@@ -92,9 +92,13 @@ defined('ROUTE_LOGIN')        OR define('ROUTE_LOGIN', 'getPDOfficerCurrentLocat
 /*********************AWS resources Constants*************************************************/
 defined('PROFILE_PICTURE_BUCKET_NAME') OR define('PROFILE_PICTURE_BUCKET_NAME','sineedgedevprofilepic');
 defined('LENDER_BUCKET_NAME_PREFIX') OR define('LENDER_BUCKET_NAME_PREFIX','lender');
-defined('TEMPLATE_BUCKET_NAME') OR define('TEMPLATE_BUCKET_NAME','dev_templates');
+
 /*********************END of AWS resources Constants*************************************************/
 
+defined('LOGTOBOT') OR define('LOGTOBOT',1);
+defined('LOGTOSYS') OR define('LOGTOSYS',1);
+defined('PROCESSJSON') OR define('PROCESSJSON',0);
+
 /*******************Constants PD status*********************************/
 defined('TRIGGERED') OR define('TRIGGERED','TRIGGERED'); //First time PD Trigger.
 defined('ALLOCATED') OR define('ALLOCATED','ALLOCATED'); //PD Allocated to PD officer
@@ -488,6 +492,9 @@ defined('VEHICLETYPEID') OR define('VEHICLETYPEID','vehicle_type_id');
 defined('PDOFFICERRECOMMENDATIONS') OR define('PDOFFICERRECOMMENDATIONS','m_pdofficer_recommendations');
 defined('PDOFFICERRECOMMENDATIONSID') OR define('PDOFFICERRECOMMENDATIONSID','pdofficer_recommendation_id');
 
+defined('PRICINGINFO') OR define('PRICINGINFO','m_pricing_info');
+defined('PRICINGINFOID') OR define('PRICINGINFOSID','pricing_info_id');
+
 
 
 
diff --git a/api/application/config/customconfig_one.php b/api/application/config/customconfig_one.php
index 2a63ef29..ba303121 100644
--- a/api/application/config/customconfig_one.php
+++ b/api/application/config/customconfig_one.php
@@ -49,7 +49,7 @@ $config['authorization_key'] = 'sparqvenba2018';
 /* End of file jwt.php */
 /* Location: ./application/config/jwt.php */
 
-$config['master_tables_field_names'] = array('INDUSTRYCLASSIFICATION' => 'name','UOM' => 'name','OCCUPATIONMEMBERS' => 'name','EDUQUALIFICATION' => 'qualification_name', 'TYPEOFACTIVITY' => 'name','RELATIONSHIPS' => 'name','FREQUENCY' => 'name', 'CUSTOMERBEHAVIOUR' => 'description', 'CUSTOMERSEGMENT' => 'name','DESIGNATION' => 'short_name', 'EARNINGMEMBERSSTATUS' => 'earning_member_status','EDUQUALIFICATION' => 'qualification_name','ADDRESSTYPE' => 'address_type','LOCALITY' => 'locality_name','ASSETTYPE' => 'name','PROPERTIES' => 'name','INVESTMENTTYPE' => 'name','INSURANCETYPE' => 'name','PERSONSMET' => 'person_met_name','RESIDENCEOWNERSHIP' => 'name','PAYMENTMODE' => 'name','ACCOUNTTYPE' => 'name','SOURCEOFOTHERINCOME' => 'name','MORTAGEPROPERTYTYPE' => 'name','ENDUSEOFLOAN' => 'enduse_of_loan','SOURCEOFBALANCETRANSFER' => 'name', 'STATUSOFCONSTRUCTION' => 'name','BTLENDERLIST'=>'lender_name','MORTAGEPROPERTIES'=>'property_name','EXISTINGLOANTYPES'=>'loan_type_name','PDAPPLICANTSDETAILS'=>'applicant_name','RELATIONWITHBUSINESS'=>'relation_with_business_name','BUSINESSENTITYTYPE'=>'business_entity_type_name','COMPANYRELATIONSHIPS'=>'name','STATE'=>'name','CITY'=>'name','COUNTRY'=>'country_name','BOUNCEMASTER'=>'bounce_reason_name','BUSINESSEXPENSES'=>'expense_item','BUSINESSINCOME'=>'business_income_item','COMMENTSONLOCALITY'=>'rating','COMPANY'=>'company_id','LOCALITY'=>'locality_name','NONINDIVIDUALENTITIES'=>'non_individual_entity_name','PDFORMS'=>'pd_form_name','PDLOCATIONAPPROACH'=>'description','PDTYPE'=>'type_name','PDNOTIFICATION'=>'pd_status','QUESTIONCATEGORY'=>'category_name','ROLES'=>'role_name','SUBPRODUCTS'=>'name','TITLES'=>'name','PINCODE'=>'pincode','PRODUCTS'=>'name','ENTITYTYPE'=>'name','PDTEAM'=>'team_name','ENTITY'=>'short_name','PDSTATUS'=>'pd_status_name','LISTOFMASTERS'=>'master_name','OTPREJECTION'=>'rejection_reason','ENDUSEOFTOPUP'=>'end_use_of_topup','VEHICLETYPE'=>'vehicle_type_name','PDOFFICERRECOMMENDATIONS'=>'pdofficer_recommendation');
+$config['master_tables_field_names'] = array('INDUSTRYCLASSIFICATION' => 'name','UOM' => 'name','OCCUPATIONMEMBERS' => 'name','EDUQUALIFICATION' => 'qualification_name', 'TYPEOFACTIVITY' => 'name','RELATIONSHIPS' => 'name','FREQUENCY' => 'name', 'CUSTOMERBEHAVIOUR' => 'description', 'CUSTOMERSEGMENT' => 'name','DESIGNATION' => 'short_name', 'EARNINGMEMBERSSTATUS' => 'earning_member_status','EDUQUALIFICATION' => 'qualification_name','ADDRESSTYPE' => 'address_type','LOCALITY' => 'locality_name','ASSETTYPE' => 'name','PROPERTIES' => 'name','INVESTMENTTYPE' => 'name','INSURANCETYPE' => 'name','PERSONSMET' => 'person_met_name','RESIDENCEOWNERSHIP' => 'name','PAYMENTMODE' => 'name','ACCOUNTTYPE' => 'name','SOURCEOFOTHERINCOME' => 'name','MORTAGEPROPERTYTYPE' => 'name','ENDUSEOFLOAN' => 'enduse_of_loan','SOURCEOFBALANCETRANSFER' => 'name', 'STATUSOFCONSTRUCTION' => 'name','BTLENDERLIST'=>'lender_name','MORTAGEPROPERTIES'=>'property_name','EXISTINGLOANTYPES'=>'loan_type_name','PDAPPLICANTSDETAILS'=>'applicant_name','RELATIONWITHBUSINESS'=>'relation_with_business_name','BUSINESSENTITYTYPE'=>'business_entity_type_name','COMPANYRELATIONSHIPS'=>'name','STATE'=>'name','CITY'=>'name','COUNTRY'=>'country_name','BOUNCEMASTER'=>'bounce_reason_name','BUSINESSEXPENSES'=>'expense_item','BUSINESSINCOME'=>'business_income_item','COMMENTSONLOCALITY'=>'rating','COMPANY'=>'company_id','LOCALITY'=>'locality_name','NONINDIVIDUALENTITIES'=>'non_individual_entity_name','PDFORMS'=>'pd_form_name','PDLOCATIONAPPROACH'=>'description','PDTYPE'=>'type_name','PDNOTIFICATION'=>'pd_status','QUESTIONCATEGORY'=>'category_name','ROLES'=>'role_name','SUBPRODUCTS'=>'name','TITLES'=>'name','PINCODE'=>'pincode','PRODUCTS'=>'name','ENTITYTYPE'=>'name','PDTEAM'=>'team_name','ENTITY'=>'short_name','PDSTATUS'=>'pd_status_name','LISTOFMASTERS'=>'master_name','OTPREJECTION'=>'rejection_reason','ENDUSEOFTOPUP'=>'end_use_of_topup','VEHICLETYPE'=>'vehicle_type_name','PDOFFICERRECOMMENDATIONS'=>'pdofficer_recommendation','REGIONS'=>'name','PRICINGINFO'=>'pricing_info_id');
 
-$config['master_tables_pkid'] = array('INDUSTRYCLASSIFICATION' => 'industry_classification_id','UOM' => 'uom_id','OCCUPATIONMEMBERS' => 'occupation_non_earning_member_id','EDUQUALIFICATION' => 'qualification_name', 'TYPEOFACTIVITY' => 'type_of_activity_id','RELATIONSHIPS' => 'relationship_id','FREQUENCY' => 'frequency_id', 'CUSTOMERBEHAVIOUR' => 'customer_behaviour_id', 'CUSTOMERSEGMENT' => 'customer_segment_id','DESIGNATION' => 'designation_id', 'EARNINGMEMBERSSTATUS' => 'earning_member_status_id','EDUQUALIFICATION' => 'qualification_id','ADDRESSTYPE' => 'address_type_id','LOCALITY' => 'locality_id','ASSETTYPE' => 'id','PROPERTIES' => 'id','INVESTMENTTYPE' => 'id','INSURANCETYPE' => 'id','PERSONSMET' => 'person_met_id','RESIDENCEOWNERSHIP' => 'id','PAYMENTMODE' => 'id','ACCOUNTTYPE' => 'id','SOURCEOFOTHERINCOME' => 'id','MORTAGEPROPERTYTYPE' => 'id','ENDUSEOFLOAN' => 'enduse_of_loan_id','SOURCEOFBALANCETRANSFER' => 'id', 'STATUSOFCONSTRUCTION' => 'id','MORTAGEPROPERTIES' => 'mortage_property_id','BTLENDERLIST'=>'bt_lender_list_id','EXISTINGLOANTYPES'=>'existing_loan_type_id','PDAPPLICANTSDETAILS'=>'pd_co_applicant_id','RELATIONWITHBUSINESS'=>'relation_with_business_id','BUSINESSENTITYTYPE'=>'business_entity_type_id','COMPANYRELATIONSHIPS'=>'company_relationship_id','STATE'=>'state_id','CITY'=>'city_id','COUNTRY'=>'country_id','BOUNCEMASTER'=>'bounce_id','BUSINESSEXPENSES'=>'expense_item_id','BUSINESSINCOME'=>'business_income_id','COMMENTSONLOCALITY'=>'comments_on_locality_id','COMPANY'=>'name','LOCALITY'=>'locality_id','NONINDIVIDUALENTITIES'=>'non_individual_entity_id','PDFORMS'=>'form_id','PDLOCATIONAPPROACH'=>'pd_location_approach_id','PDTYPE'=>'pd_type_id','PDNOTIFICATION'=>'pdnotification_id','QUESTIONCATEGORY'=>'question_category_id','ROLES'=>'role_id','SUBPRODUCTS'=>'subproduct_id','TITLES'=>'title_id','PINCODE'=>'pincode_id','PRODUCTS'=>'product_id','ENTITYTYPE'=>'entity_type_id','PDTEAM'=>'pdteam_id','ENTITY'=>'entity_id','PDSTATUS'=>'pd_status_id','LISTOFMASTERS'=>'master_id','OTPREJECTION'=>'otp_rejection_id','ENDUSEOFTOPUP'=>'end_use_of_topup_id','VEHICLETYPE'=>'vehicle_type_id','PDOFFICERRECOMMENDATIONS'=>'pdofficer_recommendation_id');
+$config['master_tables_pkid'] = array('INDUSTRYCLASSIFICATION' => 'industry_classification_id','UOM' => 'uom_id','OCCUPATIONMEMBERS' => 'occupation_non_earning_member_id','EDUQUALIFICATION' => 'qualification_name', 'TYPEOFACTIVITY' => 'type_of_activity_id','RELATIONSHIPS' => 'relationship_id','FREQUENCY' => 'frequency_id', 'CUSTOMERBEHAVIOUR' => 'customer_behaviour_id', 'CUSTOMERSEGMENT' => 'customer_segment_id','DESIGNATION' => 'designation_id', 'EARNINGMEMBERSSTATUS' => 'earning_member_status_id','EDUQUALIFICATION' => 'qualification_id','ADDRESSTYPE' => 'address_type_id','LOCALITY' => 'locality_id','ASSETTYPE' => 'id','PROPERTIES' => 'id','INVESTMENTTYPE' => 'id','INSURANCETYPE' => 'id','PERSONSMET' => 'person_met_id','RESIDENCEOWNERSHIP' => 'id','PAYMENTMODE' => 'id','ACCOUNTTYPE' => 'id','SOURCEOFOTHERINCOME' => 'id','MORTAGEPROPERTYTYPE' => 'id','ENDUSEOFLOAN' => 'enduse_of_loan_id','SOURCEOFBALANCETRANSFER' => 'id', 'STATUSOFCONSTRUCTION' => 'id','MORTAGEPROPERTIES' => 'mortage_property_id','BTLENDERLIST'=>'bt_lender_list_id','EXISTINGLOANTYPES'=>'existing_loan_type_id','PDAPPLICANTSDETAILS'=>'pd_co_applicant_id','RELATIONWITHBUSINESS'=>'relation_with_business_id','BUSINESSENTITYTYPE'=>'business_entity_type_id','COMPANYRELATIONSHIPS'=>'company_relationship_id','STATE'=>'state_id','CITY'=>'city_id','COUNTRY'=>'country_id','BOUNCEMASTER'=>'bounce_id','BUSINESSEXPENSES'=>'expense_item_id','BUSINESSINCOME'=>'business_income_id','COMMENTSONLOCALITY'=>'comments_on_locality_id','COMPANY'=>'name','LOCALITY'=>'locality_id','NONINDIVIDUALENTITIES'=>'non_individual_entity_id','PDFORMS'=>'form_id','PDLOCATIONAPPROACH'=>'pd_location_approach_id','PDTYPE'=>'pd_type_id','PDNOTIFICATION'=>'pdnotification_id','QUESTIONCATEGORY'=>'question_category_id','ROLES'=>'role_id','SUBPRODUCTS'=>'subproduct_id','TITLES'=>'title_id','PINCODE'=>'pincode_id','PRODUCTS'=>'product_id','ENTITYTYPE'=>'entity_type_id','PDTEAM'=>'pdteam_id','ENTITY'=>'entity_id','PDSTATUS'=>'pd_status_id','LISTOFMASTERS'=>'master_id','OTPREJECTION'=>'otp_rejection_id','ENDUSEOFTOPUP'=>'end_use_of_topup_id','VEHICLETYPE'=>'vehicle_type_id','PDOFFICERRECOMMENDATIONS'=>'pdofficer_recommendation_id','REGIONS'=>'region_id','PRICINGINFO'=>'pricing_info_id');
 ?>
\ No newline at end of file
diff --git a/api/application/config/routes.php b/api/application/config/routes.php
index c53963f0..52f7e159 100644
--- a/api/application/config/routes.php
+++ b/api/application/config/routes.php
@@ -141,6 +141,8 @@ $route['listLenderBranches'] = 'Entity_Management_Controller/listLenderBranches'
 $route['getFullTATInfo'] = 'Entity_Management_Controller/getFullTATInfo'; 
 $route['saveTATInfo'] = 'Entity_Management_Controller/saveTATInfo'; 
 $route['deleteTATCombimaion'] = 'Entity_Management_Controller/deleteTATCombimaion'; 
+$route['saveEntityPricingInfo'] = 'Entity_Management_Controller/saveEntityPricingInfo'; 
+$route['listEntityPricingInfo'] = 'Entity_Management_Controller/listEntityPricingInfo'; 
 
 //PD RELATED
 $route['triggerNewPD'] = 'PD_Controller/triggerNewPD'; 
diff --git a/api/application/controllers/Entity_Management_Controller.php b/api/application/controllers/Entity_Management_Controller.php
index a6f93b84..ccd5f703 100644
--- a/api/application/controllers/Entity_Management_Controller.php
+++ b/api/application/controllers/Entity_Management_Controller.php
@@ -752,4 +752,77 @@ class Entity_Management_Controller extends REST_Controller {
 	}
 	
 	
+	public function saveEntityPricingInfo_post()
+	{
+		$records = $this->post('records');
+		$count = 0;
+		foreach($records as $key => $record)
+		{
+			if($record['pricing_info_id'] != "" || $record['pricing_info_id'] != null)
+			{
+			  	
+			    $where_condition_array = array('pricing_info_id' => $record['pricing_info_id']);
+			    $id = $this->Entity_Management_Model->updateRecords($temp,PRICINGINFO,$where_condition_array);
+				if($id != null || $id != "")
+				{
+					$count++;
+				}
+			}
+			else
+			{
+				$id = $this->Entity_Management_Model->saveRecords($record,PRICINGINFO);
+				if($id != null || $id != "")
+				{
+					$count++;
+				}
+			}
+		}
+		
+		if($count != 0 && count($records) == $count)
+		{
+					$data['dataStatus'] = true;
+					$data['status'] = REST_Controller::HTTP_OK;
+					$data['records'] = $count;
+					$this->response($data,REST_Controller::HTTP_OK);
+		}
+		else
+		{
+					$data['dataStatus'] = false;
+					$data['status'] = REST_Controller::HTTP_NOT_MODIFIED;
+					$data['msg'] = 'Something Went Wrong! Try Later...';
+					$this->response($data,REST_Controller::HTTP_OK);
+		}
+	}
+	
+	
+	public function listEntityPricingInfo_post()
+	{
+			$records = $this->post('records');
+	  
+	  
+			$columns = array('ENTITY.short_name as lender_name', 'pricing_info_id', 'fk_lender_id', 'slab_name', 'from', 'to', 'full_pd_di', 'full_pd_ai', 'smart_pd', 'tele_pd', 'PRICINGINFO.isactive', 'PRICINGINFO.createdon', 'PRICINGINFO.updateon', 'PRICINGINFO.fk_createdby',' PRICINGINFO.fk_updatedby');
+			$table = PRICINGINFO.' as PRICINGINFO';
+			$joins = array(array('table' => ENTITY. ' as ENTITY',
+								  'condition' =>'PRICINGINFO.fk_lender_id = ENTITY.entity_id',
+								   'jointype' => 'INNER'));
+			$where_condition_array = array('PRICINGINFO.isactive' => 1,'PRICINGINFO.fk_lender_id' => $records['entity_id']);
+			$pricing_details = $this->Entity_Management_Model->getJoinRecords($columns,$table,$joins,$where_condition_array);
+			// print_r($this->db->last_query());
+				if(count($pricing_details))
+				{
+							$data['dataStatus'] = true;
+							$data['status'] = REST_Controller::HTTP_OK;
+							$data['records'] = $pricing_details;
+							$this->response($data,REST_Controller::HTTP_OK);
+				}
+				else
+				{
+							$data['dataStatus'] = false;
+							$data['status'] = REST_Controller::HTTP_NO_CONTENT;
+							$data['msg'] = 'No Records Found';
+							$this->response($data,REST_Controller::HTTP_OK);
+				}
+	}
+	
+	
 }
\ No newline at end of file
diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php
index 71d24e2d..5a55e9c9 100644
--- a/api/application/controllers/PD_Controller.php
+++ b/api/application/controllers/PD_Controller.php
@@ -9,6 +9,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 
 
 require_once APPPATH . '/libraries/REST_Controller.php';
+require APPPATH . 'vendor/autoload.php';
 //require_once APPPATH . '/libraries/Smartie.php';
 //require BASEPATH.'core/Controller.php';
 
@@ -413,29 +414,7 @@ class PD_Controller extends REST_Controller {
 			
 		// }
 		
-		/************ASSIGN Random URL******************/
-		$characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-		$charactersLength = strlen($characters);
-		$randomString = '';
-		for ($i = 0; $i < 8; $i++) 
-		{
-		 $randomString .= $characters[rand(0, $charactersLength - 1)];
-	    }
-		$pd_details['random_string'] = $randomString;
 		
-		
-			$ch = curl_init();  
-			$timeout = 5;  
-			$url = 'https:/ssa.sineedge.com/officertracking/'.$randomString;
-			//echo "$url";
-			curl_setopt($ch,CURLOPT_URL,'http://tinyurl.com/api-create.php?url='.$url);  
-			curl_setopt($ch,CURLOPT_RETURNTRANSFER,1);  
-			curl_setopt($ch,CURLOPT_CONNECTTIMEOUT,$timeout);  
-			$tinyurl = curl_exec($ch);  
-			curl_close($ch); 
-			$pd_details['encrypted_url'] = $tinyurl;
-			//echo $tinyurl;	
-		/************ASSIGN Random URL******************/
 		//die();
 		
 		$pd_id = $this->PD_Model->saveRecords($pd_details,PDTRIGGER);
@@ -619,19 +598,43 @@ class PD_Controller extends REST_Controller {
 	public function updatePDMaster_post()
 	{
 		$pd_details = $this->post('records');
-		
+	
+		// $l = MYLOG::logFunction("GENERIC TEMPLATE  CHOOSED",array('PDID' => $pd_details['pd_id']),'INFO');
+		// $l->info("GENERIC TEMPLATE  CHOOSED",array('PDID' => $pd_details['pd_id']));
+		// die();
 		// OTP Generate Condition
 		if($pd_details['pd_status'] == INITIATED)
 		{
-			//$msg = "Dear ".$pd_details['firstName'].", Officer ".$pd_details['officerName']." is on his way to meet you for a personal discussion with regards to your loan application. You can track his realtime location in this link.http://maps.google.com/?q=".$pd_details['link'];
-			 $no = (string)$pd_details['mobile_no'];
+			
 			unset($pd_details['mobile_no']);
 			unset($pd_details['firstName']);
 			unset($pd_details['officerName']);
 			$pd_details['initiate_location'] =  $pd_details['link'];
-			$pd_details['customer_link'] = "http://maps.google.com/?q=".$pd_details['link'];
 			unset($pd_details['link']);
-			//$this->aws_sns->sendSMS($msg,$no);
+			
+						/************ASSIGN Random URL******************/
+					$characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+					$charactersLength = strlen($characters);
+					$randomString = '';
+					for ($i = 0; $i < 8; $i++) 
+					{
+					 $randomString .= $characters[rand(0, $charactersLength - 1)];
+					}
+					$pd_details['random_string'] = $randomString;
+					
+					
+						$ch = curl_init();  
+						$timeout = 5;  
+						$url = 'https:/ssa.sineedge.com/officertracking/'.$randomString;
+						//echo "$url";
+						curl_setopt($ch,CURLOPT_URL,'http://tinyurl.com/api-create.php?url='.$url);  
+						curl_setopt($ch,CURLOPT_RETURNTRANSFER,1);  
+						curl_setopt($ch,CURLOPT_CONNECTTIMEOUT,$timeout);  
+						$tinyurl = curl_exec($ch);  
+						curl_close($ch); 
+						$pd_details['encrypted_url'] = $tinyurl;
+						//echo $tinyurl;	
+					/************ASSIGN Random URL******************/
 			
 		}
 		if($pd_details['pd_status'] == STARTED)
@@ -658,7 +661,7 @@ class PD_Controller extends REST_Controller {
 		}
 		
 		
-		if($pd_details['pd_status'] == TRIGGERED)
+		if($pd_details['pd_status'] == TRIGGERED || $pd_details['pd_status'] == INITIATED)
 		{
 			// Template Re assign Functionality
 			
@@ -671,47 +674,72 @@ class PD_Controller extends REST_Controller {
 			if(count($res_array))
 			{
 					
-					if($res_array[0]['pd_status'] == TRIGGERED || $res_array[0]['pd_status'] == DRAFT)
-						{
+					// if($res_array[0]['pd_status'] == TRIGGERED || $res_array[0]['pd_status'] == DRAFT || $pd_details['pd_status'] == INITIATED )
+						// {
+							
 							$fields = array('fk_template_id');
 						 
 						 $where_condition_array = array('fk_lender_id'=>$res_array[0]['fk_lender_id'] ,'fk_product_id'=> $res_array[0]['fk_product_id'],'fk_customer_segment'=> $res_array[0]['fk_customer_segment'],'isactive' => 1);
-						 
+						 // print_r($res_array);
 						 $table = LENDERTEMPLATE;
 						 
 						 $choosed_template_id = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,$table);
-						 
+						 // print_r($this->db->last_query());
+						 // print_r($choosed_template_id);die();
 						 if(count($choosed_template_id))// CHOOSE FILTERED TEMPLATE// 
 						 { 
 							$pd_details['fk_pd_template_id'] = $choosed_template_id[0]['fk_template_id']; 
+							 
+															
+								$logger = MYLOG::logFunction();
+								$logger->info("CUSTOM SPECIFIC TEMPLATE ".$pd_details['fk_pd_template_id']." CHOOSED",array('PDID' => $pd_details['pd_id']));
+							
+							
+							
+								$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');
+								 MYHTTPCLIENT::sendPOST($dataToBot);
+							
 						 }
 						 else // CHOOSE GENERIC TEMPLATE//
 						 {
-							 if($pd_details['fk_customer_segment'] == 1 || $pd_details['fk_customer_segment'] == 2) 
+							// echo "CHOOSE GENERIC ";
+							 if($res_array[0]['fk_customer_segment'] == 1 || $res_array[0]['fk_customer_segment'] == 2) 
 							 {
 								 //SAL - (CASH/CHQ)
 								 $pd_details['fk_pd_template_id'] = 1; 
 							 }
-							 else if($pd_details['fk_customer_segment'] == 3 || $pd_details['fk_customer_segment'] == 5)
+							 else if($res_array[0]['fk_customer_segment'] == 3 || $res_array[0]['fk_customer_segment'] == 5)
 							 {
 								  //* SENP/SEP - (DI)
 								  $pd_details['fk_pd_template_id'] = 2; 
 							 }
-							 else if($pd_details['fk_customer_segment'] == 4 || $pd_details['fk_customer_segment'] == 6)
+							 else if($res_array[0]['fk_customer_segment'] == 4 || $res_array[0]['fk_customer_segment'] == 6)
 							 {
-								  //* SENP/SEP - (DI)
+								  //* SENP/SEP - (AI)
 								  $pd_details['fk_pd_template_id'] = 3; 
+								   
 							 }
+							 
+															
+								$logger = MYLOG::logFunction();
+								$logger->info("GENERIC TEMPLATE ".$pd_details['fk_pd_template_id']." CHOOSED",array('PDID' => $pd_details['pd_id']));
+							
+							
+							
+								$dataToBot = array('Task Name'=>'PD Template Assign','Template Catagory'=>'GENERIC TEMPLATE ID - '.$pd_details['pd_id'] ,'PDID'=> $pd_details['pd_id'],'Method' => 'UpdatePDMaster');
+								MYHTTPCLIENT::sendPOST($dataToBot);
+							
+							 
 						 }
-					}
-					else
-					{
-						unset($pd_details['pd_status']);
-					}
+					// }
+					// else
+					// {
+						// unset($pd_details['pd_status']);
+					// }
 			}
 					
 		}
-		
+			
 			$where_condition_array = array('pd_id' => $pd_details['pd_id']);
 			$pd_id_modified = $this->PD_Model->updateRecords($pd_details,PDTRIGGER,$where_condition_array);
 			
@@ -2189,79 +2217,82 @@ class PD_Controller extends REST_Controller {
 	
 	
 		/*****Call Form Specific funcitons to convert RAW JSON Data to Processed JSON DATA******/
-		// switch($formid)
-		// {
-			// // case 1: 
-				  // $processed_json = GETPROCESSEDJSON::convertSupplierForm($records,$formid);	
-				  // break;
+		if(PROCESSJSON == true)
+		{
+		switch($formid)
+		{
+		     case 1: 
+				  $processed_json = GETPROCESSEDJSON::convertSupplierForm($records,$formid);	
+				  break;
 				  
-			// case 2: 
-				  // $processed_json = GETPROCESSEDJSON::convertClientForm($records,$formid);	
-				  // break;
-			// case 4: $processed_json = GETPROCESSEDJSON::convertOtherAssetForm($records,$formid);	
-				  // $processed_json = $records;	
-				  // break;
-			// case 5: 
-				  // $processed_json = GETPROCESSEDJSON::convertAddressForm($records,$formid);	
-				  // break;
+			case 2: 
+				  $processed_json = GETPROCESSEDJSON::convertClientForm($records,$formid);	
+				  break;
+			case 4: $processed_json = GETPROCESSEDJSON::convertOtherAssetForm($records,$formid);	
+				  $processed_json = $records;	
+				  break;
+			case 5: 
+				  $processed_json = GETPROCESSEDJSON::convertAddressForm($records,$formid);	
+				  break;
 				  
-			// case 6:
-				  // $processed_json = GETPROCESSEDJSON::convertOtherFamilyDetailsForm($records,$formid);	
-				  // break;	  
-			// case 8:
-				  // $processed_json = GETPROCESSEDJSON::convertExistingLoanDetailsForm($records,$formid);	
-				  // break;
-			// case 7:	
-					// $processed_json = GETPROCESSEDJSON::convertBankingInfoDetailsForm($records,$formid);
-					// break;
-			// case 9:	
-					// $processed_json = GETPROCESSEDJSON::convertOtherIncomeDetailsForm($records,$formid);
-					// break;
-			// case 10:	
-					// $processed_json = GETPROCESSEDJSON::convertLoanDetailsForm($records,$formid);
-					// break;
+			case 6:
+				  $processed_json = GETPROCESSEDJSON::convertOtherFamilyDetailsForm($records,$formid);	
+				  break;	  
+			case 8:
+				  $processed_json = GETPROCESSEDJSON::convertExistingLoanDetailsForm($records,$formid);	
+				  break;
+			case 7:	
+					$processed_json = GETPROCESSEDJSON::convertBankingInfoDetailsForm($records,$formid);
+					break;
+			case 9:	
+					$processed_json = GETPROCESSEDJSON::convertOtherIncomeDetailsForm($records,$formid);
+					break;
+			case 10:	
+					$processed_json = GETPROCESSEDJSON::convertLoanDetailsForm($records,$formid);
+					break;
 			
-			// case 11: //In Stock UOM Only - also coming Text - right now No need to convert.	
-					// //$processed_json = GETPROCESSEDJSON::convertStockDetailsForm($records,$formid);
-					// $processed_json = $records;
-					// break;
-			// case 12: 
-				  // $processed_json = $records;	
-				  // break;
+			case 11: //In Stock UOM Only - also coming Text - right now No need to convert.	
+					//$processed_json = GETPROCESSEDJSON::convertStockDetailsForm($records,$formid);
+					$processed_json = $records;
+					break;
+			case 12: 
+				  $processed_json = $records;	
+				  break;
 					
-			// case 14: // There is no master Data in Financial Form	
-					// $processed_json = $records;
-					// break;
+			case 14: // There is no master Data in Financial Form	
+					$processed_json = $records;
+					break;
 					
-			// case 13:	
-					// $processed_json = GETPROCESSEDJSON::convertBusinessDetailsForm($records,$formid);
-					// break;
-		    // case 15: 
-				  // $processed_json = $records;	
-				  // break;
-			// case 17: 
-				  // $processed_json = $records;	
-				  // break;
-			// case 18: 
-				 // $processed_json = GETPROCESSEDJSON::convertGeneralDetailsForm($records,$formid);
-				  // break;
+			case 13:	
+					$processed_json = GETPROCESSEDJSON::convertBusinessDetailsForm($records,$formid);
+					break;
+		    case 15: 
+				  $processed_json = $records;	
+				  break;
+			case 17: 
+				  $processed_json = $records;	
+				  break;
+			case 18: 
+				 $processed_json = GETPROCESSEDJSON::convertGeneralDetailsForm($records,$formid);
+				  break;
 					
-			// case 19:	
-					// $processed_json = GETPROCESSEDJSON::convertNeighbourDetailsForm($records,$formid);
-					// break;
-			// case 20: 
-				  // $processed_json = $processed_json = GETPROCESSEDJSON::convertFinalRemarksForm($records,$formid);
-				  // break;
+			case 19:	
+					$processed_json = GETPROCESSEDJSON::convertNeighbourDetailsForm($records,$formid);
+					break;
+			case 20: 
+				  $processed_json = $processed_json = GETPROCESSEDJSON::convertFinalRemarksForm($records,$formid);
+				  break;
 				  
-			// case 22: 
-				  // $processed_json = GETPROCESSEDJSON::convertBusinessAssetsForm($records,$formid);
-				  // break;
+			case 22: 
+				  $processed_json = GETPROCESSEDJSON::convertBusinessAssetsForm($records,$formid);
+				  break;
 				  
-			// //default:
-					// //echo "Something Wrong! Form ID did not match, Contact System Administrator";
-		 // }
+			//default:
+					//echo "Something Wrong! Form ID did not match, Contact System Administrator";
+		 }
+		}
 		
-		 // die();
+		// die();
 		/*****End of Form Specific funcitons to convert RAW JSON Data to Processed JSON DATA*******/
 		
 		unset($records['pdid']);
@@ -4095,15 +4126,15 @@ class PD_Controller extends REST_Controller {
 		$data['pd_additional_requirements'] = $this->PD_Model->getPDAdditionalRequirements($pdid);
 		
 			//GET ALL PROCESSED JSON
-			for($i = 1;$i<=20;$i++)
+			for($i = 1;$i<=25;$i++)
 			{	
-				$fields = array('json','processed_json');
+				$fields = array('processed_json');
 				 $where_condition_array = array('isactive' => 1,'fk_pd_id'=>$pdid,'fk_form_id' => $i);
 				 // if($company_id != null)
 					// {
 				 // $where_condition_array = array('fk_form_id'=>$pd_form_id,'fk_pd_id'=>$pd_id,'company_id' => $company_id,'isactive' => 1);
 					// }
-			   $data['pd_processed_forms'][$i] = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDFORMDETAILSJSON);
+			   $data['pd_processed_forms'][$i] = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDFORMDETAILSJSON,array(),'','company_id','ASC');
 			}
 		print_r($data['pd_processed_forms']);die();
 		// print_r(json_decode($data['pd_processed_forms'][13][0]['processed_json'],true));
@@ -4111,6 +4142,7 @@ class PD_Controller extends REST_Controller {
 	  
 		// die();
 		$t = $this->load->view('report_templates/JSONTOREPORT',$data,true);
+		//print_r($t);die();
 		//PDF Gen using DOM PDF
 		$pdf_doc = $this->pdfgenerator->generate($t, $filename='version', $stream=false, $paper = 'A4', $orientation = "portrait");
 		//End of PDF Gen using DOM PDF
@@ -4291,8 +4323,9 @@ class PD_Controller extends REST_Controller {
 						  }
 						  else
 						  {
-							  if($business_form_status == 1){ 
-								$temp[] = array('form_id' => $form['form_id'],'form_name'=> $form['form_name'],'isAnswered' => true,'isAnswerable'=>true);
+							  if($business_form_status == 1){
+								
+								
 								
 								if($form['form_id'] == 1)//if supplier form answered set supplier_form_status = 1
 								  {
@@ -4306,16 +4339,21 @@ class PD_Controller extends REST_Controller {
 								  
 								if($form['form_id'] == 11)
 								{
-									
+									//echo "COUNT YES STOCK"
 									if($client_form_status == 1 && $supplier_form_status == 1)
 									{
 										$temp[] = array('form_id' => $form['form_id'],'form_name'=> $form['form_name'],'isAnswered' => true,'isAnswerable'=>true);
 									}
-								}									
+								}
+								else								
+								{
+									$temp[] = array('form_id' => $form['form_id'],'form_name'=> $form['form_name'],'isAnswered' => true,'isAnswerable'=>true);
+								}
 						  
 							  }
-							  else
+							  else //busienss false
 							  {
+								  //echo "business false".$form['form_id'];	
 								  $temp[] = array('form_id' => $form['form_id'],'form_name'=> $form['form_name'],'isAnswered' => true,'isAnswerable'=>false);
 							  }
 						  }
@@ -4443,8 +4481,9 @@ class PD_Controller extends REST_Controller {
 	public function getPDOfficerCurrentLocation_post()
 	{
 		$pdid = $this->post('pd_id');
-		PDALERTS::pdnotification($pdid);
-		die();
+		//
+		//PDALERTS::pdnotification($pdid);
+		
 		$result_data = $this->db->SELECT('*')->FROM(PDOFFICERCURRENTLOCATION)->WHERE('fk_pd_id',$pdid)->ORDER_BY(PDOFFICERCURRENTLOCATIONID,'DESC')->LIMIT(1)->GET()->result_array();
 			
 			if(count($result_data))
@@ -4655,12 +4694,12 @@ class PD_Controller extends REST_Controller {
 	{ 
 		    $pdid = $this->post('pd_id');
 		    $company_id = $this->post('company_id');
-			//echo $pdid;
+			//echo $pdid.$company_id;die();
 			//Get Details From  General Full
 			$fields = array('json');
 			$where_condition_array = array('isactive' => 1,'fk_form_id' =>13,'fk_pd_id' => $pdid,'company_id' => $company_id);
 			$business_data = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDFORMDETAILSJSON);
-			$final_data = array();
+			$final_data_from_business = array();
 			//print_r($business_data);
 			if(count($business_data))
 			{
@@ -4675,7 +4714,7 @@ class PD_Controller extends REST_Controller {
 					  $temp_data['products'][] = $manufacturing_activity_details['main_products'];	 	
 					}
 					
-					$final_data[] = $temp_data;
+					$final_data_from_business[] = $temp_data;
 					$temp_data = array();
 				}
 				
@@ -4688,7 +4727,7 @@ class PD_Controller extends REST_Controller {
 					  $temp_data['products'][] = $retail_trading_activity_details['main_products'];	 	
 					}
 					
-					$final_data[] = $temp_data;
+					$final_data_from_business[] = $temp_data;
 					$temp_data = array();
 				}
 				
@@ -4701,7 +4740,7 @@ class PD_Controller extends REST_Controller {
 					  $temp_data['products'][] = $wholesale_trading_activity_details['main_products'];	 	
 					}
 					
-					$final_data[] = $temp_data;
+					$final_data_from_business[] = $temp_data;
 					$temp_data = array();
 				}
 				
@@ -4714,18 +4753,50 @@ class PD_Controller extends REST_Controller {
 					  $temp_data['products'][] = $service_provider_activity_details['main_products'];	 	
 					}
 					
-					$final_data[] = $temp_data;
+					$final_data_from_business[] = $temp_data;
 					$temp_data = array();
 				}
 				
 				
 			}
 			
+			//GET RAW MATERIALS FROM SUPPLIER Form
+			$fields = array('json');
+			$where_condition_array = array('isactive' => 1,'fk_form_id' =>1,'fk_pd_id' => $pdid,'company_id' => $company_id);
+			$supplier_data = $this->PD_Model->selectCustomRecords($fields,$where_condition_array,PDFORMDETAILSJSON);
+			$final_data_from_supplier = array();	
+			//print_r($supplier_data);
+			if(count($supplier_data))
+			{
 				
+				$supplier_data = json_decode($supplier_data[0]['json'],true);
+				//print_r($supplier_data);
+				if(array_key_exists('manufacturing_details',$supplier_data))
+				{
+					
+					foreach($supplier_data['manufacturing_details'] as $manufacturing_activity_detail_key => $manufacturing_activity_detail)
+					{
+						$temp_data = $manufacturing_activity_detail['main_raw_materials'];
+						//print_r($temp_data);die();
+						// print_r(count($temp_data));
+						// print_r($temp_data[0]);
+						// print_r($temp_data[1]);
+						if($temp_data != "" || $temp_data != null)
+						{
+							foreach($temp_data as $raw_material)
+							{
+								//print_r($raw_material);
+								$final_data_from_supplier[] = $raw_material['manufacturing_raw_material_name'];
+							}
+						}
+					}
+					
+				}
+			}
 				
 				$data['dataStatus'] = true;
 				$data['status'] = REST_Controller::HTTP_OK;
-				$data['record'] = $final_data;
+				$data['record'] = array('from_business' => $final_data_from_business,'from_supplier' => $final_data_from_supplier);
 				$this->response($data,REST_Controller::HTTP_OK);
 			
 				
diff --git a/api/application/docs/sample.pdf b/api/application/docs/sample.pdf
index be9b86a7..e5d991a6 100644
Binary files a/api/application/docs/sample.pdf and b/api/application/docs/sample.pdf differ
diff --git a/api/application/helpers/getprocessedjson_helper.php b/api/application/helpers/getprocessedjson_helper.php
index 6c8ebd99..6854128c 100644
--- a/api/application/helpers/getprocessedjson_helper.php
+++ b/api/application/helpers/getprocessedjson_helper.php
@@ -38,7 +38,7 @@ class GETPROCESSEDJSON
 					  {
 						  //GET MASASTER DATA
 						  
-						    $table = constant($master_value['family_details']);
+						    $table = constant($master_value['master_name']);
 							
 							$temp_fields =  array($master_tables_field_names[$master_value['master_name']].' as name');
 							
@@ -61,7 +61,7 @@ class GETPROCESSEDJSON
 			}
 			
 			
-			// Handling manufacturing_details subarry
+			// Handling trading_products subarry
 			foreach($raw_json['trade_details'][0]['trading_products'] as $trading_products_key => $trading_products)
 			{
 				foreach($trading_products as $key => $value)
@@ -167,7 +167,7 @@ class GETPROCESSEDJSON
 				}
 		}
 		
-		print_r($raw_json);
+		return $raw_json;
 	}
 	/*****************##########  END EXISTING LOAN DETAILS FORM  ##########**************/
 	
@@ -269,7 +269,31 @@ class GETPROCESSEDJSON
 				}
 				$raw_json['end_use_master'] = $end_use_master;
 				
+				if(array_key_exists('end_use_topup',$raw_json))
+				{
+					$CI->db->SELECT( $master_tables_field_names['ENDUSEOFTOPUP'] );
+					$CI->db->FROM(ENDUSEOFTOPUP);
+					$CI->db->WHERE('is_active',1);
+					$CI->db->WHERE( $master_tables_pkid['ENDUSEOFTOPUP'] ,$raw_json['end_use_topup']);
+					$end_use_topup = $CI->db->GET()->result_array();
+					if(count($end_use_topup))
+					{
+						$raw_json['end_use_topup_master'] = $end_use_topup[0][ $master_tables_field_names['ENDUSEOFTOPUP'] ];
+					}
+				}
 				
+				if(array_key_exists('construction_status',$raw_json))
+				{
+					$CI->db->SELECT( $master_tables_field_names['STATUSOFCONSTRUCTION'] );
+					$CI->db->FROM(STATUSOFCONSTRUCTION);
+					$CI->db->WHERE('isactive',1);
+					$CI->db->WHERE( $master_tables_pkid['STATUSOFCONSTRUCTION'] ,$raw_json['construction_status']);
+					$status_of_construction = $CI->db->GET()->result_array();
+					if(count($status_of_construction))
+					{
+						$raw_json['construction_status_master'] = $status_of_construction[0][ $master_tables_field_names['STATUSOFCONSTRUCTION'] ];
+					}
+				}
 				
 				
 				if(array_key_exists('lender',$raw_json))
@@ -299,6 +323,8 @@ class GETPROCESSEDJSON
 				}
 				
 				
+				if(array_key_exists('source_group',$raw_json))
+				{
 				$source_of_own_contribution_master = array();
 				foreach($raw_json['source_group'] as $source_group_key => $source_group)
 				{
@@ -315,18 +341,19 @@ class GETPROCESSEDJSON
 					}
 				}
 				$raw_json['source_of_own_contribution_master'] = $source_of_own_contribution_master;
-				
+				}
 				
 				$owners_list_master = array();
 				foreach($raw_json['owner_name_group'] as $owner_name_group_key => $owner_name_group)
 				{
 					
-					
+					//print_r($owner_name_group);die();
 					$CI->db->SELECT( $master_tables_field_names['PDAPPLICANTSDETAILS'] );
 					$CI->db->FROM(PDAPPLICANTSDETAILS);
-					$CI->db->WHERE('isactive',1);
-					$CI->db->WHERE( $master_tables_pkid['PDAPPLICANTSDETAILS'] ,$owner_name_group['owner_name']);
+					//$CI->db->WHERE('isactive',1);
+					$CI->db->WHERE( $master_tables_pkid['PDAPPLICANTSDETAILS'] ,$owner_name_group['owner_name']['id']);
 					$owners_list= $CI->db->GET()->result_array();
+					//print_r($owners_list);
 					if(count($owners_list))
 					{
 						$owners_list_master = array_merge($owners_list_master,array($owners_list[0][$master_tables_field_names['PDAPPLICANTSDETAILS']]));
@@ -674,18 +701,33 @@ class GETPROCESSEDJSON
 		if(!empty($raw_json) && !empty($master_keys))
 		{
 			
-					if(array_key_exists('business_entity_type',$raw_json))
+					
+					if(array_key_exists('partners',$raw_json))
 					{
-						$CI->db->SELECT( $master_tables_field_names['BUSINESSENTITYTYPE'] );
-						$CI->db->FROM(BUSINESSENTITYTYPE);
-						$CI->db->WHERE('isactive',1);
-						$CI->db->WHERE( $master_tables_pkid['BUSINESSENTITYTYPE'] ,$raw_json['business_entity_type']);
-						$business_entity_type= $CI->db->GET()->result_array();
-						if(count($business_entity_type))
+						foreach($raw_json['partners'] as $partner_key => $partner)
 						{
-							$business_entity_type_master = $business_entity_type[0][$master_tables_field_names['BUSINESSENTITYTYPE']];
-							$raw_json['business_entity_type_master'] = $business_entity_type_master;
-							
+							if($partner['partner_name'] != "" || $partner['partner_name'] != null)
+							{
+								$applicant_title_name = 'applicant_title_name';
+								$CI->db->SELECT( 'applicant_name,name as applicant_title_name');
+								$CI->db->FROM(PDAPPLICANTSDETAILS. ' as PDAPPLICANTSDETAILS');
+								$CI->db->JOIN(TITLES .' as TITLES','PDAPPLICANTSDETAILS.applicant_title_name = TITLES.title_id');
+								$CI->db->WHERE( $master_tables_pkid['PDAPPLICANTSDETAILS'] ,$partner['partner_name']);
+								$partner_name= $CI->db->GET()->result_array();
+								//print_r($partner_name);die();
+								if(count($partner_name))
+								{
+									//echo $partner_name[0][$master_tables_field_names['PDAPPLICANTSDETAILS']];die();
+									//print_r($raw_json['partners'][$partner_key]);
+									$raw_json['partners'][$partner_key]['partner_name_master'] = $partner_name[0]['applicant_title_name'].$partner_name[0][$master_tables_field_names['PDAPPLICANTSDETAILS']];
+									
+									//$raw_json['partners'][$partner_key]['partner_name_master'] = $partner_name[0][$master_tables_field_names['PDAPPLICANTSDETAILS']]; 
+									
+									
+									//$raw_json['PAT'] = $partner_name[0][$master_tables_field_names['PDAPPLICANTSDETAILS']]; 
+									//print_r($raw_json);die();
+								}
+							}
 						}
 					}
 					
@@ -837,6 +879,357 @@ class GETPROCESSEDJSON
 							
 						}
 					}
+					
+					
+					//#############  START Retail Activity##############//
+					
+					if(array_key_exists('retail_trading_activity_details',$raw_json))
+					{
+						foreach($raw_json['retail_trading_activity_details'] as $retail_trading_activity_detail_key => $retail_trading_activity_detail)
+						{
+							
+							//##################  GET INDIA_WHERE_SALE_DONE Informations
+							if(array_key_exists('india_where_sale_done',$retail_trading_activity_detail))
+							{
+							 foreach($retail_trading_activity_detail['india_where_sale_done'] as $india_where_sale_done_key => $india_where_sale_done)
+							 {
+								//SELECT STATE NAME
+								$CI->db->SELECT( $master_tables_field_names['STATE'] );
+								$CI->db->FROM(STATE);
+								$CI->db->WHERE('isactive',1);
+								$CI->db->WHERE( $master_tables_pkid['STATE'] ,$india_where_sale_done['state_name']);
+								$state= $CI->db->GET()->result_array();
+								if(count($state))
+								{
+								 $raw_json['retail_trading_activity_details'][$retail_trading_activity_detail_key]['india_where_sale_done'][$india_where_sale_done_key]['state_name'] = $state[0][$master_tables_field_names['STATE']];
+								}
+								
+								//SELECT CITY NAME
+								$CI->db->SELECT( $master_tables_field_names['CITY'] );
+								$CI->db->FROM(CITY);
+								$CI->db->WHERE('isactive',1);
+								$CI->db->WHERE_IN( $master_tables_pkid['CITY'] ,$india_where_sale_done['city_name']);
+								$city = $CI->db->GET()->result_array();
+								
+								if(count($city))
+								{
+									$temp = array();
+								 foreach($city as $c){ $temp = array_merge($temp,array($c['name'])); }	
+								 $raw_json['retail_trading_activity_details'][$retail_trading_activity_detail_key]['india_where_sale_done'][$india_where_sale_done_key]['city_name'] = $temp;
+								}
+							 }
+							}
+							//##################  END OF GET INDIA_WHERE_SALE_DONE Informations
+							
+							
+							//##################  GET MAX_SALE_STATE_NAME Informations
+							if(array_key_exists('max_sale_state_name',$retail_trading_activity_detail))
+							{
+							 foreach($retail_trading_activity_detail['max_sale_state_name'] as $max_sale_state_name_key => $max_sale_state_name)
+							 {
+								//SELECT STATE NAME
+								$CI->db->SELECT( $master_tables_field_names['STATE'] );
+								$CI->db->FROM(STATE);
+								$CI->db->WHERE('isactive',1);
+								$CI->db->WHERE_IN( $master_tables_pkid['STATE'] ,$max_sale_state_name['state_name']);
+								$state= $CI->db->GET()->result_array();
+								if(count($state))
+								{
+								 $temp = array();
+								 foreach($state as $s){ $temp = array_merge($temp,array($s['name'])); }	
+								
+								 $raw_json['retail_trading_activity_details'][$retail_trading_activity_detail_key]['max_sale_state_name'][$max_sale_state_name_key]['state_name'] = $temp;
+								}
+								
+								//SELECT CITY NAME
+								$CI->db->SELECT( $master_tables_field_names['CITY'] );
+								$CI->db->FROM(CITY);
+								$CI->db->WHERE('isactive',1);
+								$CI->db->WHERE_IN( $master_tables_pkid['CITY'] ,$max_sale_state_name['city_name']);
+								$city = $CI->db->GET()->result_array();
+								
+								if(count($city))
+								{
+									$temp = array();
+								 foreach($city as $c){ $temp = array_merge($temp,array($c['name'])); }	
+								 //print_r($t);
+								 $raw_json['retail_trading_activity_details'][$retail_trading_activity_detail_key]['max_sale_state_name'][$max_sale_state_name_key]['city_name'] = $temp;
+								}							
+							 }
+							}
+							//##################  END OF GET MAX_SALE_STATE_NAME Informations
+							
+							
+							
+							//##################  GET COUNTRIES_WHERE_EXPORT_DONE Informations
+							if(array_key_exists('countries_where_export_done',$retail_trading_activity_detail))
+							{
+							 foreach($retail_trading_activity_detail['countries_where_export_done'] as $countries_where_export_done_key => $countries_where_export_done)
+							 {
+								
+								foreach($countries_where_export_done as $key => $value)
+								{
+									if(!strcmp($key,'country_name'))
+									{
+									//SELECT COUNTRY NAME
+									$CI->db->SELECT( $master_tables_field_names['COUNTRY'] );
+									$CI->db->FROM(COUNTRY);
+									$CI->db->WHERE('isactive',1);
+									$CI->db->WHERE( $master_tables_pkid['COUNTRY'] ,$value);
+									$country= $CI->db->GET()->result_array();
+										if(count($country))
+										{
+										 $raw_json['retail_trading_activity_details'][$retail_trading_activity_detail_key]['countries_where_export_done'][$countries_where_export_done_key]['country_name'] = $country[0][$master_tables_field_names['COUNTRY']];
+										}
+									}
+									
+								}
+							 }
+							}
+							
+							//##################  END OF GET COUNTRIES_WHERE_EXPORT_DONE Informations
+							
+							
+						}
+					}
+					
+					//#############  END Retail Activity##############//
+					
+					
+					
+					//#############  START Wholesale Activity##############//
+					
+					if(array_key_exists('wholesale_trading_activity_details',$raw_json))
+					{
+						foreach($raw_json['wholesale_trading_activity_details'] as $wholesale_trading_activity_detail_key => $wholesale_trading_activity_detail)
+						{
+							
+							//##################  GET INDIA_WHERE_SALE_DONE Informations
+							if(array_key_exists('india_where_sale_done',$wholesale_trading_activity_detail))
+							{
+							 foreach($wholesale_trading_activity_detail['india_where_sale_done'] as $india_where_sale_done_key => $india_where_sale_done)
+							 {
+								//SELECT STATE NAME
+								$CI->db->SELECT( $master_tables_field_names['STATE'] );
+								$CI->db->FROM(STATE);
+								$CI->db->WHERE('isactive',1);
+								$CI->db->WHERE( $master_tables_pkid['STATE'] ,$india_where_sale_done['state_name']);
+								$state= $CI->db->GET()->result_array();
+								if(count($state))
+								{
+								 $raw_json['wholesale_trading_activity_details'][$wholesale_trading_activity_detail_key]['india_where_sale_done'][$india_where_sale_done_key]['state_name'] = $state[0][$master_tables_field_names['STATE']];
+								}
+								
+								//SELECT CITY NAME
+								$CI->db->SELECT( $master_tables_field_names['CITY'] );
+								$CI->db->FROM(CITY);
+								$CI->db->WHERE('isactive',1);
+								$CI->db->WHERE_IN( $master_tables_pkid['CITY'] ,$india_where_sale_done['city_name']);
+								$city = $CI->db->GET()->result_array();
+								
+								if(count($city))
+								{
+									$temp = array();
+								 foreach($city as $c){ $temp = array_merge($temp,array($c['name'])); }	
+								 $raw_json['wholesale_trading_activity_details'][$wholesale_trading_activity_detail_key]['india_where_sale_done'][$india_where_sale_done_key]['city_name'] = $temp;
+								}
+							 }
+							}
+							//##################  END OF GET INDIA_WHERE_SALE_DONE Informations
+							
+							
+							//##################  GET MAX_SALE_STATE_NAME Informations
+							if(array_key_exists('max_sale_state_name',$wholesale_trading_activity_detail))
+							{
+							 foreach($wholesale_trading_activity_detail['max_sale_state_name'] as $max_sale_state_name_key => $max_sale_state_name)
+							 {
+								//SELECT STATE NAME
+								$CI->db->SELECT( $master_tables_field_names['STATE'] );
+								$CI->db->FROM(STATE);
+								$CI->db->WHERE('isactive',1);
+								$CI->db->WHERE_IN( $master_tables_pkid['STATE'] ,$max_sale_state_name['state_name']);
+								$state= $CI->db->GET()->result_array();
+								if(count($state))
+								{
+								 $temp = array();
+								 foreach($state as $s){ $temp = array_merge($temp,array($s['name'])); }	
+								
+								 $raw_json['wholesale_trading_activity_details'][$wholesale_trading_activity_detail_key]['max_sale_state_name'][$max_sale_state_name_key]['state_name'] = $temp;
+								}
+								
+								//SELECT CITY NAME
+								$CI->db->SELECT( $master_tables_field_names['CITY'] );
+								$CI->db->FROM(CITY);
+								$CI->db->WHERE('isactive',1);
+								$CI->db->WHERE_IN( $master_tables_pkid['CITY'] ,$max_sale_state_name['city_name']);
+								$city = $CI->db->GET()->result_array();
+								
+								if(count($city))
+								{
+									$temp = array();
+								 foreach($city as $c){ $temp = array_merge($temp,array($c['name'])); }	
+								 //print_r($t);
+								 $raw_json['wholesale_trading_activity_details'][$wholesale_trading_activity_detail_key]['max_sale_state_name'][$max_sale_state_name_key]['city_name'] = $temp;
+								}							
+							 }
+							}
+							//##################  END OF GET MAX_SALE_STATE_NAME Informations
+							
+							
+							
+							//##################  GET COUNTRIES_WHERE_EXPORT_DONE Informations
+							if(array_key_exists('countries_where_export_done',$wholesale_trading_activity_detail))
+							{
+							 foreach($wholesale_trading_activity_detail['countries_where_export_done'] as $countries_where_export_done_key => $countries_where_export_done)
+							 {
+								
+								foreach($countries_where_export_done as $key => $value)
+								{
+									if(!strcmp($key,'country_name'))
+									{
+									//SELECT COUNTRY NAME
+									$CI->db->SELECT( $master_tables_field_names['COUNTRY'] );
+									$CI->db->FROM(COUNTRY);
+									$CI->db->WHERE('isactive',1);
+									$CI->db->WHERE( $master_tables_pkid['COUNTRY'] ,$value);
+									$country= $CI->db->GET()->result_array();
+										if(count($country))
+										{
+										 $raw_json['wholesale_trading_activity_details'][$wholesale_trading_activity_detail_key]['countries_where_export_done'][$countries_where_export_done_key]['country_name'] = $country[0][$master_tables_field_names['COUNTRY']];
+										}
+									}
+									
+								}
+							 }
+							}
+							
+							//##################  END OF GET COUNTRIES_WHERE_EXPORT_DONE Informations
+							
+							
+						}
+					}
+					
+					//#############  END Wholesale Activity##############//
+					
+					
+					
+					
+					//#############  START SERVICE PROVIDER Activity##############//
+					
+					if(array_key_exists('service_provider_activity_details',$raw_json))
+					{
+						foreach($raw_json['service_provider_activity_details'] as $service_provider_activity_detail_key => $service_provider_activity_detail)
+						{
+							
+							//##################  GET INDIA_WHERE_SALE_DONE Informations
+							if(array_key_exists('india_where_sale_done',$service_provider_activity_detail))
+							{
+							 foreach($service_provider_activity_detail['india_where_sale_done'] as $india_where_sale_done_key => $india_where_sale_done)
+							 {
+								//SELECT STATE NAME
+								$CI->db->SELECT( $master_tables_field_names['STATE'] );
+								$CI->db->FROM(STATE);
+								$CI->db->WHERE('isactive',1);
+								$CI->db->WHERE( $master_tables_pkid['STATE'] ,$india_where_sale_done['state_name']);
+								$state= $CI->db->GET()->result_array();
+								if(count($state))
+								{
+								 $raw_json['service_provider_activity_details'][$service_provider_activity_detail_key]['india_where_sale_done'][$india_where_sale_done_key]['state_name'] = $state[0][$master_tables_field_names['STATE']];
+								}
+								
+								//SELECT CITY NAME
+								$CI->db->SELECT( $master_tables_field_names['CITY'] );
+								$CI->db->FROM(CITY);
+								$CI->db->WHERE('isactive',1);
+								$CI->db->WHERE_IN( $master_tables_pkid['CITY'] ,$india_where_sale_done['city_name']);
+								$city = $CI->db->GET()->result_array();
+								
+								if(count($city))
+								{
+									$temp = array();
+								 foreach($city as $c){ $temp = array_merge($temp,array($c['name'])); }	
+								 $raw_json['service_provider_activity_details'][$service_provider_activity_detail_key]['india_where_sale_done'][$india_where_sale_done_key]['city_name'] = $temp;
+								}
+							 }
+							}
+							//##################  END OF GET INDIA_WHERE_SALE_DONE Informations
+							
+							
+							//##################  GET MAX_SALE_STATE_NAME Informations
+							if(array_key_exists('max_sale_state_name',$service_provider_activity_detail))
+							{
+							 foreach($service_provider_activity_detail['max_sale_state_name'] as $max_sale_state_name_key => $max_sale_state_name)
+							 {
+								//SELECT STATE NAME
+								$CI->db->SELECT( $master_tables_field_names['STATE'] );
+								$CI->db->FROM(STATE);
+								$CI->db->WHERE('isactive',1);
+								$CI->db->WHERE_IN( $master_tables_pkid['STATE'] ,$max_sale_state_name['state_name']);
+								$state= $CI->db->GET()->result_array();
+								if(count($state))
+								{
+								 $temp = array();
+								 foreach($state as $s){ $temp = array_merge($temp,array($s['name'])); }	
+								
+								 $raw_json['service_provider_activity_details'][$service_provider_activity_detail_key]['max_sale_state_name'][$max_sale_state_name_key]['state_name'] = $temp;
+								}
+								
+								//SELECT CITY NAME
+								$CI->db->SELECT( $master_tables_field_names['CITY'] );
+								$CI->db->FROM(CITY);
+								$CI->db->WHERE('isactive',1);
+								$CI->db->WHERE_IN( $master_tables_pkid['CITY'] ,$max_sale_state_name['city_name']);
+								$city = $CI->db->GET()->result_array();
+								
+								if(count($city))
+								{
+									$temp = array();
+								 foreach($city as $c){ $temp = array_merge($temp,array($c['name'])); }	
+								 //print_r($t);
+								 $raw_json['service_provider_activity_details'][$service_provider_activity_detail_key]['max_sale_state_name'][$max_sale_state_name_key]['city_name'] = $temp;
+								}							
+							 }
+							}
+							//##################  END OF GET MAX_SALE_STATE_NAME Informations
+							
+							
+							
+							//##################  GET COUNTRIES_WHERE_EXPORT_DONE Informations
+							if(array_key_exists('countries_where_export_done',$service_provider_activity_detail))
+							{
+							 foreach($service_provider_activity_detail['countries_where_export_done'] as $countries_where_export_done_key => $countries_where_export_done)
+							 {
+								
+								foreach($countries_where_export_done as $key => $value)
+								{
+									if(!strcmp($key,'country_name'))
+									{
+									//SELECT COUNTRY NAME
+									$CI->db->SELECT( $master_tables_field_names['COUNTRY'] );
+									$CI->db->FROM(COUNTRY);
+									$CI->db->WHERE('isactive',1);
+									$CI->db->WHERE( $master_tables_pkid['COUNTRY'] ,$value);
+									$country= $CI->db->GET()->result_array();
+										if(count($country))
+										{
+										 $raw_json['service_provider_activity_details'][$service_provider_activity_detail_key]['countries_where_export_done'][$countries_where_export_done_key]['country_name'] = $country[0][$master_tables_field_names['COUNTRY']];
+										}
+									}
+									
+								}
+							 }
+							}
+							
+							//##################  END OF GET COUNTRIES_WHERE_EXPORT_DONE Informations
+							
+							
+						}
+					}
+					
+					//##################  END OF SERVICE PROVIDER ACTIVITY
+					
+					
+					
 				
 		}
 		
@@ -982,6 +1375,18 @@ class GETPROCESSEDJSON
 		{
 			foreach($raw_json['company_with_relationships'] as $company_with_relationship_key => $company_with_relationship)
 			{
+				
+				if(array_key_exists('companies',$raw_json))
+				{
+				//echo "exists";
+					foreach($raw_json['companies'] as $company_key => $company)
+					{
+						if($company_with_relationship['applicant_name'] == $company['company_order_id'])
+						{
+							$raw_json['company_with_relationships'][$company_with_relationship_key]['relation_to_company_name'] = $company['company_name'];
+						}
+					}
+				}
 				if($company_with_relationship['applicant_name'] != "" || $company_with_relationship['applicant_name'] != null)
 				{
 									$CI->db->SELECT( $master_tables_field_names['PDAPPLICANTSDETAILS'] );
@@ -1025,6 +1430,9 @@ class GETPROCESSEDJSON
 						}
 					}
 				}
+				
+				
+				
 			}
 		}
 		
@@ -1190,7 +1598,156 @@ class GETPROCESSEDJSON
 	
 		public static function convertClientForm($raw_json,$formid)
 		{
+				
+				
+			$CI =& get_instance();
+			$master_tables_field_names = $CI->config->item('master_tables_field_names');
+			$master_tables_pkid = $CI->config->item('master_tables_pkid');
 			
+			//print_r($raw_json);
+			
+			// GET KEYS FROM MASTER TABLE FOR SUPPLIER FORM
+			$fields = array('question', 'key', 'ismaster', 'master_name');
+			$where_condition_array = array('fk_form_id' => $formid,'isactive' => 1);
+			$master_keys = $CI->PD_Model->selectCustomRecords($fields,$where_condition_array,QUESTIONKEYMAPPING);
+			
+			//print_r($master_keys);
+			if(!empty($raw_json) && !empty($master_keys))
+			{
+				
+				// Handling manufacturing_details subarry
+				if(array_key_exists('manufacturing_details',$raw_json))
+				{	
+				if(array_key_exists('main_raw_materials',$raw_json['manufacturing_details'][0]))
+				{
+				foreach($raw_json['manufacturing_details'][0]['main_raw_materials'] as $manufacturing_details_key => $manufacturing_details)
+				{
+					foreach($manufacturing_details as $key => $value)
+					{
+					  if($value != "" || $value != null)
+					  {
+					  //compare with master_keys array
+						  foreach($master_keys as $master_key => $master_value)
+						  {
+							  if(!strcmp($key,$master_value['key']) && $master_value['ismaster'] == 1)
+							  {
+								  //GET MASASTER DATA
+								  
+									$table = constant($master_value['master_name']);
+									
+									$temp_fields =  array($master_tables_field_names[$master_value['master_name']].' as name');
+									
+									$where_condition_array = array($master_tables_pkid[$master_value['master_name']] => $value);
+									
+									$result_data = $CI->PD_Model->selectCustomRecords($temp_fields,$where_condition_array,$table);
+									if(count($result_data))
+									{
+										//print_r($result_data[0]['name']);
+										$key = $key . '_master';
+										$raw_json['manufacturing_details'][0]['main_raw_materials'][$manufacturing_details_key][$key] = $result_data[0]['name'];
+										
+									}
+							  }
+						  }
+					  }
+					}
+					
+					
+				}
+			}
+			}
+			
+			
+			
+			// Handling trading_details subarry
+				if(array_key_exists('trade_details',$raw_json))
+				{	
+				if(array_key_exists('trading_products',$raw_json['trade_details'][0]))
+				{
+				foreach($raw_json['trade_details'][0]['trading_products'] as $trade_details_key => $manufacturing_details)
+				{
+					foreach($manufacturing_details as $key => $value)
+					{
+					  if($value != "" || $value != null)
+					  {
+					  //compare with master_keys array
+						  foreach($master_keys as $master_key => $master_value)
+						  {
+							  if(!strcmp($key,$master_value['key']) && $master_value['ismaster'] == 1)
+							  {
+								  //GET MASASTER DATA
+								  
+									$table = constant($master_value['master_name']);
+									
+									$temp_fields =  array($master_tables_field_names[$master_value['master_name']].' as name');
+									
+									$where_condition_array = array($master_tables_pkid[$master_value['master_name']] => $value);
+									
+									$result_data = $CI->PD_Model->selectCustomRecords($temp_fields,$where_condition_array,$table);
+									if(count($result_data))
+									{
+										//print_r($result_data[0]['name']);
+										$key = $key . '_master';
+										$raw_json['trade_details'][0]['trading_products'][$trade_details_key][$key] = $result_data[0]['name'];
+										
+									}
+							  }
+						  }
+					  }
+					}
+					
+					
+				}
+			}
+			}
+			
+			
+			
+			// Handling Service_details_ subarry
+				if(array_key_exists('trade_details',$raw_json))	
+				{
+				if(array_key_exists('service_products',$raw_json['service_provider_details'][0]))
+				{
+				foreach($raw_json['service_provider_details'][0]['service_products'] as $service_provider_details_key => $manufacturing_details)
+				{
+					foreach($manufacturing_details as $key => $value)
+					{
+					  if($value != "" || $value != null)
+					  {
+					  //compare with master_keys array
+						  foreach($master_keys as $master_key => $master_value)
+						  {
+							  if(!strcmp($key,$master_value['key']) && $master_value['ismaster'] == 1)
+							  {
+								  //GET MASASTER DATA
+								  
+									$table = constant($master_value['master_name']);
+									
+									$temp_fields =  array($master_tables_field_names[$master_value['master_name']].' as name');
+									
+									$where_condition_array = array($master_tables_pkid[$master_value['master_name']] => $value);
+									
+									$result_data = $CI->PD_Model->selectCustomRecords($temp_fields,$where_condition_array,$table);
+									if(count($result_data))
+									{
+										//print_r($result_data[0]['name']);
+										$key = $key . '_master';
+										$raw_json['service_provider_details'][0]['service_products'][$service_provider_details_key][$key] = $result_data[0]['name'];
+										
+									}
+							  }
+						  }
+					  }
+					}
+					
+					
+				}
+			}
+			}
+				
+			}
+			
+			return $raw_json;
 		}
 	/*****************##########   END OF CLIENT FORM DETAILS  ##########**************/
 	
@@ -1306,7 +1863,7 @@ class GETPROCESSEDJSON
 		
 		//print_r($raw_json);
 		
-			// GET KEYS FROM MASTER TABLE FOR SUPPLIER FORM
+			// GET KEYS FROM MASTER TABLE FOR FINAL FORM
 			$fields = array('question', 'key', 'ismaster', 'master_name');
 			$where_condition_array = array('fk_form_id' => $formid,'isactive' => 1);
 			$master_keys = $CI->PD_Model->selectCustomRecords($fields,$where_condition_array,QUESTIONKEYMAPPING);
diff --git a/api/application/helpers/myhttpclient_helper.php b/api/application/helpers/myhttpclient_helper.php
new file mode 100644
index 00000000..d02a23a9
--- /dev/null
+++ b/api/application/helpers/myhttpclient_helper.php
@@ -0,0 +1,28 @@
+<?php
+
+class MYHTTPCLIENT
+{
+	
+
+	
+	// Create the http client
+	public static function sendPost($dataToBot)
+	{
+		include_once APPPATH.'/vendor/autoload.php';
+		
+		if(LOGTOBOT == true)
+		{
+			$client = new \GuzzleHttp\Client();
+			$response = $client->post( 'https://cliq.zoho.com/api/v2/bots/sample/incoming?authtoken=467975ee8e33abf1549803925eaace0f', [
+				'headers' => ['Content-Type' => 'application/json'],
+				'body' => json_encode($dataToBot)
+			]);
+			//return $response;
+		}
+		
+	}
+	
+
+}
+
+?>
\ No newline at end of file
diff --git a/api/application/helpers/mylog_helper.php b/api/application/helpers/mylog_helper.php
index 3e3bb91c..faf240d9 100644
--- a/api/application/helpers/mylog_helper.php
+++ b/api/application/helpers/mylog_helper.php
@@ -6,29 +6,42 @@ class MYLOG
 
 	
 	// Create the logger
-	public static function logFunction($r)
+	public static function logFunction() //$msg,$data,$log_type
 	{
 		include_once APPPATH.'/vendor/autoload.php';
-		
-		// use Monolog\Logger;
-		// use Monolog\Handler\StreamHandler;
-		// use Monolog\Handler\FirePHPHandler;
-		
-		$logger = new  \Monolog\Logger('my_logger');
-		$streamHandler = new \Monolog\Handler\StreamHandler(APPPATH.'syslogs/my_app.log', $logger::DEBUG);
-		$firePHPHandler = new \Monolog\Handler\FirePHPHandler();
-		// $dateFormat = "Y n j, g:i a";
-		// $output = "%datetime% > %level_name% > %message% %context% %extra%/n";
-		// $formatter = new \Monolog\Formatter\LineFormatter($output,$dateFormat);
-		
-		
-	    //$logger = new Logger('my_logger');
-		// Now add some handlers
+		$logger = new  \Monolog\Logger('ssa_beta_logger');
+		$streamHandler = new \Monolog\Handler\StreamHandler(APPPATH.'syslogs/ssa_app_'.date('Y-m-d').'.html', $logger::DEBUG);
+		$streamHandler->setFormatter(new \Monolog\Formatter\HtmlFormatter());
+		$browserHanlder = new \Monolog\Handler\BrowserConsoleHandler($logger);
+		$logger->pushProcessor(new \Monolog\Processor\WebProcessor());
+		$logger->pushProcessor(new \Monolog\Processor\IntrospectionProcessor());
+		$logger->pushProcessor(new \Monolog\Processor\ProcessIdProcessor());
+		$logger->pushProcessor(new \Monolog\Processor\UidProcessor());
+		//$logger->pushProcessor(new \Monolog\Processor\HostnameProcessor());
+		$logger->pushProcessor(new \Monolog\Processor\MemoryUsageProcessor());
+		$logger->pushProcessor(new \Monolog\Processor\MemoryPeakUsageProcessor());
 		$logger->pushHandler($streamHandler);
-		$logger->pushHandler($firePHPHandler);
-
-		// You can now use your logger
-		$logger->info('Adding a new user', array('username' => $r));
+		
+		return $logger;
+		//$CI =&get_instance();
+		
+	if(LOGTOSYS == 1)
+	{		
+		switch($log_type)
+		{
+			case 'INFO':
+						$logger->info($msg, $data);
+						break;
+			case 'WARN':
+						$logger->warning($msg, $data);
+						break;
+			case 'ERROR':
+						$logger->error($msg, $data);
+						break;
+			default:	
+					$logger->info($msg, $data);
+		}
+	}
 	}
 	
 
diff --git a/api/application/helpers/myuitil_helper.php b/api/application/helpers/myuitil_helper.php
new file mode 100644
index 00000000..0f712d9a
--- /dev/null
+++ b/api/application/helpers/myuitil_helper.php
@@ -0,0 +1,79 @@
+<?php
+
+class MYUITIL
+{
+	
+
+	
+	
+	public static function numtowords($number)
+	{
+		
+	   $no = round($number);
+	   $point = round($number - $no, 2) * 100;
+	   $hundred = null;
+	   $digits_1 = strlen($no);
+	   $i = 0;
+	   $str = array();
+	   $words = array('0' => '', '1' => 'one', '2' => 'two',
+		'3' => 'three', '4' => 'four', '5' => 'five', '6' => 'six',
+		'7' => 'seven', '8' => 'eight', '9' => 'nine',
+		'10' => 'ten', '11' => 'eleven', '12' => 'twelve',
+		'13' => 'thirteen', '14' => 'fourteen',
+		'15' => 'fifteen', '16' => 'sixteen', '17' => 'seventeen',
+		'18' => 'eighteen', '19' =>'nineteen', '20' => 'twenty',
+		'30' => 'thirty', '40' => 'forty', '50' => 'fifty',
+		'60' => 'sixty', '70' => 'seventy',
+		'80' => 'eighty', '90' => 'ninety');
+	   $digits = array('', 'hundred', 'thousand', 'lakh', 'crore');
+	   while ($i < $digits_1) {
+		 $divider = ($i == 2) ? 10 : 100;
+		 $number = floor($no % $divider);
+		 $no = floor($no / $divider);
+		 $i += ($divider == 10) ? 1 : 2;
+		 if ($number) {
+			$plural = (($counter = count($str)) && $number > 9) ? 's' : null;
+			$hundred = ($counter == 1 && $str[0]) ? ' and ' : null;
+			$str [] = ($number < 21) ? $words[$number] .
+				" " . $digits[$counter] . $plural . " " . $hundred
+				:
+				$words[floor($number / 10) * 10]
+				. " " . $words[$number % 10] . " "
+				. $digits[$counter] . $plural . " " . $hundred;
+		 } else $str[] = null;
+	  }
+	  $str = array_reverse($str);
+	  $result = implode('', $str);
+	  $points = ($point) ?
+		"." . $words[$point / 10] . " " . 
+			  $words[$point = $point % 10] : '';
+	  $res = $result . "Rupees  " ;
+	  if($points != "")
+	  {
+	  $res.=$points . " Paise";
+	  }
+	  return $res;
+
+	}
+	
+	public static function findCompanyName($array,$companyid)
+	{
+		if($array != null)
+		{
+			foreach($array as $key => $value)
+			{
+				if($companyid == $value['company_order_id'])
+				{
+					return $value['company_name'];
+				}
+				
+			}
+		}
+		else
+		{
+			return 'Company Not Found';
+		}			
+	}	
+}
+
+?>
\ No newline at end of file
diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php
index 02cb2809..e9fee14b 100644
--- a/api/application/models/PD_Model.php
+++ b/api/application/models/PD_Model.php
@@ -334,8 +334,9 @@ class PD_Model extends SPARQ_Model {
 			$this->db->JOIN(PINCODE.' as PINCODENEW','COMMONMASTER.new_value = PINCODENEW.pincode_id','LEFT');
 			$this->db->JOIN(PDTRIGGER.' as PDTRIGGER','COMMONMASTER.primary_key = PDTRIGGER.pd_id','LEFT');
 			$this->db->WHERE('COMMONMASTER.table_name="'.PDTRIGGER.'" AND COMMONMASTER.primary_key=',$pdid);
+			$this->db->ORDER_BY('COMMONMASTER.log_id');
 			$logs = $this->db->GET()->result_array();
-			//print_r($logs);
+			//print_r($logs);die();
 			
 			//$sql = 'SELECT * FROM '.COMMONMASTER.' WHERE table_name = "'.PDTRIGGER.'" AND primary_key = '.$pdid;
 			//$logs = $this->db->query($sql)->result_array();
@@ -481,7 +482,7 @@ class PD_Model extends SPARQ_Model {
 						break;
 						
 						case 'pincode':
-							
+							//echo "pincode";
 							if($log['old_pincode'] != null || $log['old_pincode'] != "")
 							{
 								if(is_numeric($log['new_pincode']) && is_numeric($log['old_pincode']))
@@ -495,6 +496,7 @@ class PD_Model extends SPARQ_Model {
 								}
 								else if(!is_numeric($log['new_pincode']))
 								{
+									
 									$log_string = $arrayForText[$log['field_name']].' Changed From "'.$log['old_pincode'].'" to "'.$log['other_pincode'].'"';
 									$user = $log['createdby'];
 									$time = $log['createdon'];
@@ -505,7 +507,8 @@ class PD_Model extends SPARQ_Model {
 								}
 								else if(!is_numeric($log['old_pincode']))
 								{
-									$log_string = $arrayForText[$log['field_name']].' Changed From "'.$log['other_pincode'].'" to "'.$log['old_pincode'].'"';
+									//echo "FOUND";
+									$log_string = $arrayForText[$log['field_name']].' Changed From "'.$log['other_pincode'].'" to "'.$log['new_pincode'].'"';
 									$user = $log['createdby'];
 									$time = $log['createdon'];
 									$actual_logs[$log_key]['log']  = $log_string;
diff --git a/api/application/views/report_templates/JSONTOREPORT.php b/api/application/views/report_templates/JSONTOREPORT.php
index ea6b8772..00721c83 100644
--- a/api/application/views/report_templates/JSONTOREPORT.php
+++ b/api/application/views/report_templates/JSONTOREPORT.php
@@ -11,7 +11,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 	<style type="text/css">
 .page_break { page-break-before: always; }
 
-@page {
+	  @page {
                 margin: 50px 25px;
             }
 
@@ -42,6 +42,27 @@ defined('BASEPATH') OR exit('No direct script access allowed');
                 text-align: right;
                 /*line-height: 35px;*/
             }
+			
+			.table2 {
+			border: 1px solid black;
+			width: 100%;
+			}
+			.table2 td {
+			border: 1px solid black;
+			height: 50px;
+			text-align: center;
+			}
+			 .table2 th {
+			border: 1px solid black;
+			height: 50px;
+			text-align: center;
+			}
+			.table2 {
+			border-collapse: collapse;
+		}
+		tfoot{
+			color:#e00201;
+		}
 
 	</style>
 	
@@ -61,42 +82,214 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 
         <!-- Wrap the content of your PDF inside a main tag -->
 		<?php
-			echo "<br><br><br><br><br><br><br><br><br>";		
+			//echo "<br><br><br><br><br><br><br><br><br>";		
+			setlocale(LC_MONETARY, 'en_IN');
 			echo "<div style='background-color:#add1eb;font-style:italic'>";
 			echo "<h1><center><data>PERSONAL DISCUSSION REPORT</data></center></h1> ";
 			echo "<center style='font-size:15px;font-style:italic;font-weight:bold'>for the case of</center>";
+			
 			echo "<h2><center><data >".$pd_master_details[0]['title_name'].$pd_master_details[0]['main_applicant']."</data></center></h2>";
 			echo "</div>";
 			echo "<br><br><br><br>";
-			echo "<p><code>PD Report Date : <data>".$pd_master_details[0]['updatedon']."</data></code></p>";
-			echo "<p><code>PD Vist Date : <data>".$pd_master_details[0]['scheduled_on']."</data></code></p>";
-			echo "<p><code>PD Initiated by <data>".$pd_master_details[0]['branch_name']." </data>Branch</code></p>";
-			echo "<p><code>Loan Applicant ID : <data>".$pd_master_details[0]['lender_applicant_id']."</data></code></p>";
-			echo "<p><code>Loan Amount Applied For :</code></p>";
+			?>
+			<table>
+			<tbody>
+			<?php
+			echo "<tr><td>PD Report Date </td><td><data>".$pd_master_details[0]['updatedon']."</data></td>";
+			echo "<tr><td>PD Vist Date </td><td> <data>".$pd_master_details[0]['scheduled_on']."</data></td></tr>";
+			echo "<tr><td>PD Initiated by </td><td><data>".$pd_master_details[0]['branch_name']." </data>Branch</td></tr>";
+			echo "<tr><td>Loan Applicant ID </td><td> <data>".$pd_master_details[0]['lender_applicant_id']."</data></td></tr>";
+			echo "<tr><td>Product </td><td>".$pd_master_details[0]['product_name']."</td></tr>";
+			echo "<tr><td>Customer Segment </td><td>".$pd_master_details[0]['customer_segment_name']."<td></tr>";
+			?>
+			</tbody>
+			</table>
+			
+			<?php
+			echo "<p>Loan Amount Applied For </p>";
+			
 			echo "<p>
 					<table border=1 style='border-collapse:collapse;text-align:center;'>
 					 <thead> <tr> <th>As Per PD Initiation</th> <th>As Per Loan Applicants during PD</th> </tr></thead>	
 					 
 					 <tbody>
-					 <tr> <td>Rs  " . number_format($pd_master_details[0]['loan_amount']). ".</td> <td> #### </td> </tr>
+					 <tr> <td>Rs  " . number_format($pd_master_details[0]['loan_amount'],2). ".</td> <td> #### </td> </tr>
 					 </tbody>
 					</table>
 				 </p>";
-				 
-			echo "<p><code>Product : <data>".$pd_master_details[0]['product_name']."</data></code></p>";
-			echo "<p><code>Customer Segment : <data>".$pd_master_details[0]['customer_segment_name']."</data></code></p>";
+			echo "<div class='page_break'></div>";
 			
+			
+			//####################General Section Statred########################
+			
+			$general_form = json_decode($pd_processed_forms[18][0]['processed_json'],true);
+			$persons_met = "Default";
+			$all_company_details = null;
+			if(array_key_exists('companies',$general_form))
+			{
+				$all_company_details = $general_form['companies'];
+			}
+			// echo MYUITIL::findCompanyName($all_company_details,2);
+			//print_r($all_company_details);
+			?>
+			<h3>General Section Information</h3>
+			<table>
+			<tbody>
+			<tr>
+				<td>Person(s) Met&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td><td><?php 
+				foreach($general_form['individuals'] as $ind_key => $individual)
+			{
+				if($individual['is_person_met'] == true)
+				{
+					echo ($individual['applicant_title_name_master'] .$individual['pd_co_applicant_id_master']);
+					
+					foreach($general_form['company_with_relationships']  as $company_with_relationship)
+					{
+						if($individual['pd_co_applicant_id'] == $company_with_relationship['applicant_name'])
+						{
+							//FInd Company Name from JSON
+							
+							
+							echo '<br>'.$company_with_relationship['company_relationship_master'] .' Of  '.$company_with_relationship['company_name'];
+						}
+					}
+					
+					foreach($general_form['persons_with_relationships']  as $persons_with_relationship)
+					{
+						if($individual['pd_co_applicant_id'] == $persons_with_relationship['pd_co_applicant_id'] && $persons_with_relationship['relationship'] != null)
+						{
+							echo '<br>'.$persons_with_relationship['relationship_master'] .' Of  '.$persons_with_relationship['relation_to_master'];
+							//print_r($persons_with_relationship);
+						}
+					}
+					
+					
+					
+				}
+			}
+			?>
+			</td></tr>
+			</tbody>
+			</table>
+			
+			
+			<p>Loan Applicants</p>
+			<!-- <table border=1 style='border-collapse:collapse;'> -->
+			<table class="table2">
+			
+			<?php
+			foreach($general_form['individuals'] as $ind_key => $individual)
+			{
+				
+				if($individual['is_applicant'] == true)
+				{
+					echo "<tr><td>".$individual['applicant_title_name_master'].$individual['pd_co_applicant_id_master']."</td><td>";
+					
+					foreach($general_form['company_with_relationships']  as $company_with_relationship)
+					{
+						if($individual['pd_co_applicant_id'] == $company_with_relationship['applicant_name'])
+						{
+							//FInd Company Name from JSON
+							
+							
+							print_r($company_with_relationship['company_relationship_master'] .' Of  '.$company_with_relationship['company_name']);
+						}
+					}
+					
+					foreach($general_form['persons_with_relationships']  as $persons_with_relationship)
+					{
+						if($individual['pd_co_applicant_id'] == $persons_with_relationship['pd_co_applicant_id'] && $persons_with_relationship['relationship'] != null)
+						{
+							echo "<br><br>";
+							print_r($persons_with_relationship['relationship_master'] .' Of  '.$persons_with_relationship['relation_to_master']);
+							//print_r($persons_with_relationship);
+						}
+					}
+					
+					echo "</tr>";
+				}
+			}
+			?>
+			
+			</table>
+			
+			<p>PD Officer's Note (About General Section) :</p> <?php echo $general_form['general_remark']; ?>
+			
+			<?php $address_form = json_decode($pd_processed_forms[5][0]['processed_json'],true);
+			 
+			 ?>
+			<p><b>Location Details :</b></p>
+			
+			<p><?php echo "The applicants were met at their ".$address_form['address_type_master']." at  ".$address_form['address'].". The PD location is situated in an area that can be classified as ".$address_form['locality_master'].", and the approach was ".$address_form['pd_location_master'].". The locality was ".$address_form['comment_locality_master'].".";?></p>
+			<p><b>PD Officer's Note (About Location Details) :</b></p> <?php echo $address_form['address_form_remark']; ?>
+			 
+			 <?php $loan_form = json_decode($pd_processed_forms[10][0]['processed_json'],true);?>
+			<br>
+			<p><b>Loan Details :</b></p> 
+				<?php echo "A loan for Rs ".number_format($loan_form['loan_amount'])." (".MYUITIL::numtowords($loan_form['loan_amount']).") has been applied by the applicant for ".$loan_form['end_use_master'][0].".";
+				if($loan_form['is_transfer'] == 'yes')
+				{	
+					echo "There is a balance transfer of Rs. ".number_format($loan_form['balance_transfer_amount'])." (".MYUITIL::numtowords($loan_form['balance_transfer_amount']).")from ".$loan_form['lender_master']."),and the balance top up of Rs.".$loan_form['topup_amount']." is to be used for ".$loan_form['end_use_topup_master'].". The applicants are comfortable to pay an EMI of Rs.".number_format($loan_form['emi_level'])." per month.";
+				}
+				else
+				{
+					$own_contribution_string = "";
+					if(count($loan_form['source_of_own_contribution_master']))
+					{
+						$own_contribution_string = implode(" , ",$loan_form['source_of_own_contribution_master']);
+					}
+					// echo $own_contribution_string;
+					// echo "#################".strripos($own_contribution_string,',');
+					if($loan_form['other_source'] != "")
+					{
+						$own_contribution_string = substr_replace($own_contribution_string,"and",strripos($own_contribution_string,','),1);
+					}
+					echo "The amount of Rs.".number_format($loan_form['own_contribution'])." as own contribution from ".$own_contribution_string.". The applicants are comfortable to pay an EMI of Rs.".number_format($loan_form['emi_level'])." per month.";
+				}
+				
+				
+				//print_r($loan_form['owners_list_master']);
+				$owners_list = "";
+				if(count($loan_form['owners_list_master']))
+				{
+					foreach($loan_form['owners_list_master'] as $owner)
+					{
+						$owners_list .= $owner." , ";
+					}
+					$owners_list = substr($owners_list,0,(strlen($owners_list)-2));
+				}
+				
+				//echo "#################".strripos($owners_list,',');
+			    $owners_list = substr_replace($owners_list," and ",strripos($owners_list,','),1);
+			    echo "The property being mortgaged is a ".$loan_form['property_type_master']." owned by ".$owners_list.", and is ".$loan_form['construction_status_master']." with an estimated market value of Rs ".number_format($loan_form['emv_per_customer'])."(".MYUITIL::numtowords($loan_form['emv_per_customer']).")";
+			?>
+			<br>
+			<p><b>PD Officer's Note (About Loan Details) :<b></p> <?php echo $loan_form['loandetails_remarks']; ?>
+			<!-- ####################End Of General Section Statred########################-->
+			
+			
+			
+			<!-- ####################Business Form Section Statred########################-->
+			<?php
 			echo "<div class='page_break'></div>";
 			echo "<h3>Business Related Information</h3>";
+			echo "count-".count($pd_processed_forms[13]);
 			if(count($pd_processed_forms[13]))
 			{
-				$business_details = json_decode($pd_processed_forms[13][0]['processed_json'],true);
-				//print_r($business_details);
-				$name_of_the_business_entity  = "####";
-			if($business_details['profession_name'] != "") {$name_of_the_business_entity =  $business_details['profession_name'];}else { $name_of_the_business_entity = $business_details['profession_name']; }
-			
-			echo "Name of the Business Entity : <data> <?php echo $name_of_the_business_entity; ?><data>";
 				
+				foreach($pd_processed_forms[13] as $pd_processed_form_key => $pd_processed_form)
+				{
+					
+					//print_r($pd_processed_form['processed_json']);
+					$pd_processed_form = json_decode($pd_processed_form['processed_json'],true);
+					//print_r($pd_processed_form);
+					if($pd_processed_form != null || $pd_processed_form != "")
+					{
+						$name_of_the_business_entity  = MYUITIL::findCompanyName($all_company_details,($pd_processed_form_key + 1));
+						echo "Name of the Business Entity : $name_of_the_business_entity"; 
+					}
+					
+				}
 			}
 			
 		?>