update design table laporan

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;
                                    
         }