diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 3b7a31fc..b0b83381 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -360,16 +360,16 @@ class LelongController extends Controller
                             ]);
 
 
-                        if($lelongbid->save())
-                        {
-                            $updategadai = Gadai::where('norujukan','=', $data->norujukan)->first();
-                            $updategadai->taglel = 1;
-                            $updategadai->save();
+                        // if($lelongbid->save())
+                        // {
+                        //     $updategadai = Gadai::where('norujukan','=', $data->norujukan)->first();
+                        //     $updategadai->taglel = 1;
+                        //     $updategadai->save();
                             
 
-                            // $hapussimulasi = SimulasiBid::where('norujukan','=',$data->norujukan)->first();
-                            // $hapussimulasi->delete();
-                        }
+                        //     // $hapussimulasi = SimulasiBid::where('norujukan','=',$data->norujukan)->first();
+                        //     // $hapussimulasi->delete();
+                        // }
 
                         $simulasibidmarhun = SimulasiBidMarhun::where('simulasibid_id','=',$data->id)->get();
                         foreach($simulasibidmarhun as $simbidmarhun)
@@ -980,7 +980,7 @@ class LelongController extends Controller
         
 
         $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
-        ->join('gadai','lelongbid.norujukan','=','gadai.norujukan')
+        // ->join('gadai','lelongbid.norujukan','=','gadai.norujukan')
         ->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid)
         ->select(
             'lelongbid.t_lelong',
@@ -998,35 +998,52 @@ class LelongController extends Controller
             'lelongbid.baki',
             'lelongbid.bakiupah',
             'lelongbid.status_jual',
-            'lelongbid.jbg',
-            'gadai.pinjaman as pinjasal',
-            'gadai.bakipjm',
-            'gadai.bakihargajualan',
-            'gadai.upah12',
-            'gadai.ansakhir',
-            'gadai.tempoh',
-            'gadai.tempohbayar',
-            'gadai.kadarupah',
-            'gadai.nokp',
-            'gadai.bakiupah as upah6bulan'
+            'lelongbid.jbg'
+            // 'gadai.pinjaman as pinjasal',
+            // 'gadai.bakipjm',
+            // 'gadai.bakihargajualan',
+            // 'gadai.upah12',
+            // 'gadai.ansakhir',
+            // 'gadai.tempoh',
+            // 'gadai.tempohbayar',
+            // 'gadai.kadarupah',
+            // 'gadai.nokp',
+            // 'gadai.bakiupah as upah6bulan'
         )
         ->get()->toArray();
         // dd($marhuns);
-
+        $arraymarhun = [];
         foreach ($marhuns as $index1=> $cal) {
-
-            $customer =  Customer::on('mysql2')
-            ->where('kpbaru','=',$cal['nokp'])
-            ->orWhere('kplama','=',$cal['nokp'])
+            // 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);
 
-            $ktlhbyr = TransaksiKeuntungan::on('mysql2')->where('norujukan','=',$cal['norujukan'])->sum('bayaran_keuntungan');
-            // dd($ktlhbyr);  
-            $marhuns[$index1]['ktlhbyr'] = $ktlhbyr; 
+            // $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;
 
-            $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) );
-            $marhuns[$index1]['keuntungan'] = bcdiv($keuntungan,1,1); 
-            $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']
+            ]);
         }
 
         $arrayinfo = [];
@@ -1047,7 +1064,7 @@ class LelongController extends Controller
             ->toArray();
             array_push($arrayinfo,['laporan' => $laporan,'details' => $details]);
         }
