BLANK PAGES REMOVED AND LOAN APP ID EXIST CHECK

api/application/config/routes.php

@@ -227,6 +227,7 @@ $route['smartyTestFunction'] = 'PD_Controller/smartyTestFunction';
 $route['codeigniterViewTest'] = 'PD_Controller/codeigniterViewTest'; 
 $route['archivePDImages'] = 'PD_Controller/archivePDImages'; 
 $route['pdFormsCompletenessCheck'] = 'PD_Controller/pdFormsCompletenessCheck'; 
+$route['checkExistPDDetails'] = 'PD_Controller/checkExistPDDetails'; 
 
 //PD Form Related
 $route['getPDFormDetails'] = 'PD_Controller/getPDFormDetailsJSON'; 

api/application/controllers/PD_Controller.php

@@ -9107,4 +9107,23 @@ public function getCompaniesListsFromGeneralFormRawJSON_post()
 		
 		//pd_co_applicant_id, fk_pd_id, , applicant_type, mobile_no, landline, email, isactive, addressline1, addressline2, addressline3, fk_city, fk_state, pincode, relation, company_name, applicant_title_name, additional_pd_id
 	}
+
+	public function checkExistPDDetails_post()
+	{
+		$records = $this->post('records');
+		//print_r($records);die();
+		$lender_applicant_id = isset($records['lender_applicant_id']) ? $records['lender_applicant_id'] : null; 
+		$params = array();
+		if($lender_applicant_id)
+		{
+			$params['lender_applicant_id'] = $lender_applicant_id;
+		}
+
+		$result_data = $this->PD_Model->checkExistPDDetails($params);
+		$data['dataStatus'] = true;
+		$data['status'] = REST_Controller::HTTP_OK;
+		$data['records'] = $result_data;
+		$this->response($data,REST_Controller::HTTP_OK);
+		
+	}
 }

api/application/helpers/pdalerts_helper.php

@@ -164,7 +164,7 @@ class PDALERTS
 								}
 							
 							$msg = $pd_notification_msg[0]['lender'];
