KoPKB/admin-erahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in hotfix/saringan-gadaian (pull request #153)

Browse Source 
add more column for NM TGB Lelong,NM TGB Biasa,NM Gadai Biasa,Pinjaman TGB Lelong,Pinjaman TGB Biasa,Pinjaman Gadai Biasa
This commit is contained in:
nur amirah zulkipli
2026-02-03 08:36:40 +00:00
parent 8cdd8fa51f de30a500e8
commit c2093121bf
2 changed files with 145 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Exports/GadaianDetailExport.php
-1
View File
@@ -77,5 +77,4 @@ class GadaianDetailExport implements FromView
'grandTotal'
));
}
}
resources/views/reports/saringan-gadaian/index.blade.php
+95 -1
View File
@@ -111,6 +111,30 @@
class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
Pinjaman(RM)
</th>
<th
class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
NM TGB Lelong
</th>
<th
class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
NM TGB Biasa
</th>
<th
class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
NM Gadai Biasa
</th>
<th
class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
Pinjaman TGB Lelong(RM)
</th>
<th
class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
Pinjaman TGB Biasa(RM)
</th>
<th
class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
Pinjaman Gadai Biasa(RM)
</th>
<th
class="px-5 py-3 border-b-2 border-gray-200 bg-gray-100 text-left text-xs font-semibold text-gray-600 uppercase tracking-wider">
Action
@@ -126,6 +150,14 @@
$totalberat = 0;
$totalnm = 0;
$totalpinjaman = 0;
$total_nm_tgb_lelong = 0;
$total_nm_tgb_biasa = 0;
$total_nm_gadai_biasa = 0;
$total_pinjaman_tgb_lelong = 0;
$total_pinjaman_tgb_biasa = 0;
$total_pinjaman_gadai_biasa = 0;
@endphp
<tbody>
@@ -143,6 +175,37 @@
$totalberat += $gadai['sum_berat'] ?? 0;
$totalnm += $gadai['sum_nilai_marhun'] ?? 0;
$totalpinjaman += $gadai['sum_pinjaman'] ?? 0;
$nm_tgb_lelong = $gadai['details'] ?? [];
$nm_tgb_lelong = collect($nm_tgb_lelong)
->where('jenis', 'TGB_LELONG')
->sum('nilaimarhun');
$nm_tgb_biasa = collect($gadai['details'] ?? [])
->where('jenis', 'TGB_BIASA')
->sum('nilaimarhun');
$nm_gadai_biasa = collect($gadai['details'] ?? [])
->where('jenis', 'GADAI_BIASA')
->sum('nilaimarhun');
$pinjaman_tgb_lelong = collect($gadai['details'] ?? [])
->where('jenis', 'TGB_LELONG')
->sum('pinjaman');
$pinjaman_tgb_biasa = collect($gadai['details'] ?? [])
->where('jenis', 'TGB_BIASA')
->sum('pinjaman');
$pinjaman_gadai_biasa = collect($gadai['details'] ?? [])
->where('jenis', 'GADAI_BIASA')
->sum('pinjaman');
$total_nm_tgb_lelong += $nm_tgb_lelong;
$total_nm_tgb_biasa += $nm_tgb_biasa;
$total_nm_gadai_biasa += $nm_gadai_biasa;
$total_pinjaman_tgb_lelong += $pinjaman_tgb_lelong;
$total_pinjaman_tgb_biasa += $pinjaman_tgb_biasa;
$total_pinjaman_gadai_biasa += $pinjaman_gadai_biasa;
@endphp
<tr>
@@ -176,6 +239,21 @@
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
<div class="ml-3">{{ number_format($gadai['sum_pinjaman'], 2) }}</div>
</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
{{ number_format($nm_tgb_lelong, 2) }}</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
{{ number_format($nm_tgb_biasa, 2) }}</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
{{ number_format($nm_gadai_biasa, 2) }}</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
{{ number_format($pinjaman_tgb_lelong, 2) }}</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
{{ number_format($pinjaman_tgb_biasa, 2) }}</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
{{ number_format($pinjaman_gadai_biasa, 2) }}</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
<div class="ml-3">
<a href="{{ route('reports.saringan.gadaian.cawangan.excel', [$gadai['kodcaw'], 'startDate' => request()->startDate, 'endDate' => request()->endDate]) }}"
@@ -220,7 +298,23 @@
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
{{ number_format($totalpinjaman, 2) }}
</td>
<td></td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
{{ number_format($total_nm_tgb_lelong, 2) }}</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
{{ number_format($total_nm_tgb_biasa, 2) }}</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
{{ number_format($total_nm_gadai_biasa, 2) }}</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
{{ number_format($total_pinjaman_tgb_lelong, 2) }}</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
{{ number_format($total_pinjaman_tgb_biasa, 2) }}</td>
<td class="px-5 py-5 border-b border-gray-200 bg-white text-sm">
{{ number_format($total_pinjaman_gadai_biasa, 2) }}</td>
<td colspan="1"
class="px-5 py-5 border-b border-gray-200 bg-white text-sm text-center">
</td>
</tr>
</tbody>