-        return view('lelong.senaraimarhun',compact('marhuns','lelongid','cawid','arrayinfo'));
+        return view('lelong.senaraimarhun',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo'));
     }
 
     public function deletemarhun(Request $request){
@@ -2646,44 +2663,65 @@ class LelongController extends Controller
     {
         $keuntungan = 0;
 
-        $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
-        ->join('gadai','lelongbid.norujukan','=','gadai.norujukan')
+        $arraylistgadai = 0;
+        $marhun = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
         ->where('lelong_id','=',$lelongid)
-        ->where('caw_id','=',$cawid)
-        ->groupBy('gadai.nokp')
-        ->select('gadai.nokp')
-        ->get()->toArray();
-        // dd($marhuns);
+        ->where('caw_id','=',$cawid);
+
+        $arraynorujukan = $marhun->pluck('norujukan')->toArray();
+        $datalelong = $marhun->get();
+        $marhuns = Gadai::on($datalelong[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
+        ->select('nokp')
+        ->groupBy('nokp')->get();
+        // dd($datagadai); 
+        $arraysag = [];
+       
 
         foreach($marhuns as $index1=>$cal){
-            $customer =  Customer::on('mysql2')
-            ->where('kpbaru','=',$cal['nokp'])
+            $customer =  Customer::where('kpbaru','=',$cal['nokp'])
             ->orWhere('kplama','=',$cal['nokp'])
             ->first();
 
-            $listsag = LelongBid::join('gadai', 'gadai.norujukan','=','lelongbid.norujukan')
-            ->where('gadai.nokp','=',$cal['nokp'])
-            ->select('lelongbid.bakiupah', 'gadai.bakiupah as 6bulan','lelongbid.norujukan','lelongbid.nilaimarhun','lelongbid.berat','lelongbid.hargaasas','lelongbid.pinjaman','gadai.pinjaman as pinjasal','gadai.tempoh' )
+            $listsag = Gadai::on($datalelong[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
+            ->where('nokp','=',$cal['nokp'])
             ->get();
-            // dd($listsag);
+            // dd($listgadai);
             foreach($listsag as $index=>$listing){
-                $ktlhbyr = TransaksiKeuntungan::on('mysql2')->where('norujukan','=',$listing['norujukan'])->sum('bayaran_keuntungan');
+                $ktlhbyr = TransaksiKeuntungan::on('main')->where('norujukan','=',$listing['norujukan'])->sum('bayaran_keuntungan');
                 // dd($ktlhbyr);  
+                $total_untung_rebet = TransaksiKeuntungan::on('main')->where('norujukan','=',$listing['norujukan'])->sum('keuntungan_rebet');
+                $total_untung_asal = TransaksiKeuntungan::on('main')->where('norujukan','=',$listing['norujukan'])->sum('bayaran_keuntungan');
+                $beza_keuntungan = $total_untung_asal - $total_untung_rebet;
+                $keuntungan = bcdiv(($listing['tempoh']-$listing['tempohbayar'])*$listing['kadarupah']/100*$listing['bakipjm'],1,1)-$beza_keuntungan;
+                // dd($keuntungan);
                 $listsag[$index]['ktlhbyr'] = $ktlhbyr; 
+                $listsag[$index]['keuntungan'] = $keuntungan; 
             }
-            
-           
-            
-           // $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;   
-            $marhuns[$index1]['listsag'] = $listsag; 
-            // $marhuns[$index1]['ktlhbyr'] = $ktlhbyr; 
-            // dd($total_untung_asal);
+            $marhuns[$index1]['nama'] = $customer;
+            $marhuns[$index1]['listsag'] = $listsag;
 
             
         }
-        return view('lelong.listsagbycust',compact('marhuns','lelongid','cawid','listsag','ktlhbyr'));
+
+        $arrayinfo = [];
+
+        $lelong_id = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        ->where('cawangan_lelong.lelong_id','=',$lelongid)
+        ->select('lelong_id','tarikh_lelong','lelong.fasa')
+        ->groupBy('lelong_id')
+        ->get()->toArray();
+
+
+        foreach($lelong_id as $laporan)
+        {
+            $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            ->where('lelong_id',$laporan['lelong_id'])
+            ->where('caw_id',$cawid)
+            ->get()
+            ->toArray();
+            array_push($arrayinfo,['laporan' => $laporan,'details' => $details]);
+        }
+        return view('lelong.listsagbycust',compact('marhuns','lelongid','cawid','listsag','ktlhbyr','arrayinfo'));
     }
 
 
diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index 81b9fbb4..30551754 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -1205,30 +1205,9 @@ class SimulasiController extends Controller
                 $listsag[$index]['ktlhbyr'] = $ktlhbyr; 
                 $listsag[$index]['keuntungan'] = $keuntungan; 
             }
-
-            
-            
-
-
-            
-
-            // $listsag = SimulasiBid::join($dbname.'.gadai as db2','SimulasiBid.norujukan','=','db2.norujukan')
-            // ->where('db2.nokp','=',$cal['nokp'])
-            // ->where('SimulasiBid.simulasi_id','=',$simulasi_id)
-            // ->get();
-            // dd($listsag);
-
-           // $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;
             $marhuns[$index1]['listsag'] = $listsag;
 
-            // array_push($arraylistgadai,[
-            //     'hargaasas' => $cal[0]['hargaasas']
-            
-            // ]);
-
-
         }
         return view('simulasi.listsagbycust',compact('marhuns','simulasi_id','cawid','ktlhbyr'));
     }
diff --git a/resources/views/lelong/listsagbycust.blade.php b/resources/views/lelong/listsagbycust.blade.php
index 2b2bb73c..9e6399c6 100644
--- a/resources/views/lelong/listsagbycust.blade.php
+++ b/resources/views/lelong/listsagbycust.blade.php
@@ -6,14 +6,38 @@
     <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('lelong.listsagbycust',[$lelongid,'cawid'=>$cawid]) }}" class="btn btn-success">Senarai Nama Pelangan</a>
