From d15f421f70f0d01d0fd72acd5246cedce43df689 Mon Sep 17 00:00:00 2001 From: sanjeev Date: Fri, 17 Dec 2021 22:04:24 +0530 Subject: [PATCH] Banking Details : ps --- api/application/controllers/PD_Controller.php | 48 +++++--- .../report_templates/JSONTOREPORT_DI_AI.php | 15 +-- .../JSONTOREPORT_DI_AI_SMARTPD.php | 91 ++++++++++++++- .../JSONTOREPORT_DI_AI_TELE_PD.php | 105 ++++++++++++++++-- .../report_templates/JSONTOREPORT_RI.php | 14 +-- .../JSONTOREPORT_RI_SMARTPD.php | 21 +++- .../JSONTOREPORT_RI_TELE_PD.php | 21 +++- 7 files changed, 263 insertions(+), 52 deletions(-) diff --git a/api/application/controllers/PD_Controller.php b/api/application/controllers/PD_Controller.php index d4570fe1..c01413cc 100644 --- a/api/application/controllers/PD_Controller.php +++ b/api/application/controllers/PD_Controller.php @@ -6714,7 +6714,9 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() $form_array[] = array('form_id' => 22,'form_name' => 'Business Assets'); - //$form_array[] = array('form_id' => 21,'form_name' => 'Business Banking'); Removed ( step 2 ) + if(strcasecmp($lender_short_name, 'CLIX')){ + $form_array[] = array('form_id' => 21,'form_name' => 'Business Banking'); // this is temporary have to Remove ( step 2 ) + } $form_array[] = array('form_id' => 14,'form_name' => 'Financial Information'); $form_array[] = array('form_id' => 1,'form_name' => 'Supplier Details'); $form_array[] = array('form_id' => 2,'form_name' => 'Client Details'); @@ -6730,7 +6732,9 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() $form_array[] = array('form_id' => 13,'form_name' => 'About Business'); $form_array[] = array('form_id' => 22,'form_name' => 'Business Assets'); - //$form_array[] = array('form_id' => 21,'form_name' => 'Business Banking');Removed ( step 2 ) + if(strcasecmp($lender_short_name, 'CLIX')){ + $form_array[] = array('form_id' => 21,'form_name' => 'Business Banking');//Removed ( step 2 ) + } $form_array[] = array('form_id' => 14,'form_name' => 'Financial Information'); $form_array[] = array('form_id' => 1,'form_name' => 'Supplier Details'); $form_array[] = array('form_id' => 2,'form_name' => 'Client Details'); @@ -8290,19 +8294,35 @@ public function getCompaniesListsFromGeneralFormRawJSON_post() #####End of Other Assest Form Questions######## ######Business Banking ############## - $business_bank_form = (json_decode($form_data[7][0]['processed_json'],true)); - // here i am changed to 21 form-id to 7 form-id - - $vintage = array(); - if(array_key_exists('business_details',$business_bank_form)) - { - - foreach($business_bank_form['business_details'] as $banking) + //here IF Else is Temporary CLix + //here i am changed to 21 form-id to 7 form-id + $temp_flag = isset($form_data[21][0]['processed_json'])?1:0; + if($temp_flag == 0){ + $business_bank_form = (json_decode($form_data[7][0]['processed_json'],true)); + $vintage = array(); + if(array_key_exists('business_details',$business_bank_form)) { - $year = $banking['vintage_year_business'] ? $banking['vintage_year_business'] : 0 ; - $month = $banking['vintage_month_business'] ? $banking['vintage_month_business'] : 0; - $temp = $year.'.'.$month; - $vintage = array_merge($vintage,array($temp)); + + foreach($business_bank_form['business_details'] as $banking) + { + $year = $banking['vintage_year_business'] ? $banking['vintage_year_business'] : 0 ; + $month = $banking['vintage_month_business'] ? $banking['vintage_month_business'] : 0; + $temp = $year.'.'.$month; + $vintage = array_merge($vintage,array($temp)); + } + } + }else{ + $business_bank_form = (json_decode($form_data[21][0]['processed_json'],true)); + $vintage = array(); + if(array_key_exists('banking_details',$business_bank_form)) + { + foreach($business_bank_form['banking_details'] as $banking) + { + $year = $banking['vintage_year'] ? $banking['vintage_year'] : 0 ; + $month = $banking['vintage_month'] ? $banking['vintage_month'] : 0; + $temp = $year.'.'.$month; + $vintage = array_merge($vintage,array($temp)); + } } } diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php index de29bcc0..7ee9ebbb 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php @@ -2719,7 +2719,8 @@ if($total_no_of_business > 0) { As per person met, Applicant does not have any business account.

