From f8b1d044284943a71b72afb2e7e47b8eb046775c Mon Sep 17 00:00:00 2001
From: Velz2020 <velmurugan.s@venbainfotech.com>
Date: Tue, 2 Jun 2020 19:37:30 +0530
Subject: [PATCH] TELE PD INHOUSE FEEDBACK FIXED

---
 api/application/controllers/PD_Controller.php |  8 ++++++-
 .../helpers/pdcompletenesscheck_helper.php    | 23 ++++++++++++++++---
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php
index 696e6b35..9cb83189 100644
--- a/api/application/controllers/PD_Controller.php
+++ b/api/application/controllers/PD_Controller.php
@@ -8931,7 +8931,13 @@ public function getCompaniesListsFromGeneralFormRawJSON_post()
 				$current_doc_title = $records['image_key'];
 		}
 
-		 //echo $current_doc_title;die();
+		//set company id for business related forms
+		$business_forms  = array(1,2,13,14,11,16,21,22,23);
+		if(in_array($records['fk_form_id'], $business_forms))
+		{
+			$company_id = 1;
+		}
+		// echo $company_id;die();
 		//de activate previous one
 		
 		if($records['image_key'] != 'common_image' && $records['image_key'] != 'stock_image')
diff --git a/api/application/helpers/pdcompletenesscheck_helper.php b/api/application/helpers/pdcompletenesscheck_helper.php
index dc54830f..808c08f7 100644
--- a/api/application/helpers/pdcompletenesscheck_helper.php
+++ b/api/application/helpers/pdcompletenesscheck_helper.php
@@ -775,21 +775,37 @@ class pdcompletenesscheck
 		$person_met_is_applicant_count = 0;
 		$person_met_selfie_count = 0;
 		$person_met_id_proof_count = 0;
-		//print_r( $general_form['individuals'] );die();
+		//print_r( $general_form['individuals'] );//die();
+		$selfie_images = $CI->PD_Model->selectCustomRecords(array('*'),array('fk_pd_id' => $pdid,'fk_form_id' => 18,'co_applicant_id!=' => null),PDDOCUMENTS);
+		// print_r($CI->db->last_query());//die();
+		// print_r($selfie_images);//die();
 		foreach($general_form['individuals'] as $person)
 		{
 			
 			if($person['is_person_met'] == true )
 			{
 
+				$is_cur_permet_captured = false;
+				$is_cur_per_id_captured = false;
+				foreach ($selfie_images as $key => $value) 
+				{
+					if($person['applicant_name'] == $value['pd_document_title'])
+					{
+						$is_cur_permet_captured = true;
+					}
+					if(($person['applicant_name'].'-id_proof') == $value['pd_document_title'])
+					{
+						$is_cur_per_id_captured = true;
+					}
+				}
 				//print_r($person);die();
-				if(!$person['is_person_met_pic'])
+				if(!$is_cur_permet_captured)
 				{
 					$person_met_selfie_count++;
 
 				}
 
-				if(!$person['is_person_met_id_proof'])
+				if(!$is_cur_per_id_captured)
 				{
 					$person_met_id_proof_count++;
 				}
@@ -810,6 +826,7 @@ class pdcompletenesscheck
 		}
 
 		//if(!$person_met_is_applicant_count && $sal_check == null){ $incomplete_details[] = 'General Section - Person met is not an applicant'; }
+		//print_r($person_met_selfie_count);die();
 		if($person_met_selfie_count && $sal_check == null){ $incomplete_details[] = 'General Section - Person met selfie image with PD officer not captured'; }
 		if($person_met_id_proof_count && $sal_check == null ){ $incomplete_details[] = 'General Section - Person met ID proof image not captured'; }
 		#####End of General Form Questions########