diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index a1d53c75..2e246a1f 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -1337,72 +1337,41 @@ class LelongController extends Controller
         $bakilelong = 0;
         $total_cazlelong = 0;
         // dd($cawid);
-        $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
-        ->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid)
-        ->select(
-            'lelongbid.t_lelong',
-            'lelongbid.kodcaw',
-            'cawangan.caw_name',
-            'lelongbid.norujukan',
-            'lelongbid.pinjaman',
-            'lelongbid.berat',
-            'lelongbid.nilaimarhun',
-            'lelongbid.hargaasas',
-            'lelongbid.hargajual',
-            'lelongbid.t_jual',
-            'lelongbid.upahsimpan',
-            'lelongbid.cajlelong',
-            'lelongbid.baki',
-            'lelongbid.bakiupah',
-            'lelongbid.status_jual',
-            'lelongbid.jbg'
-        )
-        ->get()->toArray();
+
+        $lelonglel = Lelong::with('cawangan')->find($lelongid);
+
+        $cawanganDetail = $lelonglel->cawangan->find($cawid);
+
+        $marhuns = LelongBid::where('caw_id', '=', $cawid)
+        ->where('lelong_id', '=', $lelongid)
+        ->get();
         // dd($marhuns);
         $arraymarhun = [];
         foreach ($marhuns as $index1=> $cal) {
-            // dd($cal);
-            $gadai = Gadai::on($cal['kodcaw'])
-            ->where('norujukan','=',$cal['norujukan'])
-            ->first();
-            // dd($gadai);
-            $customer =  Customer::where('kpbaru','=',$gadai['nokp'])
-            ->orWhere('kplama','=',$gadai['nokp'])
-            ->first();
-            // dd($customer);
-
-            $simulasilel = Lelong::where('id',$lelongid)->get();
-            $sumcajlelong =  $cal['hargaasas'] * ($simulasilel[0]['cajlelong']/100);
+            $sumcajlelong =  $cal['hargaasas'] * ($lelonglel->cajlelong/100);
             $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - bcdiv($sumcajlelong,1,1);
             $marhuns[$index1]['cajlelong'] =  bcdiv($sumcajlelong,1,1);
             $marhuns[$index1]['baki'] =  $totalbaki;
-
-            // $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) );
             $marhuns[$index1]['keuntungan'] = $keuntungan;
-            $marhuns[$index1]['nama'] = $customer;
 
-            // array_push($arraymarhun,[
-            //     'norujukan' => $cal['norujukan'],
-            //     'tempoh' => $gadai['tempoh'],
-            //     'nama' => $customer['nama'],
-            //     'berat' => $cal['berat'],
-            //     'nilaimarhun' => $cal['nilaimarhun'],
-            //     'hargaasas' => $cal['hargaasas'],
-            //     'hargajual' => $cal['hargajual'],
-            //     't_jual' => $cal['t_jual'],
-            //     'pinjaman' => $cal['pinjaman'],
-            //     'pinjasal' => $gadai['pinjaman'],
-            //     'bakiupah' => $cal['bakiupah'],
-            //     'cajlelong' => $cal['cajlelong'],
-            //     'baki' => $cal['baki'],
-            //     'upah6bulan' => $gadai['bakiupah']
-            // ]);
             $total_berat = $total_berat + $cal['berat'];
             $total_pinjaman = $total_pinjaman + $cal['pinjaman'];
             $total_hargaasas = $total_hargaasas  +  $cal['hargaasas'];
             $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
             $total_bakiupah = $total_bakiupah + $cal['bakiupah'];
             $total_cazlelong = $total_cazlelong +  bcdiv($sumcajlelong,1,1);
+
+            array_push($arraymarhun,[
+                'norujukan' => $cal['norujukan'],
+                'tempoh' => $cal['jbg'],
+                'berat' => $cal['berat'],
+                'nilaimarhun' => $cal['nilaimarhun'],
+                'hargaasas' => $cal['hargaasas'],
+                'pinjaman' => $cal['pinjaman'],
+                'bakiupah' => $cal['bakiupah'],
+                'cajlelong' => $cal['cajlelong'],
+                'baki' => $cal['baki'],
+            ]);
         }
 
         $arrayinfo = [];
@@ -1429,6 +1398,8 @@ class LelongController extends Controller
         'total_hargaasas',
         'total_bakiupah',
         'total_nilaimarhun',
+        'lelonglel',
+        'cawanganDetail',
         'total_cazlelong'));
     }
 
@@ -3118,6 +3089,11 @@ class LelongController extends Controller
         $keuntungan = 0;
 
         $arraylistgadai = 0;
+
+        $lelonglel = Lelong::with('cawangan')->find($lelongid);
+
+        $cawanganDetail = $lelonglel->cawangan->find($cawid);
+
         $marhun = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
         ->where('lelong_id','=',$lelongid)
         ->where('caw_id','=',$cawid);
@@ -3175,7 +3151,7 @@ class LelongController extends Controller
             ->toArray();
             array_push($arrayinfo,['laporan' => $laporan,'details' => $details]);
         }
-        return view('lelong.listsagbycust',compact('marhuns','lelongid','cawid','listsag','ktlhbyr','arrayinfo'));
+        return view('lelong.listsagbycust',compact('lelonglel','cawanganDetail','marhuns','lelongid','cawid','listsag','ktlhbyr','arrayinfo'));
     }
 
     public function exportlelong(Request $request)
@@ -3757,7 +3733,7 @@ class LelongController extends Controller
             ->where('cawangan_lelong.caw_id', $caw->id)           
             ->get()
             ->toArray();
-            array_push($arraydetails,['laporan' => $laporan,'details' => $details]);
+            array_push($arraydetails,['laporan' => $laporan,'details' => $details]); 
         }
 
 
@@ -4591,8 +4567,11 @@ class LelongController extends Controller
             $data = Lelong::where('lelong.id','=',$lelong_id)
             ->first();
         }
+        $datacaw = Cawangan::where('id','=',$caw->id)
+        ->get();
 
