Sineedge/sparqapi
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Others option bank merge : ps

Browse Source
This commit is contained in:
sanjeev 2021-12-18 15:10:01 +05:30
parent 9c9fbb2c4b
commit 2740d36dd5
7 changed files with 185 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api/application/helpers/bankingform_helper.php
View File

@ -39,13 +39,14 @@ public static function getIndividualBankingDetails($values,$pdid){
$count_vintage .=$tag['vintage_month'] >0 ? $tag['vintage_month'] : ""; $count_vintage .=$tag['vintage_month'] >0 ? $tag['vintage_month'] : "";
$count_vintage .=($tag['vintage_month'] == 1) ? " Month" : (($tag['vintage_month'] > 1) ? " Months" : ""); $count_vintage .=($tag['vintage_month'] == 1) ? " Month" : (($tag['vintage_month'] > 1) ? " Months" : "");
return array( return array(
'account_name' => $tag['applicant_name']['id']==0 ? $tag['other_applicant'] : APPLICANTNAME_GRABBER::getApplicantsNameById($tag['applicant_name']['id'],$latest_applicants_names), 'account_name' => $tag['applicant_name']['id']==0 ? $tag['other_applicant'] : ($tag['applicant_name']['group_id'] == 2 ? APPLICANTNAME_GRABBER::getApplicantsNameById($tag['applicant_name']['id'],$latest_applicants_names) : $tag['applicant_name']['name']),
'bank_name' => $tag['bank_name'] ==1 ? $tag['other_bank'] : $tag['bank_name_master'], 'bank_name' => $tag['bank_name'] ==1 ? $tag['other_bank'] : $tag['bank_name_master'],
'account_type' => $tag['account_type_master'], 'account_type' => $tag['account_type_master'],
'main_business' => $tag['salary'], 'main_business' => $tag['salary'],
'od_cc_limit' => ($tag['account_type']==3) ? $tag['limit'] : (($tag['account_type']==4) ? $tag['limit'] : ''), 'od_cc_limit' => ($tag['account_type']==3) ? $tag['limit'] : (($tag['account_type']==4) ? $tag['limit'] : ''),
'vintage' => $count_vintage, 'vintage' => $count_vintage,
'same_ac_used_for' => ucwords($tag['same_ac_used_for']), 'same_ac_used_for' => $tag['same_ac_used_for'] != "" ? ucwords($tag['same_ac_used_for']) : "",
'str_flag'=>$tag['applicant_name']['id']==0 ? "applicant" : ($tag['applicant_name']['group_id'] == 2 ? "applicant" : "individual-company"),
); );
}, $values); }, $values);
} }
@ -62,13 +63,14 @@ public static function getNewBuinessBankingDetails($values,$pdid){
$count_vintage .=$tag['vintage_month_business'] >0 ? $tag['vintage_month_business'] : ""; $count_vintage .=$tag['vintage_month_business'] >0 ? $tag['vintage_month_business'] : "";
$count_vintage .=($tag['vintage_month_business'] == 1) ? " Month" : (($tag['vintage_month_business'] > 1) ? " Months" : ""); $count_vintage .=($tag['vintage_month_business'] == 1) ? " Month" : (($tag['vintage_month_business'] > 1) ? " Months" : "");
return array( return array(
'account_name' => $tag['applicant_name_business']['id']==0 ? $tag['other_applicant_business'] : ($tag['applicant_name']['group_id'] == 2 ? APPLICANTNAME_GRABBER::getApplicantsNameById($tag['applicant_name']['id'],$latest_applicants_names) : $tag['applicant_name_business']['name']), 'account_name' => $tag['applicant_name_business']['id']==0 ? $tag['other_applicant_business'] : ($tag['applicant_name_business']['group_id'] == 2 ? APPLICANTNAME_GRABBER::getApplicantsNameById($tag['applicant_name_business']['id'],$latest_applicants_names) : $tag['applicant_name_business']['name']),
'bank_name' => $tag['bank_name_business'] ==1 ? $tag['other_bank_business'] : $tag['bank_name_business_master'], 'bank_name' => $tag['bank_name_business'] ==1 ? $tag['other_bank_business'] : $tag['bank_name_business_master'],
'account_type' => $tag['account_type_business_master'], 'account_type' => $tag['account_type_business_master'],
'main_business' => $tag['is_main'], 'main_business' => $tag['is_main'],
'od_cc_limit' => ($tag['account_type_business']==3) ? $tag['limit_business'] : (($tag['account_type_business']==4) ? $tag['limit_business'] : ''), 'od_cc_limit' => ($tag['account_type_business']==3) ? $tag['limit_business'] : (($tag['account_type_business']==4) ? $tag['limit_business'] : ''),
'vintage' => $count_vintage, 'vintage' => $count_vintage,
'same_ac_used_for' => "Business", 'same_ac_used_for' => $tag['applicant_name_business']['id']==0 ? "" : "Business",
'str_flag'=>$tag['applicant_name_business']['id']==0 ? "applicant" : ($tag['applicant_name_business']['group_id'] == 2 ? "applicant" : "buiness-company"),
); );
}, $values); }, $values);
} }