'; + // echo '

As per person met, Applicant does not have any business account.

'; + echo '

As per loan applicant, he does not have any business account.

'; } } ?> @@ -4101,7 +4102,7 @@ if($total_no_of_business > 0) { if(count($individualBankRow['banking_details'])>0){ // $tag['same_ac_used_for'] both $stmt_flag = array_map(function ($ar) { - return $ar['same_ac_used_for'] == "both" ? ($stmt_flag+1) : 0; + return $ar['same_ac_used_for'] == "business" ? ($stmt_flag+1) : 0; }, $individualBankRow['banking_details']); $getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']); @@ -4116,7 +4117,7 @@ if($total_no_of_business > 0) { } ?> -

Banking Details:

+

Personal Banking Details:

@@ -4130,7 +4131,7 @@ if($total_no_of_business > 0) { Account Type OD / CC Limit Vintage - Account Used for + @@ -4143,7 +4144,7 @@ if($total_no_of_business > 0) { - + @@ -4153,8 +4154,8 @@ if($total_no_of_business > 0) { } if($stmt_flag > 0 ){ echo '

The personal banking is done through same account used for business banking

'; } - if($ind_banking_common_remarks != ''){echo '

'.$ind_banking_common_remarks.'

'; } ?> - + if($ind_banking_common_remarks != ''){echo '

'.$ind_banking_common_remarks.'

'; } + if($is_personal_banking_available == null){ echo '

As per loan applicant, he does not have any personal account

';}?> diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI_SMARTPD.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI_SMARTPD.php index f6ad8ab2..2528fcb4 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI_SMARTPD.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI_SMARTPD.php @@ -2641,7 +2641,84 @@ if($total_no_of_business > 0) { + + $ibRow) { + $individualBankRow = json_decode($ibRow['processed_json'],true); + if(isset($individualBankRow['bank_info_available_business']) && $individualBankRow['bank_info_available_business'] == 1){ + if(count($individualBankRow['business_details'])>0){ + $getBuinessEachValues=BANKINGFORM::getNewBuinessBankingDetails($individualBankRow['business_details'],$pd_master_details[0]['pd_id']); + $newBankingResult = array_merge($newBankingResult,$getBuinessEachValues); + } + } + if(isset($individualBankRow['bank_info_available']) && $individualBankRow['bank_info_available'] == 1) + { + if(count($individualBankRow['banking_details'])>0){ + $getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']); + $newBankingResult = array_merge($newBankingResult,$getIndividualEachValues); + } + } + } + foreach($newBankingResult as $bd){ if($bd['account_type']== 4 || $bd['account_type']== 3){ $is_od_cc = true; } } + if(count($newBankingResult)>0){ + // $newBankingResult = array_filter($newBankingResult, function ($var) { + // // return ($var['same_ac_used_for'] == "Business"); + // return (($var['account_name'] == $fetchRow['company_details']['company_name']) && ($var['same_ac_used_for'] == "Business")); + // }); + $filteredBankingResult = array();$b=0; + for($a = 0; $a <= count($newBankingResult); $a++){ + if($newBankingResult[$a]['account_name'] == $fetchRow['company_details']['company_name'] && $newBankingResult[$a]['same_ac_used_for'] == "Business"){ + $filteredBankingResult[$b] = $newBankingResult[$a]; + $b++; + } + } + }//forloop ends here. + ?> + Business Banking:'; + if(count($filteredBankingResult)>0){ ?> + + + + + + + + + + + + + + + + + + + + + + + + +
Account NameBank NameAccount TypeAccount VintageOD/CC Limit(Rs)Main Business A/c
+ As per loan applicant, he does not have any business account.

'; + } + } + ?> + @@ -3999,6 +4076,7 @@ if($total_no_of_business > 0) { $ibRow) { $individualBankRow = json_decode($ibRow['processed_json'],true); @@ -4007,6 +4085,9 @@ if($total_no_of_business > 0) { { $is_personal_banking_available = 1; if(count($individualBankRow['banking_details'])>0){ + $stmt_flag = array_map(function ($ar) { + return $ar['same_ac_used_for'] == "business" ? ($stmt_flag+1) : 0; + }, $individualBankRow['banking_details']); $getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']); $bankingResult = array_merge($bankingResult,$getIndividualEachValues); @@ -4016,7 +4097,7 @@ if($total_no_of_business > 0) { ?> -

Personal Banking:

+

Personal Banking Details:

@@ -4031,6 +4112,7 @@ if($total_no_of_business > 0) { OD / CC Limit Vintage + @@ -4044,6 +4126,7 @@ if($total_no_of_business > 0) { + @@ -4052,9 +4135,9 @@ if($total_no_of_business > 0) { } - - if($ind_banking_common_remarks != ''){echo '

'.$ind_banking_common_remarks.'

'; } ?> - + if($stmt_flag > 0 ){ echo '

The personal banking is done through same account used for business banking

'; } + if($ind_banking_common_remarks != ''){echo '

'.$ind_banking_common_remarks.'

'; } + if($is_personal_banking_available == null){ echo '

As per loan applicant, he does not have any personal account

';}?> 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 ea594dc3..2ea1b2a1 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 @@ -2639,11 +2639,85 @@ if($total_no_of_business > 0) { + + + $ibRow) { + $individualBankRow = json_decode($ibRow['processed_json'],true); + if(isset($individualBankRow['bank_info_available_business']) && $individualBankRow['bank_info_available_business'] == 1){ + if(count($individualBankRow['business_details'])>0){ + $getBuinessEachValues=BANKINGFORM::getNewBuinessBankingDetails($individualBankRow['business_details'],$pd_master_details[0]['pd_id']); + $newBankingResult = array_merge($newBankingResult,$getBuinessEachValues); + } + } + if(isset($individualBankRow['bank_info_available']) && $individualBankRow['bank_info_available'] == 1) + { + if(count($individualBankRow['banking_details'])>0){ + $getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']); + $newBankingResult = array_merge($newBankingResult,$getIndividualEachValues); + } + } + } + foreach($newBankingResult as $bd){ if($bd['account_type']== 4 || $bd['account_type']== 3){ $is_od_cc = true; } } + if(count($newBankingResult)>0){ + // $newBankingResult = array_filter($newBankingResult, function ($var) { + // // return ($var['same_ac_used_for'] == "Business"); + // return (($var['account_name'] == $fetchRow['company_details']['company_name']) && ($var['same_ac_used_for'] == "Business")); + // }); + $filteredBankingResult = array();$b=0; + for($a = 0; $a <= count($newBankingResult); $a++){ + if($newBankingResult[$a]['account_name'] == $fetchRow['company_details']['company_name'] && $newBankingResult[$a]['same_ac_used_for'] == "Business"){ + $filteredBankingResult[$b] = $newBankingResult[$a]; + $b++; + } + } + }//forloop ends here. + ?> + Business Banking:'; + if(count($filteredBankingResult)>0){ ?> + + + + + + + + + + + + + + + + + + + + - - - + + + +
Account NameBank NameAccount TypeAccount VintageOD/CC Limit(Rs)Main Business A/c
+ As per loan applicant, he does not have any business account.

'; + } + } + ?> + 0) { $ibRow) { $individualBankRow = json_decode($ibRow['processed_json'],true); @@ -4005,17 +4080,21 @@ if($total_no_of_business > 0) { if(isset($individualBankRow['bank_info_available']) && $individualBankRow['bank_info_available'] == 1) { $is_personal_banking_available = 1; - if(count($individualBankRow['banking_details'])>0){ - $getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']); - $bankingResult = array_merge($bankingResult,$getIndividualEachValues); - - } + if(count($individualBankRow['banking_details'])>0){ + // $tag['same_ac_used_for'] both + $stmt_flag = array_map(function ($ar) { + return $ar['same_ac_used_for'] == "business" ? ($stmt_flag+1) : 0; + }, $individualBankRow['banking_details']); + + $getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']); + $bankingResult = array_merge($bankingResult,$getIndividualEachValues); + } } } ?> -

Personal Banking:

+

Personal Banking Details:

@@ -4030,6 +4109,7 @@ if($total_no_of_business > 0) { OD / CC Limit Vintage + @@ -4043,6 +4123,7 @@ if($total_no_of_business > 0) { + @@ -4051,9 +4132,9 @@ if($total_no_of_business > 0) { } - - if($ind_banking_common_remarks != ''){echo '

'.$ind_banking_common_remarks.'

'; } ?> - + if($stmt_flag > 0 ){ echo '

The personal banking is done through same account used for business banking

'; } + if($ind_banking_common_remarks != ''){echo '

'.$ind_banking_common_remarks.'

'; } + if($is_personal_banking_available == null){ echo '

As per loan applicant, he does not have any personal account

';}?> diff --git a/api/application/views/report_templates/JSONTOREPORT_RI.php b/api/application/views/report_templates/JSONTOREPORT_RI.php index c133e484..d7686277 100644 --- a/api/application/views/report_templates/JSONTOREPORT_RI.php +++ b/api/application/views/report_templates/JSONTOREPORT_RI.php @@ -1309,7 +1309,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $is_personal_banking_available = 1; if(count($individualBankRow['banking_details'])>0){ $stmt_flag = array_map(function ($ar) { - return $ar['same_ac_used_for'] == "both" ? ($stmt_flag+1) : 0; + return $ar['same_ac_used_for'] == "business" ? ($stmt_flag+1) : 0; }, $individualBankRow['banking_details']); $getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']); $bankingResult = array_merge($bankingResult,$getIndividualEachValues); @@ -1320,7 +1320,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); ?> -

Personal Banking:

+

Personal Banking Details:

@@ -1335,7 +1335,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); OD / CC Limit Vintage - Account Used for + @@ -1349,7 +1349,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); - + @@ -1358,9 +1358,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); } - - if($ind_banking_common_remarks != ''){echo '

'.$ind_banking_common_remarks.'

'; } ?> - + if($stmt_flag > 0 ){ echo '

The personal banking is done through same account used for business banking

'; } + if($ind_banking_common_remarks != ''){echo '

'.$ind_banking_common_remarks.'

'; } + if($is_personal_banking_available == null){ echo '

As per loan applicant, he does not have any personal account

';}?> diff --git a/api/application/views/report_templates/JSONTOREPORT_RI_SMARTPD.php b/api/application/views/report_templates/JSONTOREPORT_RI_SMARTPD.php index 5882d180..d7686277 100644 --- a/api/application/views/report_templates/JSONTOREPORT_RI_SMARTPD.php +++ b/api/application/views/report_templates/JSONTOREPORT_RI_SMARTPD.php @@ -1292,14 +1292,25 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $ibRow) { $individualBankRow = json_decode($ibRow['processed_json'],true); $ind_banking_common_remarks = $individualBankRow['banking_form_remark']; + if(isset($individualBankRow['bank_info_available_business']) && $individualBankRow['bank_info_available_business'] == 1){ + $is_personal_banking_available = 1; + if(count($individualBankRow['business_details'])>0){ + $getBuinessEachValues=BANKINGFORM::getNewBuinessBankingDetails($individualBankRow['business_details'],$pd_master_details[0]['pd_id']); + $bankingResult = array_merge($bankingResult,$getBuinessEachValues); + } + } if(isset($individualBankRow['bank_info_available']) && $individualBankRow['bank_info_available'] == 1) { $is_personal_banking_available = 1; if(count($individualBankRow['banking_details'])>0){ + $stmt_flag = array_map(function ($ar) { + return $ar['same_ac_used_for'] == "business" ? ($stmt_flag+1) : 0; + }, $individualBankRow['banking_details']); $getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']); $bankingResult = array_merge($bankingResult,$getIndividualEachValues); @@ -1309,7 +1320,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); ?> -