-        $pdf = PDF::loadView('pdf.lelreportpc',compact('arraycaw',
+
+        $pdf = PDF::loadView('pdf.lelreportpc',compact('datacaw','arraycaw',
                                                     'total_marhun',
                                                     'total_berat',
                                                     'total_nmarhun',
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index d6d2a034..7ffe9ca1 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -753,8 +753,10 @@ class ReportController extends Controller
             ->toArray();
             array_push($arrayinfo,['laporan' => $laporan,'details' => $details]);
         }
+          $datacaw = Cawangan::where('id','=',$cawid)
+            ->get();
 
-        $pdf = PDF::loadView('pdf.pdflelongreport',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo','total_berat',
+        $pdf = PDF::loadView('pdf.pdflelongreport',compact('datacaw','arraymarhun','marhuns','lelongid','cawid','arrayinfo','total_berat',
         'total_pinjaman',
         'total_upah',
         'total_hargaasas',
@@ -836,6 +838,7 @@ class ReportController extends Controller
         $total_bakiupah = 0;
         $total_nilaimarhun = 0;
         $keuntungan = 0;
+        $total_cazlelong = 0;
         $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
         ->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid)
         ->select(
@@ -869,6 +872,11 @@ class ReportController extends Controller
             ->orWhere('kplama','=',$gadai['nokp'])
             ->first();
             // dd($customer);
+            $simulasilel = Lelong::where('id',$lelongid)->get();
+            $sumcajlelong =  $cal['hargaasas'] * ($simulasilel[0]['cajlelong']/100);
+            $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - bcdiv($sumcajlelong,1,1);
+            $marhuns[$index1]['cajlelong'] =  bcdiv($sumcajlelong,1,1);
+            $marhuns[$index1]['baki'] =  $totalbaki;
 
             // $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) );
             $marhuns[$index1]['keuntungan'] = $keuntungan;
@@ -895,6 +903,7 @@ class ReportController extends Controller
             $total_hargaasas = $total_hargaasas  +  $cal['hargaasas'];
             $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
             $total_bakiupah = $total_bakiupah + $cal['bakiupah'];
+            $total_cazlelong = $total_cazlelong +  bcdiv($sumcajlelong,1,1);
 
         }
 
@@ -916,14 +925,17 @@ class ReportController extends Controller
             ->toArray();
             array_push($arrayinfo,['laporan' => $laporan,'details' => $details]);
         }
+        $datacaw = Cawangan::where('id','=',$cawid)
+        ->get();
 
         
-        $pdf = PDF::loadView('pdf.pdflelongreportpc',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo','total_berat',
+        $pdf = PDF::loadView('pdf.pdflelongreportpc',compact('datacaw','arraymarhun','marhuns','lelongid','cawid','arrayinfo','total_berat',
         'total_pinjaman',
         'total_upah',
         'total_hargaasas',
         'total_bakiupah',
-        'total_nilaimarhun'))
+        'total_nilaimarhun',
+        'total_cazlelong'))
         ->setPaper('a4','potrait');
 
         return $pdf->download('Laporan Lelong Cawangan.pdf');
diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index aa3f4c5f..929163b1 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -1042,8 +1042,11 @@ class SimulasiController extends Controller
             $total_berat += $berat;
             $total_hargaasas += $hargaasas;
         }
+        $tarikhkemaskini = $simulasi->simkarat[0];
+        $data = $simulasi;
 
         return view('simulasi.showsimulasi', compact(
+            'tarikhkemaskini',
             'data',
             'simkarat',
             'jeniskarat',
@@ -1920,6 +1923,11 @@ class SimulasiController extends Controller
     {
         $keuntungan = 0;
         $arraylistgadai = 0;
+
+        $simulasilel = Simulasi::with('cawangan')->find($simulasi_id);
+
+        $cawanganDetail = $simulasilel->cawangan->find($cawid);
+
        $marhun = SimulasiBid::join('cawangan', 'simulasibid.caw_id', '=', 'cawangan.id')
         ->where('simulasi_id','=',$simulasi_id)
         ->where('caw_id','=',$cawid);
@@ -1958,7 +1966,7 @@ class SimulasiController extends Controller
             $marhuns[$index1]['listsag'] = $listsag;
 
         }
-        return view('simulasi.listsagbycust',compact('marhuns','simulasi_id','cawid','ktlhbyr'));
+        return view('simulasi.listsagbycust',compact('simulasilel','cawanganDetail','marhuns','simulasi_id','cawid','ktlhbyr'));
     }
 
     public function senaraisimulasiall()
diff --git a/app/Models/Cawangan.php b/app/Models/Cawangan.php
index d518a5bd..cd57db68 100644
--- a/app/Models/Cawangan.php
+++ b/app/Models/Cawangan.php
@@ -65,12 +65,4 @@ class Cawangan extends Model
     {
         return $this->belongsTo(User::class, 'kodcaw', 'caw_code');
     }
-
-  
-
-    // public function lelong() 
-    // {
-    //     return $this->belongsToMany(Lelong::class, 'cawangan_lelong', 'caw_id', 'lelong_id');
-    // }
-
 }
diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index 72fb6082..791e4b49 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/resources/views/includes/sidebar.blade.php
@@ -94,14 +94,14 @@
       @endhasrole
       @hasrole('pengurus-cawangan')
 
-      <li class="{{ (request()->is('serahan/*')) ? 'active' : '' }}">
+      {{-- <li class="{{ (request()->is('serahan/*')) ? 'active' : '' }}">
         <a href="#serahanSubmenu" data-toggle="collapse" aria-expanded="false"  style="">Serahan</a>
         <ul class="list-unstyled collapse {{ (request()->is('serahan/*')) ? 'show' : '' }}" id="serahanSubmenu" >
           <li class="{{ (request()->is('serahan/laporanserahan/*') || request()->is('serahan/laporanserahan') ) ? 'active' : '' }}">
             <a href="{{url('serahan/laporanserahan')}}">Laporan Serahan</a>
           </li>
         </ul>
-      </li>
+      </li> --}}
       
       <li class="{{ (request()->is('')) ? 'active' : '' }}">
         <a href="#jananotisSubmenu" data-toggle="collapse" aria-expanded="false"  style="">Notis Lelong</a>
@@ -123,12 +123,8 @@
         </ul> --}}
       </li>
       <li class="{{ (request()->is('')) ? 'active' : '' }}">
-        <a href="#lelonghargajualSubmenu" data-toggle="collapse" aria-expanded="false"  style="">Lelong</a>
-        <ul class="list-unstyled collapse {{ (request()->is('lelonghargajual/*')) ? 'show' : '' }}" id="lelonghargajualSubmenu" >
-          <li class="{{ (request()->is('jananotis/senarailelongpc/*') || request()->is('lelonghargajual/senarailelongpc') ) ? 'active' : '' }}">
-            <a href="{{url('jananotis/senarailelongpc')}}">Senarai Lelongan</a>
-          </li>
-        </ul>   
+        <a href="{{url('jananotis/senarailelongpc')}}">Senarai Lelongan</a>
+       
       </li>
       <li class="{{ (request()->is('Pengesahan/*')) ? 'active' : '' }}">
         <a href="#pengesahanSubmenu" data-toggle="collapse" aria-expanded="false"  style="">Kelulusan</a>
diff --git a/resources/views/lelong/listsagbycust.blade.php b/resources/views/lelong/listsagbycust.blade.php
index 3dc5f252..ef9c313d 100644
--- a/resources/views/lelong/listsagbycust.blade.php
+++ b/resources/views/lelong/listsagbycust.blade.php
@@ -5,47 +5,36 @@
 
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
+        <div class="col">
             
-        <div class="nav nav-tabs" id="nav-tab" role="tablist">
-                <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
-              </div>
-       
-            <table cellspacing="" cellpadding="4" text-align="left" border="0" height="25" align="left" id="sim" class="table table-striped  table-xl">
-            <thead class="bg-light ">
-              @foreach ($arrayinfo as $laporan)
-              <tr>
-                <td><b>ID Lelong: {{ $laporan['laporan']['lelong_id']}} <b></td>     
-                <td><b>Fasa Lelong: {{ $laporan['laporan']['fasa']}} <b></td>   
-                <td><b>Tarikh Lelong : @php 
-                    $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
-                      $datez = $myDateTime->format('d-m-Y');
-                      echo($datez);                  
-                    @endphp</b></td>
-                @foreach($laporan['details'] as $details)
-                <td><b>Nama Cawangan : {{ $details['caw_name']}}</b></td>                
-                <td><b>Kod Cawangan : {{ $details['caw_code']}}</b></td>
-                @endforeach
-              </tr>
-              @endforeach
-                            
-            </thead>
-            </table>
+            <div class="card">
+            <div class="card-header header-style">
+                @hasrole('operasi')
+                <a href="{{ route('lelong.senaraimarhun',[$lelongid,$cawid]) }}" class="header-style-icon">
+                    <i class="fas fa-arrow-left"></i>
+                </a>
+                @endhasrole
+                @hasrole('pengurus-cawangan')
+                <a href="{{ route('jananotis.senaraimarhunpc',[$lelongid,$cawid]) }}" class="header-style-icon">
+                    <i class="fas fa-arrow-left"></i>
+                </a>
+                @endhasrole
+                <div class="header-style-title">
+                    senarai Mengikut Nama Pelanggan : {{ $cawanganDetail->caw_name }}
+                </div>
+            </div>
+            <div class="card-body">
             @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
                 </div>
             @endif
-            <div class="text-left pt-4">
-            <a  href="{{ route('lelong.senaraimarhunsimulasi',[$lelongid,$cawid]) }}" class="btn btn-success">Simulasi Lelong</a>
-            <a  href="{{ route('lelong.listsagbycust',[$lelongid,$cawid])  }}" class="btn btn-success">Senarai Mengikut Nama Pelangan</a>
-            </div>
             <form id="deletesag" method="POST">
                 @csrf
                 <input type="hidden" name="lelongid" value="{{$lelongid}}">
                 <input type="hidden" name="cawid" value="{{$cawid}}">
-                <table class="table table-striped  table-xl" id="marhun" style="width:100%">
-                    <thead class="bg-primary text-white">
+                <table class="table text-center table-bordered" id="marhun" >
+                    <thead class="bg-primary text-white" >
                         <tr>
                             <th>No</th>
                             <th>Nama Pelanggan</th> 
@@ -68,7 +57,7 @@
                         @foreach ($marhuns as $index=> $marhun)
                             <tr>
                             <td>{{$loop->iteration}}</td>                              
-                                <td style='word-wrap'>{{ $marhun['nama']['nama']}}</td>
+                                <td style='word-wrap' align="left">{{ $marhun['nama']['nama']}}</td>
                                 <td style='word-wrap'>{{ $marhun['nokp']}}</td>
                                 <td style='white-space:nowrap;'>@foreach ($marhun['listsag'] as $item)
                                 {{-- {{$loop->iteration}}. {{ $item['norujukan'] }}<br> --}}
@@ -155,31 +144,6 @@
                                         <strong>{{ number_format($jumnilaimarhun, 2, '.', ',') }}</strong>
                                
                                 </td> 
-                                <!-- <td align = 'right'>
-                                    @php $jumcajlelong = 0;@endphp 
-                                    @foreach ($marhun['listsag'] as $item)
-                                    @php 
-                                        $jumcajlelong = $jumcajlelong + $item['cajlelong'];
-                                        @endphp
-                                        {{ number_format($item['cajlelong'], 2, '.', ',') }}<br>
-                                    @endforeach
-                                        <strong>{{ number_format($jumcajlelong, 2, '.', ',') }}</strong>
-                               
-                                </td> 
-                                <td align = 'right'>
-                                    @php $jumbaki = 0;@endphp 
-                                    @foreach ($marhun['listsag'] as $item)
-                                    @php 
-                                        $jumbaki = $jumbaki + $item['baki'];
-                                        @endphp
-                                        {{ number_format($item['baki'], 2, '.', ',') }}<br>
-                                    @endforeach
-                                        <strong>{{ number_format($jumbaki, 2, '.', ',') }}</strong>
-                               
-                                </td>  -->
-                                
-                                
-                               
                             </tr>
                         @endforeach
                     </tbody>
