diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php
index 0f075ccb..15e9f03e 100644
--- a/api/application/controllers/PD_Controller.php
+++ b/api/application/controllers/PD_Controller.php
@@ -4893,11 +4893,14 @@ public function getPDFormDetailsJSON_post()
}
//Get Common Images
- $data['pd_images']['common_images'] = $this->PD_Model->getSignedPDDocsURL($pdid,null,null,'common',null,'report');
- if($data['pd_master_details'][0]['customer_segment_abbr'] == "SAL")
+ if($data['pd_master_details'][0]['customer_segment_abbr'] == "SAL" && $data['pd_master_details'][0]['fk_pd_type'] != 3)
{
$data['pd_images']['common_images'] = $this->PD_Model->getSignedPDDocsURL($pdid,null,null,null,null,'report');
}
+ else
+ {
+ $data['pd_images']['common_images'] = $this->PD_Model->getSignedPDDocsURL($pdid,null,null,'common',null,'report');
+ }
$t = 'DEFAULT DATA';
// if(!count($add_on_pd))
// {
@@ -6247,11 +6250,15 @@ public function getPDFormDetailsJSON_post()
// print_r($this->db->last_query());
}
//print_r(json_decode($data['pd_processed_forms'][13][0]['processed_json']));die();
- $data['pd_images']['common_images'] = $this->PD_Model->getSignedPDDocsURL($pdid,null,null,'common',null,'report');
- if($data['pd_master_details'][0]['customer_segment_abbr'] == "SAL")
+
+ if($data['pd_master_details'][0]['customer_segment_abbr'] == "SAL" && $data['pd_master_details'][0]['fk_pd_type'] != 3)
{
$data['pd_images']['common_images'] = $this->PD_Model->getSignedPDDocsURL($pdid,null,null,null,null,'report');
}
+ else
+ {
+ $data['pd_images']['common_images'] = $this->PD_Model->getSignedPDDocsURL($pdid,null,null,'common',null,'report');
+ }
//print_r(json_decode($data['pd_processed_forms'][24][0]['processed_json']));//die();
// $it = array_filter($data['pd_images'][11],function($d){ if($d['company_id'] == 2){ echo $d['company_id'].'TRUE';return 1;}else {echo $d['company_id'].'FALSE'; return 0;} });
diff --git a/api/application/views/report_templates/JSONTOREPORT_SAL_TELE_PD.php b/api/application/views/report_templates/JSONTOREPORT_SAL_TELE_PD.php
index fcf19dac..65a28d1a 100644
--- a/api/application/views/report_templates/JSONTOREPORT_SAL_TELE_PD.php
+++ b/api/application/views/report_templates/JSONTOREPORT_SAL_TELE_PD.php
@@ -654,7 +654,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
if(count($person_met_data))
{
echo 'Person(s) Met:
';
- //echo '';
+ echo '
';
foreach($person_met_data as $pk => $person)
{
@@ -667,21 +667,21 @@ defined('BASEPATH') OR exit('No direct script access allowed');
//if($display_for_person_met != "" || $display_for_person_met != null){
echo '
';
//}
- // if($person['photo'])
- // {
- // echo '
';
- // }
- // echo ' ';
- // if($person['id_proof'])
- // {
- // echo '
';
- // }
+ if($person['photo'])
+ {
+ echo '
';
+ }
+ echo ' ';
+ if($person['id_proof'])
+ {
+ echo '
';
+ }
//echo count($person_met_data) != ($pk+1)? '
':'';
}
- //echo '
';
+ echo '
';
?>
@@ -1158,14 +1158,14 @@ defined('BASEPATH') OR exit('No direct script access allowed');
echo $employeement_data['total_business_previous_experience'] ? ("Previously, applicant ".$employeement_data['total_business_previous_experience']) : '';
- echo $employeement_data['was_met'] == 'no'? "
No one was met at the visited premises who could confirm the employment details of loan applicant.
":"During PD visit, ".$employeement_data['name_person_met'].' ( '. ($employeement_data['others_person_met'] ? $employeement_data['others_person_met'] : $employeement_data['designation_person_met_master']) .' ) was met at the visited premises.';
+ //echo $employeement_data['was_met'] == 'no'? "
No one was met at the visited premises who could confirm the employment details of loan applicant.
":"During PD visit, ".$employeement_data['name_person_met'].' ( '. ($employeement_data['others_person_met'] ? $employeement_data['others_person_met'] : $employeement_data['designation_person_met_master']) .' ) was met at the visited premises.';
- echo ($employeement_data['confirm_salary'] == 'no'? '
Salary amount was not confirmed because '.$employeement_data['sal_amount_was_not_confirmed'].'
' : 'Salary amount confirmed by person met is '.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($employeement_data['confirm_salary_amount']).'.
');
+ echo ($employeement_data['confirm_salary'] == 'no'? 'Salary amount was not confirmed because '.$employeement_data['sal_amount_was_not_confirmed'].'
' : 'Salary amount confirmed by person contacted is '.$rupee_symbol.' '.MYUTIL::customIndianNumberFormat($employeement_data['confirm_salary_amount']).'.
');
- echo $employeement_data['attendance_seen'] == 'no' ? "Attendance Register was not seen during visit.
": "Attendance register was seen during visit.
";
+ echo $employeement_data['attendance_seen'] == 'no' ? "Attendance Register was not shared.
": "Attendance register was shared.
";
- echo $employeement_data['sal_reg_seen'] == 'no' ? "Salary register was not seen during visit.
": "Salary register was seen during visit.
";
+ echo $employeement_data['sal_reg_seen'] == 'no' ? "Salary register was not shared.
": "Salary register was shared.
";
@@ -1188,7 +1188,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
echo "Applicant gets monthly gross salary of ". $rupee_symbol." ". MYUTIL::customIndianNumberFormat($employeement_data['gross_monthly_salary'])." and net monthly salary of ".$rupee_symbol." ". MYUTIL::customIndianNumberFormat($employeement_data['net_monthly_salary'])."
";
- echo $employeement_data['check_validated'] == "not validated" ? "The salary amount was not validated during visit because ".$employeement_data['why_was_it_not_validated']."
": "The salary amount was validated during visit ".$employeement_data['how_was_it_validated']."
";
+ echo $employeement_data['check_validated'] == "not validated" ? "The salary amount was not validated because ".$employeement_data['why_was_it_not_validated']."
": "The salary amount was validated ".$employeement_data['how_was_it_validated']."
";
echo $employeement_data['any_delays'] == 'yes' ? 'As per person met, sometimes there is delay in salary payment.
' : 'Generally, there is no delay in salary payment.
';