diff --git a/app/Http/Controllers/ReportCawanganController.php b/app/Http/Controllers/ReportCawanganController.php index a15d9e0e..3f36b454 100644 --- a/app/Http/Controllers/ReportCawanganController.php +++ b/app/Http/Controllers/ReportCawanganController.php @@ -154,7 +154,9 @@ class ReportCawanganController extends Controller $lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->where('cawangan_lelong.lelong_id','=',$lelong_id) + ->where('cawangan.caw_code',$user->kodcaw) ->select('lelong_id','tarikh_lelong','lelong.fasa') ->groupBy('lelong_id') ->get()->toArray(); @@ -192,9 +194,6 @@ class ReportCawanganController extends Controller ]); - - - $pdf = PDF::loadView('pdf.laporanbrgleldetailscaw',compact('lelongs','arraycaw','total_nmarhun','total_berat','total_harga','total_hargaasas','arrayinfo' ))->setPaper('a4', 'potrait'); @@ -336,6 +335,7 @@ class ReportCawanganController extends Controller foreach($laporanlelong as $index1=>$laplelong) { + $margin = ($laplelong['pinjaman']/ $laplelong['nilaimarhun'])*100; $total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun']; $total_pembiayaan = $total_pembiayaan + $laplelong['pinjaman']; @@ -344,6 +344,8 @@ class ReportCawanganController extends Controller $total_hargalelong = $total_hargalelong + $laplelong['hargabida']; $total_bakirugi = $total_bakirugi + $laplelong['baki']; $total_hargaasas = $total_hargaasas + $laplelong['hargaasas']; + + $laporanlelong[$index1]['margin']=$margin; } diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index d438ee53..267b06c5 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -554,9 +554,9 @@ class ReportController extends Controller Public function lelongtebus ($lelong_id, $kodcaw){ - $total_berat = 0; - $total_hargaasas = 0; - $total_hargalelong = 0; + $total_nmarhun = 0; + $total_pinjaman = 0; + $total_upah = 0; $arrayinfocaw = []; @@ -584,16 +584,15 @@ class ReportController extends Controller ->get()->toArray(); // dd($laporantebus); - // foreach( $brglelpembida as $index1=>$totalbrglelpembida){ + foreach( $laporantebus as $index1=>$totalbrglelpembida){ - // $total_berat = $total_berat + $totalbrglelpembida['berat']; - // $total_hargaasas = $total_hargaasas + $totalbrglelpembida['hargaasas']; - // $total_hargalelong = $total_hargalelong + $totalbrglelpembida['hargabida']; - - // } + $total_nmarhun += $totalbrglelpembida['nilaimarhun']; + $total_pinjaman += $totalbrglelpembida['pinjaman']; + $total_upah += $totalbrglelpembida['upah']; + } - $pdf = PDF::loadView('pdf.pdflelongtebus',compact('lelong_id','info','laporantebus','total_berat','total_hargaasas','total_hargalelong','arrayinfocaw')) + $pdf = PDF::loadView('pdf.pdflelongtebus',compact('lelong_id','info','laporantebus','total_nmarhun','total_pinjaman','total_upah','arrayinfocaw')) ->setPaper('a4','potrait'); return $pdf->download('Laporan Barang Lelong Pembida.pdf'); diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 3bdea217..6646f801 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -163,7 +163,7 @@