57
api/application/views/report_templates/JSONTOREPORT_DI_AI.php
View File

@ -2648,6 +2648,7 @@ if($total_no_of_business > 0) {
<!-- #################end business banking section #################--> <!-- #################end business banking section #################-->
<!-- #################Start new business banking section (11.12.2021)#################--> <!-- #################Start new business banking section (11.12.2021)#################-->
<?php <?php
// print_r($fetchRow['company_details']);die();
if(isset($pd_processed_forms[7])){ if(isset($pd_processed_forms[7])){
$newBankingResult=array(); $newBankingResult=array();
$is_od_cc = null; $is_od_cc = null;
@ -2659,13 +2660,13 @@ if($total_no_of_business > 0) {
$newBankingResult = array_merge($newBankingResult,$getBuinessEachValues); $newBankingResult = array_merge($newBankingResult,$getBuinessEachValues);
} }
} }
if(isset($individualBankRow['bank_info_available']) && $individualBankRow['bank_info_available'] == 1) // if(isset($individualBankRow['bank_info_available']) && $individualBankRow['bank_info_available'] == 1)
{ // {
if(count($individualBankRow['banking_details'])>0){ // if(count($individualBankRow['banking_details'])>0){
$getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']); // $getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']);
$newBankingResult = array_merge($newBankingResult,$getIndividualEachValues); // $newBankingResult = array_merge($newBankingResult,$getIndividualEachValues);
} // }
} // }
} }
foreach($newBankingResult as $bd){ if($bd['account_type']== 4 || $bd['account_type']== 3){ $is_od_cc = true; } } foreach($newBankingResult as $bd){ if($bd['account_type']== 4 || $bd['account_type']== 3){ $is_od_cc = true; } }
if(count($newBankingResult)>0){ if(count($newBankingResult)>0){
@ -2675,7 +2676,7 @@ if($total_no_of_business > 0) {
// }); // });
$filteredBankingResult = array();$b=0; $filteredBankingResult = array();$b=0;
for($a = 0; $a <= count($newBankingResult); $a++){ for($a = 0; $a <= count($newBankingResult); $a++){
if($newBankingResult[$a]['account_name'] == $fetchRow['company_details']['company_name'] && $newBankingResult[$a]['same_ac_used_for'] == "Business"){ if($newBankingResult[$a]['account_name'] == $fetchRow['company_details']['company_name'] && $newBankingResult[$a]['str_flag'] == "buiness-company"){
$filteredBankingResult[$b] = $newBankingResult[$a]; $filteredBankingResult[$b] = $newBankingResult[$a];
$b++; $b++;
} }
@ -4089,38 +4090,38 @@ if($total_no_of_business > 0) {
foreach($pd_processed_forms[7] as $rowKey=> $ibRow) { foreach($pd_processed_forms[7] as $rowKey=> $ibRow) {
$individualBankRow = json_decode($ibRow['processed_json'],true); $individualBankRow = json_decode($ibRow['processed_json'],true);
$ind_banking_common_remarks = $individualBankRow['banking_form_remark']; $ind_banking_common_remarks = $individualBankRow['banking_form_remark'];
// if(isset($individualBankRow['bank_info_available_business']) && $individualBankRow['bank_info_available_business'] == 1){ if(isset($individualBankRow['bank_info_available_business']) && $individualBankRow['bank_info_available_business'] == 1){
// $is_personal_banking_available = 1; $is_personal_banking_available = 1;
// if(count($individualBankRow['business_details'])>0){ if(count($individualBankRow['business_details'])>0){
// $getBuinessEachValues=BANKINGFORM::getNewBuinessBankingDetails($individualBankRow['business_details'],$pd_master_details[0]['pd_id']); $getBuinessEachValues=BANKINGFORM::getNewBuinessBankingDetails($individualBankRow['business_details'],$pd_master_details[0]['pd_id']);
// $bankingResult = array_merge($bankingResult,$getBuinessEachValues); $bankingResult = array_merge($bankingResult,$getBuinessEachValues);
// } }
// } }
if(isset($individualBankRow['bank_info_available']) && $individualBankRow['bank_info_available'] == 1) if(isset($individualBankRow['bank_info_available']) && $individualBankRow['bank_info_available'] == 1)
{ {
$is_personal_banking_available = 1; $is_personal_banking_available = 1;
if(count($individualBankRow['banking_details'])>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'] == "business" ? ($stmt_flag+1) : 0;
}, $individualBankRow['banking_details']);
$getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']); $getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']);
$bankingResult = array_merge($bankingResult,$getIndividualEachValues); $bankingResult = array_merge($bankingResult,$getIndividualEachValues);
} }
} }
} }
if(count($bankingResult)>0){ if(count($bankingResult)>0){
$bankingResult = array_filter($bankingResult, function ($var) { $filteredPersonalBankingResult = array();$x=0;
return ($var['same_ac_used_for'] != "Business"); for($y = 0; $y < count($bankingResult); $y++){
}); if($bankingResult[$y]['str_flag'] !== "buiness-company" ){
$filteredPersonalBankingResult[$x] = $bankingResult[$y];
$x++;
} }
if($bankingResult[$y]['same_ac_used_for'] == "Business"){
$stmt_flag++;
}
}
}
// print_r($filteredPersonalBankingResult);die();
?> ?>
<h3 contenteditable="true">Personal Banking Details: </h3> <h3 contenteditable="true">Personal Banking Details: </h3>
<?php if($is_personal_banking_available != null){ <?php if($is_personal_banking_available != null){ ?>
//print_r($bankingResult);
?>
<p>Below bank account details were shared :</p> <p>Below bank account details were shared :</p>
<table class="scorecard_table"> <table class="scorecard_table">
<thead> <thead>
@ -4135,7 +4136,7 @@ if($total_no_of_business > 0) {
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php foreach($bankingResult as $pbkey => $bdRow){ <?php foreach($filteredPersonalBankingResult as $pbkey => $bdRow){
?> ?>
<tr> <tr>
<td class="customtd"><?php echo (++$pbkey); ?></td> <td class="customtd"><?php echo (++$pbkey); ?></td>

45
api/application/views/report_templates/JSONTOREPORT_DI_AI_SMARTPD.php
View File

@ -2654,23 +2654,19 @@ if($total_no_of_business > 0) {
$newBankingResult = array_merge($newBankingResult,$getBuinessEachValues); $newBankingResult = array_merge($newBankingResult,$getBuinessEachValues);
} }
} }
if(isset($individualBankRow['bank_info_available']) && $individualBankRow['bank_info_available'] == 1) // if(isset($individualBankRow['bank_info_available']) && $individualBankRow['bank_info_available'] == 1)
{ // {
if(count($individualBankRow['banking_details'])>0){ // if(count($individualBankRow['banking_details'])>0){
$getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']); // $getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']);
$newBankingResult = array_merge($newBankingResult,$getIndividualEachValues); // $newBankingResult = array_merge($newBankingResult,$getIndividualEachValues);
} // }
} // }
} }
foreach($newBankingResult as $bd){ if($bd['account_type']== 4 || $bd['account_type']== 3){ $is_od_cc = true; } } foreach($newBankingResult as $bd){ if($bd['account_type']== 4 || $bd['account_type']== 3){ $is_od_cc = true; } }
if(count($newBankingResult)>0){ 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; $filteredBankingResult = array();$b=0;
for($a = 0; $a <= count($newBankingResult); $a++){ for($a = 0; $a <= count($newBankingResult); $a++){
if($newBankingResult[$a]['account_name'] == $fetchRow['company_details']['company_name'] && $newBankingResult[$a]['same_ac_used_for'] == "Business"){ if($newBankingResult[$a]['account_name'] == $fetchRow['company_details']['company_name'] && $newBankingResult[$a]['str_flag'] == "buiness-company"){
$filteredBankingResult[$b] = $newBankingResult[$a]; $filteredBankingResult[$b] = $newBankingResult[$a];
$b++; $b++;
} }
@ -4081,16 +4077,31 @@ if($total_no_of_business > 0) {
foreach($pd_processed_forms[7] as $rowKey=> $ibRow) { foreach($pd_processed_forms[7] as $rowKey=> $ibRow) {
$individualBankRow = json_decode($ibRow['processed_json'],true); $individualBankRow = json_decode($ibRow['processed_json'],true);
$ind_banking_common_remarks = $individualBankRow['banking_form_remark']; $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) if(isset($individualBankRow['bank_info_available']) && $individualBankRow['bank_info_available'] == 1)
{ {
$is_personal_banking_available = 1; $is_personal_banking_available = 1;
if(count($individualBankRow['banking_details'])>0){ 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']); $getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']);
$bankingResult = array_merge($bankingResult,$getIndividualEachValues); $bankingResult = array_merge($bankingResult,$getIndividualEachValues);
}
}
}
if(count($bankingResult)>0){
$filteredPersonalBankingResult = array();$x=0;
for($y = 0; $y < count($bankingResult); $y++){
if($bankingResult[$y]['str_flag'] !== "buiness-company" ){
$filteredPersonalBankingResult[$x] = $bankingResult[$y];
$x++;
}
if($bankingResult[$y]['same_ac_used_for'] == "Business"){
$stmt_flag++;
} }
} }
} }
@ -4116,7 +4127,7 @@ if($total_no_of_business > 0) {
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php foreach($bankingResult as $pbkey => $bdRow){ <?php foreach($filteredPersonalBankingResult as $pbkey => $bdRow){
?> ?>
<tr> <tr>
<td class="customtd"><?php echo (++$pbkey); ?></td> <td class="customtd"><?php echo (++$pbkey); ?></td>

46
api/application/views/report_templates/JSONTOREPORT_DI_AI_TELE_PD.php
View File

@ -2653,23 +2653,19 @@ if($total_no_of_business > 0) {
$newBankingResult = array_merge($newBankingResult,$getBuinessEachValues); $newBankingResult = array_merge($newBankingResult,$getBuinessEachValues);
} }
} }
if(isset($individualBankRow['bank_info_available']) && $individualBankRow['bank_info_available'] == 1) // if(isset($individualBankRow['bank_info_available']) && $individualBankRow['bank_info_available'] == 1)
{ // {
if(count($individualBankRow['banking_details'])>0){ // if(count($individualBankRow['banking_details'])>0){
$getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']); // $getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']);
$newBankingResult = array_merge($newBankingResult,$getIndividualEachValues); // $newBankingResult = array_merge($newBankingResult,$getIndividualEachValues);
} // }
} // }
} }
foreach($newBankingResult as $bd){ if($bd['account_type']== 4 || $bd['account_type']== 3){ $is_od_cc = true; } } foreach($newBankingResult as $bd){ if($bd['account_type']== 4 || $bd['account_type']== 3){ $is_od_cc = true; } }
if(count($newBankingResult)>0){ 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; $filteredBankingResult = array();$b=0;
for($a = 0; $a <= count($newBankingResult); $a++){ for($a = 0; $a <= count($newBankingResult); $a++){
if($newBankingResult[$a]['account_name'] == $fetchRow['company_details']['company_name'] && $newBankingResult[$a]['same_ac_used_for'] == "Business"){ if($newBankingResult[$a]['account_name'] == $fetchRow['company_details']['company_name'] && $newBankingResult[$a]['str_flag'] == "buiness-company"){
$filteredBankingResult[$b] = $newBankingResult[$a]; $filteredBankingResult[$b] = $newBankingResult[$a];
$b++; $b++;
} }
@ -4077,20 +4073,34 @@ if($total_no_of_business > 0) {
foreach($pd_processed_forms[7] as $rowKey=> $ibRow) { foreach($pd_processed_forms[7] as $rowKey=> $ibRow) {
$individualBankRow = json_decode($ibRow['processed_json'],true); $individualBankRow = json_decode($ibRow['processed_json'],true);
$ind_banking_common_remarks = $individualBankRow['banking_form_remark']; $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) if(isset($individualBankRow['bank_info_available']) && $individualBankRow['bank_info_available'] == 1)
{ {
$is_personal_banking_available = 1; $is_personal_banking_available = 1;
if(count($individualBankRow['banking_details'])>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'] == "business" ? ($stmt_flag+1) : 0;
}, $individualBankRow['banking_details']);
$getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']); $getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']);
$bankingResult = array_merge($bankingResult,$getIndividualEachValues); $bankingResult = array_merge($bankingResult,$getIndividualEachValues);
} }
} }
} }
if(count($bankingResult)>0){
$filteredPersonalBankingResult = array();$x=0;
for($y = 0; $y < count($bankingResult); $y++){
if($bankingResult[$y]['str_flag'] !== "buiness-company" ){
$filteredPersonalBankingResult[$x] = $bankingResult[$y];
$x++;
}
if($bankingResult[$y]['same_ac_used_for'] == "Business"){
$stmt_flag++;
}
}
}
?> ?>
@ -4113,7 +4123,7 @@ if($total_no_of_business > 0) {
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php foreach($bankingResult as $pbkey => $bdRow){ <?php foreach($filteredPersonalBankingResult as $pbkey => $bdRow){
?> ?>
<tr> <tr>
<td class="customtd"><?php echo (++$pbkey); ?></td> <td class="customtd"><?php echo (++$pbkey); ?></td>

23
api/application/views/report_templates/JSONTOREPORT_RI.php
View File

@ -1285,11 +1285,6 @@ defined('BASEPATH') OR exit('No direct script access allowed');
<?php } <?php }
if($other_assest_common_remrks != ""){ echo '<p>'.$other_assest_common_remrks.'</p>'; } if($other_assest_common_remrks != ""){ echo '<p>'.$other_assest_common_remrks.'</p>'; }
?>
<!-- end other asset section -->
<!-- start individual banking section -->
<?php
$bankingResult=array(); $bankingResult=array();
$is_personal_banking_available = null; $is_personal_banking_available = null;
$stmt_flag = 0; $stmt_flag = 0;
@ -1308,12 +1303,20 @@ defined('BASEPATH') OR exit('No direct script access allowed');
{ {
$is_personal_banking_available = 1; $is_personal_banking_available = 1;
if(count($individualBankRow['banking_details'])>0){ 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']); $getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']);
$bankingResult = array_merge($bankingResult,$getIndividualEachValues); $bankingResult = array_merge($bankingResult,$getIndividualEachValues);
}
}
}
if(count($bankingResult)>0){
$filteredPersonalBankingResult = array();$x=0;
for($y = 0; $y < count($bankingResult); $y++){
// if($bankingResult[$y]['str_flag'] !== "buiness-company" ){
$filteredPersonalBankingResult[$x] = $bankingResult[$y];
$x++;
// }
if($bankingResult[$y]['same_ac_used_for'] == "Business"){
$stmt_flag++;
} }
} }
} }
@ -1339,7 +1342,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php foreach($bankingResult as $pbkey => $bdRow){ <?php foreach($filteredPersonalBankingResult as $pbkey => $bdRow){
?> ?>
<tr> <tr>
<td class="customtd"><?php echo (++$pbkey); ?></td> <td class="customtd"><?php echo (++$pbkey); ?></td>

18
api/application/views/report_templates/JSONTOREPORT_RI_SMARTPD.php
View File

@ -1308,12 +1308,20 @@ defined('BASEPATH') OR exit('No direct script access allowed');
{ {
$is_personal_banking_available = 1; $is_personal_banking_available = 1;
if(count($individualBankRow['banking_details'])>0){ 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']); $getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']);
$bankingResult = array_merge($bankingResult,$getIndividualEachValues); $bankingResult = array_merge($bankingResult,$getIndividualEachValues);
}
}
}
if(count($bankingResult)>0){
$filteredPersonalBankingResult = array();$x=0;
for($y = 0; $y < count($bankingResult); $y++){
// if($bankingResult[$y]['str_flag'] !== "buiness-company" ){
$filteredPersonalBankingResult[$x] = $bankingResult[$y];
$x++;
// }
if($bankingResult[$y]['same_ac_used_for'] == "Business"){
$stmt_flag++;
} }
} }
} }
@ -1339,7 +1347,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php foreach($bankingResult as $pbkey => $bdRow){ <?php foreach($filteredPersonalBankingResult as $pbkey => $bdRow){
?> ?>
<tr> <tr>
<td class="customtd"><?php echo (++$pbkey); ?></td> <td class="customtd"><?php echo (++$pbkey); ?></td>

18
api/application/views/report_templates/JSONTOREPORT_RI_TELE_PD.php
View File

@ -1307,12 +1307,20 @@ defined('BASEPATH') OR exit('No direct script access allowed');
{ {
$is_personal_banking_available = 1; $is_personal_banking_available = 1;
if(count($individualBankRow['banking_details'])>0){ 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']); $getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']);
$bankingResult = array_merge($bankingResult,$getIndividualEachValues); $bankingResult = array_merge($bankingResult,$getIndividualEachValues);
}
}
}
if(count($bankingResult)>0){
$filteredPersonalBankingResult = array();$x=0;
for($y = 0; $y < count($bankingResult); $y++){
// if($bankingResult[$y]['str_flag'] !== "buiness-company" ){
$filteredPersonalBankingResult[$x] = $bankingResult[$y];
$x++;
// }
if($bankingResult[$y]['same_ac_used_for'] == "Business"){
$stmt_flag++;
} }
} }
} }
@ -1338,7 +1346,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php foreach($bankingResult as $pbkey => $bdRow){ <?php foreach($filteredPersonalBankingResult as $pbkey => $bdRow){
?> ?>
<tr> <tr>
<td class="customtd"><?php echo (++$pbkey); ?></td> <td class="customtd"><?php echo (++$pbkey); ?></td>