@@ -187,6 +151,8 @@
                 </table>
               
             </form>
+            </div>
+            </div>
         </div>
         
     </div>
@@ -235,43 +201,11 @@
     });
     }
 
-    var tablemarhun = $('#marhun').DataTable( {
-            "columnDefs": [ 
-                {
-                "targets": 13,
-                "orderable": false
-                }, 
-                // {
-                // "targets": 4,
-                // "orderable": false
-                // }
-            ],
-            // order: [[1, 'asc']],
-            // "ordering": false,
-            "info": false,
-            "lengthChange": false,
-            "pageLength": 10000000,
-            dom: 'Bfrtip',
-            // buttons: [
-            //     // 'copy', 'excel', 'pdf'
-            //     // { text: 'copy', className: 'btn btn-primary' },
-            //     {
-            //         className: 'btn btn-outline-success pl-4 pr-4 btn-sm adduser',
-            //         text: '<i class="fas fa-plus" id="test"></i>',
-            //         titleAttr: 'Tambah Pengguna',
-            //         action: function ( e, dt, node, config ) {
-            //             alert( 'Button activated' );
-            //         }
-            //     },
-            //     {
-            //         className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
-            //         titleAttr: 'Export to CSV',
-            //         text: '<i class="fas fa-download"></i>',
-            //         action: function ( e, dt, node, config ) {
-            //             $("#exportform").submit();
-            //         }
-            //     }
-            // ]
+    var tableMarhun = $('#marhun').DataTable({
+        "scrollX": true,
+        "info": false,
+        "paging": false,
+        "pageLength": 5000,
         });
     
 </script>
diff --git a/resources/views/lelong/senarailelongpc.blade.php b/resources/views/lelong/senarailelongpc.blade.php
index 481c1a70..3143c380 100644
--- a/resources/views/lelong/senarailelongpc.blade.php
+++ b/resources/views/lelong/senarailelongpc.blade.php
@@ -4,14 +4,22 @@
 
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            
-        @if ($message = Session::get('success'))
-                <div class="alert alert-success">
-                    <p>{{ $message }}</p>
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="header-style-title">
+                        senarai Lelongan
+                    </div>
                 </div>
-        @endif
-        <table class="table table-striped  table-xl text-center" id="senarailelongtaklaku" style="width:100%">
+                <div class="card-body">
+                    @if ($message = Session::get('success'))
+                    <div class="alert alert-success">
+                        {{ $message }}
+                    </div>
+                    @endif
+                    <form id="exportform" action="" method="POST">
+                        <input type="hidden" name="type" value="User">
+        <table class="table table-bordered text-center" id="senarailelongtaklaku" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
                             <th>Bil</th>
@@ -61,9 +69,10 @@
                         
                         <td class="text-center">
                             @hasrole('pengurus-cawangan')
+                            <div class="row justify-content-center">
                                 @if($data['laporan']['sts_lelong'] == 0)
                                  {{-- <a  href="{{ route('lelonghargajual.kemaskinidata',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a> --}}
-                                <a  href="{{ route('jananotis.showlelongpc',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Senarai Lelong" style="margin-right:40px" ><i class="far fa-edit"></i></a>
+                                <a  class="btn m-1 btn-primary" href="{{ route('jananotis.showlelongpc',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Senarai Lelong" style="margin-right:40px" ><i class="far fa-edit"></i></a>
                                 @elseif($data['laporan']['sts_lelong'] == 1)
                                 <button class="btn btn-warning btn-sm" disabled>LELONGAN SEDANG DIJALANKAN</button>
                                 @elseif($data['laporan']['sts_lelong'] == 2)
@@ -72,6 +81,7 @@
                                 <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
                                 {{-- <a href="{{ route('lelong.exportDataByCawangan', $data['laporan']['lelong_id']) }}" class="btn btn-primary btn-sm">EXPORT <i class="fas fa-file-export"></i></a> --}}
                             @endif
+                            </div>
                             @endhasrole
                         </td>
                     </tr>
diff --git a/resources/views/lelong/senaraimarhun.blade.php b/resources/views/lelong/senaraimarhun.blade.php
index 33768fd3..7a26c873 100644
--- a/resources/views/lelong/senaraimarhun.blade.php
+++ b/resources/views/lelong/senaraimarhun.blade.php
@@ -4,49 +4,60 @@
 
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-
-            <div class="nav nav-tabs" id="nav-tab" role="tablist">
-                <button type="button" class="btn btn-light"><a href="javascript:window.history.go(-1);">
-                        <h3><i class="fas fa-arrow-alt-circle-left"></i></h3>
-                    </a></button>
-            </div>
-
-            <table cellspacing="" cellpadding="4" text-align="left" border="0" height="25" align="left" id="sim" class="table table-striped  table-xl">
-                <thead class="bg-light ">
-                    @foreach ($arrayinfo as $laporan)
-                    <tr>
-                        <td><b>ID Lelong: {{ $laporan['laporan']['lelong_id']}} <b></td>
-                        <td><b>Fasa Lelong: {{ $laporan['laporan']['fasa']}} <b></td>
-                        <td><b>Tarikh Lelong : @php
-                                $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
-                                $datez = $myDateTime->format('d-m-Y');
-                                echo($datez);
-                                @endphp</b></td>
-                        @foreach($laporan['details'] as $details)
-                        <td><b>Nama Cawangan : {{ $details['caw_name']}}</b></td>
-                        <td><b>Kod Cawangan : {{ $details['caw_code']}}</b></td>
-                        @endforeach
-                    </tr>
-                    @endforeach
-
-                </thead>
-            </table>
-
-
-
-
-            @if ($message = Session::get('success'))
-            <div class="alert alert-success">
-                <p>{{ $message }}</p>
-            </div>
-            @endif
-            <div class="text-left pt-4">
-                <a href=" {{ route('report.lelongreport',[$lelongid,$cawid]) }}" class="btn btn-success">PDF</a>
-                <a href="{{ route('lelong.senaraimarhunsimulasi',[$lelongid,$cawid]) }}" class="btn btn-success">Simulasi Lelong</a>
-                <a href="{{ route('lelong.listsagbycust',[$lelongid,$cawid])  }}" class="btn btn-success">Senarai Mengikut Nama Pelangan</a>
-
+        <div class="col mx-auto p-4">
+            <div class="card">
+            <div class="card-header header-style">
+                <a href="{{ route('lelong.show',$lelongid) }}" class="header-style-icon">
+                    <i class="fas fa-arrow-left"></i>
+                </a>
+                <div class="header-style-title">
+                    senarai Sag : {{ $cawanganDetail->caw_name }}
+                </div>
             </div>
+            <div class="card-body">
+                @if ($message = Session::get('success'))
+                <div class="alert alert-success">
+                    {{ $message }}
+                </div>
+                @endif
+                @php
+                $myDateTime = DateTime::createFromFormat('Y-m-d', $lelonglel->tarikh_lelong );
+                $t_lelong = $myDateTime->format('d-m-Y');
+                @endphp
+                <div class="col-3">
+                    <div class="form-group row">
+                        <label class="col-6 col-form-label text-left">Tarikh Lelong</label>
+                        <div class="col-6">
+                            <div class="input-group">
+                                <input type="text" readonly class="form-control bg-light" value="{{$t_lelong}}">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-3">
+                    <div class="form-group row">
+                        <label class="col-6 col-form-label text-left">JBG</label>
+                        <div class="col-6">
+                            <div class="input-group">
+                                <input type="text" readonly class="form-control bg-light" value="{{$lelonglel->jbg}}">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-3">
+                    <div class="form-group row">
+                        <label class="col-6 col-form-label text-left">Bil SAG Cawangan</label>
+                        <div class="col-6">
+                            <div class="input-group">
+                                <input type="text" readonly class="form-control bg-light" value="{{sizeof($arraymarhun)}}">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="mb-3">
+                    <a href=" {{ route('report.lelongreport',[$lelongid,$cawid]) }}" class="btn btn-outline-success">Muat Turun PDF</a>
+                    <a href="{{ route('lelong.listsagbycust',[$lelongid,'cawid'=>$cawid]) }}" class="btn btn-primary">Senarai Mengikut Nama Pelanggan</a>
+                </div>
             <form id="deletesag" action="{{route('lelong.deletemarhun')}}" method="POST">
                 @csrf
                 <input type="hidden" name="lelongid" value="{{$lelongid}}">
@@ -63,8 +74,7 @@
                             <th>Harga Asas (RM)</th>
                             <th>Pembiayaan (RM)</th>
                             <th>Keuntungan (RM)</th>
-                            <th>Caj Lelong (%)</th>
-                            {{-- <th>Rugi Lelong (RM)</th> --}}
+                            <th>Caj Lelong (RM)</th>
                             <th>Baki Lelong (RM)</th>
                             <th>Tindakan</th>
                         </tr>
@@ -99,7 +109,6 @@
                                     $bakilelong += $marhun['baki'];
                                  }
                             @endphp
-                            {{-- <td>{{number_format($rugi, 2, '.', ',')}}</td> --}}
                             <td align = 'right'>@if($marhun['baki'] > 0)
                                 {{number_format($marhun['baki'], 2, '.', ',')}}
                                 @elseif($marhun['baki'] < 0 )
@@ -123,7 +132,6 @@
                             <td align = 'right'>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
-                            {{-- <td align = 'right'>({{ number_format($rugilelong, 2, '.', ',') }})</td> --}}
                             <td align = 'right'>{{ number_format($bakilelong, 2, '.', ',') }}</td>
                         </tr>
                     </tfoot>
@@ -138,7 +146,8 @@
 
             </form>
         </div>
-
+    </div>
+    </div>
     </div>
 </div>
 <script>
diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php
index 3b9a109e..b2e614b2 100644
--- a/resources/views/lelong/showlelong.blade.php
+++ b/resources/views/lelong/showlelong.blade.php
@@ -348,6 +348,14 @@
 
     function save(){
         $('#formhargaasas').submit();
+        $.dialog({
+            icon: 'fa fa-spinner fa-spin',
+            title: 'Dalam Proses !',
+            content: 'Halaman akan dikemaskini selepas proses selesai.',
+            closeIcon: false,
+            boxWidth: '500px',
+            useBootstrap: false,
+        });
     }
 
     $('a.confirmdel').confirm({
diff --git a/resources/views/lelong/showlelongpc.blade.php b/resources/views/lelong/showlelongpc.blade.php
index beac85cb..63c4a568 100644
--- a/resources/views/lelong/showlelongpc.blade.php
+++ b/resources/views/lelong/showlelongpc.blade.php
@@ -4,95 +4,186 @@
 <div class="container-fluid">
     <div class="row ">
         <div class="col-md-11 mx-auto card p-4">
-            <nav>
-                <div class="nav nav-tabs" id="nav-tab" role="tablist">
-                    <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
-                  <a class="nav-link active" id="nav-simulasi-tab" data-toggle="tab" href="#nav-simulasi" role="tab" aria-controls="nav-simulasi" aria-selected="true">Lelong</a>
-                  {{-- <a class="nav-link" id="nav-hargaasas-tab" data-toggle="tab" href="#nav-hargaasas" role="tab" aria-controls="nav-hargaasas" aria-selected="false">Harga Emas Asas</a> --}}
+            <div class="card-header header-style">
+                <a href="{{ route('jananotis.senarailelongpc') }}" class="header-style-icon">
+                    <i class="fas fa-arrow-left"></i>
+                </a>
+                <div class="header-style-title">
+                    @foreach($data as $data1)
+                    @php 
+                        $today = date('d-m-Y');
+                        $kemaskini = date('d-m-Y', strtotime($tarikhkemaskini->updated_at));
+                        $myDateTime = DateTime::createFromFormat('Y-m-d', $data1['tarikh_lelong'] );
+                        $datez = $myDateTime->format('d-m-Y');
+                    @endphp
+                    @endforeach
+                    butiran lelong : {{$datez}}
                 </div>
-              </nav>
-              <div class="tab-content" id="nav-tabContent">
-                <div class="tab-pane fade show active" id="nav-simulasi" role="tabpanel" aria-labelledby="nav-simulasi-tab">
-                <br>
+            </div>
+              <div class="card-body">
                 @if ($message = Session::get('success'))
-                    <div class="alert alert-success">
-                        <p>{{ $message }}</p>
-                    </div>
+                <div class="alert alert-success">
+                    {{ $message }}
+                </div>
                 @endif
                 <form id="exportform" action="{{route('jananotis.exportlelongpc')}}" method="POST">
                     @csrf
                     <input type="hidden" name="type" value="User">
                     <input type="hidden" name="lelongid" value="{{ $lelong_id }}">
-
-                        <div class="row">
-                            <div class="col-md-5">
-                                <table class="table table-striped table-xl" id="conclusion" style="width:100%">
-                                    <tr>
-                                        <td>Bilangan Lelong : {{$total_marhun}}</td>
-                                    </tr>
-                                    <tr>
-                                        <td>Nilai Marhun Keseluruhan : RM{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
-                                    </tr>
-                                    <tr>
-                                        <td>Pembiayaan Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',')  }}</td>
-                                    </tr>
-                                    <tr>
-                                        <td>Keuntungan Keseluruhan : RM{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
-                                    </tr>
-                                    <tr>
+                    <div class="row">
+                        <div class="col-md-12 col-lg">
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Tarikh Lelong</label>
+                                <div class="col-6">
+                                    <div class="input-group">
                                         @foreach($data as $data1)
-                                        <td>Tarikh Lelong : 
                                             @php 
                                             $today = date('d-m-Y');
                                             $kemaskini = date('d-m-Y', strtotime($tarikhkemaskini->updated_at));
                                             $myDateTime = DateTime::createFromFormat('Y-m-d', $data1['tarikh_lelong'] );
                                               $datez = $myDateTime->format('d-m-Y');
-                                              echo($datez);
+                                            //   echo($datez);
                                           
                                           @endphp
-                                        </td>
                                         @endforeach
-                                    </tr>
-                                </table>
+                                        <input type="text" readonly class="form-control bg-light" value="{{$datez}}">
+                                    </div>
+                                </div>
                             </div>
-                            <div class="col-md-2"></div>
-                            <div class="col-md-5">
-                                <table class="table table-striped table-xl" id="conclusion2" style="width:100%">
-                                    <td>
-                                        {{-- {{dd($kemaskini)}} --}}
-                                        @if($kemaskini == $today) 
-                                        <button class="btn btn-success btn-sm" disabled>Telah Dikemaskini Pada {{date('d-m-Y', strtotime($tarikhkemaskini->updated_at))}}</button>   <br>
-                                        Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}}
-                                        @else
-                                        <button class="btn btn-danger btn-sm" disabled>Harga Emas Lelong Belum Dikemaskini Hari Ini</button>  <br>
-                                        Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}}
-                                        @endif                                     
-                                    </td>
-                                    <tr>
-                                        <td>Rugi Lelong Keseluruhan : -RM{{ number_format($total_rugilelong, 2, '.', ',') }}</td>
-                                    </tr>
-                                    <tr>
-                                        <td>Baki Lelong Keseluruhan : RM{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
-                                    </tr>
-                                    <tr>
-                                        <td>Caj Lelong Keseluruhan : RM{{ number_format($total_cazlelong, 2, '.', ',')  }}</td>
-                                    </tr>
-                                    <tr>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">JBG</label>
+                                <div class="col-6">
+                                    <div class="input-group">
                                         @foreach($data as $data)
-                                        <td>Tempoh : {{$data['jbg'] }}</td>
+                                        {{-- <td>Tempoh : {{$data['jbg'] }}</td> --}}
+                                        <input type="text" readonly class="form-control bg-light" value="{{$data['jbg']}}">
                                         @endforeach
-                                    </tr>
-                                </table>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Bilangan SAG</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <input type="text" readonly class="form-control bg-light" value="{{$total_marhun}}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Harga Emas Per Gram</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="{{$tarikhkemaskini->harga2}}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Nilai Marhun Keseluruhan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_nilaimarhun, 2, '.', ',') }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Pembiayaan Keseluruhan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_pinjaman, 2, '.', ',') }}">
+                                    </div>
+                                </div>
                             </div>
                         </div>
