diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 740f3d00..c6e8d7b8 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -5842,7 +5842,10 @@ class LelongController extends Controller
         $total_nilaimarhun = 0;
         $keuntungan = 0;
         $total_cazlelong = 0;
-        $lelonglel = Lelong::where('id','=',$lelongid)->first();
+        $total_ujrah = 0;
+        $total_onepercent = 0;
+        $lelonglel = Lelong::with('cawangan')->find($lelongid);
+        $cawanganDetail = $lelonglel->cawangan->find($cawid);
         $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
         ->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid)
         ->where('status_jual','=',0)
@@ -5863,7 +5866,10 @@ class LelongController extends Controller
             'lelongbid.baki',
             'lelongbid.bakiupah',
             'lelongbid.status_jual',
-            'lelongbid.jbg'
+            'lelongbid.jbg',
+            'lelongbid.tagujrah',
+            'lelongbid.ujrah',
+            'lelongbid.onepercent'
         )
         ->get()->toArray();
         // dd($marhuns);
@@ -5903,7 +5909,9 @@ class LelongController extends Controller
                 'bakiupah' => $cal['bakiupah'],
                 'cajlelong' => $cajlelongnew,
                 'baki' =>  $totalbaki,
-                'upah6bulan' => $gadai['bakiupah']
+                'upah6bulan' => $gadai['bakiupah'],
+                'ujrah' => $cal['ujrah'],
+                'onepercent' => $cal['onepercent'],
             ]);
             // $total_marhun = $total_marhun + sizeof($databid);
             $total_berat = $total_berat + $cal['berat'];
@@ -5912,6 +5920,8 @@ class LelongController extends Controller
             $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
             $total_bakiupah = $total_bakiupah + $cal['bakiupah'];
             $total_cazlelong += $cajlelongnew;
+            $total_ujrah += $cal['ujrah'];
+            $total_onepercent += $cal['onepercent'];
         }
 
         $arrayinfo = [];
@@ -5937,8 +5947,12 @@ class LelongController extends Controller
         'total_upah',
         'total_hargaasas',
         'total_bakiupah',
+        'total_ujrah',
+        'total_onepercent',
         'total_nilaimarhun',
         'total_cazlelong',
+        'lelonglel',
+        'cawanganDetail',
        ));
     }
     public function showlelongpc(Request $request, $id)
diff --git a/app/Http/Controllers/ReportAllController.php b/app/Http/Controllers/ReportAllController.php
index b18171e3..758b669c 100644
--- a/app/Http/Controllers/ReportAllController.php
+++ b/app/Http/Controllers/ReportAllController.php
@@ -618,7 +618,7 @@ class ReportAllController extends Controller
         ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
         ->where('cawangan.caw_code','=',$kodcaw)
         ->where('cawangan_lelong.lelong_id','=',$lelong_id)
-        ->select('lelong_id','tarikh_lelong','lelong.fasa','lelong.tagujrah')
+        ->select('lelong_id','tarikh_lelong','lelong.fasa','cawangan_lelong.tagujrah')
         ->groupBy('lelong_id')
         ->get();
 
diff --git a/app/Http/Controllers/ReportCawanganController.php b/app/Http/Controllers/ReportCawanganController.php
index 6f3bda83..34a888e0 100644
--- a/app/Http/Controllers/ReportCawanganController.php
+++ b/app/Http/Controllers/ReportCawanganController.php
@@ -306,13 +306,15 @@ class ReportCawanganController extends Controller
         $total_hargalelong = 0;
         $total_bakirugi = 0;
         $total_hargaasas = 0;
+        $total_onepercent = 0;
+        $total_ujrah = 0;
         $arrayinfocaw = [];
 
         $info = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
         ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
         ->where('cawangan.caw_code','=',$user['kodcaw'])
         ->where('cawangan_lelong.lelong_id','=',$lelong_id)
-        ->select('lelong_id','tarikh_lelong','lelong.fasa')
+        ->select('lelong_id','tarikh_lelong','lelong.fasa','cawangan_lelong.tagujrah')
         ->groupBy('lelong_id')
         ->get();
 
@@ -331,7 +333,7 @@ class ReportCawanganController extends Controller
         ->where('lelongbid.kodcaw','=',$user['kodcaw']) 
         ->where('lelongbidder.status_bidder','=','1')
         ->select('lelongbid.norujukan','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.bakiupah',
-        'lelongbid.cajlelong','lelongbidder.hargabida','lelongbid.baki','lelongbid.hargaasas','lelongbidder.nama_bidder')
+        'lelongbid.cajlelong','lelongbidder.hargabida','lelongbid.baki','lelongbid.hargaasas','lelongbidder.nama_bidder','lelongbid.tagujrah','lelongbid.ujrah','lelongbid.onepercent')
         ->get()->toArray();
 
         foreach($laporanlelong as $index1=>$laplelong)
@@ -341,6 +343,8 @@ class ReportCawanganController extends Controller
             $total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun'];
             $total_pembiayaan = $total_pembiayaan + $laplelong['pinjaman'];
             $total_upahsimpan = $total_upahsimpan + $laplelong['bakiupah'];
+            $total_onepercent += $laplelong['onepercent'];
+            $total_ujrah += $laplelong['ujrah'];
             $total_cajlelong = $total_cajlelong + $laplelong['cajlelong'];
             $total_hargalelong = $total_hargalelong + $laplelong['hargabida'];
             $total_bakirugi = $total_bakirugi + $laplelong['baki'];