+            <a  href="{{ route('lelong.senaraimarhun',[$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
@@ -22,18 +46,18 @@
                 <table class="table table-striped  table-xl" id="marhun" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
-                            <th>No</th>
-                            <th>Nama Pelanggan</th>   
+                        <th>No</th>
+                            <th>Nama Pelanggan</th> 
+                            <th>No.KP</th>   
                             <th>No.Rujukan</th>   
                             <th>Tempoh</th>
+                            <th>K.Tlh Byr(RM)</th>
+                            <th>K.6Bulan(RM)</th>
+                            <th>K.Semasa(RM)</th>
+                            <th>Pembiayaan Asal(RM)</th>
+                            <th>Baki Pembiayaan(RM)</th>
                             <th>Berat (gm)</th>
                             <th>Nilai Marhun (RM)</th>
-                            <th>Harga Asas (RM)</th>
-                            <th>Pembiayaan (RM)</th>
-                            <th>Pembiayaan Asal (RM)</th>
-                            <th>K.6Bulan (RM)</th>
-                            <th>K.Telah Bayar (RM)</th>
-                            <th>K.Semasa (RM)</th>
                             <!-- <th>Caj Lelong (%)</th>
                             <th>Baki Lelong (RM)</th> -->
                             <!-- <th>Tindakan</th> -->
@@ -42,14 +66,71 @@
                     <tbody>
                         @foreach ($marhuns as $index=> $marhun)
                             <tr>
-                                <td>{{$loop->iteration}}</td>                              
+                            <td>{{$loop->iteration}}</td>                              
                                 <td style='word-wrap'>{{ $marhun['nama']['nama']}}</td>
+                                <td style='word-wrap'>{{ $marhun['nokp']}}</td>
                                 <td style='word-wrap'>@foreach ($marhun['listsag'] as $item)
                                 {{$loop->iteration}}. {{ $item['norujukan'] }}<br>
                                 @endforeach</td>
                                 <td>@foreach ($marhun['listsag'] as $item)
                                 {{ $item['tempoh'] }}<br>
