diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index ba6fe4a2..9d5d4cdc 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -129,7 +129,6 @@ class ReportController extends Controller ->get() ->toArray(); - foreach($brgdetails as $brg) { $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') @@ -393,15 +392,21 @@ class ReportController extends Controller $sumcajlelong = $laplelong['hargaasas'] * ($lelong[0]['cajlelong']/100); $totalbaki = $laplelong['hargaasas'] - $laplelong['pinjaman'] - $laplelong['bakiupah'] - bcdiv($sumcajlelong,1,1); - if($totalbaki > 0) + if($laplelong['baki'] > 0) { - $bakilelong = $bakilelong + $totalbaki; + $bakilelong = $bakilelong + $laplelong['baki']; } else { - $rugilelong = $rugilelong - $totalbaki; + $rugilelong = $rugilelong + $laplelong['baki']; } + // if($laplelong['baki'] < 0) + // { + // $rugilelong = $rugilelong + $laplelong['baki']; + // } + + $total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun']; @@ -431,7 +436,7 @@ class ReportController extends Controller $pdf = PDF::loadView('pdf.pdflaplelong',compact('info','lelong_id','laporanlelong','lelong_id','total_nmarhun','total_pembiayaan', 'total_upahsimpan','total_cajlelong','total_hargalelong','total_bakirugi','total_hargaasas','arrayinfocaw','margin','arraydetails', - 'total_rugilelong','total_bakilelong')) + 'total_rugilelong','total_bakilelong','bakilelong','rugilelong')) ->setPaper('a4', 'landscape'); return $pdf->download('Laporan Lelong Keseluruhan.pdf'); diff --git a/resources/views/pdf/pdflaplelong.blade.php b/resources/views/pdf/pdflaplelong.blade.php index 86ae623c..14f7e4b8 100644 --- a/resources/views/pdf/pdflaplelong.blade.php +++ b/resources/views/pdf/pdflaplelong.blade.php @@ -200,8 +200,8 @@ tr:nth-child(even) { - Jumlah Baki A: {{$total_bakilelong}} - Jumlah Baki B: {{$total_rugilelong}} + Jumlah Baki A: {{$bakilelong}} + Jumlah Baki B: {{$rugilelong}} Baki A - Baki B: RM{{number_format($total_baki, 2, '.', ',')}}