+                        <div class="col-lg-1"></div>
+                        <div class="col-md-12 col-lg">
+                            <div class="form-group row">
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        @if($kemaskini == $today) 
+                                        <button class="btn btn-success btn-sm" disabled>Harga Telah Dikemaskini Pada {{date('d-m-Y', strtotime($tarikhkemaskini->updated_at))}}</button>
+                                        {{-- Harga Emas Per Gram (916) : RM{{$simulasi->harga_emas_asas}} --}}
+                                        @else
+                                        <button class="btn btn-danger btn-sm" disabled>Harga Emas Lelong Belum Dikemaskini Hari Ini</button>
+                                        {{-- <strong>Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}}</strong> --}}
+                                        @endif    
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Keuntungan Keseluruhan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_bakiupah, 2, '.', ',') }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Harga Asas Keseluruhan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_hargaasas, 2, '.', ',') }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Caj Lelong Keseluruhan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_cazlelong, 2, '.', ',') }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Baki Lelong Keseluruhan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_bakilelong, 2, '.', ',') }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Rugi Lelong Keseluruhan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="(RM{{ number_format($total_rugilelong, 2, '.', ',') }})">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    
                         
-        
-                        <table class="table table-striped  table-xl" id="simulasi" style="width:100%">
+                    <button class="btn mb-5 btn-outline-success" type="submit">Muat Turun PDF</button>
+                        <table class="table text-right table-bordered" id="simulasi">
                             <thead class="bg-primary text-white">
                                 <tr class="text-center">
                                     <th>No</th>
                                     <th>Cawangan</th>
-                                    <th>Bil Marhun (Paket)</th>
+                                    <th>Bil SAG</th>
                                     <th>Berat (gm)</th>
                                     <th>N. Marhun (RM)</th>
                                     <th>Pembiayaan (RM)</th>
@@ -124,33 +215,35 @@
                             <tfoot>
                                 <tr>
                                     <td colspan="2"><b>JUMLAH KESELURUHAN</b></td>
-                                    <td>{{ $total_marhun }}</td>
-                                    <td>{{ number_format($total_berat, 2, '.', ',') }}</td>
-                                    <td>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
-                                    <td>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
-                                    <td>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
-                                    <td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
-                                    <td>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
-                                    <td>{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
-                                    <td>({{ number_format($total_rugilelong, 2, '.', ',') }})</td>
+                                    <td><b>{{ $total_marhun }}</b></td>
+                                    <td><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_bakilelong, 2, '.', ',') }}</b></td>
+                                    <td><b>({{ number_format($total_rugilelong, 2, '.', ',') }})</b></td>
                                 </tr>
                             </tfoot>
                             
                         </table>
-                        <table class="table table-striped  table-xl" id="jumlahberat" style="width:80%">
-                            <thead class="bg-primary text-white">
-                                <tr class="text-center">
-                                    <th colspan="12">JUMLAH BERAT MENGIKUT MUTU (KESELURUHAN)</th>
 
+                        <h6 class="mt-5">Jumlah Berat Mengikut Mutu (Keseluruhan)</h6>
+                        <table class="table table-bordered text-center" id="jumlahberat">
+                            <thead class="bg-light">
+                                <!-- <tr class="text-center">
+                                    <th colspan="12">JUMLAH BERAT MENGIKUT MUTU (KESELURUHAN)</th>
+                                </tr> -->
+                                <tr>
+                                    <th>MUTU</th>
+                                    @foreach ($lelkarat as $index=>$karat)
+                                    <th>{{$karat->karat}}</th>
+                                    @endforeach
                                 </tr>
                             </thead>
                             <tbody>
-                                <tr>
-                                    <td>MUTU</td>
-                                    @foreach ($lelkarat as $index=>$karat)
-                                    <td>{{$karat->karat}}</td>
-                                    @endforeach
-                                </tr>
+
                                 <tr>
                                     <td>BERAT (gm)</td>
                                     <td>{{$total24Kgb}}</td>
@@ -163,11 +256,10 @@
                                     <td>{{$total18K}}</td>
                                     <td>{{$total14Kp}}</td>
                                     <td>{{$total14K}}</td>
-                                    {{-- <td>{{$total9K}}</td> --}}
-                                    
+
                                 </tr>
                             </tbody>
-                            
+
                         </table>
                     </form>
                     <div class="row">
@@ -348,41 +440,30 @@
         }
     });
 
-        var tablesimulasi = $('#simulasi').DataTable( {
+    var tablesimulasi = $('#simulasi').DataTable( {
             "columnDefs": [ 
                 {
                 "targets": 0,
-                "orderable": false
+                "orderable": false,
+                "width": 100%
                 }
             ],
             order: [[0, 'asc']],
             // "ordering": false,
-            "searching":false,
+            "searching":true,
             "info": false,
             "lengthChange": false,
-            "pageLength": 9999,
-            dom: 'Bfrtip',
-            buttons: [
-                // 'copy', 'excel', 'pdf'
-                // { text: 'copy', className: 'btn btn-primary' },
-                // {
-                //     className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim',
-                //     text: '<i class="fas fa-filter"></i>',
-                //     titleAttr: 'Filter By',
-                //     action: function ( e, dt, node, config ) {
-                //         $('#modalfilter').modal("show");
-                //     }
-                // },
-                {
-                    className: 'btn btn-outline-danger pl-4 pr-4 btn-sm  export',
-                    titleAttr: 'Muat Turun PDF',
-                    text: '<h8><b>PDF</b></h8>',
-                    action: function ( e, dt, node, config ) {
-                        $("#exportform").submit();
-                    }
-                }
-            ]
-        });
+            "scrollX": true,
+            "paging": false,
+
+    });
+        var tableJumlahBerat = $('#jumlahberat').DataTable({
+        "scrollX": true,
+        "info": false,
+        "paging": false,
+        "searching": false,
+        "ordering": false
+    });
 
         $('.addsim').tooltip();
         $('.export').tooltip();
diff --git a/resources/views/pdf/lelreportpc.blade.php b/resources/views/pdf/lelreportpc.blade.php
index aed238ad..8dbb8d85 100644
--- a/resources/views/pdf/lelreportpc.blade.php
+++ b/resources/views/pdf/lelreportpc.blade.php
@@ -1,127 +1,118 @@
 
 <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 <style>
-#sim {
-    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	font-size:8px;
-	border-collapse: collapse;
-    width: 100%;
-}
-
-#sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
-    border: 0px solid;
-    padding: 1px;
-    text-align: right;
-    
-}
-
-#sim tr:nth-child(even){}
-
-#sim tr:hover {}
-
-#sim th {
-    text-align: left;
-    border: 0px solid;
-	table-layout:auto;
-    color: black;
-	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-}
-
-* {
-  box-sizing: border-box;
-}
-
-.row {
-  margin-left:-5px;
-  margin-right:-5px;
-}
+  #sim {
+      font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:10px;
+    border-collapse: collapse;
+      width: 100%;
+  }
   
-.column {
-  float: left;
-  width: 100%;
-  padding: 5px;
-}
-
-/* Clearfix (clear floats) */
-.row::after {
-  content: "";
-  clear: both;
-  display: table;
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-  width: 200%;
-  /* border: 0px solid #ddd; */
-}
-
-th, td {
-  /* text-align: right; */
-  padding: 16px;
-}
-
-/* tr:nth-child(even) {
-  background-color: #f2f2f2;
-} */
-
-</style>
+  #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+      border: 0px solid;
+      padding: 1px;
+      text-align: left;
+      
+  }
+  
+  #sim tr:nth-child(even){}
+  
+  #sim tr:hover {}
+  
+  #sim th {
+      text-align: center;
+      border: 0px solid;
+    table-layout:auto;
+      color: black;
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+  }
+  
+  * {
+    box-sizing: border-box;
+  }
+  
+  .row {
+    margin-right:-5px;
+    margin-right:-5px;
+  }
+    
+  .column {
+    float: right;
+    width: 100%;
+    padding: 5px;
+  }
+  
+  /* Clearfix (clear floats) */
+  .row::after {
+    content: "";
+    clear: both;
+    display: table;
+  }
+  
+  table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    width: 200%;
+    border: 1px solid #ddd;
+  }
+  
+  td {
+    text-align: right;
+    padding: 16px;
+    border: 1px solid #ddd;
+  }
+  
+  th{
+    text-align: center;
+    padding: 16px;
+    border: 1px solid #ddd;
+  }
+  
+  tr:nth-child(even) {
+  }
+  
+  </style>
 
 <body>
 
-                      <table width="100%" border="0" id="sim">
-                        
-                        {{-- <h3><b>Laporan Lelong Cawangan: --}}
-                          {{-- <br> @foreach ($arraycaw as $index=>$caw){{$caw['cawangan']}}<br>@endforeach</b></h3>               --}}
-                        {{-- <b
-                          r> --}}
-                        <h3><b>PERMODALAN KELANTAN BERHAD</b></h3>                    
-                      
-                       
-                      </table>
-
-                      <br>
+  <header>
+    @foreach($datacaw as $data1)
+    <u><b><h5>LAPORAN SIMULASI CAWANGAN: {{$data1['caw_name']}}</h5></b></u>
+    @endforeach
+    </header>
                                           
-                      <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
+                      <table text-align="left" border="0" height="25" style="text-left" id="sim">
                         <thead>
-                          <br>
+                          
                           <tr>