@@ -352,7 +356,7 @@ class ReportCawanganController extends Controller
 
 
         $pdf = PDF::loadView('pdf.laporanlelfullcaw',compact('info','lelong_id','laporanlelong','lelong_id','total_nmarhun','total_pembiayaan',
-        'total_upahsimpan','total_cajlelong','total_hargalelong','total_bakirugi','total_hargaasas','arrayinfocaw'))
+        'total_upahsimpan','total_cajlelong','total_hargalelong','total_bakirugi','total_hargaasas','arrayinfocaw','total_ujrah','total_onepercent'))
 
         ->setPaper('a4', 'landscape');
         return $pdf->download('Laporan Lelong Keseluruhan.pdf');
diff --git a/resources/views/lelong/senaraimarhunpc.blade.php b/resources/views/lelong/senaraimarhunpc.blade.php
index 8df9a118..226fc135 100644
--- a/resources/views/lelong/senaraimarhunpc.blade.php
+++ b/resources/views/lelong/senaraimarhunpc.blade.php
@@ -11,9 +11,9 @@
                     <i class="fas fa-arrow-left"></i>
                 </a>
                 <div class="header-style-title">
-                    @if($lelonglel->tagujrah == '0')
+                    @if($cawanganDetail['tagujrah'] == '0')
                     senarai Lelongan
-                    @elseif($lelonglel->tagujrah == '1')
+                    @elseif($cawanganDetail['tagujrah'] == '1')
                     senarai Lelongan Ujrah
                     @endif
                 </div>
@@ -81,9 +81,9 @@
                 <input type="hidden" name="lelongid" value="{{$lelongid}}">
                 <input type="hidden" name="cawid" value="{{$cawid}}">
                 <table class="table text-right table-bordered" id="marhun" style="width:100%">
-                    @if($lelonglel->tagujrah == '0')
+                    @if($cawanganDetail['tagujrah'] == '0')
                     <thead class="bg-primary text-white">
-                    @elseif($lelonglel->tagujrah == '1')
+                    @elseif($cawanganDetail['tagujrah'] == '1')
                     <thead class="bg-success text-white">
                     @endif
                         <tr>
@@ -94,7 +94,13 @@
                             <th>Berat (gm)</th>
                             <th>Nilai Marhun Asal (RM)</th>
                             <th>Pembiayaan (RM)</th>
+                            @if($cawanganDetail['tagujrah'] == '0')
                             <th>Keuntungan (RM)</th>
+                            @elseif($cawanganDetail['tagujrah'] == '1')
+                            <th>Keuntungan (RM)</th>
+                            <th>1%(RM)</th>
+                            <th>Lain-Lain Caj(RM)</th>
+                            @endif
                             <th>Caj Lelong (RM)</th>
                             <th>Harga Asas (RM)</th>
                             <th>Baki Lelong (RM)</th>
@@ -115,7 +121,13 @@
                             <td align = 'right'>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
+                            @if($cawanganDetail['tagujrah'] == '0')
                             <td align = 'right'>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
+                            @elseif($cawanganDetail['tagujrah'] == '1')
+                            <td>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
+                            <td>{{ number_format($marhun['onepercent'], 2, '.', ',') }}</td>
+                            <td>{{ number_format($marhun['ujrah'], 2, '.', ',') }}</td>
+                            @endif
                             <td align = 'right'>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
                             @php
@@ -152,7 +164,13 @@
                             <td align = 'right'><b><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
                             <td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
                             <td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
+                            @if($cawanganDetail['tagujrah'] == '0')
                             <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+                            @elseif($cawanganDetail['tagujrah'] == '1')
+                            <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_onepercent, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_ujrah, 2, '.', ',') }}</b></td>
+                            @endif
                             <td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
                             <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
                             <td align = 'right'><b>@if($bakilelong > 0)
diff --git a/resources/views/pdf/laporanlelfullcaw.blade.php b/resources/views/pdf/laporanlelfullcaw.blade.php
index 52bc2a7d..4b44021a 100644
--- a/resources/views/pdf/laporanlelfullcaw.blade.php
+++ b/resources/views/pdf/laporanlelfullcaw.blade.php
@@ -225,9 +225,9 @@ tr:nth-child(even) {
                 <td align="right"><strong>{{ number_format($total_nmarhun, 2, '.', ',') }}</strong></td>
                 <td align = 'right'><strong>{{ number_format($total_pembiayaan, 2, '.', ',') }}</strong></td>
                 <td></td>
-                @if($laporan['tagujrah'] == '0')
+                @if($info['tagujrah'] == '0')
                 <td align = 'right'><strong>{{ number_format($total_upahsimpan, 2, '.', ',') }}</strong></td>
-                @elseif($laporan['tagujrah'] == '1')
+                @elseif($info['tagujrah'] == '1')
                 <td align = 'right'><strong>{{ number_format($total_upahsimpan, 2, '.', ',') }}</strong></td>
                 <td align = 'right'><strong>{{ number_format($total_onepercent, 2, '.', ',') }}</strong></td>
                 <td align = 'right'><strong>{{ number_format($total_ujrah, 2, '.', ',') }}</strong></td>