From 0ef23f59241562f7efa5181c286cc72937e8b868 Mon Sep 17 00:00:00 2001
From: KhatamNugraha <nuganugraha2019@gmail.com>
Date: Thu, 21 Mar 2024 16:38:36 +0700
Subject: [PATCH] fix export

---
 Entities/Account.php                          | 4 ++--
 Http/Controllers/KonfirmasiBankController.php | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Entities/Account.php b/Entities/Account.php
index cd820a4..2e919ff 100644
--- a/Entities/Account.php
+++ b/Entities/Account.php
@@ -73,7 +73,7 @@ class Account extends Model
         // $uppercaseKodeCabang = Str::upper($kodecabang);
 
           $data = DB::connection("db2")->table("STG_DB.ACCOUNT AS AC")
-             ->selectRaw('AC.CUSTOMER_NO, MAX(INACTIV_MARKER) as INACTIV_MARKER,AC.ACCOUNT_NUMBER,MAX(AC.BATCH_DATE) AS BATCH_DATE,MAX(AC.CURRENCY)AS CURRENCY, AC.SHORT_TITLE,MAX(AC.OPENING_DATE) AS OPENING_DATE, MAX(AC.WORKING_BALANCE) AS WORKING_BALANCE, MAX(AC.CATEGORY) AS CATEGORY,CT.SHORT_NAME,CP.COMPANY_NAME')
+             ->selectRaw('AC.CUSTOMER_NO,AC.CATEGORY, MAX(INACTIV_MARKER) as INACTIV_MARKER,AC.ACCOUNT_NUMBER,MAX(AC.BATCH_DATE) AS BATCH_DATE,MAX(AC.CURRENCY)AS CURRENCY, AC.SHORT_TITLE,MAX(AC.OPENING_DATE) AS OPENING_DATE, MAX(AC.WORKING_BALANCE) AS WORKING_BALANCE, MAX(AC.CATEGORY) AS CATEGORY,CT.SHORT_NAME,CP.COMPANY_NAME')
             ->join('STG_DB.CATEGORY AS CT', 'AC.CATEGORY', '=', 'CT.ID')
             ->join('STG_DB.COMPANY AS CP', 'AC.CO_CODE', '=', 'CP.ID')
             ->where('CUSTOMER_NO',$cif)
@@ -82,7 +82,7 @@ class Account extends Model
             ->where('AC.BATCH_DATE',$startDate)
             ->whereIn('AC.ACCOUNT_NUMBER', $arrAccount)
             //->whereIn(DB::raw("LEFT(CATEGORY, 3)"),['100','600','660','101'])
-            ->groupBy('CUSTOMER_NO','ACCOUNT_NUMBER','SHORT_TITLE','SHORT_NAME','COMPANY_NAME')
+            ->groupBy('CUSTOMER_NO','ACCOUNT_NUMBER','SHORT_TITLE','SHORT_NAME','COMPANY_NAME','CATEGORY')
             ->orderBy('SHORT_NAME', 'ASC')
             ->limit(100);
          return $data;
diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php
index 361ba34..46ea5eb 100644
--- a/Http/Controllers/KonfirmasiBankController.php
+++ b/Http/Controllers/KonfirmasiBankController.php
@@ -358,7 +358,6 @@
             $arrAccount = explode("," , $request['accNo']);
             $startDate = Carbon::parse($request['startDate2']);
             $dateCore = $startDate->subDays(2);
-
             $Account = new Account;
             $data = [];
             $DataAccounts = [];
@@ -396,7 +395,7 @@
                 $DataPinjaman[$key2]['ARRANGEMENT_ID']      = $pinjaman->ARRANGEMENT_ID;
                 $DataPinjaman[$key2]['START_DATE']          = $pinjaman->START_DATE;
                 $DataPinjaman[$key2]['CURRENCY']            = $pinjaman->CURRENCY;
-                $DataPinjaman[$key2]['PRODUCT']             = $pinjaman->PRODUCT_LINE;
+                $DataPinjaman[$key2]['PRODUCT']             = $pinjaman->PRODUCT;
                 $DataPinjaman[$key2]['WORKING_BALANCE']     =  number_format($balance->WORKING_BALANCE, 2, ',', '.') ?? '';
                 $DataPinjaman[$key2]['TERM']                =  $pinjaman->TERM ?? '';
                 $DataPinjaman[$key2]['FIXED_RATE']          =  $pinjaman->FIXED_RATE ?? '';
@@ -437,7 +436,7 @@
             $data['DataCustomer'] = $GetCustomer ?? '';
             $data['localDate']    = $tanggalIndonesia;
             $data['today']        = $today;
-            $data['batchDate']    = $startDate->format('d-m-Y');
+            $data['batchDate']    = $startDate->addDays(2)->format('d-m-Y');
             $data['infoSuratOld'] = $infoSuratOld;
             $data['infoSuratNew'] = $infoSuratNew;
 
@@ -649,4 +648,4 @@
    }
 
 
-    }
+    }
\ No newline at end of file