From 7159ef15f382fcf8096979c9560ed7703d0c575e Mon Sep 17 00:00:00 2001
From: sanjeev
Date: Sat, 11 Dec 2021 16:05:47 +0530
Subject: [PATCH] multiple entry displayed in report : ps
---
.../report_templates/JSONTOREPORT_DI_AI.php | 139 +++++++++++-------
1 file changed, 85 insertions(+), 54 deletions(-)
diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php
index 10fd414f..4fe7555a 100644
--- a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php
+++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php
@@ -2573,65 +2573,24 @@ 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]))
{
- $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)
- {
+ // 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)
+ {
$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){
-
?>
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"));
+ });
+ }//forloop ends here.
+ ?>
+ Business Banking:';
+ if(count($newBankingResult)>0){ ?>
+
+
+
+ | Account Name |
+ Bank Name |
+ Account Type |
+ Account Vintage |
+ OD/CC Limit(Rs) |
+ Main Business A/c |
+
+
+
+
+
+
+ |
+ |
+ |
+ |
+ |
+ |
+
+
+
+
+
+ As per person met, Applicant does not have any business account.
';
+ }
+ }
+ ?>
+
@@ -4055,10 +4085,7 @@ if($total_no_of_business > 0) {
$is_personal_banking_available = 1;
if(count($individualBankRow['business_details'])>0){
$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");
- });
+ $bankingResult = array_merge($bankingResult,$getBuinessEachValues);
}
}
if(isset($individualBankRow['bank_info_available']) && $individualBankRow['bank_info_available'] == 1)
@@ -4075,7 +4102,11 @@ if($total_no_of_business > 0) {
}
}
}
-
+ if(count($bankingResult)>0){
+ $bankingResult = array_filter($bankingResult, function ($var) {
+ return ($var['same_ac_used_for'] != "Business");
+ });
+ }
?>
Banking Details: