From e0a72ca7ec29f0957becaf0302090acbd39f25c4 Mon Sep 17 00:00:00 2001
From: "sanjeev.p" <sanjeev.p@venbainfotech.com>
Date: Thu, 11 Nov 2021 20:06:12 +0530
Subject: [PATCH] bank report Changes : ps

---
 .../helpers/bankingform_helper.php            | 24 +++++++++++++++++++
 .../report_templates/JSONTOREPORT_DI_AI.php   | 22 ++++++++++-------
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/api/application/helpers/bankingform_helper.php b/api/application/helpers/bankingform_helper.php
index 526fc041..c19926fb 100644
--- a/api/application/helpers/bankingform_helper.php
+++ b/api/application/helpers/bankingform_helper.php
@@ -45,6 +45,30 @@ public static function getIndividualBankingDetails($values,$pdid){
                 'main_business' => $tag['salary'],
                 'od_cc_limit' => ($tag['account_type']==3) ? $tag['limit'] : (($tag['account_type']==4) ? $tag['limit'] : ''),
                 'vintage' => $count_vintage,
+                'same_ac_used_for' => ucwords($tag['same_ac_used_for']),
+            );
+        }, $values);  
+    }
+    return $values;
+}
+
+public static function getIndividualBankingDetails2($values,$pdid){
+    $latest_applicants_names = APPLICANTNAME_GRABBER::getLatestApplicantsName($pdid);
+    if(count($values)>0){
+        $values = array_map(function($tag) use ($latest_applicants_names){
+            $count_vintage = $tag['vintage_year_business'] >0 ? $tag['vintage_year_business'] :"";
+            $count_vintage .= ($tag['vintage_year_business'] == 1) ? " Yr" : (($tag['vintage_year_business'] > 1)  ? " Yrs" : "");
+            $count_vintage.=' ';
+            $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" : "");
+            return array(
+                'account_name' =>  $tag['applicant_name_business']['id']==0 ? $tag['other_applicant_business'] : APPLICANTNAME_GRABBER::getApplicantsNameById($tag['applicant_name_business']['id'],$latest_applicants_names),
+                'bank_name' => $tag['bank_name_business'] ==1 ? $tag['other_bank_business'] : $tag['bank_name_business_master'],
+                'account_type' => $tag['account_type_business_master'],
+                'main_business' => $tag['salary_business'],
+                'od_cc_limit' => ($tag['account_type_business']==3) ? $tag['limit'] : (($tag['account_type_business']==4) ? $tag['limit'] : ''),
+                'vintage' => $count_vintage,
+                'same_ac_used_for' => "Business",
             );
         }, $values);  
     }
diff --git a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php
index bff48700..635bc12c 100644
--- a/api/application/views/report_templates/JSONTOREPORT_DI_AI.php
+++ b/api/application/views/report_templates/JSONTOREPORT_DI_AI.php
@@ -4010,14 +4010,20 @@ if($total_no_of_business > 0) {
 			foreach($pd_processed_forms[7] as $rowKey=> $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::getIndividualBankingDetails2($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){
-					$getIndividualEachValues=BANKINGFORM::getIndividualBankingDetails($individualBankRow['banking_details'],$pd_master_details[0]['pd_id']);
-					$bankingResult = array_merge($bankingResult,$getIndividualEachValues);
-
-				}
+					$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);
+					}
 				}
 			}
 			
@@ -4035,9 +4041,9 @@ if($total_no_of_business > 0) {
 			<th>Account Holder's Name</th>
 			<th>Bank Name</th>
 			<th>Account Type</th>
-			
 			<th>OD / CC Limit</th>
 			<th>Vintage</th>
+			<th>Account Used for</th>
 			</tr>
 		</thead>
 			<tbody>
@@ -4048,9 +4054,9 @@ if($total_no_of_business > 0) {
 			<td class="customtd"><?php echo $bdRow['account_name'] ?></td>
 			<td class="customtd"><?php echo $bdRow['bank_name'] ?></td>
 			<td class="customtd"><?php echo $bdRow['account_type'] ?></td>
-			
 			<td class="customtd"><?php echo $bdRow['od_cc_limit'] ? $bdRow['od_cc_limit'] : "NA" ?></td>
 			<td class="customtd"><?php echo $bdRow['vintage'] ?></td>
+			<td class="customtd"><?php echo $bdRow['same_ac_used_for'] ?></td>
 			</tr>	
 			<?php } ?>
 			</tbody>