From 949fc6f9da678e91598e9790e6709106972a5c18 Mon Sep 17 00:00:00 2001
From: "sanjeev.p" <sanjeev.p@venbainfotech.com>
Date: Tue, 31 Aug 2021 14:33:47 +0530
Subject: [PATCH] Fixes 3 : ps

---
 .../controllers/SMC_Credit_PD_Controller.php  | 69 ++++++++++---------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/api/application/controllers/SMC_Credit_PD_Controller.php b/api/application/controllers/SMC_Credit_PD_Controller.php
index 894fff9d..b793e262 100644
--- a/api/application/controllers/SMC_Credit_PD_Controller.php
+++ b/api/application/controllers/SMC_Credit_PD_Controller.php
@@ -1373,12 +1373,12 @@ public function filterSalesPDList_post() {
 
 	function loadDataFromExcelBusiProcess($pd_master_data,$form_id)
 	{
-		$filename = ($pd_master_data[0]['re_uploaded'] ? XLPATH.'/tmp/'.$pd_master_data[0]['re_uploaded_file_name'] : XLPATH.'/tmp/'.$pd_master_data[0]['modified_fname']);
-	  	// $filename = XLPATH.'/tmp/mySMCPD_client_working.xlsx';
-	  	// $filename = 'C:\Users\Venba\Documents\Test Demo17_dev_LFMP.xls';
-	  	// $filename = 'C:\Users\Venba\Downloads\Test Demo17_dev.xlsx';
-	  	 // echo $filename;die();
-		//  $filename = '/home/venba/Downloads/Sample_CET_Upload4.xls';
+		$is_file_uploaded = ($pd_master_data[0]['re_uploaded'] ? true : ($pd_master_data[0]['modified_fname'] ? true : false));
+
+		if($is_file_uploaded){
+			$filename = ($pd_master_data[0]['re_uploaded'] ? XLPATH.'/tmp/'.$pd_master_data[0]['re_uploaded_file_name'] : XLPATH.'/tmp/'.$pd_master_data[0]['modified_fname']);
+			// $filename = XLPATH.'/tmp/mySMCPD_client_working.xlsx';
+			//$filename = '/home/venba/Downloads/Sample_CET_Upload4.xls';
 			if(!file_exists($filename))
 			{
 
@@ -1392,6 +1392,9 @@ public function filterSalesPDList_post() {
 				//echo '*'.$sucess;
 			}
 			return $cur_section_data = readexceldata::getExcelSectionData($filename,$form_id,$pd_master_data[0]['pd_id']);
+	    }else{
+			return [];
+		}
 	}
 
 
@@ -1727,42 +1730,40 @@ public function filterSalesPDList_post() {
 	{
 		$records = $this->post('records');
 		$pd_master_data = $this->PD_Model->getPDMasterDetails($records['pd_id'],$records['random_string']);  
-		if($pd_master_data[0]['modified_fname'] != "" &&  $pd_master_data[0]['re_uploaded_file_name'] != ""){
-		$filename = ($pd_master_data[0]['re_uploaded'] ? XLPATH.'/tmp/'.$pd_master_data[0]['re_uploaded_file_name'] : XLPATH.'/tmp/'.$pd_master_data[0]['modified_fname']);
-		// $filename = '/home/VenbaLap08/Downloads/Test Demo17_dev.xlsx';
-		// $filename = '/home/venba/Downloads/Sample_CET_Upload4.xls';
-			if(!file_exists($filename))
-			{
-				$bucket_name = LENDER_BUCKET_NAME_PREFIX.$pd_master_data[0]['fk_lender_id'];
-				$key = 'tmp/'. ($pd_master_data[0]['re_uploaded'] ? $pd_master_data[0]['re_uploaded_file_name'] : $pd_master_data[0]['modified_fname']);
-				$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$key,'+5 minutes');
-		
-				$sucess = file_put_contents($filename, file_get_contents($singed_uri));
-			}
-			$cur_section_data = readexceldata::getCompanyListForSMCList($filename,$pd_master_data[0]['pd_id']);
-		}
-	  	else{
-			$arr = $this->PD_Model->getApplicantsDetails($pd_master_data[0]['pd_id']);  
-			$new_arr = array_filter($arr, function ($var) {
-				return ($var['applicant_type'] != 0);
-			});
-			if(!empty($new_arr)){
-				for($i=0;$i<count($new_arr);$i++){
-					$cur_section_data[$i]['borrower_type'] = $new_arr[$i]['applicant_type'] == 1 ? "Main Applicant" : "Company";
-					$cur_section_data[$i]['borrower_name'] = $new_arr[$i]['company_name'];
+		$is_file_uploaded = ($pd_master_data[0]['re_uploaded'] ? true : ($pd_master_data[0]['modified_fname'] ? true : false));
+		if($is_file_uploaded){
+				$filename = ($pd_master_data[0]['re_uploaded'] ? XLPATH.'/tmp/'.$pd_master_data[0]['re_uploaded_file_name'] : XLPATH.'/tmp/'.$pd_master_data[0]['modified_fname']);		  
+				//$filename = '/home/venba/Downloads/Sample_CET_Upload4.xls';
+				if(!file_exists($filename))
+				{
+					$bucket_name = LENDER_BUCKET_NAME_PREFIX.$pd_master_data[0]['fk_lender_id'];
+					$key = 'tmp/'. ($pd_master_data[0]['re_uploaded'] ? $pd_master_data[0]['re_uploaded_file_name'] : $pd_master_data[0]['modified_fname']);
+					$singed_uri = $this->aws_s3->getSingleObjectInaBucketAsSignedURI($bucket_name,$key,'+5 minutes');
+			
+					$sucess = file_put_contents($filename, file_get_contents($singed_uri));
+				}
+				$cur_section_data = readexceldata::getCompanyListForSMCList($filename,$pd_master_data[0]['pd_id']);
+		}else{
+ 			$arr = $this->PD_Model->getApplicantsDetails($pd_master_data[0]['pd_id']);  
+ 			$filtered_arr = array_filter($arr, function ($var) {
+ 				return ($var['applicant_type'] != 0);
+ 			});
+
+			 if(!empty($filtered_arr)){
+				for($i=0;$i<count($filtered_arr);$i++){
+					$cur_section_data[$i]['borrower_type'] = $filtered_arr[$i]['applicant_type'] == 1 ? "Main Applicant" : "Company";
+					$cur_section_data[$i]['borrower_name'] = $filtered_arr[$i]['company_name'];
 					$cur_section_data[$i]['entity_type'] = "Non Individual";
 					$cur_section_data[$i]['designation'] = "";
 					$cur_section_data[$i]['relationship_to'] = "";
 					$cur_section_data[$i]['relationship'] = "";
 					$cur_section_data[$i]['borrower_age'] = "";
 					$cur_section_data[$i]['numbers_of_years_business_running'] = "";
-					$cur_section_data[$i]['company_id'] = $new_arr[$i]['pd_co_applicant_id'];
+					$cur_section_data[$i]['company_id'] = $filtered_arr[$i]['pd_co_applicant_id'];
 				}
 			}
-			else{
-				$cur_section_data = [];	
-			}	
-		}  	
+			else $cur_section_data = [];	
+		}
 	  	if(count($cur_section_data))
 	  	{
 	  						$data['dataStatus'] = true;