-                                @endforeach</td> 
+                                @endforeach</td>
+                                <td align = 'right'>
+                                    @php $jumktlhbyr = 0;@endphp 
+                                    @foreach ($marhun['listsag'] as $item)
+                                    @php 
+                                        $jumktlhbyr = $jumktlhbyr + $item['ktlhbyr'];
+                                        @endphp
+                                        {{ number_format($item['ktlhbyr'], 2, '.', ',') }}<br>
+                                    @endforeach
+                                        <strong>Total: {{ number_format($jumktlhbyr, 2, '.', ',') }}</strong>
+                               
+                                </td> 
+                                <td align = 'right'>
+                                    @php $jum6bulan = 0;@endphp 
+                                    @foreach ($marhun['listsag'] as $item)
+                                    @php 
+                                        $jum6bulan = $jum6bulan + $item['bakiupah'];
+                                        @endphp
+                                        {{ number_format($item['bakiupah'], 2, '.', ',') }}<br>
+                                    @endforeach
+                                        <strong>Total: {{ number_format($jum6bulan, 2, '.', ',') }}</strong>
+                               
+                                </td> 
+                                <td align = 'right'>
+                                    @php $jum6bulan = 0;@endphp 
+                                    @foreach ($marhun['listsag'] as $item)
+                                    @php 
+                                        $jum6bulan = $jum6bulan + $item['keuntungan'];
+                                        @endphp
+                                        {{ number_format($item['keuntungan'], 2, '.', ',') }}<br>
+                                    @endforeach
+                                        <strong>Total: {{ number_format($jum6bulan, 2, '.', ',') }}</strong>
+                               
+                                </td>
+                                <td align = 'right'>
+                                    @php $jumpinjasal = 0;@endphp 
+                                    @foreach ($marhun['listsag'] as $item)
+                                    @php 
+                                        $jumpinjasal = $jumpinjasal + $item['pinjaman'];
+                                        @endphp
+                                        {{ number_format($item['pinjaman'], 2, '.', ',') }}<br>
+                                    @endforeach
+                                        <strong>Total: {{ number_format($jumpinjasal, 2, '.', ',') }}</strong>
+                               
+                                </td> 
+                                <td align = 'right'>
+                                    @php $jumpinjaman = 0;@endphp 
+                                    @foreach ($marhun['listsag'] as $item)
+                                    @php 
+                                        $jumpinjaman = $jumpinjaman + $item['bakipjm'];
+                                        @endphp
+                                        {{ number_format($item['bakipjm'], 2, '.', ',') }}<br>
+                                    @endforeach
+                                        <strong>Total: {{ number_format($jumpinjaman, 2, '.', ',') }}</strong>
+                               
+                                </td> 
+                                
                                 <td align = 'right'>
                                     @php $jumberat = 0;@endphp 
                                     @foreach ($marhun['listsag'] as $item)
@@ -70,75 +151,6 @@
                                     @endforeach
                                         <strong>Total: {{ number_format($jumnilaimarhun, 2, '.', ',') }}</strong>
                                
-                                </td> 
-                                <td align = 'right'>
-                                    @php $jumhargaasas = 0;@endphp 
-                                    @foreach ($marhun['listsag'] as $item)
-                                    @php 
-                                        $jumhargaasas = $jumhargaasas + $item['hargaasas'];
-                                        @endphp
-                                        {{ number_format($item['hargaasas'], 2, '.', ',') }}<br>
-                                    @endforeach
-                                        <strong>Total: {{ number_format($jumhargaasas, 2, '.', ',') }}</strong>
-                               
-                                </td> 
-                                <td align = 'right'>
-                                    @php $jumpinjaman = 0;@endphp 
-                                    @foreach ($marhun['listsag'] as $item)
-                                    @php 
-                                        $jumpinjaman = $jumpinjaman + $item['pinjaman'];
-                                        @endphp
-                                        {{ number_format($item['pinjaman'], 2, '.', ',') }}<br>
-                                    @endforeach
-                                        <strong>Total: {{ number_format($jumpinjaman, 2, '.', ',') }}</strong>
-                               
-                                </td> 
-                                <td align = 'right'>
-                                    @php $jumpinjasal = 0;@endphp 
-                                    @foreach ($marhun['listsag'] as $item)
-                                    @php 
-                                        $jumpinjasal = $jumpinjasal + $item['pinjasal'];
-                                        @endphp
-                                        {{ number_format($item['pinjasal'], 2, '.', ',') }}<br>
-                                    @endforeach
-                                        <strong>Total: {{ number_format($jumpinjaman, 2, '.', ',') }}</strong>
-                               
-                                </td> 
-                                
-                                <td align = 'right'>
-                                    @php $jum6bulan = 0;@endphp 
-                                    @foreach ($marhun['listsag'] as $item)
-                                    @php 
-                                        $jum6bulan = $jum6bulan + $item['6bulan'];
-                                        @endphp
-                                        {{ number_format($item['6bulan'], 2, '.', ',') }}<br>
-                                    @endforeach
-                                        <strong>Total: {{ number_format($jum6bulan, 2, '.', ',') }}</strong>
-                               
-                                </td> 
-                                <td align = 'right'>
-                                    @php $jumktlhbyr = 0;@endphp 
-                                    @foreach ($marhun['listsag'] as $item)
-                                    @php 
-                                        $jumktlhbyr = $jumktlhbyr + $item['ktlhbyr'];
-                                        @endphp
-                                        {{ number_format($item['ktlhbyr'], 2, '.', ',') }}<br>
-                                    @endforeach
-                                        <strong>Total: {{ number_format($jumktlhbyr, 2, '.', ',') }}</strong>
-                               
-                                </td> 
-                                
-
-                                <td align = 'right'>
-                                    @php $jumbakiupah = 0;@endphp 
-                                    @foreach ($marhun['listsag'] as $item)
-                                    @php 
-                                        $jumbakiupah = $jumbakiupah + $item['bakiupah'];
-                                        @endphp
-                                        {{ number_format($item['bakiupah'], 2, '.', ',') }}<br>
-                                    @endforeach
-                                        <strong>Total: {{ number_format($jumbakiupah, 2, '.', ',') }}</strong>
-                               
                                 </td> 
                                 <!-- <td align = 'right'>
                                     @php $jumcajlelong = 0;@endphp 
