diff --git a/app/Http/Controllers/ReportAllController.php b/app/Http/Controllers/ReportAllController.php
index bdf3b89a..b18171e3 100644
--- a/app/Http/Controllers/ReportAllController.php
+++ b/app/Http/Controllers/ReportAllController.php
@@ -691,15 +691,21 @@ class ReportAllController extends Controller
$total_bil_lelong = 0;
$jum_billelong = 0;
$jum_berat = 0;
+ $jum_nilaimarhun = 0;
$jum_pembiayaan = 0;
$jum_hargajual = 0;
$jum_bakiupah = 0;
$jum_cajlelong = 0;
$jum_baki = 0;
+ $jum_rugi = 0;
+
foreach($cawangan_all as $cawangan){
+ $rugilelong = 0;
+ $bakilelong = 0;
$getsurat = LelongCawangan::on($cawangan->caw_code)
->where('t_lelong','>=',$tarikh_dari)
->where('t_lelong','<=',$tarikh_hingga);
+ $surat = $getsurat->get()->toArray();
$bil_lelong = $getsurat->count('norujukan');
$total_bil_lelong += $bil_lelong;
@@ -710,6 +716,17 @@ class ReportAllController extends Controller
$total_cajlelong = $getsurat->sum('cajlelong');
$total_baki = $getsurat->sum('baki');
$total_pembiayaan = $getsurat->sum('pinjaman');
+ foreach($surat as $index => $sag){
+ if($sag['baki'] > 0)
+ {
+ $bakilelong = $bakilelong + $sag['baki'];
+ }
+ else
+ {
+ $rugilelong = $rugilelong - $sag['baki'];
+ }
+ }
+
$data = [
't_dari'=>$tarikh_dari,
't_hingga'=>$tarikh_hingga,
@@ -719,7 +736,8 @@ class ReportAllController extends Controller
'total_hargajual'=>$total_hargajual,
'total_bakiupah'=>$total_bakiupah,
'total_cajlelong'=>$total_cajlelong,
- 'total_baki'=>$total_baki,
+ 'total_baki'=>$bakilelong,
+ 'total_rugi'=>$rugilelong,
'total_pembiayaan'=>$total_pembiayaan,
'kodcaw'=>$cawangan->caw_code,
'caw_name'=>$cawangan->caw_name];
@@ -727,11 +745,13 @@ class ReportAllController extends Controller
$jum_billelong += $bil_lelong;
$jum_berat += $total_berat;
+ $jum_nilaimarhun += $total_nilaimarhun;
$jum_pembiayaan += $total_pembiayaan;
$jum_hargajual += $total_hargajual;
$jum_bakiupah += $total_bakiupah;
$jum_cajlelong += $total_cajlelong;
- $jum_baki += $total_baki;
+ $jum_baki += $bakilelong;
+ $jum_rugi += $rugilelong;
}
if($total_bil_lelong == 0)
{
@@ -747,8 +767,8 @@ class ReportAllController extends Controller
'getsurat',
'senarai',
'tarikh_dari',
- 'tarikh_hingga','jum_billelong','jum_berat','jum_pembiayaan','jum_hargajual','jum_bakiupah','jum_baki','jum_cajlelong'))
- ->setPaper('a4', 'potrait');
+ 'tarikh_hingga','jum_billelong','jum_berat','jum_nilaimarhun','jum_pembiayaan','jum_hargajual','jum_bakiupah','jum_baki','jum_cajlelong','jum_rugi'))
+ ->setPaper('a4', 'landscape');
return $pdf->download('laporan lelong dari'.$t_dari.'hingga'.$t_hingga.'.pdf');
}else{
@@ -757,7 +777,7 @@ class ReportAllController extends Controller
'getsurat',
'senarai',
'tarikh_dari',
- 'tarikh_hingga','jum_billelong','jum_berat','jum_pembiayaan','jum_hargajual','jum_bakiupah','jum_baki','jum_cajlelong'
+ 'tarikh_hingga','jum_billelong','jum_berat','jum_nilaimarhun','jum_pembiayaan','jum_hargajual','jum_bakiupah','jum_baki','jum_cajlelong','jum_rugi'
));
}
}
diff --git a/resources/views/laporan/senaraitemplaporanbydate.blade.php b/resources/views/laporan/senaraitemplaporanbydate.blade.php
index e0cc404d..5e2bbcb5 100644
--- a/resources/views/laporan/senaraitemplaporanbydate.blade.php
+++ b/resources/views/laporan/senaraitemplaporanbydate.blade.php
@@ -49,11 +49,13 @@
Cawangan |
Bil Lelong |
Berat (gm) |
+ Nilai Marhun Asal(RM) |
Pembiayaan (RM) |
Keuntungan (RM) |
Harga Jual (RM) |
Caj Lelong (RM) |
Baki Lelong (RM) |
+ Rugi Lelong (RM) |
{{-- Tindakan | --}}
@@ -69,11 +71,14 @@
{{ $send['caw_name'] }} |
{{ $send['bil_lelong'] }} |
{{ number_format($send['total_berat'], 2) }} |
+ {{ number_format($send['total_nilaimarhun'], 2) }} |
{{ number_format($send['total_pembiayaan'], 2) }} |
{{ number_format($send['total_bakiupah'] , 2) }} |
{{ number_format($send['total_hargajual'] , 2) }} |
{{ number_format($send['total_cajlelong'] , 2) }} |
{{ number_format($send['total_baki'] , 2) }} |
+ {{ number_format(-$send['total_rugi'] , 2) }} |
+
{{--
@@ -87,11 +92,13 @@
| JUMLAH KESELURUHAN |
{{ $jum_billelong }} |
{{ number_format($jum_berat, 2) }} |
+ {{ number_format($jum_nilaimarhun, 2) }} |
{{ number_format($jum_pembiayaan, 2) }} |
{{ number_format($jum_bakiupah, 2) }} |
{{ number_format($jum_hargajual, 2) }} |
{{ number_format($jum_cajlelong, 2) }} |
{{ number_format($jum_baki, 2) }} |
+ -{{ number_format($jum_rugi, 2) }} |
@@ -120,7 +127,7 @@
"orderable": false
}
],
- order: [[1, 'asc']],
+ order: [[0, 'asc']],
"info": false,
"lengthChange": false,
"pageLength": 15,
diff --git a/resources/views/laporan/senaraitemplaporanbydate_pdf.blade.php b/resources/views/laporan/senaraitemplaporanbydate_pdf.blade.php
index 0be9ddba..84685d87 100644
--- a/resources/views/laporan/senaraitemplaporanbydate_pdf.blade.php
+++ b/resources/views/laporan/senaraitemplaporanbydate_pdf.blade.php
@@ -7,9 +7,9 @@
width: 100%;
}
- #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+ #sim td {padding:3px 5px 3px 5px; padding-right:5px;}, #sim th {
border: 0px solid;
- padding: 1px;
+ padding: 0px;
text-align: left;
}
@@ -153,12 +153,13 @@
Cawangan |
Bil Lelong |
Berat (gm) |
+ Nilai Marhun Asal(RM) |
Pembiayaan (RM) |
Keuntungan (RM) |
Harga Jual (RM) |
Caj Lelong (RM) |
Baki Lelong (RM) |
- {{-- Tindakan | --}}
+ Rugi Lelong (RM) |
@@ -171,13 +172,15 @@
{{ $count++ }} |
{{ $send['kodcaw'] }} |
{{ $send['caw_name'] }} |
- {{ $send['bil_lelong'] }} |
- {{ number_format($send['total_berat'], 2) }} |
- {{ number_format($send['total_pembiayaan'], 2) }} |
- {{ number_format($send['total_bakiupah'] , 2) }} |
- {{ number_format($send['total_hargajual'] , 2) }} |
- {{ number_format($send['total_cajlelong'] , 2) }} |
- {{ number_format($send['total_baki'] , 2) }} |
+ {{ number_format($send['bil_lelong'], 0) }} |
+ {{ number_format($send['total_berat'], 2) }} |
+ {{ number_format($send['total_nilaimarhun'], 2) }} |
+ {{ number_format($send['total_pembiayaan'], 2) }} |
+ {{ number_format($send['total_bakiupah'] , 2) }} |
+ {{ number_format($send['total_hargajual'] , 2) }} |
+ {{ number_format($send['total_cajlelong'] , 2) }} |
+ {{ number_format($send['total_baki'] , 2) }} |
+ ({{ number_format($send['total_rugi'] , 2) }}) |
{{--
@@ -189,13 +192,16 @@
|
| JUMLAH KESELURUHAN |
- {{ $jum_billelong }} |
- {{ number_format($jum_berat, 2) }} |
- {{ number_format($jum_pembiayaan, 2) }} |
- {{ number_format($jum_bakiupah, 2) }} |
- {{ number_format($jum_hargajual, 2) }} |
- {{ number_format($jum_cajlelong, 2) }} |
- {{ number_format($jum_baki, 2) }} |
+ {{ number_format($jum_billelong, 0) }} |
+ {{ number_format($jum_berat, 2) }} |
+ {{ number_format($jum_nilaimarhun, 2) }} |
+ {{ number_format($jum_pembiayaan, 2) }} |
+ {{ number_format($jum_bakiupah, 2) }} |
+ {{ number_format($jum_hargajual, 2) }} |
+ {{ number_format($jum_cajlelong, 2) }} |
+ {{ number_format($jum_baki, 2) }} |
+ ({{ number_format($jum_rugi, 2) }}) |
+