-						    $msg = self::stringReplace($msg,$core_details);
+						    $msg = self::stringReplace($msg,$core_details,'MAIL');
 							if($lender_email != null)
 							{
 								//	self::sendMail($CI,$lender_email,$msg,$core_details); // currently Mail disabled
@@ -405,7 +405,7 @@ class PDALERTS
 		/*********************************************/
 		/**REPLACE PLACEHOLDERS****/
 		/*********************************************/
-		public static function stringReplace($msg,$core_details)
+		public static function stringReplace($msg,$core_details,$for = 'SMS')
 		{
 				
 				$msg = str_replace('{{applicant_name}}',$core_details[0]['applicant_name'],$msg);
@@ -418,9 +418,17 @@ class PDALERTS
 				$msg = str_replace('{{lender_name}}',$core_details[0]['short_name'],$msg);
 				$msg = str_replace('{{link}}',$core_details[0]['encrypted_url'],$msg);
 			    //$msg = str_replace('{{\n\n}}','\n\n',$msg);
-			    $msg = nl2br($msg);
+			   // $msg = nl2br($msg);
+				if($for == 'SMS')
+				{
 				    $msg = str_replace('\n','',$msg);
 					$msg = str_replace('\\','',$msg);
+				}
+				else if($for == 'MAIL')
+				{
+					 $msg = str_replace('\n','<br>',$msg);
+					$msg = str_replace('\\','',$msg);
+				}
 				
 				
 				return $msg;

api/application/models/PD_Model.php

@@ -604,7 +604,12 @@ class PD_Model extends SPARQ_Model {
 						case 'fk_pd_template_id':
 							
 							$log_string = $arrayForText[$log['field_name']].' Changed From "'.$log['old_template_name'].'" to "'.$log['new_template_name'].'"';
-							$actual_logs[]  = $log_string;
+							//$actual_logs[]  = $log_string;
+							$user = $log['createdby'];
+							$time = $log['createdon'];
+							$actual_logs[$log_key]['log']  = $log_string;
+							$actual_logs[$log_key]['user']  = $user;
+							$actual_logs[$log_key]['time']  = $time;
 							
 						break;
 						case 'fk_customer_segment':
@@ -796,7 +801,7 @@ class PD_Model extends SPARQ_Model {
 			
 			$result_data['child'] = array('testkey'=>'testvalue');
 			$result_data['master'] = $actual_logs;
-			//print_r($result_data['master']);die();
+			print_r($result_data['master']);die();
 			// Child History Start
 			// $this->db->SELECT('PDAPPLICANTSDETAILS.pd_co_applicant_id, PDAPPLICANTSDETAILS.fk_pd_id, PDAPPLICANTSDETAILS.applicant_name, PDAPPLICANTSDETAILS.applicant_type, PDAPPLICANTSDETAILS.mobile_no, PDAPPLICANTSDETAILS.email, PDAPPLICANTSDETAILS.isactive, PDAPPLICANTSDETAILS.relation');
 			// $this->db->FROM(PDAPPLICANTSDETAILS.' as PDAPPLICANTSDETAILS');
@@ -1842,4 +1847,18 @@ class PD_Model extends SPARQ_Model {
 
 	 }
 
+	 function checkExistPDDetails($params)
+	 {
+	 	if(count($params))
+	 	{
+	 		$fields = array('pd_id','pd_sno');
+	 		$where_condition_array = array('lender_applicant_id' => $params['lender_applicant_id']);
+	 		return $this->selectCustomRecords($fields,$where_condition_array,PDTRIGGER);
+	 	}
+	 	else
+	 	{
+	 		return array();
+	 	}
+	 }
+	 
 }

api/application/views/report_templates/JSONTOREPORT_CLIX.php

@@ -3628,7 +3628,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 				}
 			}
 			?>
-			<div id="page_break"></div>
+			<!-- <div id="page_break"></div> -->
 			<h3 contenteditable="">Personal Assets</h3>
 			<?php 
 			//print_r($otherAssetResult);die();

api/application/views/report_templates/JSONTOREPORT_DI_AI.php

@@ -3685,7 +3685,7 @@ if($total_no_of_business > 0) {
 			// 		echo '</tbody>';
 			// 		echo '</table>';
 			// }
-			echo "<div class='page_break'></div>";
+			// echo "<div class='page_break'></div>";
 			//
 
 			?>
@@ -3720,7 +3720,7 @@ if($total_no_of_business > 0) {
 				}
 			}
 			?>
-			<div id="page_break"></div>
+			<!-- <div id="page_break"></div> -->
 			<h3 contenteditable="">Personal Assets</h3>
 			<?php 
 			//print_r($otherAssetResult);die();
@@ -3910,7 +3910,7 @@ if($total_no_of_business > 0) {
 					$residence_text ='<span contenteditable="true">This is a </span><span class="tooltip">'. $fmValue['residence_ownership'].' <span class="tooltiptext">Family Information - Ownership of Residence </span></span><span contenteditable="true"> residence,  where the applicant has been staying for </span><span class="tooltip">'. $fmValue['residence_No_of_years'].'<span class="tooltiptext">Family Information - No of Yrs in current residence </span></span><span contenteditable="true">.</span>';
 					$residence_text .= (!strcasecmp($fmValue['residence_ownership'],'rented')) ? '<span contenteditable="true"> The rent paid '.$rupee_symbol.' </span>'.$fmValue['rent'].'<span contenteditable="true"> per month.</span>' : '';
 					
-					echo $intro_text;echo "<br><br>";echo $residence_text;
+					echo $intro_text;echo "<br>";echo $residence_text;
 					
 					?>
 					

api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php

@@ -3659,7 +3659,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 			// 		echo '</tbody>';
 			// 		echo '</table>';
 			// }
-			echo "<div class='page_break'></div>";
+			// echo "<div class='page_break'></div>";
 			//
 			?>
 				
@@ -3691,8 +3691,8 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 				}
 			}
 			?>
-			<div id="page_break"></div>
+			<!-- <div id="page_break"></div> -->
-			<h3 contenteditable="">Personal Assets</h3>
+			<h3 contenteditable="true">Personal Assets</h3>
 			<?php 
 			//print_r($otherAssetResult);die();
 			if($is_personal_info_available != null){ ?>

api/application/views/report_templates/JSONTOREPORT_RI.php

@@ -1204,7 +1204,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 				}
 			}
 			?>
-			<div id="page_break"></div>
+			<!-- <div id="page_break"></div> -->
 			<h3 contenteditable="">Personal Assets</h3>
 			<?php 
 			//print_r($otherAssetResult);die();