diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php
index fbce6251..8069a8a6 100644
--- a/app/Http/Controllers/NotisController.php
+++ b/app/Http/Controllers/NotisController.php
@@ -162,7 +162,10 @@ class NotisController extends Controller
             ->where('nokp','=',$cal['nokp'])
             ->get();
             // dd($listsag);
-            foreach($listsag as $index=>$listing){
+
+            
+            foreach($listsag as $index=>$listing)
+            {
 
                 $bayaran = $listing['hargajualan'] - $listing['bakihargajualan'];
 
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 106353f2..aec74bf4 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -89,12 +89,14 @@ class ReportController extends Controller
         $arraydetails = [];
         $arrayinfo = [];
 
-
         $test = Lelong::with(['cawangan','lelongBid'])
         ->find($lelong_id);
 
-        $cawangan = $test->cawangan;
-        $lelong_bid = $test->lelongBid;
+        $cawangan = $test->cawangan
+        ->where('kodcaw','=',$kodcaw);
+
+        $lelong_bid = $test->lelongBid
+        ->where('kodcaw','=',$kodcaw);
    
 
 
@@ -207,7 +209,7 @@ class ReportController extends Controller
       
 
           
-        $pdf = PDF::loadView('pdf.listlelongdetails',compact('lelongs','arraycaw','total_nmarhun','total_berat','total_harga','total_hargaasas','arrayinfo'
+        $pdf = PDF::loadView('pdf.listlelongdetails',compact('lelongs','arraycaw','total_nmarhun','total_berat','total_harga','total_hargaasas','arrayinfo','nilai_marhun'
                                                         ))->setPaper('a4', 'potrait');
         
         return $pdf->download('Senarai Lelong Details.pdf');
@@ -347,7 +349,14 @@ class ReportController extends Controller
         $total_hargalelong = 0;
         $total_bakirugi = 0;
         $total_hargaasas = 0;
+        $jumlahmargin = 0;
         $arrayinfocaw = [];
+        $arraydetails = [];
+        $rugilelong = 0;
+        $bakilelong = 0;
+        $total_rugilelong = 0;
+        $total_bakilelong = 0;
+
 
         $info = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
         ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
@@ -372,12 +381,29 @@ class ReportController extends Controller
         ->where('lelongbidder.status_bidder','=','1')
         ->where('lelongbid.kodcaw',$kodcaw)
         ->select('lelongbid.norujukan','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.upahsimpan',
-        'lelongbid.cajlelong','lelongbidder.hargabida','lelongbid.baki','lelongbid.hargaasas','lelongbidder.nama_bidder')
+        'lelongbid.cajlelong','lelongbidder.hargabida','lelongbid.baki','lelongbid.hargaasas','lelongbidder.nama_bidder','bakiupah')
         ->get()->toArray();
 
         foreach($laporanlelong as $index1=>$laplelong)
         {
-                     
+
+            $margin = ($laplelong['pinjaman']/ $laplelong['nilaimarhun'])*100;
+
+            $lelong = Lelong::where('id',$lelong_id)->get();
+            $sumcajlelong =  $laplelong['hargaasas'] * ($lelong[0]['cajlelong']/100);
+            $totalbaki = $laplelong['hargaasas'] - $laplelong['pinjaman'] - $laplelong['bakiupah'] - bcdiv($sumcajlelong,1,1);
+
+            if($totalbaki > 0)
+            {
+                $bakilelong = $bakilelong + $totalbaki;  
+            }
+            else
+            {
+                $rugilelong = $rugilelong - $totalbaki;
+            }
+
+
+                                 
             $total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun'];
             $total_pembiayaan = $total_pembiayaan + $laplelong['pinjaman'];
             $total_upahsimpan = $total_upahsimpan + $laplelong['upahsimpan'];
@@ -385,14 +411,29 @@ class ReportController extends Controller
             $total_hargalelong = $total_hargalelong + $laplelong['hargabida'];
             $total_bakirugi = $total_bakirugi + $laplelong['baki'];
             $total_hargaasas = $total_hargaasas + $laplelong['hargaasas'];
+
+            array_push($arraydetails,['laplelong' => $laplelong,
+                                      'margin' => $margin,
+                                      'rugilelong'=>$rugilelong,
+                                      'bakilelong'=>$bakilelong,
+                                    
+                                    
+                                    ]);
+
+            $total_rugilelong = $total_rugilelong + $rugilelong;
+            $total_bakilelong = $total_bakilelong + $bakilelong;
+
                                    
         }   
 
 
-        $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'))
 
-        ->setPaper('a4', 'potrait');
+
+        $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'))
+
+        ->setPaper('a4', 'landscape');
         return $pdf->download('Laporan Lelong Keseluruhan.pdf');
        
 
diff --git a/resources/views/marhun/scanbarcode.blade.php b/resources/views/marhun/scanbarcode.blade.php
index c085a4e6..ac1a5a82 100644
--- a/resources/views/marhun/scanbarcode.blade.php
+++ b/resources/views/marhun/scanbarcode.blade.php
@@ -23,8 +23,8 @@
                         {{ $message }}
                     </div>
                     @endif
-                    {{-- <a class="btn btn-secondary mb-1" href="{{route('marhun.senarailelongscan')}}">Kembali</a>
-                    <a class="btn btn-primary" href="{{route('marhun.scanbarcodemasuk',$lelong_id )}}">Senarai SAG Keluar Peti Besi</a> --}}
+                    <a class="btn btn-secondary mb-1" href="{{route('marhun.senarailelongscan')}}">Kembali</a>
+                    <a class="btn btn-primary" href="{{route('marhun.scanbarcodemasuk',$lelong_id )}}">Senarai SAG Keluar Peti Besi</a>
 
                     <p>Tarikh Lelong:
                         @php
@@ -38,9 +38,10 @@
                         <li class="nav-item">
                             <a class="nav-link active" id="scan-keluar-tab" data-toggle="tab" href="#scan-keluar" role="tab" aria-controls="scan-keluar" aria-selected="false">Senarai SAG Akan Dilelong</a>
                         </li>
-                        {{-- <li class="nav-item">
-                            <a class="nav-link" id="scan-masuk-tab" data-toggle="tab" href="#scan-masuk" role="tab" aria-controls="scan-masuk" aria-selected="false">Senarai SAG Keluar/Masuk Peti Besi</a>
-                        </li> --}}
+                        <li class="nav-item">
+                            {{-- <a class="nav-link" id="scan-masuk-tab" data-toggle="tab" href="#scan-masuk" role="tab" aria-controls="scan-masuk" aria-selected="false">Senarai SAG Keluar/Masuk Peti Besi</a> --}}
+                            <a class="nav-link" href="{{route('marhun.scanbarcodemasuk',$lelong_id )}}">Senarai SAG Keluar Peti Besi</a>
+                        </li>
                     </ul>
                     <div class="tab-content" id="myTabContent">
                         <div class="tab-pane fade show active" id="scan-keluar" role="tabpanel" aria-labelledby="scan-keluar-tab">
diff --git a/resources/views/marhun/scanbarcodemasuk.blade.php b/resources/views/marhun/scanbarcodemasuk.blade.php
index 6dbf066a..373d0c23 100644
--- a/resources/views/marhun/scanbarcodemasuk.blade.php
+++ b/resources/views/marhun/scanbarcodemasuk.blade.php
@@ -36,6 +36,9 @@
                     </p>
 
                     <ul class="nav mb-2 nav-tabs" id="myTab" role="tablist">
+                        <li class="nav-item">
+                            <a class="nav-link" href="{{route('marhun.scanbarcode',$lelong_id )}}">Senarai SAG Keluar Peti Besi</a>
+                        </li>
                         <li class="nav-item">
                             <a class="nav-link active" id="scan-masuk-tab" data-toggle="tab" href="#scan-masuk" role="tab" aria-controls="scan-masuk" aria-selected="false">Senarai SAG Keluar/Masuk Peti Besi</a>
                         </li>                     
diff --git a/resources/views/pdf/listlelongdetails.blade.php b/resources/views/pdf/listlelongdetails.blade.php
index bc13f395..c8434cd8 100644
--- a/resources/views/pdf/listlelongdetails.blade.php
+++ b/resources/views/pdf/listlelongdetails.blade.php
@@ -160,7 +160,7 @@ tr:nth-child(even) {
                           <td colspan="4" align="left"></td>
                           <td>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
                           <td></td>
-                          <td>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
+                          <td>{{ number_format($marhun['nmarhuns'], 2, '.', ',') }}</td>
                           <td>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
                           <td></td>
                         </tr>  
diff --git a/resources/views/pdf/pdflaplelong.blade.php b/resources/views/pdf/pdflaplelong.blade.php
index 9b719534..86ae623c 100644
--- a/resources/views/pdf/pdflaplelong.blade.php
+++ b/resources/views/pdf/pdflaplelong.blade.php
@@ -120,41 +120,42 @@ tr:nth-child(even) {
                             <th>No Rujukan</th>
                             <th>Nilai Marhun</th>
                             <th>Pembiayaan</th>
+                            <th>Margin%</th>
                             <th>Upah Simpan</th>
                             <th>Caj Lelong</th>
                             <th>Harga Lelong</th>
                             <th>Baki</th>
-                            <th>Rugi</th>
                             <th>Harga Asas</th>
-                            <th>Nama Pembeli</th>                        >
+                            <th>Nama Pembeli</th>             
 
                         </tr>
                         </thead>
 
-              @foreach ($laporanlelong as $laporan)
+              @foreach ($arraydetails as $laporan)
                 <tr>
                     <td>{{ $loop->iteration }}</td>
-                    <td>{{ $laporan['norujukan'] }}</td>
-                    <td>{{ number_format($laporan['nilaimarhun'], 2, '.', ',')}}</td>
-                    <td>{{ number_format($laporan['pinjaman'], 2, '.', ',')}}</td>
-                    <td>{{ number_format($laporan['upahsimpan'], 2, '.', ',')}}</td>
-                    <td>{{ number_format($laporan['cajlelong'], 2, '.', ',')}}</td>
-                    <td>{{ number_format($laporan['hargabida'], 2, '.', ',')}}</td>
+                    <td>{{ $laporan['laplelong']['norujukan'] }}</td>
+                    <td>{{ number_format($laporan['laplelong']['nilaimarhun'], 2, '.', ',')}}</td>
+                    <td>{{ number_format($laporan['laplelong']['pinjaman'], 2, '.', ',')}}</td>
+                    <td>{{ number_format($laporan['margin'], 2, '.', ',')}}</td>
+                    <td>{{ number_format($laporan['laplelong']['upahsimpan'], 2, '.', ',')}}</td>
+                    <td>{{ number_format($laporan['laplelong']['cajlelong'], 2, '.', ',')}}</td>
+                    <td>{{ number_format($laporan['laplelong']['hargabida'], 2, '.', ',')}}</td>
+                    <td>{{ number_format($laporan['laplelong']['baki'], 2, '.', ',')}}</td>
+
                     <?php
                         $rugi = 0;
                         $baki = 0;
-                         if(strpos($laporan['baki'], '-') !== false)
+                         if(strpos($laporan['laplelong']['baki'], '-') !== false)
                          {
-                            $rugi  = $laporan['baki'];
+                            $rugi  = $laporan['laplelong']['baki'];
                          }
                          else {
-                            $baki = $laporan['baki'];
+                            $baki = $laporan['laplelong']['baki'];
                          }
                     ?>
-                     <td>{{ number_format($baki, 2, '.', ',') }}</td>
-                     <td>{{ number_format($rugi, 2, '.', ',') }}</td>
-                     <td>{{ number_format($laporan['hargaasas'], 2, '.', ',')}}</td>
-                     <td>{{$laporan['nama_bidder']}}</td>
+                     <td>{{ number_format($laporan['laplelong']['hargaasas'], 2, '.', ',')}}</td>
+                     <td>{{$laporan['laplelong']['nama_bidder']}}</td>
                     
                 </tr>                
               @endforeach
@@ -165,32 +166,53 @@ tr:nth-child(even) {
                 <td colspan="2" align="left"><strong>Jumlah Keseluruhan</strong></td>
                 <td><strong>{{ number_format($total_nmarhun, 2, '.', ',') }}</strong></td>
                 <td><strong>{{ number_format($total_pembiayaan, 2, '.', ',') }}</strong></td>
+                <td></td>
                 <td><strong>{{ number_format($total_upahsimpan, 2, '.', ',') }}</strong></td>
                 <td><strong>{{ number_format($total_cajlelong, 2, '.', ',') }}</strong></td>
                 <td><strong>{{ number_format($total_hargalelong, 2,'.',',') }}</strong></td>
+
+
                 <?php
                 $total_rugi = 0;
                 $total_baki = 0;
                  if(strpos($total_bakirugi, '-') !== false)
                  {
                      $total_rugi  = $total_bakirugi;
-                     
                     }
                     else {
                     $total_baki = $total_bakirugi;
 
                  }
-            ?>
+
+                ?>
                 <td><strong>{{number_format($total_baki, 2, '.', ',')}}</strong></td>
-                <td><strong>{{number_format($total_rugi, 2, '.', ',')}}</strong></td>
                 <td><strong>{{number_format($total_hargaasas, 2, '.', ',')}}</strong></td>
                 <td></td>
-              </tr>                                         
-                       
+              </tr> 
+
+           
+          
+          </table>
+
+          <table  cellspacing="0" cellpadding="1" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">
+            <br><br><br><br><br><br><br><br><br><br>
 
           
-          </table>  
+           
+            <tr>              
+              <td>Jumlah Baki A: {{$total_bakilelong}}</td>         
+              <td>Jumlah Baki B: {{$total_rugilelong}}</td>          
+              <td><b>Baki A - Baki B: RM{{number_format($total_baki, 2, '.', ',')}}<b></td>
+            </tr>
+  
+          </table>
 
+
+          
+
+          
+
+