-                            <td>Bilangan Lelong:  {{$total_marhun}}</td>
-                            <td>Nilai Marhun Keseluruhan: RM{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
-                            <td>Pembiayaan Keseluruhan: RM{{ number_format($total_pinjaman, 2, '.', ',')  }} </td>
-                            <td>Keuntungan Keseluruhan:RM{{ number_format($total_bakiupah, 2, '.', ',') }}</td>                                                  
-                        </thead>
-                      </table>
-
-                      <table cellspacing="" cellpadding="5" text-align="left" border="0"  height="25" align="left" id="sim">
-                            <thead>
-                            <tr>
-                            <td>Rugi Lelong Keseluruhan: RM{{ number_format($total_rugilelong, 2, '.', ',') }}</td>
-                            <td>Baki Lelong Keseluruhan: RM{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
-                            <td>Caj Lelong Keseluruhan: RM{{ number_format($total_cazlelong, 2, '.', ',')  }}</td>
-                            <td>Tempoh: {{ $data['jbg']}}</td> 
-                            <td>Tarikh Lelong :@php 
+                            <td style="text-left">Bilangan Lelong:  {{$total_marhun}}</td>
+                            <td style="text-left">Tempoh: {{ $data['jbg']}}</td> 
+                            <td style="text-left">Tarikh Lelong: <br>@php 
                               $myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
                                 $datez = $myDateTime->format('d-m-Y');
                                 echo($datez);                            
                             @endphp
                           </td> 
-                            </tr>
+                            {{-- <td>Nilai Marhun: RM{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td> --}}
+                            {{-- <td>Pembiayaan: RM{{ number_format($total_pinjaman, 2, '.', ',')  }} </td> --}}
+                            {{-- <td>Keuntungan: <br>RM{{ number_format($total_bakiupah, 2, '.', ',') }}</td>                          --}}
+                            {{-- <td>Harga Asas: <br>RM{{ number_format($total_hargaasas, 2, '.', ',') }}</td>                                                   --}}
                         </thead>
-                      </table>             
+                      </table>
+          
                   
               
                       <br>
-                      <table width="100%" border="0" id="sim">      
+                      <table width="100%" id="sim">      
                         <thead>
                                     
-                        <tr>                       
+                        {{-- <tr>                       
                           <th style="text-align:center;" colspan="12"><h3><b>SIMULASI KESELURUHAN</b></h3></th>   
-                        </tr>
+                        </tr> --}}
                             <tr >
                                 <th>No</th>
                                 <th>Cawangan</th>
-                                <th>Bil Marhun (Paket)</th>
+                                <th>Bil SAG</th>
                                 <th>Berat (gm)</th>
                                 <th>Nilai Marhun (RM)</th>
                                 <th>Pinjaman (RM)</th>
@@ -153,15 +144,15 @@ th, td {
                         <tfoot>
                             <tr>
                                     <td colspan="2"><b>JUMLAH KESELURUHAN</b></td>
-                                    <td align = 'center'>{{ $total_marhun }}</td>
-                                    <td align = 'right'>{{ number_format($total_berat, 2, '.', ',') }}</td>
-                                    <td align = 'right'>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
-                                    <td align = 'right'>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
-                                    <td align = 'right'>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
-                                    <td align = 'right'>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
-                                    <td align = 'right'>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
-                                    <td align = 'right'>{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
-                                    <td align = 'right'>({{ number_format($total_rugilelong, 2, '.', ',') }})</td>
+                                    <td align = 'center'><b>{{ $total_marhun }}</td>
+                                    <td align = 'right'><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>
+                                    <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_bakilelong, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>({{ number_format($total_rugilelong, 2, '.', ',') }})</b></td>
                             </tr>
                         </tfoot>
                         
@@ -173,7 +164,7 @@ th, td {
                       <thead>
 
                         <tr>
-                          <th style="text-align:center;" colspan="10"><h3><b>JUMLAH BERAT MENGIKUT MUTU (KESELURUHAN)</b></h3></th>   
+                          <th style="text-align:center;" colspan="10"><b>JUMLAH BERAT MENGIKUT MUTU (KESELURUHAN)</b></h5></th>   
                       </tr>
                       <tr>
                         <td colspan="1" align="left"><strong>MUTU &nbsp;</strong></td>
diff --git a/resources/views/pdf/pdflelongreport.blade.php b/resources/views/pdf/pdflelongreport.blade.php
index f5eda715..750ee69c 100644
--- a/resources/views/pdf/pdflelongreport.blade.php
+++ b/resources/views/pdf/pdflelongreport.blade.php
@@ -1,88 +1,130 @@
 
 <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 <style>
-#sim {
-    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	font-size:10px;
-	border-collapse: collapse;
-    width: 100%;
-}
-
-#sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
-    border: 0px solid;
-    padding: 1px;
-    text-align: right;
-    
-}
-
-#sim tr:nth-child(even){}
-
-#sim tr:hover {}
-
-#sim th {
-    text-align: left;
-    border: 0px solid;
-	table-layout:auto;
-    color: black;
-	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-}
-
-* {
-  box-sizing: border-box;
-}
-
-.row {
-  margin-left:-5px;
-  margin-right:-5px;
-}
+  #sim {
+      font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:10px;
+    border-collapse: collapse;
+      width: 100%;
+  }
   
-.column {
-  float: left;
-  width: 100%;
-  padding: 5px;
-}
-
-/* Clearfix (clear floats) */
-.row::after {
-  content: "";
-  clear: both;
-  display: table;
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-  width: 200%;
-  border: 0px solid #ddd;
-}
-
-td {
-  /* text-align: left; */
-  padding: 16px;
-}
-
-th{
-  text-align: left;
-  padding: 16px;
-  background-color:gainsboro;
-}
-
-tr:nth-child(even) {
-  /* background-color: #f2f2f2; */
-}
-
-</style>
+  #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+      border: 0px solid;
+      padding: 1px;
+      text-align: left;
+      
+  }
+  
+  #sim tr:nth-child(even){}
+  
+  #sim tr:hover {}
+  
+  #sim th {
+      text-align: center;
+      border: 0px solid;
+    table-layout:auto;
+      color: black;
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+  }
+  
+  * {
+    box-sizing: border-box;
+  }
+  
+  .row {
+    margin-right:-5px;
+    margin-right:-5px;
+  }
+    
+  .column {
+    float: right;
+    width: 100%;
+    padding: 5px;
+  }
+  
+  /* Clearfix (clear floats) */
+  .row::after {
+    content: "";
+    clear: both;
+    display: table;
+  }
+  
+  table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    width: 200%;
+    border: 0px solid #ddd;
+  }
+  
+  td {
+    text-align: right;
+    padding: 16px;
+  }
+  
+  th{
+    text-align: center;
+    padding: 16px;
+  }
+  
+  tr:nth-child(even) {
+  }
+  
+  </style>
+  
+  <style>
+    /** Define now the real margins of every page in the PDF **/
+    body {
+        margin-top: 1cm;
+        /* margin-left: 2cm; */
+        /* margin-right: 2cm; */
+        margin-bottom: 2cm;
+    }
+    
+    /** Define the header rules **/
+    header {
+        position: fixed;
+        top: -1cm;
+        left: 0cm;
+        right: 0cm;
+        height: 0cm;
+        /** Extra personal styles **/
+        /* background-color: #eaeaea; */
+        color: black;
+        text-align: center;
+        line-height: 1.5cm;
+    }
+    
+    /** Define the footer rules **/
+    footer {
+        position: fixed;
+        bottom: 0cm;
+        left: 0cm;
+        right: 0cm;
+        height: 2cm;
+    
+        /** Extra personal styles **/
+        /* background-color: #eaeaea; */
+        color: black;
+        text-align: center;
+        line-height: 1.5cm;
+    }
+    footer .pagenum:before {
+        content: counter(page);
+    }
+    </style>
 
 <body>
 
-          <table width="100%" border="0" id="sim">
-                        <tr>
-                          <td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
-                        </tr>
-{{-- @foreach($datacaw as $data) --}}
-                     
-                    </table>
-                    <table cellspacing="" cellpadding="4" text-align="left" border="0" height="25" align="left" id="sim" class="table table-striped  table-xl">
+  <header>
+    @foreach($datacaw as $data)
+    <u><b><h5>LAPORAN SIMULASI CAWANGAN: {{$data['caw_name']}}</h5></b></u>
+    @endforeach
+    </header>
+    
+  <footer>
+    <div class="pagenum-container"><span class="pagenum"></span></div>
+  </footer>
+                    {{-- <table cellspacing="" cellpadding="4" text-align="left" border="0" height="25" align="left" id="sim" class="table table-striped  table-xl">
                       <thead class="bg-light ">
                           @foreach ($arrayinfo as $laporan)
                           <tr>
@@ -93,15 +135,12 @@ tr:nth-child(even) {
                                       $datez = $myDateTime->format('d-m-Y');
                                       echo($datez);
                                       @endphp</b></td>
-                              @foreach($laporan['details'] as $details)
-                              <td><b>Nama Cawangan : {{ $details['caw_name']}}</b></td>
-                              <td><b>Kod Cawangan : {{ $details['caw_code']}}</b></td>
-                              @endforeach
+                           
                           </tr>
                           @endforeach
       
                       </thead>
-                  </table>
+                  </table> --}}
 
                       <br>
           
@@ -180,12 +219,5 @@ tr:nth-child(even) {
                       </tfoot>                                   
                        
           </table>  
-
-                    
-
-
-               
-                      
-                    
-</tbody>
+  </body>
 
diff --git a/resources/views/pdf/pdflelongreportpc.blade.php b/resources/views/pdf/pdflelongreportpc.blade.php
index e74a2d1b..20202164 100644
--- a/resources/views/pdf/pdflelongreportpc.blade.php
+++ b/resources/views/pdf/pdflelongreportpc.blade.php
@@ -1,88 +1,130 @@
 
 <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 <style>
-#sim {
-    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-	font-size:10px;
-	border-collapse: collapse;
-    width: 100%;
-}
-
-#sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
-    border: 0px solid;
-    padding: 1px;
-    text-align: right;
-    
-}
-
-#sim tr:nth-child(even){}
-
-#sim tr:hover {}
-
-#sim th {
-    text-align: left;
-    border: 0px solid;
-	table-layout:auto;
-    color: black;
-	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
-}
-
-* {
-  box-sizing: border-box;
-}
-
-.row {
-  margin-left:-5px;
-  margin-right:-5px;
-}
+  #sim {
+      font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+    font-size:10px;
+    border-collapse: collapse;
+      width: 100%;
+  }
   
