diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index ce07e9ef..a11cdc37 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -420,6 +420,7 @@ class ReportController extends Controller $bakilelong = 0; $total_rugilelong = 0; $total_bakilelong = 0; + $total_berat = 0; $info = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') @@ -444,7 +445,7 @@ class ReportController extends Controller ->where('lelongbid.lelong_id','=',$lelong_id) ->where('lelongbidder.status_bidder','=','1') ->where('lelongbid.kodcaw',$kodcaw) - ->select('lelongbid.norujukan','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.bakiupah', + ->select('lelongbid.norujukan','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.bakiupah','lelongbid.berat', 'lelongbid.cajlelong','lelongbidder.hargabida','lelongbid.baki','lelongbid.hargaasas','lelongbidder.nama_bidder') ->get()->toArray(); @@ -473,7 +474,7 @@ class ReportController extends Controller - + $total_berat = $total_berat + $laplelong['berat']; $total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun']; $total_pembiayaan = $total_pembiayaan + $laplelong['pinjaman']; $total_upahsimpan = $total_upahsimpan + $laplelong['bakiupah']; @@ -501,7 +502,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','bakilelong','rugilelong')) + 'total_rugilelong','total_bakilelong','bakilelong','rugilelong','total_berat')) ->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 3355d3f8..cf03e2b3 100644 --- a/resources/views/pdf/pdflaplelong.blade.php +++ b/resources/views/pdf/pdflaplelong.blade.php @@ -160,6 +160,7 @@ tr:nth-child(even) { ( No No Rujukan + Berat(gm) Nilai Marhun Asal(RM) Pembiayaan(RM) Margin(%) @@ -177,6 +178,7 @@ tr:nth-child(even) { {{ $loop->iteration }} {{ $laporan['laplelong']['norujukan'] }} + {{ number_format($laporan['laplelong']['berat'], 2, '.', ',')}} {{ number_format($laporan['laplelong']['nilaimarhun'], 2, '.', ',')}} {{ number_format($laporan['laplelong']['pinjaman'], 2, '.', ',')}} {{ number_format($laporan['margin'], 2, '.', ',')}} @@ -209,6 +211,7 @@ tr:nth-child(even) { Jumlah Keseluruhan + {{ number_format($total_berat, 2, '.', ',') }} {{ number_format($total_nmarhun, 2, '.', ',') }} {{ number_format($total_pembiayaan, 2, '.', ',') }}