From 62f5d12631d1f1c9c0cf5dd244f787f42386669a Mon Sep 17 00:00:00 2001 From: Velz2020 Date: Tue, 11 Aug 2020 14:37:32 +0530 Subject: [PATCH] CONT OF PRE CHANGES --- api/application/controllers/PD_Controller.php | 8 ++++---- .../views/report_templates/JSONTOREPORT_DI_AI_TELE_PD.php | 1 + .../views/report_templates/JSONTOREPORT_RI.php | 3 ++- api/application/views/sale_pd_templates/MWISE.php | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index f4d8829c..ada3a8ac 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -4830,7 +4830,7 @@ public function getPDFormDetailsJSON_post() // } // else // { - $pd_type = data['pd_master_details'][0]['fk_pd_type'] == 3 ? 3 : 1; + $pd_type = $data['pd_master_details'][0]['fk_pd_type'] == 3 ? 3 : 1; $data['lender_disclaimer'] = $this->PD_Model->selectRecords(ENTITYDISCLAIMER,array('fk_entity_id' => ($data['pd_master_details'][0]['sub_entity_id'] ? $data['pd_master_details'][0]['sub_entity_id'] : $data['pd_master_details'][0]['fk_lender_id']),'fk_pd_type' => $pd_type)); //} @@ -4842,7 +4842,7 @@ public function getPDFormDetailsJSON_post() //$data['dsc_cards'] = $this->getDetailedScoreCardChart( $data['pd_score'] ); $data['assessed_income_details'] = $this->getAssessedIncomeForPDReport($pdid); - if($data['pd_master_details'][0]['is_score_card_enabled'] != 0 && ($data['pd_master_details'][0]['customer_segment_abbr'] != "SAL")) + if($data['pd_master_details'][0]['is_score_card_enabled'] != 0 && ($data['pd_master_details'][0]['customer_segment_abbr'] != "SAL" && $data['pd_master_details'][0]['customer_segment_abbr'] != "SE-RI")) { $data['pd_score'] = $this->calculateScore($pdid); $score_for_chart = $data['pd_score']['score_summary']['overall_score']['final_score'] ? round($data['pd_score']['score_summary']['overall_score']['final_score'],1) : 0; @@ -6160,7 +6160,7 @@ public function getPDFormDetailsJSON_post() //print_r($data['pd_master_details'][0]['is_score_card_enabled']);die(); // echo "**************************"; //$data['dsc_cards'] = $this->getDetailedScoreCardChart( $data['pd_score'] ); - if($data['pd_master_details'][0]['is_score_card_enabled'] == 1 && ($data['pd_master_details'][0]['customer_segment_abbr'] != "SAL"))// && $data['pd_master_details'][0]['customer_segment_abbr'] != "SAL-CHQ")) //&& ($data['pd_master_details'][0]['customer_segment_abbr'] != '')) + if($data['pd_master_details'][0]['is_score_card_enabled'] == 1 && ($data['pd_master_details'][0]['customer_segment_abbr'] != "SAL" && $data['pd_master_details'][0]['customer_segment_abbr'] != "SE-RI"))// && $data['pd_master_details'][0]['customer_segment_abbr'] != "SAL-CHQ")) //&& ($data['pd_master_details'][0]['customer_segment_abbr'] != '')) { //echo $data['pd_master_details'][0]['is_score_card_enabled'].'-'.$data['pd_master_details'][0]['customer_segment_abbr'];die(); $data['pd_score'] = $this->calculateScore($pdid); @@ -9695,7 +9695,7 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-~$_'; $charactersLength = strlen($characters); - $randomString = '!'; + $randomString = 'D$'; for ($i = 0; $i < 16; $i++) { $randomString .= $characters[rand(0, $charactersLength - 1)]; diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI_TELE_PD.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI_TELE_PD.php index ea77d7f7..20e234ff 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI_TELE_PD.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI_TELE_PD.php @@ -4284,6 +4284,7 @@ if($total_no_of_business > 0) { if(isset($covid_value['is_subfield']) && !$covid_value['is_subfield']) { echo 'Question : ' . $covid_value['question'].'
'; + $temp_answer = $credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ]; if(($covid_value['type'] == 1 || $covid_value['type'] == 9) && ($covid_value['field_type'] == 'str&numtoword' || $covid_value['field_type'] == 'num' || $covid_value['field_type'] == 'numtoword') && is_numeric($temp_answer)) { $temp_answer = MYUTIL::customIndianNumberFormat($temp_answer) .' ('. MYUTIL::numtowords($temp_answer) .')'; diff --git a/api/application/views/report_templates/JSONTOREPORT_RI.php b/api/application/views/report_templates/JSONTOREPORT_RI.php index 624f4818..de4ea9b5 100644 --- a/api/application/views/report_templates/JSONTOREPORT_RI.php +++ b/api/application/views/report_templates/JSONTOREPORT_RI.php @@ -1683,9 +1683,10 @@ defined('BASEPATH') OR exit('No direct script access allowed'); foreach ($credit_officier_specific_queries['covid_section']['question_info'] as $covid_key => $covid_value) { - ifisset($covid_value['is_subfield']) && !$covid_value['is_subfield']) + if(isset($covid_value['is_subfield']) && !$covid_value['is_subfield']) { echo 'Question : ' . $covid_value['question'].'
'; + $temp_answer = $credit_officier_specific_queries['covid_section'][ $covid_value['question_key'] ]; if(($covid_value['type'] == 1 || $covid_value['type'] == 9) && ($covid_value['field_type'] == 'str&numtoword' || $covid_value['field_type'] == 'num' || $covid_value['field_type'] == 'numtoword') && is_numeric($temp_answer)) { $temp_answer = MYUTIL::customIndianNumberFormat($temp_answer) .' ('. MYUTIL::numtowords($temp_answer) .')'; diff --git a/api/application/views/sale_pd_templates/MWISE.php b/api/application/views/sale_pd_templates/MWISE.php index 177451b0..7eed54c6 100644 --- a/api/application/views/sale_pd_templates/MWISE.php +++ b/api/application/views/sale_pd_templates/MWISE.php @@ -134,7 +134,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');