Add format tanggal jangka waktu

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

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,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 @@
}
}
}