Personal Banking:

+

Personal Banking Details:

@@ -1324,6 +1335,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); OD / CC Limit Vintage + @@ -1337,6 +1349,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); + @@ -1345,9 +1358,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); } - - if($ind_banking_common_remarks != ''){echo '

'.$ind_banking_common_remarks.'

'; } ?> - + if($stmt_flag > 0 ){ echo '

The personal banking is done through same account used for business banking

'; } + if($ind_banking_common_remarks != ''){echo '

'.$ind_banking_common_remarks.'

'; } + if($is_personal_banking_available == null){ echo '

As per loan applicant, he does not have any personal account

';}?> diff --git a/api/application/views/report_templates/JSONTOREPORT_RI_TELE_PD.php b/api/application/views/report_templates/JSONTOREPORT_RI_TELE_PD.php index 18975269..ec6a5b51 100644 --- a/api/application/views/report_templates/JSONTOREPORT_RI_TELE_PD.php +++ b/api/application/views/report_templates/JSONTOREPORT_RI_TELE_PD.php @@ -1291,14 +1291,25 @@ defined('BASEPATH') OR exit('No direct script access allowed'); $ibRow) { $individualBankRow = json_decode($ibRow['processed_json'],true); $ind_banking_common_remarks = $individualBankRow['banking_form_remark']; + if(isset($individualBankRow['bank_info_available_business']) && $individualBankRow['bank_info_available_business'] == 1){ + $is_personal_banking_available = 1; + if(count($individualBankRow['business_details'])>0){ + $getBuinessEachValues=BANKINGFORM::getNewBuinessBankingDetails($individualBankRow['business_details'],$pd_master_details[0]['pd_id']); + $bankingResult = array_merge($bankingResult,$getBuinessEachValues); + } + } if(isset($individualBankRow['bank_info_available']) && $individualBankRow['bank_info_available'] == 1) { $is_personal_banking_available = 1; if(count($individualBankRow['banking_details'])>0){ + $stmt_flag = array_map(function ($ar) { + return $ar['same_ac_used_for'] == "business" ? ($stmt_flag+1) : 0; + }, $individualBankRow['banking_details']); $getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']); $bankingResult = array_merge($bankingResult,$getIndividualEachValues); @@ -1308,7 +1319,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); ?> -

Personal Banking:

+

Personal Banking Details:

@@ -1323,6 +1334,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); OD / CC Limit Vintage + @@ -1336,6 +1348,7 @@ defined('BASEPATH') OR exit('No direct script access allowed'); + @@ -1344,9 +1357,9 @@ defined('BASEPATH') OR exit('No direct script access allowed'); } - - if($ind_banking_common_remarks != ''){echo '

'.$ind_banking_common_remarks.'

'; } ?> - + if($stmt_flag > 0 ){ echo '

The personal banking is done through same account used for business banking

'; } + if($ind_banking_common_remarks != ''){echo '

'.$ind_banking_common_remarks.'

'; } + if($is_personal_banking_available == null){ echo '

As per loan applicant, he does not have any personal account

';}?>