diff --git a/resources/views/lelong/senaraimarhun.blade.php b/resources/views/lelong/senaraimarhun.blade.php
index f5d2553c..2e7fb401 100644
--- a/resources/views/lelong/senaraimarhun.blade.php
+++ b/resources/views/lelong/senaraimarhun.blade.php
@@ -40,8 +40,10 @@
                 </div>
             @endif
             <div class="text-left pt-4">
-            <a  href="{{ route('lelong.listsagbycust',[$lelongid,$cawid]) }}" class="btn btn-success">Senarai Mengikut Nama Pelangan</a>
-            </div>
+            <a  href="{{ route('lelong.senaraimarhun',[$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" action="{{route('lelong.deletemarhun')}}" method="POST">
                 @csrf
                 <input type="hidden" name="lelongid" value="{{$lelongid}}">
@@ -50,45 +52,33 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No</th>
-                            <th>No Rujukan</th>
-                            <th>Nama Pelanggan</th>
+                            <th>No Rujukan</th>   
+                            <th>Nama Pelanggan</th>                           
                             <th>Tempoh</th>
                             <th>Berat (gm)</th>
-                            <th>N. Marhun (RM)</th>
-                            <th>Tarikh Jual (RM)</th>
+                            <th>Nilai Marhun (RM)</th>
                             <th>Harga Asas (RM)</th>
-                            <th>Harga Jual (RM)</th>
-                            <th>Pembiayaan Asal (RM)</th>
-                            <th>Baki Pembiayaan (RM)</th>
-                            <th>K.Tlh Byr (RM)</th>
-                            <th>K.6bulan (RM)</th>
-                            <th>K.Semasa (RM)</th>
-                            <th>Caj (%)</th>
-                            <th>Rugi (RM)</th>
-                            <th>Baki (RM)</th>
-                            <th>Pilih</th>
+                            <th>Pembiayaan (RM)</th>
+                            <th>Keuntungan (RM)</th>
+                            <th>Caj Lelong (%)</th>
+                            <th>Rugi Lelong (RM)</th>
+                            <th>Baki Lelong (RM)</th>
+                            <th>Tindakan</th>
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach ($marhuns as $index=> $marhun)
+                        @foreach ($arraymarhun as $index=> $marhun)
                             <tr>
-                                <td>{{$loop->iteration}}</td>
+                            <td>{{$loop->iteration}}</td>                              
                                 <td>{{ $marhun['norujukan']}}</td>
-                                <td>{{ $marhun['nama']['nama']}}</td>
-                                <td>{{ $marhun['jbg']}}</td>
-                                <td align = 'right'>{{ $marhun['berat'] }}</td>
-                                <td align = 'right'>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
-                                <td align = 'center'>{{ $marhun['t_jual'] }}</td>
-                                <td align = 'right'>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
-                                <td align = 'right'>{{ number_format($marhun['hargajual'], 2, '.', ',') }}</td>
-                                <td align = 'right'>{{ number_format($marhun['pinjasal'], 2, '.', ',') }}</td>
-                                <td align = 'right'>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
-                                <td align = 'right'>{{ number_format($marhun['ktlhbyr'], 2, '.', ',') }}</td>
-                                <td align = 'right'>{{ number_format($marhun['upah6bulan'], 2, '.', ',') }}</td>
-                                <td align = 'right'>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
-
-                                {{-- <td>{{ $marhun['keuntungan'] }}</td> --}}
-                                <td align = 'right'>{{ $marhun['cajlelong'] }}</td>
+                                <td>{{ $marhun['nama']}}</td>
+                                <td>{{ number_format($marhun['tempoh'], 2, '.', ',') }}</td> 
+                                <td>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
+                                <td>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
+                                <td>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td> 
+                                <td>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
+                                <td>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
+                                <td>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
                                 <?php
                                     $rugi = 0;
                                     $baki = 0;
