KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Explore/ismail #17

Merged
afrina merged 11 commits from explore/ismail into main 2026-09-09 14:46:16 +08:00
Conversation 0 Commits 11 Files Changed 138
+139 -62
2 changed files with 139 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b6e4cf79ef - Show all commits
app/Http/Controllers/KhazanahController.php
+13 -4
View File
@@ -3990,7 +3990,7 @@ class KhazanahController extends Controller
} }
public function cetakLaporanGadaiUjrah(Request $request){ public function cetakLaporanGadaiUjrah(Request $request){
$api_url = config('api.url'); $api_url = config('api.url');
$auth_user = Auth::user(); $auth_user = Auth::user();
@@ -4012,12 +4012,21 @@ class KhazanahController extends Controller
$hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; $hingga_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];
} }
$reportGadai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/gadailaporanRangeDate/'. $auth_user['cawangan'] ,['mula' => $mula_date,'akhir' => $hingga_date])->json();
$gadai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url'). '/api/gadailaporanRangeDate/'. $auth_user['cawangan'] ,['mula' => $mula_date,'akhir' => $hingga_date])->json(); $gadai = $reportGadai['gadai'];
$statistik =$reportGadai['statistik'];
$reportPembiayaan= $statistik['reportPembiayaan'];
$reportLoanAmount=$statistik['reportLoanAmount'];
$reportMarhunValue=$statistik['reportMarhunValue'];
$reportMarhunMargin=$statistik['reportMarhunMargin'];
$reportCustomerJob=$statistik['reportCustomerJob'];
$reportCustomerRace=$statistik['reportCustomerRace'];
// dd($reportCustomerRace);
$cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); $cawangan=Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json();
$cawangan_detail=$cawangan[0]; $cawangan_detail=$cawangan[0];
return view('print.laporan_gadaian_ujrah', compact('gadai','cawangan_detail','tarikh_cetak','mula_date','api_url','hingga_date')); return view('print.laporan_gadaian_ujrah', compact('gadai','cawangan_detail','tarikh_cetak','mula_date','api_url','hingga_date','statistik','reportPembiayaan','reportLoanAmount','reportMarhunValue','reportMarhunMargin','reportCustomerJob','reportCustomerRace','reportCustomerRace'));
} }
resources/views/khazanah/laporanujrah/gadaianujrah.blade.php
+126 -58
View File
@@ -11,7 +11,7 @@
<li class="breadcrumb-item"><a href="{{ route('laporan') }}">Laporan</a></li> <li class="breadcrumb-item"><a href="{{ route('laporan') }}">Laporan</a></li>
<li class="breadcrumb-item active" aria-current="page">Pembiayaan</li> <li class="breadcrumb-item active" aria-current="page">Pembiayaan</li>
</ol> </ol>
</nav> </nav>
<div class="card-body text-center"> <div class="card-body text-center">
<div class="row form-group"> <div class="row form-group">
@@ -22,7 +22,7 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-"> <div class="col-md-12">
<form action="{{ route('gadaianujrah.laporancetak') }}" target="_blank" method="post"> <form action="{{ route('gadaianujrah.laporancetak') }}" target="_blank" method="post">
@csrf @csrf
<div class="input-group mb-3"> <div class="input-group mb-3">
@@ -86,7 +86,8 @@
var tablegadai = $('#myTable').DataTable({ var tablegadai = $('#myTable').DataTable({
"ordering": false "ordering": false
}); });
$(document).ready( function () {
$(document).ready(function () {
$('#datemula').datepicker({ $('#datemula').datepicker({
format: 'dd-mm-yyyy' format: 'dd-mm-yyyy'
}); });
@@ -99,7 +100,7 @@
var current_date = current.getDate(); var current_date = current.getDate();
var current_month = current.getMonth()+1; var current_month = current.getMonth()+1;
var current_year = current.getFullYear(); var current_year = current.getFullYear();
var today_date = current_year + '-' +current_month+'-'+current_date; var today_date = current_year + '-' + current_month + '-' + current_date;
$.ajax({ $.ajax({
method:'get', method:'get',
@@ -108,18 +109,46 @@
mula:today_date, mula:today_date,
akhir:today_date, akhir:today_date,
}, },
success: function(gadai){ success: function(response){
console.log('=== RESPONSE PENUH ===');
console.log('Type:', typeof response);
console.log('Is Array:', Array.isArray(response));
console.log('Response:', response);
// Check jika response adalah array terus
var gadai;
if (Array.isArray(response)) {
gadai = response;
} else if (response.gadai && Array.isArray(response.gadai)) {
gadai = response.gadai;
} else {
gadai = [];
}
console.log('=== DATA GADAI ===');
console.log('Jumlah rekod:', gadai.length);
console.log('Data gadai:', gadai);
if(gadai.length > 0) {
console.log('Contoh rekod pertama:', gadai[0]);
console.log('Field yang ada:', Object.keys(gadai[0]));
}
gadaitable(gadai); gadaitable(gadai);
},
error: function(xhr, status, error) {
console.error('Error AJAX:', error);
console.error('Status:', status);
console.error('Response:', xhr.responseText);
} }
}); });
}); });
$('#datemula').change(function(){ $('#datemula').change(function(){
//mula //mula
var input_date = this.value; var input_date = this.value;
var split_date = input_date.split('-'); var split_date = input_date.split('-');
var mula_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; var mula_date = split_date[2] + '-' + split_date[1] + '-' + split_date[0];
var mula = mula_date; var mula = mula_date;
@@ -130,7 +159,7 @@
{ {
var input_date = hinggainput; var input_date = hinggainput;
var split_date = input_date.split('-'); var split_date = input_date.split('-');
var hingga_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; var hingga_date = split_date[2] + '-' + split_date[1] + '-' + split_date[0];
var akhir = hingga_date; var akhir = hingga_date;
@@ -139,7 +168,7 @@
var current_date = current.getDate(); var current_date = current.getDate();
var current_month = current.getMonth()+1; var current_month = current.getMonth()+1;
var current_year = current.getFullYear(); var current_year = current.getFullYear();
var today_date = current_year + '-' +current_month+'-'+current_date; var today_date = current_year + '-' + current_month + '-' + current_date;
var akhir = today_date; var akhir = today_date;
} }
@@ -151,7 +180,18 @@
mula:mula, mula:mula,
akhir:akhir, akhir:akhir,
}, },
success: function(gadai){ success: function(response){
console.log('Response datemula:', response);
var gadai;
if (Array.isArray(response)) {
gadai = response;
} else if (response.gadai && Array.isArray(response.gadai)) {
gadai = response.gadai;
} else {
gadai = [];
}
gadaitable(gadai); gadaitable(gadai);
} }
}); });
@@ -160,7 +200,7 @@
$('#datehingga').change(function(){ $('#datehingga').change(function(){
var input_date = this.value; var input_date = this.value;
var split_date = input_date.split('-'); var split_date = input_date.split('-');
var hingga_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; var hingga_date = split_date[2] + '-' + split_date[1] + '-' + split_date[0];
var akhir = hingga_date; var akhir = hingga_date;
@@ -171,7 +211,7 @@
{ {
var input_date = mulainput; var input_date = mulainput;
var split_date = input_date.split('-'); var split_date = input_date.split('-');
var mula_date = split_date[2] + '-' +split_date[1]+'-'+split_date[0]; var mula_date = split_date[2] + '-' + split_date[1] + '-' + split_date[0];
var mula = mula_date; var mula = mula_date;
@@ -189,7 +229,18 @@
mula:mula, mula:mula,
akhir:akhir, akhir:akhir,
}, },
success: function(gadai){ success: function(response){
console.log('Response datehingga:', response);
var gadai;
if (Array.isArray(response)) {
gadai = response;
} else if (response.gadai && Array.isArray(response.gadai)) {
gadai = response.gadai;
} else {
gadai = [];
}
gadaitable(gadai); gadaitable(gadai);
} }
}); });
@@ -208,55 +259,72 @@
var total_onepercent = 0; var total_onepercent = 0;
var total_ujrah = 0; var total_ujrah = 0;
tablegadai.clear().draw(); tablegadai.clear().draw();
// Semak jika data kosong
if(!data || data.length === 0) {
console.log('Tiada data untuk dipaparkan');
return;
}
// TAMBAH INI: Log structure data pertama
console.log('=== STRUKTUR DATA ===');
console.log('Data pertama:', data[0]);
console.log('Keys yang ada:', Object.keys(data[0]));
$.each(data,function(index,gadai){ $.each(data,function(index,gadai){
total_pinjaman += Number(gadai['pinjaman']); // Log setiap item untuk debug
total_nm += Number(gadai['nilaimarhun']); console.log('Item ' + index + ':', gadai);
total_berat += Number(gadai['berat']);
total_onepercent += Number(gadai['onepercent']*12); // Validasi data sebelum gunakan
total_ujrah += Number(gadai['ujrah']*12); var pinjaman = gadai['pinjaman'] ? Number(gadai['pinjaman']) : 0;
var nilaimarhun = gadai['nilaimarhun'] ? Number(gadai['nilaimarhun']) : 0;
if (gadai['tagbaru'] == 0) { var berat = gadai['berat'] ? Number(gadai['berat']) : 0;
var onepercent = gadai['onepercent'] ? Number(gadai['onepercent']) : 0;
var upah12 = gadai['upah12']; var ujrah = gadai['ujrah'] ? Number(gadai['ujrah']) : 0;
} else { console.log('Nilai processed:', {pinjaman, nilaimarhun, berat, onepercent, ujrah});
var upah12 = gadai['ujrah']*12 + gadai['onepercent']*12; total_pinjaman += pinjaman;
total_nm += nilaimarhun;
} total_berat += berat;
total_onepercent += (onepercent * 12);
total_upah12 += Number(upah12) ; total_ujrah += (ujrah * 12);
tablegadai.row.add([ var upah12 = 0;
counter, if (gadai['tagbaru'] == 0) {
gadai['nama'], upah12 = gadai['upah12'] ? Number(gadai['upah12']) : 0;
gadai['nokp'], } else {
gadai['t_gadai'], upah12 = (ujrah * 12) + (onepercent * 12);
gadai['norujukan'], }
formatter.format(gadai['pinjaman']),
formatter.format(gadai['ujrah']*12), total_upah12 += upah12;
formatter.format(gadai['onepercent']*12),
formatter.format(upah12), // Pastikan semua nilai ada sebelum add row
formatter.format(gadai['nilaimarhun']), tablegadai.row.add([
formatter.format(gadai['berat']) counter,
]).draw(); gadai['nama'] || '-',
$('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2))); gadai['nokp'] || '-',
$('#upah12total').text(formatter.format(total_upah12.toFixed(2))); gadai['t_gadai'] || '-',
$('#nmtotal').text(formatter.format(total_nm.toFixed(2))); gadai['norujukan'] || '-',
$('#berattotal').text(formatter.format(total_berat.toFixed(2))); formatter.format(pinjaman),
$('#berattotal').text(formatter.format(total_berat.toFixed(2))); formatter.format(ujrah * 12),
$('#onepercenttotal').text(formatter.format(total_onepercent.toFixed(2))); formatter.format(onepercent * 12),
$('#ujrahtotal').text(formatter.format(total_ujrah.toFixed(2))); formatter.format(upah12),
formatter.format(nilaimarhun),
formatter.format(berat)
]).draw(false);
counter++;
counter = counter + 1;
}); });
// Update total selepas loop selesai
$('#pinjamantotal').text(formatter.format(total_pinjaman.toFixed(2)));
$('#upah12total').text(formatter.format(total_upah12.toFixed(2)));
$('#nmtotal').text(formatter.format(total_nm.toFixed(2)));
$('#berattotal').text(formatter.format(total_berat.toFixed(2)));
$('#onepercenttotal').text(formatter.format(total_onepercent.toFixed(2)));
$('#ujrahtotal').text(formatter.format(total_ujrah.toFixed(2)));
} }
</script> </script>
@endsection @endsection