From bf8247502f27cf196bff1be39c0b9f862633e1ca Mon Sep 17 00:00:00 2001
From: Velz2020 <velmurugan.s@venbainfotech.com>
Date: Sat, 19 Dec 2020 20:01:11 +0530
Subject: [PATCH] MEQ FINAL FEEDBACKS

---
 api/application/controllers/PD_Controller.php |  2 +-
 .../views/sale_pd_templates/MEQ.php           | 24 +++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php
index 39494444..8aa0347b 100644
--- a/api/application/controllers/PD_Controller.php
+++ b/api/application/controllers/PD_Controller.php
@@ -9826,7 +9826,7 @@ public function getCompaniesListsFromGeneralFormRawJSON_post()
 						$records['twilo_status'] = $composition_result_data['status'];
 						$records['composition_id'] = $composition_result_data['compositionId'];
 						$records['is_call_ended'] = 1;
-						$where_condition_array = array('fk_pd_id' => $pd_id); if($room_id){ $where_condition_array['room_id'] = $room_id; }
+						$where_condition_array = array('fk_pd_id' => $pd_id);
 						if($value['room_id']){ $where_condition_array['room_id'] = $value['room_id']; }
 						$id = $this->PD_Model->updateRecords($records,VIDEO_ROOM_INFO,$where_condition_array);
 					}
diff --git a/api/application/views/sale_pd_templates/MEQ.php b/api/application/views/sale_pd_templates/MEQ.php
index 68b4bf44..6e475006 100644
--- a/api/application/views/sale_pd_templates/MEQ.php
+++ b/api/application/views/sale_pd_templates/MEQ.php
@@ -167,12 +167,21 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 		</tr>
 	
 		<tr>
+		<?php if($master[0]['sales_pd_type'] == 1){ ?>	
 		<td colspan="3">Name of the person met during the visit</td>
+		<?php }else{ ?>	
+			<td colspan="3">Name of the person Contacted</td>
+		
+		<?php } ?>	
 		<td class = "tdcenteralign" colspan="7"> <?php echo $section1['person_met_during_visit']?></td>
 		</tr>
 		<tr>
+		<?php if($master[0]['sales_pd_type'] == 1){ ?>	
 		<td colspan="3">Person met Designation and contact no</td>
-		<td class = "tdcenteralign" colspan="7"> <?php echo $section1['person_met_designation'].'-'.$section1['person_met_contact_no']?></td>
+		<?php }else{ ?>	
+			<td colspan="3">Person Contacted and contact no</td>
+			<?php } ?>	
+		<td class = "tdcenteralign" colspan="7"> <?php echo ( isset($section1['person_met_designation']) ? (substr_replace($section1['person_met_designation'],'', -2) ) : '' ).($section1['person_met_contact_no'] != '' ? (' - '.$section1['person_met_contact_no']): '' )?></td>
 		</tr>
 	<!-- <tr>
 		<td colspan="3"><?php if($master[0]['sales_pd_type'] == 1){echo 'Name of Person Met during visit'; }else{ echo 'Name of the Person Contacted'; } ?></td>
@@ -529,6 +538,10 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 		<td  colspan="4"  >Recommended ROI for the case</td>
 		<td  class="tdcenteralign" ><?php echo $section7['recommended_roi'].' %'?></td>
 	</tr>
+	<tr>
+		<td  colspan="2" >Future Business Expansion Plans </td>
+		<td  style="text-align: justify;"  colspan="8"  ><?php echo $section7['future_business_expansion_plans']?></td>
+		</tr>
 	<tr>
 		<td  colspan="2" >Any Other remarks </td>
 		<td  style="text-align: justify;"  colspan="8"  ><?php echo $section7['any_other_remarks']?></td>
@@ -547,7 +560,9 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 		 ?>
 		<?php 
 		$iter = 0;
-		$photo_names = array('selfie_with_person_met' => array('is_multiple' => 0,'img_name' => 'Selfie of the person contacted'),'hospital_building' => array('is_multiple' => 1,'img_name' => 'Institute Building photo'),'name_board_seen' => array('is_multiple' => 1,'img_name' => 'Name Board'),'institute_interior' => array('is_multiple' => 1,'img_name' => 'Institute interior potographs'));
+		$photo_names = array('selfie_with_person_met' => 'Selfie with person met','hospital_building' => 'Institute Building photo','name_board_seen' => 'Name board', 'institute_interior' => 'Institute interior photo');
+		
+		//$photo_names = array('selfie_with_person_met' => array('is_multiple' => 0,'img_name' => 'Selfie of the person contacted'),'hospital_building' => array('is_multiple' => 1,'img_name' => 'Institute Building photo'),'name_board_seen' => array('is_multiple' => 1,'img_name' => 'Name Board'),'institute_interior' => array('is_multiple' => 1,'img_name' => 'Institute interior potographs'));
 		if($master[0]['sales_pd_type'] == 2){ $photo_names['selfie_with_person_met'] = 'Selfie of the person contacted';}
 		//echo count($section9);die();
 		//print_r(array_keys($section9));die();
@@ -600,7 +615,12 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 		<td  class="tdcenteralign" colspan="7" ><?php echo $section8['designation']?></td>
 		</tr>
 	<tr>
+		<?php if($master[0]['sales_pd_type'] == 1){?> 
 		<td  colspan="3" >Date of PD Visit </td>
+	<?php }else{ ?>
+		<td  colspan="3" >Date of PD</td>
+	<?php }?>
+
 		<td  class="tdcenteralign" colspan="7" ><?php echo $section8['date']?></td>
 		</tr>
 	<!-- <tr>