diff --git a/Entities/Account.php b/Entities/Account.php
index 7a38fb8..d970c03 100644
--- a/Entities/Account.php
+++ b/Entities/Account.php
@@ -111,6 +111,7 @@ class Account extends Model
->select('ARRANGEMENT_ID','PRODUCT_LINE','CO_CODE','START_DATE','CURRENCY','PRODUCT','LINKED_APPL_ID')
// ->join('STG_DB.ACCOUNT AS AC', 'AA.LINKED_APPL_ID', '=', 'AC.ACCOUNT_NUMBER')
->where('CUSTOMER',$cus_no)
+ // ->whereIn(DB::raw("LINKED_APPL_ID"),$arr)
->where('ARR_STATUS' , 'CURRENT')
// ->orderBy('TERM','DESC');
->where('BATCH_DATE', $dateCore)
@@ -207,4 +208,4 @@ class Account extends Model
-}
+}
\ No newline at end of file
diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php
index 6af8dcf..fb4fb58 100644
--- a/Http/Controllers/KonfirmasiBankController.php
+++ b/Http/Controllers/KonfirmasiBankController.php
@@ -352,72 +352,18 @@
$data = [];
$DataAccounts = [];
$DataPinjaman = [];
-
// dd($listAccount);
$GetCustomer = $Account->getCustomer($request['cusNo'])->first();
- $listAccount = $Account->getAccount($request['cusNo'], $arrAccount, $dateCore )->get();
-
- // $Arrangement = $Account->getPinjaman($request['cusNo'],$startDate)->get();
+ $listAccount = $Account->getAccount($request['cusNo'], $arrAccount, $dateCore )->get();
+ $Arrangement = $Account->getPinjaman($request['cusNo'], $startDate)->get();
foreach ($listAccount as $key1 => $account) {
- $Arrangement = $Account->getPinjaman($request['cusNo'],$startDate)->get();
- $months = '';
- $PRODUCTFIXED_RATE = '' ;
- $MATURITY_DATE ='';
- $PRODUCT = '' ;
- $ARRANGEMENT_ID ='' ;
- if($Arrangement){
- foreach ($Arrangement as $key2 => $pinjaman) {
- $MaturityDate = $Account->getMaturityDate($pinjaman->ARRANGEMENT_ID, $startDate )->first();
- $TermAmount = $Account->getTermAmount($pinjaman->ARRANGEMENT_ID,$startDate)->first();
- $FixedRate = $Account->getFixedRate($pinjaman->ARRANGEMENT_ID,$startDate)->first();
- $balance = $Account->getSingleAccount($pinjaman->LINKED_APPL_ID,$startDate)->first();
- $StringTerm = $TermAmount->TERM;
- // Panjang string
- $panjang_string = strlen($StringTerm);
- // Panjang bagian yang ingin dihapus dari kanan
- $panjang_hapus = 1;
- // Menghapus bagian dari kanan string
- $string_baru = substr($StringTerm, 0, $panjang_string - $panjang_hapus);
- $Term1 = substr($TermAmount->TERM, -1);
- if($TermAmount){
- if( $Term1 == 'Y'){
- $monthsInYear = 12;
- $months = intval( $string_baru) * $monthsInYear . 'D';
- $PRODUCTFIXED_RATE = $FixedRate ? $FixedRate->FIXED_RATE : '';
- $PRODUCT = $pinjaman->PRODUCT ;
- $MATURITY_DATE = $MaturityDate ? $MaturityDate->MATURITY_DATE : '';
- $ARRANGEMENT_ID = $pinjaman->ARRANGEMENT_ID ;
- // $term = $days;
- }elseif($Term1 == 'M') {
- $averageDaysInMonth = 30.44;
- $months = intval($string_baru) / $averageDaysInMonth . 'D';
- // return $days;
- }else{
- $months = $TermAmount->TERM;
- }
- }
-
-
- $DataPinjaman[$key2]['ARRANGEMENT_ID'] = $pinjaman->ARRANGEMENT_ID;
- $DataPinjaman[$key2]['START_DATE'] = $pinjaman->START_DATE;
- $DataPinjaman[$key2]['CURRENCY'] = $pinjaman->CURRENCY;
- $DataPinjaman[$key2]['PRODUCT'] = $pinjaman->PRODUCT;
- $DataPinjaman[$key2]['WORKING_BALANCE'] = $balance->WORKING_BALANCE != null ? number_format( $balance->WORKING_BALANCE, 2, ',', '.') : 'NIHIL';
- $DataPinjaman[$key2]['TERM'] = $months ;
- $DataPinjaman[$key2]['FIXED_RATE'] = $FixedRate ? $FixedRate->FIXED_RATE : '';
- $DataPinjaman[$key2]['MATURITY_DATE'] = $MaturityDate ? $MaturityDate->MATURITY_DATE : '' ;
- $DataPinjaman[$key2]['ACCOUNT_NUMBER'] = $pinjaman->LINKED_APPL_ID;
- }
- }
-
-
$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'] = $PRODUCT;
+ $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'] = '';
@@ -427,6 +373,26 @@
}
+ foreach ($Arrangement as $key2 => $pinjaman) {
+ $MaturityDate = $Account->getMaturityDate($pinjaman->ARRANGEMENT_ID, $startDate )->first();
+ $TermAmount = $Account->getTermAmount($pinjaman->ARRANGEMENT_ID,$startDate)->first();
+ $FixedRate = $Account->getFixedRate($pinjaman->ARRANGEMENT_ID,$startDate)->first();
+ $balance = $Account->getSingleAccount($pinjaman->LINKED_APPL_ID,$startDate)->first();
+
+
+ $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]['WORKING_BALANCE'] = $balance->WORKING_BALANCE != null ? number_format( $balance->WORKING_BALANCE, 2, ',', '.') : 'NIHIL';
+ $DataPinjaman[$key2]['TERM'] = $TermAmount ? $TermAmount->TERM : '' ;
+ $DataPinjaman[$key2]['FIXED_RATE'] = $FixedRate ? $FixedRate->FIXED_RATE : '';
+ $DataPinjaman[$key2]['MATURITY_DATE'] = $MaturityDate ? $MaturityDate->MATURITY_DATE : '' ;
+ $DataPinjaman[$key2]['ACCOUNT_NUMBER'] = $pinjaman->LINKED_APPL_ID;
+ }
+
+ // dd( $DataPinjaman);
+
$ListLimits = $Account->getLimit($request['cusNo'],$request['startDate2'])->get();
$fasilitas = Fasilitas::where('nomor_cif',$request['cusNo'] )->where('status',1)->get();
@@ -434,18 +400,20 @@
$signer = Signer::where('id', $request['signerId'])->where('status',1)->get();
$currentDate = Carbon::now();
$tanggalIndonesia = $currentDate->locale('id')->isoFormat('D MMMM YYYY');
+ $today = $currentDate->format("d-m-Y");
$letter = new Letters;
$infoSuratNew = $letter->where('no_cif',$request['cusNo'])->orderBy('id','DESC')->first();
$infoSuratOld = $letter->where('no_cif',$request['cusNo'])->orderBy('id','ASC')->first();
$data['DataAccounts'] = $DataAccounts;
$data['DataPinjaman'] = $DataPinjaman;
-
- $data['DataLimit'] = $ListLimits;
- $data['DataFasilitas'] = $fasilitas;
- $data['DataSigner'] = $signer;
+ $data['DataLimit'] = $ListLimits;
+ $data['DataFasilitas']= $fasilitas;
+ $data['DataSigner'] = $signer;
$data['DataCustomer'] = $GetCustomer ?? '';
- $data['localDate'] = $tanggalIndonesia;
+ $data['localDate'] = $tanggalIndonesia;
+ $data['today'] = $today;
+ $data['batchDate'] = $startDate->format('d-m-Y');
$data['infoSuratOld'] = $infoSuratOld;
$data['infoSuratNew'] = $infoSuratNew;
@@ -653,7 +621,8 @@
} catch (Exception $e) {
echo json_encode(['status' => 'error', 'message' => ' Signer deleted failed.']);
}
- }
+
+ }
}
\ No newline at end of file
diff --git a/Resources/views/exportPdf.blade.php b/Resources/views/exportPdf.blade.php
index 00bb75d..5a1e5bb 100644
--- a/Resources/views/exportPdf.blade.php
+++ b/Resources/views/exportPdf.blade.php
@@ -96,7 +96,7 @@
- Nomor : {{$data['infoSuratOld']['no_surat']}}
- - Tanggal : {{ Carbon\Carbon::parse($data['infoSuratOld']['tgl_surat'])->format('d-m-Y') }}
+ - Tanggal : {{ $data['today'] }}
- Kepada Yth
@@ -112,7 +112,7 @@
- SIMPANAN NASABAH YANG BERSANGKUTAN PADA BANK
- - POSISI : {{ Carbon\Carbon::parse($data['infoSuratNew']['tgl_req_surat'])->format('d-m-Y') }}
+ - POSISI : {{ $data['batchDate'] }}
@@ -159,7 +159,7 @@
- PINJAMAN YANG DIBERIKAN OLEH BANK KEPADA NASABAH
- - POSISI : {{ Carbon\Carbon::parse($data['infoSuratNew']['tgl_req_surat'])->format('d-m-Y') }}
+ - POSISI : {{ $data['batchDate'] }}
@@ -204,7 +204,7 @@
- FASILITAS LAIN YANG DITERIMA OLEH NASABAH
- - POSISI : {{ Carbon\Carbon::parse($data['infoSuratNew']['tgl_req_surat'])->format('d-m-Y') }}
+ - POSISI : {{ $data['batchDate'] }}
diff --git a/Resources/views/pages/index.blade.php b/Resources/views/pages/index.blade.php
index eecda71..e9c2595 100644
--- a/Resources/views/pages/index.blade.php
+++ b/Resources/views/pages/index.blade.php
@@ -6,9 +6,12 @@
-
+ {{--
-
+ --}}
+
+
+