katam/konfirmasibank
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add format tanggal jangka waktu

Browse Source
This commit is contained in:
KhatamNugraha
2023-08-23 15:42:32 +07:00
parent d8a9ee4d0c
commit ac39019e61
5 changed files with 110 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Entities/TermAmount.php Normal file
View File

@ -0,0 +1,35 @@
<?php
namespace Modules\Konfirmasibank\Entities;
use Spatie\Activitylog\LogOptions;
use Spatie\Activitylog\Traits\LogsActivity;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
class TermAmount extends Model
{
use HasFactory;
protected $connection = 'db2';
protected $table = 'STG_DB.AA_ARR_TERM_AMOUNT';
protected $primaryKey = 'ID';
//public $incrementing = false;
protected $fillable = [
"'ID',
'TERM'
'AMOUNT',"
];
public function customers(): BelongsTo
{
return $this->belongsTo(Customer::class, 'CUSTOMER_NO');
}
}

3
Entities/ViewAccount.php
View File

@ -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){

38
Http/Controllers/KonfirmasiBankController.php
View File

@ -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,6 +111,7 @@
$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) {
@ -118,6 +120,11 @@
}
}
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,8 +164,21 @@
}
}
$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();
@ -167,12 +188,10 @@
$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;

15
Resources/views/exportPdf.blade.php
View File

@ -70,7 +70,7 @@
<p>Nama Nasabah : {{$data['DataPinjaman'][0]['SHORT_NAME']}}</p>
<p>Nomor CIF &nbsp;&nbsp; : {{$data['DataAccounts'][0]['CUSTOMER_NO']}}</p><br>
<p>Nomor CIF &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; : {{$data['DataAccounts'][0]['CUSTOMER_NO']}}</p><br>
<p style="font-size: 12px;"> SIMPAMAN NASABAH YANG BERSANGKUTAN PADA BANK</p>
<p style="font-size: 12px;">POSISI {{ $data['localDate'] }}</p>
@ -99,7 +99,7 @@
<td class="space1">{{ $val['PRODUCT'] }}</td>
<td class="space1 texet-center">{{ $val['CURRENCY'] }}</td>
<td class="space1">{{ $val['WORKING_BALANCE'] }}</td>
<td class="space1">{{ $val['BATCH_DATE'] }}</td>
<td class="space1">{{ $val['TERM'] }}</td>
<td class="space1">{{ $val['FIXED_RATE'] }}</td>
<td class="space1">{{ $val['MATURITY_DATE'] }}</td>
</tr>
@ -140,7 +140,7 @@
<td class="space1">{{ $pinjaman['CATEGORY'] }}</td>
<td class="space1 texet-center">{{ $pinjaman['CURRENCY'] }}</td>
<td class="space1">{{ $pinjaman['WORKING_BALANCE'] }}</td>
<td class="space1">{{ $pinjaman['BATCH_DATE'] }}</td>
<td class="space1">{{ $pinjaman['TERM'] }}</td>
<td class="space1">{{ $pinjaman['FIXED_RATE'] }}</td>
<td class="space1">{{ $pinjaman['MATURITY_DATE'] }}</td>
</tr>
@ -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
<tr class="space1">
<td class="text-center space1">{{ $i++ }}</td>
<td class="space1">{{ $limit->SHORT_NAME }}</td>
@ -180,7 +185,7 @@
<td class="space1">{{ $limit->ACCOUNT_TYPE }}</td>
<td class="space1 texet-center">{{ $limit->LIMIT_CURRENCY }}</td>
<td class="space1">{{ $limit->AVAIL_AMT }}</td>
<td class="space1">{{ $limit->BATCH_DATE }}</td>
<td class="space1">{{ $term }} D</td>
<td class="space1">{{ $limit->LIMIT_PERCENTAGE }}</td>
<td class="space1">{{ $limit->EXPIRY_DATE}}</td>
</tr>
@ -197,7 +202,7 @@
<td class="space1">{{ $fasilitas->jenis_rekening }}</td>
<td class="space1 texet-center">{{ $fasilitas->mata_uang }}</td>
<td class="space1">{{ $fasilitas->saldo }}</td>
<td class="space1">{{ $fasilitas->jangka_waktu }}</td>
<td class="space1">{{ $fasilitas->jangka_waktu }} D</td>
<td class="space1">{{ $fasilitas->fixed_rate }}</td>
<td class="space1">{{ $fasilitas->due_date}}</td>
</tr>

68
Resources/views/pages/index_fasilitas.blade.php
View File

