diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index b355fded..e8b5785c 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -5493,6 +5493,7 @@ public function getPDFormDetailsJSON_post() if(is_object($s3result) && $s3result['ObjectURL'] != '' && $s3result['@metadata']['statusCode'] == 200) { + $this->PD_Model->updateRecords(array('isactive' => 0),PDDOCUMENTS,array('pd_document_title' => 'satellite','fk_pd_id' => $pd_id)); $record_data = array('fk_pd_id' => $pdid,'pd_document_title'=>'satellite','pd_document_name'=>'satellite.png','fk_form_id'=>null,'rental_count_id' => null,'location' => null); $id = $this->PD_Model->saveRecords($record_data,PDDOCUMENTS); diff --git a/api/application/views/report_templates/JSONTOREPORT_CLIX.php b/api/application/views/report_templates/JSONTOREPORT_CLIX.php index 9a2c204b..e58eccbf 100644 --- a/api/application/views/report_templates/JSONTOREPORT_CLIX.php +++ b/api/application/views/report_templates/JSONTOREPORT_CLIX.php @@ -711,13 +711,13 @@ defined('BASEPATH') OR exit('No direct script access allowed'); //echo $applicant_name.'**************************'; $title = isset($individual['applicant_title_name_master']) && $individual['applicant_title_name_master'] != "" ? $individual['applicant_title_name_master'] : ''; - $kyc_data = ''; + $applicant_name = $title.' '.$applicant_name; if($ind_key == 0 && array_key_exists('is_kyc', $general_form) && $general_form['is_kyc'] == 'no') { - $kyc_data = "

Name noticed as per KYC is ". $general_form['kyc_and_captur_the_name']; + $applicant_name = 'As per the request received applicant name is '.$applicant_name.'
but as per KYC name is '.$general_form['kyc_and_captur_the_name']; + //$kyc_data = "

Name noticed as per KYC is ". $general_form['kyc_and_captur_the_name']; } - - echo ''.$title.' '.$applicant_name.$kyc_data.''.$individual['age'].''.$education_qualification.''; + echo ''.$applicant_name.''.$individual['age'].''.$education_qualification.''; $company_relationship_data = null; //print_r($general_form['company_with_relationships']); @@ -1985,8 +1985,8 @@ defined('BASEPATH') OR exit('No direct script access allowed'); echo $value['fourth_row']; echo $value['fifth_row']; echo $value['sixth_row']; - echo $value['seventh_row']; - echo $value['eighth_row']; + // echo $value['seventh_row']; + // echo $value['eighth_row']; echo ''; echo ''; echo '
'; @@ -3035,7 +3035,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $is_stock_sufficient_enough_remarks = $stockRow['finished_and_traded_goods_remarks']; $is_raw_materials_sufficient_enough = null; $is_raw_materials_sufficient_enough_remarks = null; - $how_was_the_stock_validated = isset($stockRow['stock_validated']) ? $stockRow['stock_validated'] : null; + $how_was_the_stock_validated = isset($stockRow['stock_validated']) && $stockRow['stock_validated'] != '' ? $stockRow['stock_validated'] : null; $is_sufficiant_service_goods = $stockRow['is_sufficiant_service_goods']; $bindStockResult["company_name"]=MYUTIL::findCompanyName($all_company_details,$stockRow['company_id'],1); // this is for stock manufacturing details @@ -3218,7 +3218,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); echo '

Stock not required to be maintained.

'; } - echo '

'. $how_was_the_stock_validated ? 'How was stock validated :- '.$how_was_the_stock_validated : ''.'

'; + echo $how_was_the_stock_validated ? ('

How was stock validated :- '.$how_was_the_stock_validated .'

') : ''; $stock_photo_count = array_filter($pd_images[11],function($d) use ($business_count){ if($d['company_id'] == ($business_count + 1)){ return 1;}else {return 0;} }); $stock_img_row_count = ceil(count($stock_photo_count) / 3); @@ -3294,7 +3294,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $ai_summary_details_processed = ASSESSEDINCOME::getSummaryTable($ai_summary_details,$ai_core_details); - echo "

Assessed Income - ".MYUTIL::findCompanyName($all_company_details,($business_count+1),1)."

"; + echo "

Assessed Income - ".MYUTIL::findCompanyName($all_company_details,($business_count+1),1)."

"; if(isset($ai_core_details) && count($ai_summary_details_processed)) { echo '

'.$order_dipaly_array[0].') Financial Snapshot

'; @@ -3748,10 +3748,11 @@ defined('BASEPATH') OR exit('No direct script access allowed'); ?> - + +

Personal Banking:

Below bank account details were shared :

diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php index 3e7f9205..80663d3d 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php @@ -3344,7 +3344,7 @@ if($total_no_of_business > 0) { $ai_summary_details_processed = ASSESSEDINCOME::getSummaryTable($ai_summary_details,$ai_core_details); //print_r($ai_summary_details_processed);die(); - echo "

Assessed Income - ".MYUTIL::findCompanyName($all_company_details,($business_count+1),1)."

"; + echo "

Assessed Income - ".MYUTIL::findCompanyName($all_company_details,($business_count+1),1)."

"; if(isset($ai_core_details) && count($ai_summary_details_processed)) { echo '

'.$order_dipaly_array[0].') Financial Snapshot

'; diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php index df47f6f0..5605238e 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI_ADDON.php @@ -3586,7 +3586,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $ai_summary_details_processed = ASSESSEDINCOME::getSummaryTable($ai_summary_details,$ai_core_details); - echo "

Assessed Income - ".MYUTIL::findCompanyName($all_company_details,($business_count+1),1)."

"; + echo "

Assessed Income - ".MYUTIL::findCompanyName($all_company_details,($business_count+1),1)."

"; if(isset($ai_core_details) && count($ai_summary_details_processed)) { echo '

'.$order_dipaly_array[0].') Financial Snapshot

';