diff --git a/Entities/TermAmount.php b/Entities/TermAmount.php new file mode 100644 index 0000000..6f03585 --- /dev/null +++ b/Entities/TermAmount.php @@ -0,0 +1,35 @@ +belongsTo(Customer::class, 'CUSTOMER_NO'); + } + + +} \ No newline at end of file diff --git a/Entities/ViewAccount.php b/Entities/ViewAccount.php index 2fe17c5..7d04297 100644 --- a/Entities/ViewAccount.php +++ b/Entities/ViewAccount.php @@ -33,7 +33,8 @@ class ViewAccount extends Model 'ARR_STATUS', 'PRODUCT_LINE', 'CURRENCY', - 'MATURITY_DATE'" + 'MATURITY_DATE', + 'ARRANGEMENT_ID'" ]; public function getSearchAccount($cif , $kodecabang, $periode){ diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php index 868fd18..758a83c 100644 --- a/Http/Controllers/KonfirmasiBankController.php +++ b/Http/Controllers/KonfirmasiBankController.php @@ -13,6 +13,7 @@ use Modules\Konfirmasibank\Entities\Signer; use Modules\Konfirmasibank\Entities\Category; use Modules\Konfirmasibank\Entities\Company; + use Modules\Konfirmasibank\Entities\TermAmount; use Dompdf\Dompdf; use Carbon\Carbon; use Illuminate\Support\Facades\View; @@ -110,14 +111,20 @@ $DataAccounts[$key1]['WORKING_BALANCE'] = $account->WORKING_BALANCE; $DataAccounts[$key1]['BATCH_DATE'] = $account->BATCH_DATE; $DataAccounts[$key1]['MATURITY_DATE'] = $account->MATURITY_DATE; + $DataAccounts[$key1]['ARRANGEMENT_ID'] = $account->ARRANGEMENT_ID; $ListBunga =$ViewAccount->getInterest($account->ARRANGEMENT_ID); $ListTenor =$ViewAccount->getTerm($account->ARRANGEMENT_ID); - foreach ($ListBunga as $bunga) { - if (strpos($bunga->ID ,$account->ARRANGEMENT_ID) !== false) { - $DataAccounts[$key1]['FIXED_RATE'] = $bunga->FIXED_RATE; + foreach ($ListBunga as $bunga) { + if (strpos($bunga->ID ,$account->ARRANGEMENT_ID) !== false) { + $DataAccounts[$key1]['FIXED_RATE'] = $bunga->FIXED_RATE; + } + } + foreach ($ListTenor as $tenor) { + if (strpos($tenor->ID ,$account->ARRANGEMENT_ID) !== false) { + $DataAccounts[$key1]['TERM'] = $tenor->TERM; + } } - } } @@ -138,6 +145,7 @@ $pinjaman[$key]['WORKING_BALANCE'] = $item->WORKING_BALANCE; $pinjaman[$key]['BATCH_DATE'] = $item->OPENING_DATE; $pinjaman[$key]['MATURITY_DATE'] = $item->MATURITY_DATE; + $pinjaman[$key]['ARRANGEMENT_ID'] = $item->ARRANGEMENT_ID; foreach ($ListBunga as $bunga) { if (strpos($bunga->ID ,$item->ARRANGEMENT_ID) !== false) { @@ -156,23 +164,34 @@ } } - $DataProducts = []; + $ListLimits = $ViewAccount->getLimit($request['cus_no'],$request['periode']); + // foreach ($ListLimits as $key4 => $val) { + // $limitArr[$key4]['CUSTOMER'] = $item->CUSTOMER; + // $limitArr[$key4]['SHORT_NAME'] = $item->SHORT_NAME; + // $limitArr[$key4]['STREET'] = $item->STREET; + // $limitArr[$key4]['ADDRESS'] = $item->ADDRESS; + // $limitArr[$key4]['COMPANY_NAME'] = $item->COMPANY_NAME; + // $limitArr[$key4]['CURRENCY'] = $item->CURRENCY; + // $limitArr[$key4]['PRODUCT_LINE'] = $item->PRODUCT_LINE; + // $limitArr[$key4]['PRODUCT'] = $item->PRODUCT; + // $limitArr[$key4]['WORKING_BALANCE'] = $item->WORKING_BALANCE; + // $limitArr[$key4]['BATCH_DATE'] = $item->OPENING_DATE; + // } + $fasilitas = Fasilitas::where('nomor_cif',$request['cus_no'] )->where('status',1)->get(); $signer = Signer::where('id',$fasilitas[0]['signer_id'])->get(); $currentDate = Carbon::now(); $tanggalIndonesia = $currentDate->locale('id')->isoFormat('dddd, D MMMM YYYY'); - + $data['DataAccounts'] = $DataAccounts; $data['DataPinjaman'] = $pinjaman; $data['DataLimit'] = $ListLimits; $data['DataFasilitas'] = $fasilitas; - // dd($data['DataLimit']); $data['DataSigner'] = $signer; $data['localDate'] = $tanggalIndonesia; - $html = View::make('konfirmasibank::exportPdf', ['data' => $data])->render(); $pdf = new Dompdf(); @@ -345,11 +364,13 @@ 'saldo' => 'required|string', 'start_date' => 'required|string', 'due_date' => 'required|string', - 'jangka_waktu' => 'required|string', 'fixed_rate' => 'required|string' ]); + $startDate = Carbon::parse($request->start_date); + $endDate = Carbon::parse($request->due_date); + $jangkaWaktu = $endDate->diffInDays($startDate); if ($validated) { try { @@ -365,7 +386,7 @@ $fasilitas->saldo = $request->saldo; $fasilitas->start_date = $request->start_date; $fasilitas->due_date = $request->due_date; - $fasilitas->jangka_waktu = $request->jangka_waktu; + $fasilitas->jangka_waktu = $jangkaWaktu; $fasilitas->fixed_rate = $request->fixed_rate; $fasilitas->keterangan = $request->keterangan; @@ -434,7 +455,6 @@ 'saldo_edit' => 'required|string', 'start_date_edit' => 'required|string', 'due_date_edit' => 'required|string', - 'jangka_waktu_edit' => 'required|string', 'fixed_rate_edit' => 'required|string' // Other validation rules ]); @@ -444,7 +464,9 @@ return response()->json(['errors' => $validator->errors()], 422); // Return validation errors as JSON } - + $startDate = Carbon::parse($request->start_date_edit); + $endDate = Carbon::parse($request->due_date_edit); + $jangkaWaktu = $endDate->diffInDays($startDate); if ($validator) { try { $fasilitas = Fasilitas::findOrFail($request->id); @@ -457,7 +479,7 @@ $fasilitas->saldo = $request->saldo_edit; $fasilitas->start_date = $request->start_date_edit; $fasilitas->due_date = $request->due_date_edit; - $fasilitas->jangka_waktu = $request->jangka_waktu_edit; + $fasilitas->jangka_waktu = $jangkaWaktu; $fasilitas->fixed_rate = $request->fixed_rate_edit; $fasilitas->keterangan = $request->keterangan_edit; $fasilitas->updated_at = $today; @@ -519,4 +541,4 @@ } - } \ No newline at end of file + } diff --git a/Resources/views/exportPdf.blade.php b/Resources/views/exportPdf.blade.php index e6b5b59..08d11d1 100644 --- a/Resources/views/exportPdf.blade.php +++ b/Resources/views/exportPdf.blade.php @@ -70,7 +70,7 @@

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

-

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


+

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


SIMPAMAN NASABAH YANG BERSANGKUTAN PADA BANK

POSISI {{ $data['localDate'] }}

@@ -99,7 +99,7 @@ {{ $val['PRODUCT'] }} {{ $val['CURRENCY'] }} {{ $val['WORKING_BALANCE'] }} - {{ $val['BATCH_DATE'] }} + {{ $val['TERM'] }} {{ $val['FIXED_RATE'] }} {{ $val['MATURITY_DATE'] }} @@ -140,7 +140,7 @@ {{ $pinjaman['CATEGORY'] }} {{ $pinjaman['CURRENCY'] }} {{ $pinjaman['WORKING_BALANCE'] }} - {{ $pinjaman['BATCH_DATE'] }} + {{ $pinjaman['TERM'] }} {{ $pinjaman['FIXED_RATE'] }} {{ $pinjaman['MATURITY_DATE'] }} @@ -173,6 +173,11 @@ @if (count($data['DataLimit']) > 0) @php $i=1 @endphp @foreach ($data['DataLimit'] as $limit) + @php + $approvalDate = \Carbon\Carbon::parse($limit->APPROVAL_DATE); + $expiryDate = \Carbon\Carbon::parse($limit->EXPIRY_DATE); + $term = $expiryDate->diffInDays($approvalDate); + @endphp {{ $i++ }} {{ $limit->SHORT_NAME }} @@ -180,7 +185,7 @@ {{ $limit->ACCOUNT_TYPE }} {{ $limit->LIMIT_CURRENCY }} {{ $limit->AVAIL_AMT }} - {{ $limit->BATCH_DATE }} + {{ $term }} D {{ $limit->LIMIT_PERCENTAGE }} {{ $limit->EXPIRY_DATE}} @@ -197,7 +202,7 @@ {{ $fasilitas->jenis_rekening }} {{ $fasilitas->mata_uang }} {{ $fasilitas->saldo }} - {{ $fasilitas->jangka_waktu }} + {{ $fasilitas->jangka_waktu }} D {{ $fasilitas->fixed_rate }} {{ $fasilitas->due_date}} diff --git a/Resources/views/pages/index_fasilitas.blade.php b/Resources/views/pages/index_fasilitas.blade.php index a9226f9..674ac8d 100644 --- a/Resources/views/pages/index_fasilitas.blade.php +++ b/Resources/views/pages/index_fasilitas.blade.php @@ -39,7 +39,7 @@
- + @@ -51,17 +51,17 @@ @csrf
- +
- +
- + @foreach ($data['limitReference'] as $item) @endforeach @@ -80,12 +80,12 @@
- +
{{-- --}} --}} --}} +
@@ -131,19 +131,12 @@
- +
-
- -
- -
-
@@ -152,10 +145,10 @@
- +
+ placeholder="Description">
@@ -178,7 +171,7 @@
- + @@ -191,7 +184,7 @@ @csrf
- +
- +
{{-- --}} --}} --}} --}}
-
- -
- -
-
@@ -299,10 +285,10 @@
- +
+ placeholder="Description">