diff --git a/Entities/Account.php b/Entities/Account.php index e99f94b..7a38fb8 100644 --- a/Entities/Account.php +++ b/Entities/Account.php @@ -115,6 +115,7 @@ class Account extends Model // ->orderBy('TERM','DESC'); ->where('BATCH_DATE', $dateCore) //->where('LINKED_APPL_ID', $accNo) + // ->groupBy('ARRANGEMENT_ID','ACCOUNT_NUMBER','SHORT_TITLE','SHORT_NAME','COMPANY_NAME') ->limit(100);; return $data; @@ -206,4 +207,4 @@ class Account extends Model -} \ No newline at end of file +} diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php index ca21ea7..7c60dae 100644 --- a/Http/Controllers/KonfirmasiBankController.php +++ b/Http/Controllers/KonfirmasiBankController.php @@ -402,7 +402,7 @@ $DataPinjaman[$key2]['START_DATE'] = $pinjaman->START_DATE; $DataPinjaman[$key2]['CURRENCY'] = $pinjaman->CURRENCY; $DataPinjaman[$key2]['PRODUCT'] = $pinjaman->PRODUCT; - $DataPinjaman[$key2]['WORKING_BALANCE'] = number_format( $balance->WORKING_BALANCE, 2, ',', '.') ?? ''; + $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 : '' ; @@ -419,7 +419,7 @@ $DataAccounts[$key1]['CURRENCY'] = $account->CURRENCY; $DataAccounts[$key1]['PRODUCT'] = $PRODUCT; $DataAccounts[$key1]['COMPANY_NAME'] = $account->COMPANY_NAME; - $DataAccounts[$key1]['WORKING_BALANCE'] = number_format($account->WORKING_BALANCE, 2, ',', '.'); + $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'] = ''; @@ -451,7 +451,12 @@ // dd($data); $pdf = PDF::loadview('konfirmasibank::exportPdf',['data'=>$data]); - return $pdf->stream(); + $exportTime = Carbon::now(); + $filename = "Kobank_" . $request['cusNo'] .'_'.$exportTime->format('YmdHis'). '.PDF'; + + return $pdf->stream($filename); + + // return $pdf->stream(); } @@ -650,4 +655,4 @@ } - } \ No newline at end of file + } diff --git a/Resources/views/exportPdf.blade.php b/Resources/views/exportPdf.blade.php index 18e2f3d..38af247 100644 --- a/Resources/views/exportPdf.blade.php +++ b/Resources/views/exportPdf.blade.php @@ -52,6 +52,10 @@ text-align: center; } + .text-right{ + text-align: right; + } + ul.no-bullets { list-style-type: none; margin: 0; @@ -133,9 +137,10 @@