From 204454fc1fa905f25c129d1f98eabe66fd9fc3e3 Mon Sep 17 00:00:00 2001
From: KhatamNugraha <nuganugraha2019@gmail.com>
Date: Thu, 4 Apr 2024 10:00:06 +0700
Subject: [PATCH] fixing tampiolan export surat

---
 Entities/Account.php                          |  2 +-
 Http/Controllers/KonfirmasiBankController.php | 66 +++++++++++--------
 Resources/views/exportPdf.blade.php           |  4 +-
 3 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/Entities/Account.php b/Entities/Account.php
index 13def68..d8999c2 100644
--- a/Entities/Account.php
+++ b/Entities/Account.php
@@ -230,4 +230,4 @@ class Account extends Model
 
 
 
-}
+}
\ No newline at end of file
diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php
index 70cdeae..8b3c08e 100644
--- a/Http/Controllers/KonfirmasiBankController.php
+++ b/Http/Controllers/KonfirmasiBankController.php
@@ -342,39 +342,46 @@
             $dataAADepo = $Account->getAA($request['cusNo'],$arrAccount, $dateCore)->get();
 
             foreach ($listAccount as $key1 => $account) {
+                  $dataAADepo = $Account->getAA($request['cusNo'],$account->ACCOUNT_NUMBER, $dateCore)->first();
+                  if ($account->CATEGORY == '6603') {
+                        if ($dataAADepo) {
+                            $tenor = '';
+                            $tanggal_1 = date_create($dataAADepo->RENEWAL_DATE);
+                            $tanggal_2 = date_create($dataAADepo->START_DATE);
+                            $tenor  = date_diff( $tanggal_1, $tanggal_2 );
+                            $DataAccounts[$key1]['ACCOUNT_NUMBER'] = $account->ACCOUNT_NUMBER;
+                            $DataAccounts[$key1]['OPENING_DATE'] = $account->OPENING_DATE;
+                            $DataAccounts[$key1]['BATCH_DATE'] = $account->BATCH_DATE;
+                            $DataAccounts[$key1]['CUSTOMER_NO'] = $account->CUSTOMER_NO;
+                            $DataAccounts[$key1]['SHORT_NAME'] = $account->SHORT_NAME;
+                            $DataAccounts[$key1]['CURRENCY'] = $account->CURRENCY;
+                            $DataAccounts[$key1]['PRODUCT'] = $account->SHORT_TITLE;
+                            $DataAccounts[$key1]['COMPANY_NAME'] = $account->COMPANY_NAME;
+                            $DataAccounts[$key1]['WORKING_BALANCE'] = $account->WORKING_BALANCE != null ? number_format($account->WORKING_BALANCE, 2, ',', '.') : 'NIHIL';
+                            $DataAccounts[$key1]['MATURITY_DATE'] = date('d-m-Y', strtotime($dataAADepo->RENEWAL_DATE)) ;
+                            $DataAccounts[$key1]['ARRANGEMENT_ID'] = '';
+                            $DataAccounts[$key1]['FIXED_RATE'] =  $dataAADepo->FIXED_RATE . '  %';
+                            $DataAccounts[$key1]['TERM'] = intval($tenor->days/30) . '    BLN';
+                        }
 
-                   $tenor = '';
-                   $DataAccounts[$key1]['ACCOUNT_NUMBER'] = $account->ACCOUNT_NUMBER;
-                   $DataAccounts[$key1]['OPENING_DATE'] = $account->OPENING_DATE;
-                   $DataAccounts[$key1]['BATCH_DATE'] = $account->BATCH_DATE;
-                   $DataAccounts[$key1]['CUSTOMER_NO'] = $account->CUSTOMER_NO;
-                   $DataAccounts[$key1]['SHORT_NAME'] = $account->SHORT_NAME;
-                   $DataAccounts[$key1]['CURRENCY'] = $account->CURRENCY;
-                   $DataAccounts[$key1]['PRODUCT'] = $account->SHORT_TITLE;
-                   $DataAccounts[$key1]['COMPANY_NAME'] = $account->COMPANY_NAME;
-                   $DataAccounts[$key1]['WORKING_BALANCE'] = $account->WORKING_BALANCE != null ? number_format($account->WORKING_BALANCE, 2, ',', '.') : 'NIHIL';
-                   if ($account->CATEGORY == '6603') {
-                     $dataAADepo = $Account->getAA($request['cusNo'],$account->ACCOUNT_NUMBER, $dateCore)->first();
+                  }else{
+                       $DataAccounts[$key1]['ACCOUNT_NUMBER'] = $account->ACCOUNT_NUMBER;
+                        $DataAccounts[$key1]['OPENING_DATE'] = $account->OPENING_DATE;
+                        $DataAccounts[$key1]['BATCH_DATE'] = $account->BATCH_DATE;
+                        $DataAccounts[$key1]['CUSTOMER_NO'] = $account->CUSTOMER_NO;
+                        $DataAccounts[$key1]['SHORT_NAME'] = $account->SHORT_NAME;
+                        $DataAccounts[$key1]['CURRENCY'] = $account->CURRENCY;
+                        $DataAccounts[$key1]['PRODUCT'] = $account->SHORT_TITLE;
+                        $DataAccounts[$key1]['COMPANY_NAME'] = $account->COMPANY_NAME;
+                        $DataAccounts[$key1]['WORKING_BALANCE'] = $account->WORKING_BALANCE != null ? number_format($account->WORKING_BALANCE, 2, ',', '.') : 'NIHIL';
+                        $DataAccounts[$key1]['MATURITY_DATE'] =  '' ;
+                        $DataAccounts[$key1]['ARRANGEMENT_ID'] = '';
+                        $DataAccounts[$key1]['FIXED_RATE'] =  '';
+                        $DataAccounts[$key1]['TERM'] = '';
+                  }
 
-                   $tanggal_1 = date_create($dataAADepo->RENEWAL_DATE);
-                    // waktu sekarnag
-                   $tanggal_2 = date_create($dataAADepo->START_DATE);
-                   $tenor  = date_diff( $tanggal_1, $tanggal_2 );
-                   $DataAccounts[$key1]['MATURITY_DATE'] = date('d-m-Y', strtotime($dataAADepo->RENEWAL_DATE)) ;
-                   $DataAccounts[$key1]['ARRANGEMENT_ID'] = '';
-                   $DataAccounts[$key1]['FIXED_RATE'] =  $dataAADepo->FIXED_RATE . '  %';
-                   $DataAccounts[$key1]['TERM'] = intval($tenor->days/30) . '    BLN';
-                   } else {
-                   $DataAccounts[$key1]['MATURITY_DATE'] =  '' ;
-                   $DataAccounts[$key1]['ARRANGEMENT_ID'] = '';
-                   $DataAccounts[$key1]['FIXED_RATE'] =  '';
-                   $DataAccounts[$key1]['TERM'] = '';
-                   }
             }
 
-
-
-
             $Arrangement        =  $Account->getPinjaman($request['cusNo'], $dateCore)->get();
             foreach ($Arrangement as $key2 => $pinjaman) {
                 $balance        = $Account->getSingleAccount($pinjaman->LINKED_APPL_ID,$startDate)->first();
@@ -687,4 +694,5 @@
    }
 
 
+
     }
\ No newline at end of file
diff --git a/Resources/views/exportPdf.blade.php b/Resources/views/exportPdf.blade.php
index 22100aa..ba2853b 100644
--- a/Resources/views/exportPdf.blade.php
+++ b/Resources/views/exportPdf.blade.php
@@ -100,7 +100,7 @@
         top: 0px;
     }
     .footer {
-        bottom: 0px;
+        top: 23cm;
     }
     .pagenum:before {
         content: counter(page);
@@ -329,7 +329,7 @@
          </table>
       </div>
       <div class="footer">
-        Page <span class="pagenum" style="margin-top:20px"></span>
+        Page <span class="pagenum" style="margin-top:100px"></span>
     </div>
 </body>