@@ -100,8 +90,8 @@
                                         $baki = $marhun['baki'];
                                      }
                                 ?>
-                                <td align = 'right'>{{$rugi}}</td>
-                                <td align = 'right'>{{$baki}}</td>
+                                <td>{{number_format($rugi, 2, '.', ',')}}</td>
+                                <td>{{number_format($baki, 2, '.', ',')}}</td>
                                 
                                 <td class="text-center">
                                     <input type="checkbox" aria-label="Checkbox for following text input" onclick="btnDelete(this)" name="checkboxdata[]" value="{{ $marhun['norujukan'] }}">
diff --git a/resources/views/simulasi/listsagbycust.blade.php b/resources/views/simulasi/listsagbycust.blade.php
index c15c99c9..236f44a0 100644
--- a/resources/views/simulasi/listsagbycust.blade.php
+++ b/resources/views/simulasi/listsagbycust.blade.php
@@ -13,7 +13,8 @@
                 </div>
             @endif
             <div class="text-left pt-4">
-            <a  href="{{ route('analisa.listsagbycust',[$simulasi_id,'cawid'=>$cawid]) }}" class="btn btn-success">Senarai Nama Pelangan</a>
+            <a  href="{{ route('analisa.senaraimarhunlel',[$simulasi_id,$cawid]) }}" class="btn btn-success">Simulasi Lelong</a>
+            <a  href="{{ route('analisa.listsagbycust',[$simulasi_id,'cawid'=>$cawid]) }}" class="btn btn-success">Senarai Mengikut Nama Pelangan</a>
             </div>
             <form id="deletesag" action="{{route('analisa.deletemarhunlel')}}" method="POST">
                 @csrf
@@ -23,7 +24,8 @@
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No</th>
-                            <th>Nama Pelanggan</th>   
+                            <th>Nama Pelanggan</th> 
+                            <th>No.KP</th>   
                             <th>No.Rujukan</th>   
                             <th>Tempoh</th>
                             <th>K.Tlh Byr(RM)</th>
@@ -44,6 +46,7 @@
                             <tr>
                                 <td>{{$loop->iteration}}</td>                              
                                 <td style='word-wrap'>{{ $marhun['nama']['nama']}}</td>
+                                <td style='word-wrap'>{{ $marhun['nokp']}}</td>
                                 <td style='word-wrap'>@foreach ($marhun['listsag'] as $item)
                                 {{$loop->iteration}}. {{ $item['norujukan'] }}<br>
                                 @endforeach</td>
diff --git a/resources/views/simulasi/senaraimarhunlel.blade.php b/resources/views/simulasi/senaraimarhunlel.blade.php
index 26830635..648f1610 100644
--- a/resources/views/simulasi/senaraimarhunlel.blade.php
+++ b/resources/views/simulasi/senaraimarhunlel.blade.php
@@ -13,7 +13,8 @@
                 </div>
             @endif
             <div class="text-left pt-4">
-            <a  href="{{ route('analisa.listsagbycust',[$simulasi_id,$cawid]) }}" class="btn btn-success">Senarai Nama Pelangan</a>
+            <a  href="{{ route('analisa.senaraimarhunlel',[$simulasi_id,$cawid]) }}" class="btn btn-success">Simulasi Lelong</a>
+            <a  href="{{ route('analisa.listsagbycust',[$simulasi_id,'cawid'=>$cawid]) }}" class="btn btn-success">Senarai Mengikut Nama Pelangan</a>
             </div>
             <form id="deletesag" action="{{route('analisa.deletemarhunlel')}}" method="POST">
                 @csrf