diff --git a/app/Http/Controllers/AkaunController.php b/app/Http/Controllers/AkaunController.php
index 32e8b26..12c1345 100644
--- a/app/Http/Controllers/AkaunController.php
+++ b/app/Http/Controllers/AkaunController.php
@@ -1939,9 +1939,9 @@ public function cetakLaporanAnsuranRangeDate(Request $request){
$hingga_date = $request->datehingga;
}
- $barangkes = Http::get($request->hostname . '/api/barangkes/laporan/', ['kodcaw' => $request->kodcaw,'alasan' => $request->sltalasan,'tarikh_mula' => $mula_date,'tarikh_akhir' => $hingga_date])->json();
-
- $palsu = Http::get($request->hostname . '/api/palsu/laporan/', ['kodcaw' => $request->kodcaw,'tarikh_mula' => $mula_date,'tarikh_akhir' => $hingga_date])->json();
+ $status = $request->status ?? 'all';
+ // $barangkes = Http::get($request->hostname . '/api/barangkes/laporan/', ['kodcaw' => $request->kodcaw,'alasan' => $request->sltalasan,'tarikh_mula' => $mula_date,'tarikh_akhir' => $hingga_date, 'status' => $status,])->json();
+ $palsu = Http::get($request->hostname . '/api/palsu/laporan/', ['kodcaw' => $request->kodcaw,'tarikh_mula' => $mula_date,'tarikh_akhir' => $hingga_date, 'status' => $status,])->json();
if (!is_array($palsu)) {
$palsu = []; // utk nak tengok data tubik ke dok
@@ -1957,14 +1957,14 @@ public function cetakLaporanAnsuranRangeDate(Request $request){
{
if($request->jenis == 'pdf')
{
- $pdf = PDF::loadView('akaun.laporan_brgkes', compact('hostname','palsu','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url'))->setPaper('a4', 'potrait');
+ $pdf = PDF::loadView('akaun.laporan_brgkes', compact('hostname','palsu','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url','status'))->setPaper('a4', 'potrait');
return $pdf->download('laporan_brgkes' . $request->kodcaw .'_'. $mula_date .'_'. $hingga_date . '.pdf');
}else{
- return view('akaun.laporan_brgkes', compact('hostname','palsu','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url'));
+ return view('akaun.laporan_brgkes', compact('hostname','palsu','cawangan_detail','tarikh_cetak','mula_date','hingga_date','api_url','status'));
}
}
- return view('akaun.laporan_brgkes', compact('hostname','cawangan_detail','mula_date','hingga_date','tarikh_cetak','api_url','palsu'));
+ return view('akaun.laporan_brgkes', compact('hostname','cawangan_detail','mula_date','hingga_date','tarikh_cetak','api_url','palsu','palsu'));
}
diff --git a/resources/js/Akaun/Barangkes.vue b/resources/js/Akaun/Barangkes.vue
index 00cb8c7..38e070d 100644
--- a/resources/js/Akaun/Barangkes.vue
+++ b/resources/js/Akaun/Barangkes.vue
@@ -1,120 +1,189 @@
-
-
-
-
-
-
-
-
- Laporan Barang Kes
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
+
+ Laporan Barang Kes
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/views/akaun/laporan_brgkes.blade.php b/resources/views/akaun/laporan_brgkes.blade.php
index bf5b4ce..b39a2ad 100644
--- a/resources/views/akaun/laporan_brgkes.blade.php
+++ b/resources/views/akaun/laporan_brgkes.blade.php
@@ -246,7 +246,7 @@
@endforeach
--}}
-
+{{--
| Bil |
Tarikh |
@@ -274,6 +274,37 @@
{{ number_format($item['untungcajlain'], 2) }} |
@endforeach
+
--}}
+
+
+ | Bil |
+ Tarikh |
+ No Rujukan |
+ Nota |
+ Pembiayaan (RM) |
+ Nilai Marhun (RM) |
+ JBG |
+ Untung (RM) |
+ 1% (RM) |
+ Caj Lain (RM) |
+
+@php $bil = 1; @endphp
+
+@foreach($palsu as $item)
+
+ | {{ $bil++ }} |
+ {{ $item['tarikh'] }} |
+ {{ $item['norujukan'] }} |
+ {{ $item['nota'] }} |
+ {{ number_format($item['pembiayaan'], 2) }} |
+ {{ number_format($item['nilaimarhun'], 2) }} |
+ {{ number_format($item['jbg'], 2) }} |
+ {{ number_format($item['untung'], 2) }} |
+ {{ number_format($item['untungonepercent'], 2) }} |
+ {{ number_format($item['untungcajlain'], 2) }} |
+
+@endforeach
+