From 62bc8b85e3b6cab48e12dee73249709f619bc0bd Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Fri, 18 Aug 2023 17:55:50 +0530
Subject: [PATCH] SMC  CET Agency name : ps

---
 .../controllers/SMC_Credit_PD_Controller.php  | 19 ++++++++++---------
 .../views/smc_creditpd_reports/MWISE.php      | 16 ++++++++--------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/api/application/controllers/SMC_Credit_PD_Controller.php b/api/application/controllers/SMC_Credit_PD_Controller.php
index b67b486e..c07da2ec 100644
--- a/api/application/controllers/SMC_Credit_PD_Controller.php
+++ b/api/application/controllers/SMC_Credit_PD_Controller.php
@@ -510,13 +510,18 @@ class SMC_Credit_PD_Controller extends REST_Controller {
 				// print_r($filter_form_id);die();
 				    
 
+				if(isset($mater_details[0]['pd_agency_id']) && !empty($mater_details[0]['pd_agency_id'])){
+					## Vendor Officer id
+					$officer_id = isset($mater_details[0]['fk_pd_allocated_to']) ? $mater_details[0]['fk_pd_allocated_to'] : '';
+				}
+				else{
+					## Normal Officer id
 					$officer_id = isset($mater_details[0]['fk_updatedby']) ? $mater_details[0]['fk_updatedby'] : '';
+				}
+					
 					$visit_date = isset($mater_details[0]['pd_visit_date']) ? $mater_details[0]['pd_visit_date'] : '';
 					$agency_id = isset($mater_details[0]['pd_agency_id']) ? $mater_details[0]['pd_agency_id'] : '';
 					$agency_name = isset($mater_details[0]['SMC_vendor_agency_name']) ? $mater_details[0]['SMC_vendor_agency_name'] : '';
-					$agency_short_name = isset($mater_details[0]['SMC_vendor_agency_short_name']) ? $mater_details[0]['SMC_vendor_agency_short_name'] : '';
-					$pd_allocated_to = isset($mater_details[0]['fk_pd_allocated_to']) ? $mater_details[0]['fk_pd_allocated_to'] : '';
-					$pd_allocated_to_name = isset($mater_details[0]['pd_allocated_to']) ? $mater_details[0]['pd_allocated_to'] : '';
 										
 					# Additional Fields For officer
 					if (!empty($officer_id)) {
@@ -525,12 +530,8 @@ class SMC_Credit_PD_Controller extends REST_Controller {
 							foreach ($officer_details as $key => $value) {
 								$CETAPP_creditPD_data['Officer Details'] = $value;
 								$CETAPP_creditPD_data['Officer Details']['pd_visit_date'] = $visit_date;
-								$CETAPP_creditPD_data['Officer Details']['pd_vendor_officer'] = $pd_allocated_to;
-								$CETAPP_creditPD_data['Officer Details']['pd_vendor_officer_name'] = $pd_allocated_to_name;
-								$CETAPP_creditPD_data['Officer Details']['pd_agency_id'] = $agency_id;
-								$CETAPP_creditPD_data['Officer Details']['pd_agency_name'] = $agency_name;
-								$CETAPP_creditPD_data['Officer Details']['pd_agency_short_name'] = $agency_short_name;
-								
+								$CETAPP_creditPD_data['Officer Details']['agency_id'] = $agency_id;
+								$CETAPP_creditPD_data['Officer Details']['agency_name'] = $agency_name;
 							}
 						}
 					}
diff --git a/api/application/views/smc_creditpd_reports/MWISE.php b/api/application/views/smc_creditpd_reports/MWISE.php
index 2f747d27..036e2dc6 100644
--- a/api/application/views/smc_creditpd_reports/MWISE.php
+++ b/api/application/views/smc_creditpd_reports/MWISE.php
@@ -1535,22 +1535,22 @@ if(count($smc_images))
 <br><br>
 		<table class="scorecard_table">
 		<tbody>
-		<?php if(isset($pd_master_details[0]['pd_agency_id']) && !empty($pd_master_details[0]['pd_agency_id'])){?>
-			<tr>
-				<td  colspan="3" >Name of PD officer </td>
-				<td  class="tdcenteralign" colspan="7" ><?php echo $pd_master_details[0]['pd_allocated_to']?></td>
+		    <tr>
+				<td  colspan="3" >Name of PD Officer </td>
+				<td  class="tdcenteralign" colspan="7" ><?php echo (isset($pd_master_details[0]['pd_agency_id']) && !empty($pd_master_details[0]['pd_agency_id'])) ? $pd_master_details[0]['pd_allocated_to'] : $pd_master_details[0]['updatedby']; ?></td>
 			</tr>
+			<?php if(isset($pd_master_details[0]['pd_agency_id']) && !empty($pd_master_details[0]['pd_agency_id'])){?>
 			<tr>
 				<td  colspan="3" >Name of PD Agency </td>
 				<td  class="tdcenteralign" colspan="7" ><?php echo $pd_master_details[0]['SMC_vendor_agency_name']?></td>
 			</tr>
-		<?php }else{ ?>
+		    <?php } ?>
+			<!-- ## old 
 			<tr>
 				<td  colspan="3" >Name of Credit Manager </td>
 				<td  class="tdcenteralign" colspan="7" ><?php echo $pd_master_details[0]['updatedby']?></td>
-			</tr>
-		<?php } ?>
-		
+			</tr> -->
+
 	<!-- <tr>
 		<td  colspan="3" >Designation of Sales Team Member </td>
 		<td  class="tdcenteralign" colspan="7" ><?php echo $pd_master_details[0]['updatedby_designation']?></td>