-.column {
-  float: left;
-  width: 100%;
-  padding: 5px;
-}
-
-/* Clearfix (clear floats) */
-.row::after {
-  content: "";
-  clear: both;
-  display: table;
-}
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-  width: 200%;
-  border: 0px solid #ddd;
-}
-
-td {
-  /* text-align: left; */
-  padding: 16px;
-}
-
-th{
-  text-align: left;
-  padding: 16px;
-  background-color:gainsboro;
-}
-
-tr:nth-child(even) {
-  /* background-color: #f2f2f2; */
-}
-
-</style>
+  #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+      border: 0px solid;
+      padding: 1px;
+      text-align: left;
+      
+  }
+  
+  #sim tr:nth-child(even){}
+  
+  #sim tr:hover {}
+  
+  #sim th {
+      text-align: center;
+      border: 0px solid;
+    table-layout:auto;
+      color: black;
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+  }
+  
+  * {
+    box-sizing: border-box;
+  }
+  
+  .row {
+    margin-right:-5px;
+    margin-right:-5px;
+  }
+    
+  .column {
+    float: right;
+    width: 100%;
+    padding: 5px;
+  }
+  
+  /* Clearfix (clear floats) */
+  .row::after {
+    content: "";
+    clear: both;
+    display: table;
+  }
+  
+  table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    width: 200%;
+    border: 0px solid #ddd;
+  }
+  
+  td {
+    text-align: right;
+    padding: 16px;
+  }
+  
+  th{
+    text-align: center;
+    padding: 16px;
+  }
+  
+  tr:nth-child(even) {
+  }
+  
+  </style>
+  
+  <style>
+    /** Define now the real margins of every page in the PDF **/
+    body {
+        margin-top: 1cm;
+        /* margin-left: 2cm; */
+        /* margin-right: 2cm; */
+        margin-bottom: 2cm;
+    }
+    
+    /** Define the header rules **/
+    header {
+        position: fixed;
+        top: -1cm;
+        left: 0cm;
+        right: 0cm;
+        height: 0cm;
+        /** Extra personal styles **/
+        /* background-color: #eaeaea; */
+        color: black;
+        text-align: center;
+        line-height: 1.5cm;
+    }
+    
+    /** Define the footer rules **/
+    footer {
+        position: fixed;
+        bottom: 0cm;
+        left: 0cm;
+        right: 0cm;
+        height: 2cm;
+    
+        /** Extra personal styles **/
+        /* background-color: #eaeaea; */
+        color: black;
+        text-align: center;
+        line-height: 1.5cm;
+    }
+    footer .pagenum:before {
+        content: counter(page);
+    }
+    </style>
 
 <body>
 