@ -39,7 +39,7 @@
<div class="modal-content">
<!-- Modal header -->
<div class="modal-header">
<h5 class="modal-title" id="myModalLabel">Tambah Fasilitas</h5>
<h5 class="modal-title" id="myModalLabel">Add Fasilitas</h5>
<button type="button" class="closeButton" data-dismiss="modal" aria-label="Close" style="display:none">
<span aria-hidden="true">&times;</span>
</button>
@ -51,17 +51,17 @@
@csrf
<!-- Add your form fields here -->
<div class="form-group row">
<label for="inputName" class="col-sm-3 col-form-label">No Rekening</label>
<label for="inputName" class="col-sm-3 col-form-label">Account No</label>
<div class="col-sm-9">
<input type="hidden" class="form-control form-control-sm " name="nomor_cif" value="{{$data['queryParam']['cus_no_fasilitas']}}">
<input type="text" class="form-control form-control-sm " name="nomor_rekening" placeholder="Nomor Rekening">
</div>
</div>
<div class="form-group row">
<label for="inputName" class="col-sm-3 col-form-label">Cabang</label>
<label for="inputName" class="col-sm-3 col-form-label">Company</label>
<div class="col-sm-9">
<select class="form-select form-select-sm" aria-label="Small select example" name="cabang">
<option selected>Pilih Cabang</option>
<option selected>Select Company</option>
@foreach ($data['Company'] as $item)
<option value="{{$item->COMPANY_NAME}}">{{$item->COMPANY_NAME}}</option>
@endforeach
@ -69,10 +69,10 @@
</div>
</div>
<div class="form-group row">
<label for="inputName" class="col-sm-3 col-form-label">Jenis Fasilitas</label>
<label for="inputName" class="col-sm-3 col-form-label">Limit Type</label>
<div class="col-sm-9">
<select class="form-select form-select-sm" aria-label="Small select example" name="jenis_fasilitas">
<option selected>Pilih Jenis Fasilitas</option>
<option selected>Select Limit Type</option>
@foreach ($data['limitReference'] as $item)
<option value="{{$item->SHORT_NAME}}">{{$item->SHORT_NAME}}</option>
@endforeach
@ -80,12 +80,12 @@
</div>
</div>
<div class="form-group row">
<label for="inputName" class="col-sm-3 col-form-label">Jenis Rekening</label>
<label for="inputName" class="col-sm-3 col-form-label">Account Type</label>
<div class="col-sm-9">
{{-- <input type="text" class="form-control form-control-sm " id="jnsFasilitas" name="jenis_fasilitas" placeholder="Jenis Fasilitas"> --}}
<select class="form-select form-select-sm" aria-label="Small select example"
id="jnsRekening-select" name="jenis_rekening">
<option selected>Pilih Jenis Rekening</option>
<option selected>Select Account Type</option>
@foreach ($data['Category'] as $item)
<option value="{{$item->SHORT_NAME}}">{{$item->SHORT_NAME}}</option>
@endforeach
@ -97,7 +97,7 @@
<div class="col-sm-9">
{{-- <input type="text" class="form-control form-control-sm " id="jnsFasilitas" name="jenis_fasilitas" placeholder="Jenis Fasilitas"> --}}
<select class="form-select form-select-sm" aria-label="Small select example" name="signer_id">
<option selected>Pilih Penandatangan</option>
<option selected>Select Signer</option>
@foreach ($data['signer'] as $item)
<option value="{{$item->id}}">{{$item->signer_type}}</option>
@endforeach
@ -105,12 +105,12 @@
</div>
</div>
<div class="form-group row">
<label for="inputName" class="col-sm-3 col-form-label">Mata Uang</label>
<label for="inputName" class="col-sm-3 col-form-label">Currency</label>
<div class="col-sm-9">
{{-- <input type="text" class="form-control form-control-sm " id="jnsFasilitas" name="jenis_fasilitas" placeholder="Jenis Fasilitas"> --}}
<select class="form-select form-select-sm" aria-label="Small select example"
id="signerTypeEdit-select" name="mata_uang">
<option selected>Pilih Mata Uang</option>
<option selected>Select Currency</option>
<option value="IDR">IDR</option>
<option value="USD">USD</option>
<option value="EUR">EUR</option>
@ -118,9 +118,9 @@
</div>
</div>
<div class="form-group row">
<label for="inputName" class="col-sm-3 col-form-label">Saldo</label>
<label for="inputName" class="col-sm-3 col-form-label">Balance</label>
<div class="col-sm-9">
<input type="text" class="form-control form-control-sm " name="saldo" placeholder="Saldo">
<input type="text" class="form-control form-control-sm " name="saldo" placeholder="Balance">
</div>
</div>
<div class="form-group row">
@ -131,19 +131,12 @@
</div>
</div>
<div class="form-group row">
<label for="inputName" class="col-sm-3 col-form-label">Due Date</label>
<label for="inputName" class="col-sm-3 col-form-label">End Date</label>
<div class="col-sm-9">
<input type="date" class="form-control form-control-sm " name="due_date"
placeholder="Due Date">
</div>
</div>
<div class="form-group row">
<label for="inputName" class="col-sm-3 col-form-label">Jangka Waktu</label>
<div class="col-sm-9">
<input type="text" class="form-control form-control-sm " name="jangka_waktu"
placeholder="Jangka Waktu">
</div>
</div>
<div class="form-group row">
<label for="inputName" class="col-sm-3 col-form-label">Fixed Rate</label>
<div class="col-sm-9">
@ -152,10 +145,10 @@
</div>
</div>
<div class="form-group row">
<label for="inputName" class="col-sm-3 col-form-label">Keterangan</label>
<label for="inputName" class="col-sm-3 col-form-label">Desc</label>
<div class="col-sm-9">
<textarea type="text" class="form-control form-control-sm " name="keterangan"
placeholder="Keterangan"></textarea>
placeholder="Description"></textarea>
</div>
</div>
@ -178,7 +171,7 @@
<div class="modal-content">
<!-- Modal header -->
<div class="modal-header">
<h5 class="modal-title" id="myModalLabel">Edit Fasilitas</h5>
<h5 class="modal-title" id="myModalLabel">Edit Limit</h5>
<button type="button" class="closeButton" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
@ -191,7 +184,7 @@
@csrf
<!-- Add your form fields here -->
<div class="form-group row">
<label for="inputName" class="col-sm-3 col-form-label">No Rekening</label>
<label for="inputName" class="col-sm-3 col-form-label">Account No</label>
<div class="col-sm-9">
<input type="hidden" class="form-control form-control-sm " id="id" name="id">
<input type="text" class="form-control form-control-sm " id="norek" name="nomor_rekening_edit"
@ -199,12 +192,12 @@
</div>
</div>
<div class="form-group row">
<label for="inputName" class="col-sm-3 col-form-label">Cabang</label>
<label for="inputName" class="col-sm-3 col-form-label">Company</label>
<div class="col-sm-9">
{{-- <input type="text" class="form-control form-control-sm " id="jnsFasilitas" name="jenis_fasilitas" placeholder="Jenis Fasilitas"> --}}
<select class="form-select form-select-sm" aria-label="Small select example"
id="cabangEdit-select" name="cabang_edit">
<option selected>Pilih Cabang</option>
<option selected>Select Company</option>
@foreach ($data['Company'] as $item)
<option value="{{$item->COMPANY_NAME}}">{{$item->COMPANY_NAME}}</option>
@endforeach
@ -212,12 +205,12 @@
</div>
</div>
<div class="form-group row">
<label for="inputName" class="col-sm-3 col-form-label">Jenis Fasilitas</label>
<label for="inputName" class="col-sm-3 col-form-label">Limit Type</label>
<div class="col-sm-9">
{{-- <input type="text" class="form-control form-control-sm " id="jnsFasilitas" name="jenis_fasilitas" placeholder="Jenis Fasilitas"> --}}
<select class="form-select form-select-sm" aria-label="Small select example"
id="jnsFaasilitasEdit-select" name="jenis_fasilitas_edit">
<option selected>Pilih Jenis Fasilitas</option>
<option selected>Select Limit Type</option>
@foreach ($data['limitReference'] as $item)
<option value="{{$item->SHORT_NAME}}">{{$item->SHORT_NAME}}</option>
@endforeach
@ -225,7 +218,7 @@
</div>
</div>
<div class="form-group row">
<label for="inputName" class="col-sm-3 col-form-label">Jenis Rekening</label>
<label for="inputName" class="col-sm-3 col-form-label">Account Type</label>
<div class="col-sm-9">
{{-- <input type="text" class="form-control form-control-sm " id="jnsFasilitas" name="jenis_fasilitas" placeholder="Jenis Fasilitas"> --}}
<select class="form-select form-select-sm" aria-label="Small select example"
@ -251,7 +244,7 @@
</div>
</div>
<div class="form-group row">
<label for="inputName" class="col-sm-3 col-form-label">Mata Uang</label>
<label for="inputName" class="col-sm-3 col-form-label">Currency</label>
<div class="col-sm-9">
{{-- <input type="text" class="form-control form-control-sm " id="jnsFasilitas" name="jenis_fasilitas" placeholder="Jenis Fasilitas"> --}}
<select class="form-select form-select-sm" aria-label="Small select example"
@ -278,19 +271,12 @@
</div>
</div>
<div class="form-group row">
<label for="inputName" class="col-sm-3 col-form-label">Due Date</label>
<label for="inputName" class="col-sm-3 col-form-label">End Date</label>
<div class="col-sm-9">
<input type="date" class="form-control form-control-sm " id="dueDatae" name="due_date_edit"
placeholder="Due Date">
</div>
</div>
<div class="form-group row">
<label for="inputName" class="col-sm-3 col-form-label">Jangka Waktu</label>
<div class="col-sm-9">
<input type="text" class="form-control form-control-sm " id="jangkaWaktu" name="jangka_waktu_edit"
placeholder="Jangka Waktu">
</div>
</div>
<div class="form-group row">
<label for="inputName" class="col-sm-3 col-form-label">Fixed Rate</label>
<div class="col-sm-9">
@ -299,10 +285,10 @@
</div>
</div>
<div class="form-group row">
<label for="inputName" class="col-sm-3 col-form-label">Keterangan</label>
<label for="inputName" class="col-sm-3 col-form-label">Desc</label>
<div class="col-sm-9">
<textarea type="text" class="form-control form-control-sm " id="ket" name="keterangan_edit"
placeholder="Keterangan"></textarea>
placeholder="Description"></textarea>
</div>
</div>