From 53ed0847b6a140bae1decbfe2939c4f297b4b116 Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Wed, 7 Jun 2023 15:13:55 +0530
Subject: [PATCH] DemoFSL FreeText State,city : ps

---
 .../views/sale_pd_templates/DemoFSL.php       | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/api/application/views/sale_pd_templates/DemoFSL.php b/api/application/views/sale_pd_templates/DemoFSL.php
index 02c7d641..5b66e5fb 100644
--- a/api/application/views/sale_pd_templates/DemoFSL.php
+++ b/api/application/views/sale_pd_templates/DemoFSL.php
@@ -215,11 +215,11 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 	</tr>	
 	<tr>
 	    <td colspan="2">City</td>
-		<td class = "tdcenteralign" colspan="1" ><?php echo isset($rd_data[$i]['residence_city_master'])?$rd_data[$i]['residence_city_master']:'Not Provided'; ?></td>
+		<td class = "tdcenteralign" colspan="1" ><?php echo isset($rd_data[$i]['residence_city_master'])?$rd_data[$i]['residence_city_master']:($rd_data[$i]['residence_city'] ? $rd_data[$i]['residence_city'] : 'Not Provided'); ?></td>
 		<td colspan="2">State</td>
-		<td class = "tdcenteralign" colspan="1"><?php echo isset($rd_data[$i]['residence_state_master'])?$rd_data[$i]['residence_state_master']:'Not Provided'; ?></td>
+		<td class = "tdcenteralign" colspan="1"><?php echo isset($rd_data[$i]['residence_state_master'])?$rd_data[$i]['residence_state_master']:($rd_data[$i]['residence_state'] ? $rd_data[$i]['residence_state'] : 'Not Provided'); ?></td>
 		<td colspan="2">PIN</td>
-		<td class = "tdcenteralign" colspan="2"><?php echo isset($rd_data[$i]['residence_pincode_master']) ?$rd_data[$i]['residence_pincode_master']: 'Not Provided';?></td>
+		<td class = "tdcenteralign" colspan="2"><?php echo isset($rd_data[$i]['residence_pincode_master']) ?$rd_data[$i]['residence_pincode_master']: ($rd_data[$i]['residence_pincode'] ? $rd_data[$i]['residence_pincode'] : 'Not Provided');?></td>
 	</tr>
 	<?php } }?>
 	
@@ -242,11 +242,16 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 	</tr>
 	<tr>
 	<td colspan="2" >City</td>
-		<td class = "tdcenteralign" colspan="1" ><?php echo isset($section1['permanent_city_master'])?$section1['permanent_city_master']:'Not Provided'; ?></td>
+		<!-- <td class = "tdcenteralign" colspan="1" ><?php echo isset($section1['permanent_city_master'])?$section1['permanent_city_master']:'Not Provided'; ?></td>
 		<td colspan="2" >State</td>
 		<td class = "tdcenteralign" colspan="1"><?php echo isset($section1['permanent_state_master'])?$section1['permanent_state_master']:'Not Provided'; ?></td>
 		<td colspan="2" >PIN</td>
-		<td class = "tdcenteralign" colspan="2"><?php echo isset($section1['permanent_pincode_master'])?$section1['permanent_pincode_master']:'Not Provided'; ?></td>
+		<td class = "tdcenteralign" colspan="2"><?php echo isset($section1['permanent_pincode_master'])?$section1['permanent_pincode_master']:'Not Provided'; ?></td> -->
+		<td class = "tdcenteralign" colspan="1" ><?php echo isset($section1['permanent_city'])?$section1['permanent_city']:'Not Provided'; ?></td>
+		<td colspan="2" >State</td>
+		<td class = "tdcenteralign" colspan="1"><?php echo isset($section1['permanent_state'])?$section1['permanent_state']:'Not Provided'; ?></td>
+		<td colspan="2" >PIN</td>
+		<td class = "tdcenteralign" colspan="2"><?php echo isset($section1['permanent_pincode'])?$section1['permanent_pincode']:'Not Provided'; ?></td>
 	</tr>
 	<?php } ?>
 	<tr>
@@ -273,11 +278,16 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 	</tr>	
 	<tr>
 		<td colspan="2" >City</td>
-		<td class = "tdcenteralign" colspan="1" ><?php echo isset($section1['officer_city_master'])?$section1['officer_city_master']:'Not Provided'; ?></td>
+		<td class = "tdcenteralign" colspan="1" ><?php echo isset($section1['officer_city'])?$section1['officer_city']:'Not Provided'; ?></td>
+		<td colspan="2" >State</td>
+		<td class = "tdcenteralign" colspan="1"><?php echo isset($section1['officer_state'])?$section1['officer_state']:'Not Provided'; ?></td>
+		<td colspan="2" >PIN</td>
+		<td class = "tdcenteralign" colspan="2"><?php echo isset($section1['officer_pincode'])?$section1['officer_pincode']:'Not Provided'; ?></td>
+		<!-- <td class = "tdcenteralign" colspan="1" ><?php echo isset($section1['officer_city_master'])?$section1['officer_city_master']:'Not Provided'; ?></td>
 		<td colspan="2" >State</td>
 		<td class = "tdcenteralign" colspan="1"><?php echo isset($section1['officer_state_master'])?$section1['officer_state_master']:'Not Provided'; ?></td>
 		<td colspan="2" >PIN</td>
-		<td class = "tdcenteralign" colspan="2"><?php echo isset($section1['officer_pincode_master'])?$section1['officer_pincode_master']:'Not Provided'; ?></td>
+		<td class = "tdcenteralign" colspan="2"><?php echo isset($section1['officer_pincode_master'])?$section1['officer_pincode_master']:'Not Provided'; ?></td> -->
 	</tr>
 	<tr>
 		<td colspan="3">Occupation of the Loan Applicant</td>