-          <table width="100%" border="0" id="sim">
-                        <tr>
-                          <td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
-                        </tr>
-{{-- @foreach($datacaw as $data) --}}
-                     
-                    </table>
-                    <table cellspacing="" cellpadding="4" text-align="left" border="0" height="25" align="left" id="sim" class="table table-striped  table-xl">
+  <header>
+    @foreach($datacaw as $data)
+    <u><b><h5>LAPORAN SIMULASI CAWANGAN: {{$data['caw_name']}}</h5></b></u>
+    @endforeach
+    </header>
+    
+  <footer>
+    <div class="pagenum-container"><span class="pagenum"></span></div>
+  </footer>
+                    {{-- <table cellspacing="" cellpadding="4" text-align="left" border="0" height="25" align="left" id="sim" class="table table-striped  table-xl">
                       <thead class="bg-light ">
                           @foreach ($arrayinfo as $laporan)
                           <tr>
@@ -93,15 +135,12 @@ tr:nth-child(even) {
                                       $datez = $myDateTime->format('d-m-Y');
                                       echo($datez);
                                       @endphp</b></td>
-                              @foreach($laporan['details'] as $details)
-                              <td><b>Nama Cawangan : {{ $details['caw_name']}}</b></td>
-                              <td><b>Kod Cawangan : {{ $details['caw_code']}}</b></td>
-                              @endforeach
+                           
                           </tr>
                           @endforeach
       
                       </thead>
-                  </table>
+                  </table> --}}
 
                       <br>
           
@@ -111,42 +150,55 @@ tr:nth-child(even) {
                         <tr> 
                             <th>No</th>
                             <th>No Rujukan</th>
-                            <th>Nama Pelanggan</th>
+                            {{-- <th>Nama Pelanggan</th> --}}
                             <th>Tempoh</th>
                             <th>Berat (gm)</th>
                             <th>Nilai Marhun (RM)</th>
                             <th>Harga Asas (RM)</th>
                             <th>Pembiayaan (RM)</th>
                             <th>Keuntungan (RM)</th>
-                            {{-- <th>Caj Lelong (%)</th>
-                            <th>Rugi Lelong (RM)</th>
-                            <th>Baki Lelong (RM)</th> --}}
+                            <th>Caj Lelong (%)</th>
+                            {{-- <th>Rugi Lelong (RM)</th> --}}
+                            <th>Baki Lelong (RM)</th>
                         </tr>
                         </thead>
                         <tbody>
-                        @foreach ($arraymarhun as $index=> $marhun)
+                        @php     
+                          $rugilelong = 0;
+                          $bakilelong = 0; 
+                        @endphp
+                        @foreach ($marhuns as $index=> $marhun)
                         <tr>
                             <td>{{$loop->iteration}}</td>
                             <td align = 'left' style="white-space: nowrap;">{{ $marhun['norujukan']}}</td>
-                            <td align = 'left' style="white-space: nowrap;">{{ $marhun['nama']}}</td>
-                            <td >{{ number_format($marhun['tempoh'], 2, '.', ',') }}</td>
+                            {{-- <td align = 'left' style="white-space: nowrap;">{{ $marhun['nama']}}</td> --}}
+                            <td >{{ number_format($marhun['jbg'], 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
                             <td align = 'right'>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
-                            {{-- <td>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
-                            <?php
+                            <td align = 'right'>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
+                            @php
                             $rugi = 0;
-                            $baki = 0;
-                            if (strpos($marhun['baki'], '-') !== false) {
-                                $rugi  = $marhun['baki'];
-                            } else {
-                                $baki = $marhun['baki'];
-                            }
-                            ?>
-                            <td>{{number_format($rugi, 2, '.', ',')}}</td>
-                            <td>{{number_format($baki, 2, '.', ',')}}</td> --}}
+                                $baki = 0;
+                                 if(strpos($marhun['baki'], '-') !== false)
+                                 {
+                                    $baki  = -$marhun['baki'];
+                                    $bakilelong += $marhun['baki'];
+                                 }
+                                 else {
+                                    $baki = $marhun['baki'];
+                                    $bakilelong += $marhun['baki'];
+                                 }
+                            @endphp
+                            {{-- <td>{{number_format($rugi, 2, '.', ',')}}</td> --}}
+                            <td align = 'right'>@if($marhun['baki'] > 0)
+                              {{number_format($marhun['baki'], 2, '.', ',')}}
+                              @elseif($marhun['baki'] < 0 )
+                              ({{number_format(-($marhun['baki']), 2, '.', ',')}})
+                              @endif
+                          </td>
 
                           
 
@@ -155,23 +207,17 @@ tr:nth-child(even) {
                       </tbody>
                       <tfoot>
                           <tr>
-                              <td colspan="4"><b>JUMLAH KESELURUHAN</b></td>
-                              <td align = 'right'>{{ number_format($total_berat, 2, '.', ',') }}</td>
-                              <td align = 'right'>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
-                              <td align = 'right'>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
-                              <td align = 'right'>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
-                              <td align = 'right'>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
-                             
+                              <td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
+                              <td align = 'right'><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_hargaasas, 2, '.', ',') }}</b></td>
+                              <td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
+                              <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+                              <td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                              <td align = 'right'><b>{{ number_format($bakilelong, 2, '.', ',') }}</b></td>
                           </tr>
                       </tfoot>                                   
                        
           </table>  
-
-                    
-
-
-               
-                      
-                    
-</tbody>
+  </body>
 
diff --git a/resources/views/pdf/pdfsimulasireport.blade.php b/resources/views/pdf/pdfsimulasireport.blade.php
index 7b14f372..8d6be839 100644
--- a/resources/views/pdf/pdfsimulasireport.blade.php
+++ b/resources/views/pdf/pdfsimulasireport.blade.php
@@ -20,7 +20,7 @@
 #sim tr:hover {}
 
 #sim th {
-    text-align: right;
+    text-align: center;
     border: 0px solid;
 	table-layout:auto;
     color: black;
@@ -62,7 +62,7 @@ td {
 }
 
 th{
-  text-align: right;
+  text-align: center;
   padding: 16px;
 }
 
@@ -71,13 +71,60 @@ tr:nth-child(even) {
 
 </style>
 
+<style>
+  /** Define now the real margins of every page in the PDF **/
+  body {
+      margin-top: 1cm;
+      /* margin-left: 2cm; */
+      /* margin-right: 2cm; */
+      margin-bottom: 2cm;
+  }
+  
+  /** Define the header rules **/
+  header {
+      position: fixed;
+      top: -1cm;
+      left: 0cm;
+      right: 0cm;
+      height: 0cm;
+      /** Extra personal styles **/
+      /* background-color: #eaeaea; */
+      color: black;
+      text-align: center;
+      line-height: 1.5cm;
+  }
+  
+  /** Define the footer rules **/
+  footer {
+      position: fixed;
+      bottom: 0cm;
+      left: 0cm;
+      right: 0cm;
+      height: 2cm;
+  
+      /** Extra personal styles **/
+      /* background-color: #eaeaea; */
+      color: black;
+      text-align: center;
+      line-height: 1.5cm;
+  }
+  footer .pagenum:before {
+      content: counter(page);
+  }
+  </style>
+
+
 <body>
-  <div class="header-style-title" style="font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; font-size: 11px">
-    <h5>PERMODALAN KELANTAN BERHAD</h5>
+  <header>
     @foreach($datacaw as $data)
     <u><b><h5>LAPORAN SIMULASI CAWANGAN: {{$data['caw_name']}}</h5></b></u>
     @endforeach
-  </div>
+    </header>
+    
+  <footer>
+    <div class="pagenum-container"><span class="pagenum"></span></div>
+  </footer>
+ 
                       <table  cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">
                         
                         <thead>
@@ -152,5 +199,5 @@ tr:nth-child(even) {
                
                       
                     
-</tbody>
+</body>
 
diff --git a/resources/views/simulasi/listsagbycust.blade.php b/resources/views/simulasi/listsagbycust.blade.php
index 2d3449a6..6123b61f 100644
--- a/resources/views/simulasi/listsagbycust.blade.php
+++ b/resources/views/simulasi/listsagbycust.blade.php
@@ -12,7 +12,7 @@
                     <i class="fas fa-arrow-left"></i>
                 </a>
                 <div class="header-style-title">
-                    senarai Mengikut Nama Pelanggan
+                    senarai Mengikut Nama Pelanggan : {{ $cawanganDetail->caw_name }}
                 </div>
             </div>
             <div class="card-body">
@@ -29,7 +29,7 @@
                 @csrf
                 <input type="hidden" name="simulasi_id" value="{{$simulasi_id}}">
                 <input type="hidden" name="cawid" value="{{$cawid}}">
-                <table class="table text-center table-bordered" id="marhun" style="width:100%">
+                <table class="table text-center table-bordered" id="marhun">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No</th>
@@ -54,7 +54,7 @@
                         @foreach ($marhuns as $index=> $marhun)
                             <tr>
                                 <td>{{$loop->iteration}}</td>                              
-                                <td style='word-wrap'>{{ $marhun['nama']['nama']}}</td>
+                                <td style='word-wrap' align="left">{{ $marhun['nama']['nama']}}</td>
                                 <td style='word-wrap'>{{ $marhun['nokp']}}</td>
                                 <td style='white-space:nowrap;'>@foreach ($marhun['listsag'] as $item)
                                 {{-- {{$loop->iteration}}.{{ $item['norujukan'] }}<br> --}}
diff --git a/resources/views/simulasi/senaraimarhunlel.blade.php b/resources/views/simulasi/senaraimarhunlel.blade.php
index 7266e25e..e47316af 100644
--- a/resources/views/simulasi/senaraimarhunlel.blade.php
+++ b/resources/views/simulasi/senaraimarhunlel.blade.php
@@ -24,7 +24,7 @@
                     $myDateTime = DateTime::createFromFormat('Y-m-d', $simulasilel->tarikh_lelong );
                     $t_lelong = $myDateTime->format('d-m-Y');
                     @endphp
-                    <div class="col-6">
+                    <div class="col-3">
                         <div class="form-group row">
                             <label class="col-6 col-form-label text-left">Tarikh Lelong</label>
                             <div class="col-6">
@@ -34,7 +34,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="col-6">
+                    <div class="col-3">
                         <div class="form-group row">
                             <label class="col-6 col-form-label text-left">JBG</label>
                             <div class="col-6">
@@ -44,7 +44,7 @@
                             </div>
                         </div>
                     </div>
-                    <div class="col-6">
+                    <div class="col-3">
                         <div class="form-group row">
                             <label class="col-6 col-form-label text-left">Bil SAG Cawangan</label>
                             <div class="col-6">
@@ -74,7 +74,7 @@
                                     <th>Harga Asas (RM)</th>
                                     <th>Pembiayaan (RM)</th>
                                     <th>Keuntungan (RM)</th>
-                                    <th>Caj Lelong (%)</th>
+                                    <th>Caj Lelong (RM)</th>
                                     <th>Baki Lelong (RM)</th>
                                     <th>Tindakan</th>
                                 </tr>
diff --git a/resources/views/simulasi/senaraisimulasi.blade.php b/resources/views/simulasi/senaraisimulasi.blade.php
index 70fa5e07..2368c64a 100644
--- a/resources/views/simulasi/senaraisimulasi.blade.php
+++ b/resources/views/simulasi/senaraisimulasi.blade.php
@@ -1,7 +1,7 @@
 @extends('layouts.app')
 
 @section('content')
-<div class="container">
+<div class="container-fluid">
     <div class="row ">
         <div class="col">
             <div class="card">
diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php
index 173b5f63..9d78b5c4 100644
--- a/resources/views/simulasi/showsimulasi.blade.php
+++ b/resources/views/simulasi/showsimulasi.blade.php
@@ -11,6 +11,8 @@
                     </a>
                     <div class="header-style-title">
                         @php
+                          $today = date('d-m-Y');
+                        $kemaskini = date('d-m-Y', strtotime($tarikhkemaskini->updated_at));
                         $myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
                         $t_lelong = $myDateTime->format('d-m-Y');
                         @endphp
@@ -97,6 +99,19 @@
                                     </div>
                                     <div class="col-lg-1"></div>
                                     <div class="col-md-12 col-lg">
+                                        <div class="form-group row">
+                                            <div class="col-6">
+                                                <div class="input-group">
+                                                    @if($kemaskini == $today) 
+                                                    <button class="btn btn-success btn-sm" disabled>Harga Telah Dikemaskini Pada {{date('d-m-Y', strtotime($tarikhkemaskini->updated_at))}}</button>
+                                                    {{-- Harga Emas Per Gram (916) : RM{{$simulasi->harga_emas_asas}} --}}
+                                                    @else
+                                                    <button class="btn btn-danger btn-sm" disabled>Harga Emas Lelong Belum Dikemaskini Hari Ini</button>
+                                                    {{-- <strong>Harga Emas Per Gram (916) : RM{{$tarikhkemaskini->harga2}}</strong> --}}
+                                                    @endif    
+                                                </div>
+                                            </div>
+                                        </div>
                                         <div class="form-group row">
                                             <label class="col-6 col-form-label">Keuntungan Keseluruhan</label>
                                             <div class="col-6">
@@ -156,7 +171,7 @@
                                 </div>
                                 <button class="btn mb-5 btn-outline-success" type="submit">Muat Turun PDF</button>
 
-                                <table class="table text-right table-bordered" id="simulasi" style="width:100%">
+                                <table class="table text-right table-bordered" id="simulasi">
                                     <thead class="bg-primary text-center text-white">
                                         <tr>
                                             <th>No</th>
@@ -192,16 +207,16 @@
                                     </tbody>
                                     <tfoot class="bg-light">
                                         <tr>
-                                            <td colspan="2" class="text-center"><b>JUMLAH KESELURUHAN</b></td>
-                                            <td>{{ $total_marhun }}</td>
-                                            <td>{{ number_format($total_berat, 2, '.', ',') }}</td>
-                                            <td>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
-                                            <td>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
-                                            <td>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
-                                            <td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
-                                            <td>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
-                                            <td>{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
-                                            <td>({{ number_format($total_rugilelong, 2, '.', ',') }})</td>
+                                            <td colspan="2"><b>JUMLAH KESELURUHAN</b></td>
+                                            <td><b>{{ $total_marhun }}</b></td>
+                                            <td><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                                            <td><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
+                                            <td><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
+                                            <td><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+                                            <td><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                                            <td><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                                            <td><b>{{ number_format($total_bakilelong, 2, '.', ',') }}</b></td>
+                                            <td><b>({{ number_format($total_rugilelong, 2, '.', ',') }})</b></td>
                                         </tr>
                                     </tfoot>