diff --git a/Entities/Account.php b/Entities/Account.php index 2e919ff..618b6c3 100644 --- a/Entities/Account.php +++ b/Entities/Account.php @@ -113,7 +113,7 @@ class Account extends Model // ->join('STG_DB.ACCOUNT AS AC', 'AA.LINKED_APPL_ID', '=', 'AC.ACCOUNT_NUMBER') ->where('CUSTOMER',$cus_no) // ->whereIn(DB::raw("LINKED_APPL_ID"),$arr) - // ->where('ARR_STATUS' , 'CURRENT') + //->where('ARR_STATUS' , 'CURRENT') // ->orderBy('TERM','DESC'); ->where('BATCH_DATE', $dateCore) ->where('ARR_STATUS','<>', 'CLOSE') @@ -214,4 +214,4 @@ class Account extends Model -} +} \ No newline at end of file diff --git a/Http/Controllers/KonfirmasiBankController.php b/Http/Controllers/KonfirmasiBankController.php index 45ce5dd..5c309f4 100644 --- a/Http/Controllers/KonfirmasiBankController.php +++ b/Http/Controllers/KonfirmasiBankController.php @@ -287,32 +287,6 @@ } - public function fasilitas(Request $request){ - - if (is_null($this->user) || !$this->user->can('konfirmasibank.create')) { - abort(403, 'Sorry !! You are Unauthorized to view any master data !'); - } - - $data = []; - - $fasilitas = Fasilitas::where('status',1)->where('nomor_cif',$request->query()['cus_no_fasilitas'])->paginate(10)->appends($request->query()['cus_no_fasilitas'],$request->query()['company_name'],$request->query()['startDateFasilitas'],$request->query()['endDateFasilitas']); - - $Category = Category::all(); - $Company = Company::all(); - // dd($fasilitas); - $limitReference = LimitReference::all(); - $data['queryParam'] = $request->query(); - $data['fasilitas'] = $fasilitas; - $data['limitReference'] = $limitReference; - $data['Category'] = $Category; - $data['Company'] = $Company; - - return view('konfirmasibank::pages.index_fasilitas',compact('data')); - - } - - - public function updateSigner(Request $request) { @@ -394,9 +368,9 @@ $DataPinjaman[$key2]['CURRENCY'] = $pinjaman->CURRENCY; $DataPinjaman[$key2]['PRODUCT'] = $pinjaman->PRODUCT; $DataPinjaman[$key2]['WORKING_BALANCE'] = number_format($balance->WORKING_BALANCE, 2, ',', '.') ?? ''; - $DataPinjaman[$key2]['TERM'] = $pinjaman->TERM ?? ''; + $DataPinjaman[$key2]['TERM'] = $this->convertDateToMonth($pinjaman->TERM) . 'BLN' ?? ''; $DataPinjaman[$key2]['FIXED_RATE'] = $pinjaman->FIXED_RATE ?? ''; - $DataPinjaman[$key2]['MATURITY_DATE'] = $pinjaman->MATURITY_DATE ?? ''; + $DataPinjaman[$key2]['MATURITY_DATE'] = date('d-m-Y', strtotime($pinjaman->MATURITY_DATE)) ?? ''; $DataPinjaman[$key2]['ACCOUNT_NUMBER'] = $pinjaman->LINKED_APPL_ID; } @@ -407,13 +381,12 @@ $DataFasilitas[$key3]['start_date'] = $val3->start_date; $DataFasilitas[$key3]['mata_uang'] = $val3->mata_uang; $DataFasilitas[$key3]['saldo'] = number_format(floatval($val3->saldo), 2, ',', '.'); - $DataFasilitas[$key3]['jangka_waktu'] = $val3->jangka_waktu; + $DataFasilitas[$key3]['jangka_waktu'] = $this->convertDateToMonth( $val3->jangka_waktu) . ' BLN' ?? ''; $DataFasilitas[$key3]['fixed_rate'] = $val3->fixed_rate ?? ''; $DataFasilitas[$key3]['due_date'] = $val3->due_date ?? ''; $DataFasilitas[$key3]['nomor_rekening'] = $val3->nomor_rekening; } - $ListLimits = $Account->getLimit($request['cusNo'],$request['startDate2'])->get(); // dd($fasilitas); @@ -450,8 +423,52 @@ } + public function convertDateToMonth($termVal){ - public function postFasilitas(Request $request){ + $months = ''; + $getPeriode = substr($termVal, -1); // Mengambil satu karakter dari kanan + $trimmedStr = substr($termVal, 0, -1 * 1); + if ($getPeriode == 'Y') { + $months = intval($trimmedStr) * 12; + } else if ($getPeriode == 'D') { + $days = $trimmedStr; // Number of days to convert + $months = intval($trimmedStr / 30) ; // Get the whole number of months (assuming 30 days per month) + } else { + $months = $trimmedStr; + } + + return $months; + + } + + + public function fasilitas(Request $request){ + + if (is_null($this->user) || !$this->user->can('konfirmasibank.create')) { + abort(403, 'Sorry !! You are Unauthorized to view any master data !'); + } + + $data = []; + $DataFasilitas = []; + + $fasilitas = Fasilitas::where('status',1)->where('nomor_cif',$request->query()['cus_no_fasilitas'])->paginate(10)->appends($request->query()['cus_no_fasilitas'],$request->query()['company_name'],$request->query()['startDateFasilitas'],$request->query()['endDateFasilitas']); + + $Category = Category::all(); + $Company = Company::all(); + // dd($fasilitas); + $limitReference = LimitReference::all(); + $data['queryParam'] = $request->query(); + $data['fasilitas'] = $fasilitas; + $data['limitReference'] = $limitReference; + $data['Category'] = $Category; + $data['Company'] = $Company; + + return view('konfirmasibank::pages.index_fasilitas',compact('data')); + + } + + + public function postFasilitas(Request $request){ if (is_null($this->user) || !$this->user->can('konfirmasibank.create')) { abort(403, 'Sorry !! You are Unauthorized to create any konfirmasibank.create !'); @@ -645,4 +662,4 @@ } - } + } \ No newline at end of file diff --git a/Resources/views/exportPdf.blade.php b/Resources/views/exportPdf.blade.php index c0778a3..ba43676 100644 --- a/Resources/views/exportPdf.blade.php +++ b/Resources/views/exportPdf.blade.php @@ -231,6 +231,7 @@ $term = $expiryDate->diffInMonths($approvalDate); $limitPecent = intval($limit->LIMIT_PERCENTAGE) / 100 ; $noRek = explode(']', $limit->ACCOUNT); + //conver term @endphp @@ -241,7 +242,7 @@ {{ $limit->LIMIT_CURRENCY }} {{ ($limit->AVAIL_AMT != 0.00) ? number_format($limit->AVAIL_AMT,2,',','.') : 'NIHIL'}} - {{ $term }} D + {{ $term }} BLN {{ $limitPecent }} % {{ $expiryDate->format('d-m-Y')}} diff --git a/Resources/views/pages/table_fasilitas.blade.php b/Resources/views/pages/table_fasilitas.blade.php index 4a46ef1..db5fcc3 100644 --- a/Resources/views/pages/table_fasilitas.blade.php +++ b/Resources/views/pages/table_fasilitas.blade.php @@ -25,7 +25,7 @@ {{$item['jenis_fasilitas']}} {{$item['cabang']}} {{$item['jenis_rekening']}} - {{$item['saldo']}} + {{ number_format(floatval($item['saldo']), 2, ',', '.'); }} {{$item['start_date']}} {{$item['due_date']}} {{$item['fixed_rate']}}