diff --git a/api/application/helpers/bankingform_helper.php b/api/application/helpers/bankingform_helper.php index 81ad6d4c..94d8cf83 100644 --- a/api/application/helpers/bankingform_helper.php +++ b/api/application/helpers/bankingform_helper.php @@ -52,7 +52,7 @@ public static function getIndividualBankingDetails($values,$pdid){ return $values; } -public static function getIndividualBankingDetails2($values,$pdid){ +public static function getNewBuinessBankingDetails($values,$pdid){ $latest_applicants_names = APPLICANTNAME_GRABBER::getLatestApplicantsName($pdid); if(count($values)>0){ $values = array_map(function($tag) use ($latest_applicants_names){ diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php index 8ba6753c..10fd414f 100644 --- a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php +++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php @@ -2573,24 +2573,64 @@ if($total_no_of_business > 0) { 0){ + // $getEachValues['is_od_cc'] = null; + // foreach($businessBankRow['banking_details'] as $bd){ if($bd['account_type']== 4 || $bd['account_type']== 3){ $getEachValues['is_od_cc'] = true; } } + // $getEachValues['bankDetails']=BANKINGFORM::getBusinessBankingDetails($businessBankRow['banking_details'],$pd_master_details[0]['pd_id']); + // $bankingResult = array_merge($bankingResult,$getEachValues); + + // } + // } + if(isset($pd_processed_forms[21][$business_count])) { - // business banking - $bbRow = $pd_processed_forms[21][$business_count] ; - $businessBankRow = json_decode($bbRow['processed_json'],true); - $business_banking_common_remarks = $businessBankRow['banking_form_remark']; - //print_r($businessBankRow);die(); - if(isset($businessBankRow['bank_info_available']) && $businessBankRow['bank_info_available'] == 1) - { + $bbRow = $pd_processed_forms[21][$business_count] ; + $businessBankRow = json_decode($bbRow['processed_json'],true); + if(isset($businessBankRow['bank_info_available']) && $businessBankRow['bank_info_available'] == 1) + { $is_business_banking_available = 1; if(count($businessBankRow['banking_details'])>0){ $getEachValues['is_od_cc'] = null; foreach($businessBankRow['banking_details'] as $bd){ if($bd['account_type']== 4 || $bd['account_type']== 3){ $getEachValues['is_od_cc'] = true; } } $getEachValues['bankDetails']=BANKINGFORM::getBusinessBankingDetails($businessBankRow['banking_details'],$pd_master_details[0]['pd_id']); $bankingResult = array_merge($bankingResult,$getEachValues); - } } + $business_banking_common_remarks = $pd_processed_forms[21][$business_count]['banking_form_remark']; + + } + else if(isset($pd_processed_forms[7])) { + $bbRow = $pd_processed_forms[7][0] ; + $businessBankRow = json_decode($bbRow['processed_json'],true); + if(isset($businessBankRow['bank_info_available_business']) && $businessBankRow['bank_info_available_business'] == 1) + { + $is_business_banking_available = 1; + if(count($businessBankRow['business_details'])>0){ + $getEachValues['is_od_cc'] = null; + foreach($businessBankRow['business_details'] as $bd){ if($bd['account_type_business']== 4 || $bd['account_type_business']== 3){ $getEachValues['is_od_cc'] = true; } } + $getEachValues['bankDetails']=BANKINGFORM::getNewBuinessBankingDetails($businessBankRow['business_details'],$pd_master_details[0]['pd_id']); + $arr = array_merge($bankingResult,$getEachValues); + $bankingResult = array_filter($arr, function ($var) { + return (($var['account_name'] == $fetchRow['company_details']['company_name']) && ($var['same_ac_used_for'] == "Business")); + }); + } + } + $business_banking_common_remarks = ""; + } + + + // print_r($bankingResult);die(); + if($is_business_banking_available && count($bankingResult['bankDetails'])>0){ ?> @@ -4014,8 +4054,11 @@ if($total_no_of_business > 0) { 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::getIndividualBankingDetails2($individualBankRow['business_details'],$pd_master_details[0]['pd_id']); - $bankingResult = array_merge($bankingResult,$getBuinessEachValues); + $getBuinessEachValues=BANKINGFORM::getNewBuinessBankingDetails($individualBankRow['business_details'],$pd_master_details[0]['pd_id']); + $arr = array_merge($bankingResult,$getBuinessEachValues); + $bankingResult = array_filter($arr, function ($var) { + return ($var['same_ac_used_for'] != "Business"); + }); } } if(isset($individualBankRow['bank_info_available']) && $individualBankRow['bank_info_available'] == 1)