From b9ede630e05c79437b5afa5fdc5dff1823d29a60 Mon Sep 17 00:00:00 2001
From: Velz2020 <velmurugan.s@venbainfotech.com>
Date: Tue, 19 Nov 2019 19:46:59 +0530
Subject: [PATCH] KYC CHNAGE IN REPORT

---
 api/application/models/PD_Model.php                       | 5 +++--
 .../views/report_templates/JSONTOREPORT_DI_AI.php         | 8 +++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/api/application/models/PD_Model.php b/api/application/models/PD_Model.php
index 47e4083a..b0a9493b 100644
--- a/api/application/models/PD_Model.php
+++ b/api/application/models/PD_Model.php
@@ -379,7 +379,7 @@ class PD_Model extends SPARQ_Model {
 		$this->db->JOIN(TITLES.' as TITLES','PDAPPLICANTSDETAILS.applicant_title_name = TITLES.title_id','LEFT');
 		
 		$this->db->WHERE('PDAPPLICANTSDETAILS.fk_pd_id ',$pdid);
-		$this->db->WHERE('PDAPPLICANTSDETAILS.isactive ',1);
+		$this->db->WHERE('PDAPPLICANTSDETAILS.isactive',1);
 		if($type)
 		{
 			//echo 'DOIDNO';
@@ -387,7 +387,8 @@ class PD_Model extends SPARQ_Model {
 		}
 		if(count($addtional_pd_ids_string) && !$type)
 		{
-			$this->db->OR_WHERE_IN('PDAPPLICANTSDETAILS.fk_pd_id',$addtional_pd_ids_string);	
+			$this->db->OR_WHERE_IN('PDAPPLICANTSDETAILS.fk_pd_id',$addtional_pd_ids_string);
+			$this->db->WHERE('PDAPPLICANTSDETAILS.isactive',1);	
 		}
 		$this->db->ORDER_BY('PDAPPLICANTSDETAILS.pd_co_applicant_id');
 		$result_child_array = $this->db->GET()->result_array();
diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php
index 38977ee7..3e7f9205 100644
--- a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php
+++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php
@@ -713,12 +713,14 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 					
 					$title = isset($individual['applicant_title_name_master']) && $individual['applicant_title_name_master'] != "" ? $individual['applicant_title_name_master']  : '';
 
-					$kyc_data = '';
+					//$kyc_data = '';
+					$applicant_name = $title.' '.$applicant_name;
 					if($ind_key == 0 && array_key_exists('is_kyc', $general_form) && $general_form['is_kyc'] == 'no')
 					{
-						$kyc_data = "<br><br>Name noticed as per KYC is ". $general_form['kyc_and_captur_the_name'];
+						$applicant_name = 'As per the request received applicant name is '.$applicant_name.'<br> but as per KYC name is '.$general_form['kyc_and_captur_the_name'];
+						//$kyc_data = "<br><br>Name noticed as per KYC is ". $general_form['kyc_and_captur_the_name'];
 					}
-					echo '<tr><td class="customtd">'.$title.' '.$applicant_name.$kyc_data.'</td><td class="customtd">'.$individual['age'].'</td><td class="customtd">'.$education_qualification.'</td><td class="customtd">';
+					echo '<tr><td class="customtd">'.$applicant_name.'</td><td class="customtd">'.$individual['age'].'</td><td class="customtd">'.$education_qualification.'</td><td class="customtd">';
 					
 					$company_relationship_data = null;
 					//print_r($general_form['company_with_relationships']);