diff --git a/Entities/ViewAccount.php b/Entities/ViewAccount.php index 17bceac..5a1f0fe 100644 --- a/Entities/ViewAccount.php +++ b/Entities/ViewAccount.php @@ -60,12 +60,17 @@ class ViewAccount extends Model ->groupBy('CUSTOMER_NO','ACCOUNT_NUMBER','SHORT_NAME','SHORT_TITLE','CURRENCY','COMPANY_NAME','OPENING_DATE'); }else{ $data = DB::connection("db2")->table("STG_DB.VW_ACCOUNT") - ->select( 'CUSTOMER_NO', 'ACCOUNT_NUMBER','SHORT_NAME','SHORT_TITLE','CURRENCY','COMPANY_NAME','OPENING_DATE',DB::raw('MAX(WORKING_BALANCE) AS WORKING_BALANCE')) + // ->select( 'CUSTOMER_NO', 'ACCOUNT_NUMBER','SHORT_NAME','SHORT_TITLE','CURRENCY','COMPANY_NAME','OPENING_DATE',DB::raw('MAX(WORKING_BALANCE) AS WORKING_BALANCE')) + // ->where('CUSTOMER_NO',$cif) + // ->where('COMPANY_NAME', 'like', "%" .$uppercaseKodeCabang."%") + // ->whereIn('ACCOUNT_NUMBER', $arrAccount) + // ->whereBetween('OPENING_DATE', [$startDate, $endDate]) + // ->groupBy('CUSTOMER_NO','ACCOUNT_NUMBER','SHORT_NAME','SHORT_TITLE','CURRENCY','COMPANY_NAME','OPENING_DATE'); + ->select('*') ->where('CUSTOMER_NO',$cif) ->where('COMPANY_NAME', 'like', "%" .$uppercaseKodeCabang."%") ->whereIn('ACCOUNT_NUMBER', $arrAccount) - ->whereBetween('OPENING_DATE', [$startDate, $endDate]) - ->groupBy('CUSTOMER_NO','ACCOUNT_NUMBER','SHORT_NAME','SHORT_TITLE','CURRENCY','COMPANY_NAME','OPENING_DATE'); + ->whereBetween('OPENING_DATE', [$startDate, $endDate]); } return $data; @@ -94,12 +99,22 @@ class ViewAccount extends Model } - public function getPinjaman($cus_no){ + // public function getPinjaman($cus_no){ + // $data = []; + // $data = DB::connection("db2")->table("STG_DB.VW_AA_ARR") + // ->select('ARRANGEMENT_ID','LINKED_APPL_ID','CUSTOMER','PRODUCT','PRODUCT_LINE','CURRENCY',DB::raw('MAX(WORKING_BALANCE) AS WORKING_BALANCE'),'BATCH_DATE', DB::raw('MAX(OPENING_DATE) AS OPENING_DATE'),'MATURITY_DATE',DB::raw('MAX(CATEGORY) AS CATEGORY'),'MATURITY_DATE','SHORT_NAME','STREET','ADDRESS','COMPANY_NAME') + // ->where('CUSTOMER',$cus_no) + // ->groupBy('ARRANGEMENT_ID','LINKED_APPL_ID','CUSTOMER','PRODUCT','PRODUCT_LINE','CURRENCY','BATCH_DATE','MATURITY_DATE','SHORT_NAME','STREET','ADDRESS','COMPANY_NAME')->get(); + // return $data; + + // } + + public function getPinjaman($cus_no,$arrAccount){ $data = []; - $data = DB::connection("db2")->table("STG_DB.VW_AA_ARRANGEMENT") - ->select('ARRANGEMENT_ID','LINKED_APPL_ID','CUSTOMER','PRODUCT','PRODUCT_LINE','CURRENCY',DB::raw('MAX(WORKING_BALANCE) AS WORKING_BALANCE'),'BATCH_DATE', DB::raw('MAX(OPENING_DATE) AS OPENING_DATE'),'MATURITY_DATE',DB::raw('MAX(CATEGORY) AS CATEGORY'),'MATURITY_DATE','SHORT_NAME','STREET','ADDRESS','COMPANY_NAME') + $data = DB::connection("db2")->table("STG_DB.VW_AA_ARR_NEW") + ->select('*') ->where('CUSTOMER',$cus_no) - ->groupBy('ARRANGEMENT_ID','LINKED_APPL_ID','CUSTOMER','PRODUCT','PRODUCT_LINE','CURRENCY','BATCH_DATE','MATURITY_DATE','SHORT_NAME','STREET','ADDRESS','COMPANY_NAME')->get(); + ->whereIn('ACCOUNT_NUMBER', $arrAccount); return $data; } @@ -110,6 +125,12 @@ class ViewAccount extends Model return $data; } + public function getCustomer($cus_no){ + $data = []; + $data =DB::connection("db2")->table("STG_DB.CUSTOMER")->select('CUSTOMER_NO','STREET','RESIDENCE','ADDRESS','SHORT_NAME')->where('CUSTOMER_NO', $cus_no); + return $data; + } + public function getTerm($arr_id){ $data = []; $data =DB::connection("db2")->table("STG_DB.AA_ARR_TERM_AMOUNT")->select(DB::raw('MAX(ID) AS ID'),DB::raw('MAX(TERM) AS TERM'))->where('ID', 'like', "%" .$arr_id."%")->orderBy('ID','DESC')->get(); diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php index b7338bd..14a994d 100644 --- a/Http/Controllers/KonfirmasiBankController.php +++ b/Http/Controllers/KonfirmasiBankController.php @@ -76,7 +76,7 @@ $arrAccount = []; $Accounts = $Account->getSearchAccount($request->cif,$arrAccount,$request->kodecabang,$request->startDate,$request->endDate)->get(); - + foreach ($Accounts as $key => $account) { $Arrangement = $Account->getAAaccount($account->CUSTOMER_NO,$account->ACCOUNT_NUMBER); @@ -127,6 +127,9 @@ $DataLimit = []; $DataAA = []; $ListAccount = $ViewAccount->getSearchAccount($request['cus_no'],$arrAccount,$request['kode_cabang'],$request->startDate,$request->endDate)->get(); + $GetCustomer = $ViewAccount->getCustomer($request['cus_no'])->first(); + + foreach ($ListAccount as $key1 => $account) { $DataAA = $ViewAccount->getAAaccount($account->CUSTOMER_NO,$account->ACCOUNT_NUMBER); @@ -138,8 +141,11 @@ } $DataAccounts[$key1]['ACCOUNT_NUMBER'] = $account->ACCOUNT_NUMBER; $DataAccounts[$key1]['CUSTOMER_NO'] = $account->CUSTOMER_NO; + // $DataAccounts[$key1]['STREET'] = $account->STREET; + // $DataAccounts[$key1]['RESIDENCE'] = $account->RESIDENCE; + //$DataAccounts[$key1]['ADDRESS'] = $account->ADDRESS; $DataAccounts[$key1]['CURRENCY'] = $account->CURRENCY; - + $DataAccounts[$key1]['PRODUCT'] = $product ?? '-'; $DataAccounts[$key1]['COMPANY_NAME'] = $account->COMPANY_NAME; $DataAccounts[$key1]['WORKING_BALANCE'] = $account->WORKING_BALANCE; @@ -161,17 +167,19 @@ } } - $ListPinjaman =$ViewAccount->getPinjaman($ListAccount[0]->CUSTOMER_NO); - + + + $ListPinjaman =$ViewAccount->getPinjaman($ListAccount[0]->CUSTOMER_NO,$arrAccount )->get(); + $pinjaman = []; foreach ($ListPinjaman as $key => $item) { - $ListTenor =$ViewAccount->getTerm($item->ARRANGEMENT_ID); - $ListBunga =$ViewAccount->getInterest($item->ARRANGEMENT_ID); - $ListCategory =$ViewAccount->getCategory($item->CATEGORY); - $pinjaman[$key]['CUSTOMER'] = $item->CUSTOMER; - $pinjaman[$key]['SHORT_NAME'] = $item->SHORT_NAME; - $pinjaman[$key]['STREET'] = $item->STREET; - $pinjaman[$key]['ADDRESS'] = $item->ADDRESS; + // $ListTenor =$ViewAccount->getTerm($item->ARRANGEMENT_ID); + // $ListBunga =$ViewAccount->getInterest($item->ARRANGEMENT_ID); + // $ListCategory =$ViewAccount->getCategory($item->CATEGORY); + // $pinjaman[$key]['CUSTOMER'] = $item->CUSTOMER; + // $pinjaman[$key]['SHORT_NAME'] = $item->SHORT_NAME; + // $pinjaman[$key]['STREET'] = $item->STREET; + // $pinjaman[$key]['ADDRESS'] = $item->ADDRESS; $pinjaman[$key]['COMPANY_NAME'] = $item->COMPANY_NAME; $pinjaman[$key]['CURRENCY'] = $item->CURRENCY; $pinjaman[$key]['PRODUCT_LINE'] = $item->PRODUCT_LINE; @@ -180,24 +188,30 @@ // $pinjaman[$key]['BATCH_DATE'] = $item->OPENING_DATE; $pinjaman[$key]['MATURITY_DATE'] = $item->MATURITY_DATE; $pinjaman[$key]['ARRANGEMENT_ID'] = $item->ARRANGEMENT_ID; + $pinjaman[$key]['FIXED_RATE'] = $item->FIXED_RATE; + $pinjaman[$key]['TERM'] = $item->TERM; + $pinjaman[$key]['CATEGORY'] = $item->CATEGORY; - foreach ($ListBunga as $bunga) { - if (strpos($bunga->ID ,$item->ARRANGEMENT_ID) !== false) { - $pinjaman[$key]['FIXED_RATE'] = $bunga->FIXED_RATE; - } - } - foreach ($ListTenor as $tenor) { - if (strpos($tenor->ID ,$item->ARRANGEMENT_ID) !== false) { - $pinjaman[$key]['TERM'] = $tenor->TERM; - } - } - foreach ($ListCategory as $category) { - if ($category->ID == $item->CATEGORY) { - $pinjaman[$key]['CATEGORY'] = $category->SHORT_NAME; - } - } + // foreach ($ListBunga as $bunga) { + // if (strpos($bunga->ID ,$item->ARRANGEMENT_ID) !== false) { + // $pinjaman[$key]['FIXED_RATE'] = $bunga->FIXED_RATE; + // } + // } + + // foreach ($ListTenor as $tenor) { + // if (strpos($tenor->ID ,$item->ARRANGEMENT_ID) !== false) { + // $pinjaman[$key]['TERM'] = $tenor->TERM; + // } + // } + // foreach ($ListCategory as $category) { + // if ($category->ID == $item->CATEGORY) { + // $pinjaman[$key]['CATEGORY'] = $category->SHORT_NAME; + // } + // } } + // dd($pinjaman); + $ListLimits = $ViewAccount->getLimit($request['cus_no'],$request['periode']); $fasilitas = Fasilitas::where('nomor_cif',$request['cus_no'] )->where('status',1)->get(); @@ -210,8 +224,9 @@ $data['DataLimit'] = $ListLimits; $data['DataFasilitas'] = $fasilitas; $data['DataSigner'] = $signer; + $data['DataCustomer'] = $GetCustomer ?? ''; $data['localDate'] = $tanggalIndonesia; - + //DD($data); // DD($data); $html = View::make('konfirmasibank::exportPdf', ['data' => $data])->render(); @@ -220,13 +235,13 @@ $pdf->loadHtml($html); // Mengatur jenis kertas - $pdf->setPaper('f4', 'landscape')->set_option('defaultFont', 'Arial'); + $pdf->setPaper('f4', 'portrait')->set_option('defaultFont', 'Arial'); // Render HTML menjadi PDF $pdf->render(); // Keluarkan file PDF ke browser - $pdf->stream('"Konfirmasi_bank_"'.$ListPinjaman[0]->SHORT_NAME.'"'. $currentDate.'".pdf"'); + $pdf->stream('"Konfirmasi_bank_"'.$data['DataCustomer']->SHORT_NAME.'"'. $currentDate.'".pdf"'); return response()->download($pdf); diff --git a/Resources/views/exportPdf.blade.php b/Resources/views/exportPdf.blade.php index 247c090..0ea237d 100644 --- a/Resources/views/exportPdf.blade.php +++ b/Resources/views/exportPdf.blade.php @@ -54,23 +54,20 @@ Konfirmasi Bank -
- {{--

Contoh Kertas Surat Legal

--}} -

Nomor   : 577/SUBDIT.OPS/VIII/2023

Tanggal : {{ strtoupper($data['localDate']) }}


Kepada Yth

-

{{$data['DataPinjaman'][0]['SHORT_NAME']}}

-

{{$data['DataPinjaman'][0]['STREET']}}, {{str_replace(']','',$data['DataPinjaman'][0]['ADDRESS'])}}

+

{{$data['DataCustomer']->SHORT_NAME}}

+

{{$data['DataCustomer']->STREET }}, {{str_replace(']','',$data['DataCustomer']->ADDRESS)}}

Sesuai dengan surat saudara Nomor 150/KB-SENTRA1/II/2023 tanggal {{ strtoupper($data['localDate']) }} dengan ini kami sampaikan data – data nasabah sesuai permintaan saudara sebagai berikut :

-

Nama Nasabah : {{$data['DataPinjaman'][0]['SHORT_NAME']}}

-

Nomor CIF        : {{$data['DataAccounts'][0]['CUSTOMER_NO']}}


+

Nama Nasabah : {{$data['DataCustomer']->SHORT_NAME}}

+

Nomor CIF        : {{$data['DataCustomer']->CUSTOMER_NO}}


SIMPAMAN NASABAH YANG BERSANGKUTAN PADA BANK

POSISI {{ strtoupper($data['localDate']) }}