diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 9b0e2f8f..3b7a31fc 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -999,6 +999,7 @@ class LelongController extends Controller
             'lelongbid.bakiupah',
             'lelongbid.status_jual',
             'lelongbid.jbg',
+            'gadai.pinjaman as pinjasal',
             'gadai.bakipjm',
             'gadai.bakihargajualan',
             'gadai.upah12',
@@ -1006,9 +1007,11 @@ class LelongController extends Controller
             'gadai.tempoh',
             'gadai.tempohbayar',
             'gadai.kadarupah',
-            'gadai.nokp'
+            'gadai.nokp',
+            'gadai.bakiupah as upah6bulan'
         )
         ->get()->toArray();
+        // dd($marhuns);
 
         foreach ($marhuns as $index1=> $cal) {
 
@@ -1017,6 +1020,10 @@ class LelongController extends Controller
             ->orWhere('kplama','=',$cal['nokp'])
             ->first();
 
+            $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'] = bcdiv($keuntungan,1,1); 
             $marhuns[$index1]['nama'] = $customer; 
@@ -2635,6 +2642,49 @@ class LelongController extends Controller
         ->with('success','Create Lelong Berjaya');
         
     }
+    public function listsagbycust($lelongid, $cawid)
+    {
+        $keuntungan = 0;
+
+        $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
+        ->join('gadai','lelongbid.norujukan','=','gadai.norujukan')
+        ->where('lelong_id','=',$lelongid)
+        ->where('caw_id','=',$cawid)
+        ->groupBy('gadai.nokp')
+        ->select('gadai.nokp')
+        ->get()->toArray();
+        // dd($marhuns);
+
+        foreach($marhuns as $index1=>$cal){
+            $customer =  Customer::on('mysql2')
+            ->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' )
+            ->get();
+            // dd($listsag);
+            foreach($listsag as $index=>$listing){
+                $ktlhbyr = TransaksiKeuntungan::on('mysql2')->where('norujukan','=',$listing['norujukan'])->sum('bayaran_keuntungan');
+                // dd($ktlhbyr);  
+                $listsag[$index]['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;   
+            $marhuns[$index1]['listsag'] = $listsag; 
+            // $marhuns[$index1]['ktlhbyr'] = $ktlhbyr; 
+            // dd($total_untung_asal);
+
+            
+        }
+        return view('lelong.listsagbycust',compact('marhuns','lelongid','cawid','listsag','ktlhbyr'));
+    }
 
 
 
diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index c2082164..81b9fbb4 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -111,7 +111,7 @@ class SimulasiController extends Controller
 
             //create simulasi
             $simulasi = Simulasi::create([
-                'tarikh_lelong' => $t_lelong,
+                'tarikh_lelong' => $request->tarikh_lelong,
                 'harga_emas_asas' => $hargaasas,
                 'jbg' => $jbg,
                 'cajlelong' => $request->cajlelong,
@@ -801,7 +801,7 @@ class SimulasiController extends Controller
         $keuntungan = 0;
 
         $marhuns = SimulasiBid::join('cawangan', 'simulasibid.caw_id', '=', 'cawangan.id')
-        ->join('gadai','simulasibid.norujukan','=','gadai.norujukan')
+        // ->join('gadai','simulasibid.norujukan','=','gadai.norujukan')
         ->where('simulasi_id','=',$simulasi_id)
         ->where('caw_id','=',$cawid)
         ->select(
@@ -817,34 +817,51 @@ class SimulasiController extends Controller
             'simulasibid.cajlelong',
             'simulasibid.baki',
             'simulasibid.status_jual',
-            'simulasibid.jbg',
-            'gadai.bakipjm',
-            'gadai.bakihargajualan',
-            'gadai.upah12',
-            'gadai.ansakhir',
-            'gadai.tempoh',
-            'gadai.tempohbayar',
-            'gadai.kadarupah',
-            'gadai.nokp'
+            'simulasibid.jbg'
+            // 'gadai.bakipjm',
+            // 'gadai.bakihargajualan',
+            // 'gadai.upah12',
+            // 'gadai.ansakhir',
+            // 'gadai.tempoh',
+            // 'gadai.tempohbayar',
+            // 'gadai.kadarupah',
+            // 'gadai.nokp'
 
         )
         ->get()->toArray();
-
+        // dd($marhuns);
+        $arraymarhun = [];
         foreach($marhuns as $index1=>$cal){
-            $customer =  Customer::on('mysql2')
-            ->where('kpbaru','=',$cal['nokp'])
-            ->orWhere('kplama','=',$cal['nokp'])
-            ->first();
+            // 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);
 
-            $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) );
+            // $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'],
+                'pinjaman' => $cal['pinjaman'],
+                'bakiupah' => $cal['bakiupah'],
+                'cajlelong' => $cal['cajlelong'],
+                'baki' => $cal['baki'],
+            ]);
         }
 
 
-        return view('simulasi.senaraimarhunlel',compact('marhuns','simulasi_id','cawid','keuntungan'));
+        return view('simulasi.senaraimarhunlel',compact('arraymarhun','marhuns','simulasi_id','cawid','keuntungan'));
     }
 
     public function deletemarhunlel(Request $request){
@@ -1054,118 +1071,151 @@ class SimulasiController extends Controller
         $currentdate = Carbon::now();
         $currentdate = $currentdate->toDateTimeString();
         $data = [];
-        $senaraisag = SimulasiBid::where('simulasibid.simulasi_id', $simulasi_id)
-        ->whereNotIn('simulasibid.norujukan', function($query) {
-            $query->select('norujukan')
-                  ->from('gadai');
-        })
-        ->get()->toArray();
-        // dd($senaraisag);
-
-        foreach($senaraisag as $data)
+        
+        $getcaw = Simulasi::where('simulasibid.simulasi_id', $simulasi_id)->get();
+        dd($getcaw);
+        foreach($getcaw as $caw)
         {
-              //insert lelong_tebus
-              $lelongtebus = new LelongTebus;
-              $lelongtebus->tarikh = $currentdate;
-              $lelongtebus->kodcaw = $data['kodcaw'];
-              $lelongtebus->teller = $user->name;
-              $lelongtebus->norujukan = $data['norujukan'];
-              $lelongtebus->batch_no = $simulasi_id;
-              $lelongtebus->nilaimarhun = $data['nilaimarhun'];
-              $lelongtebus->pinjaman = $data['pinjaman'];
-              $lelongtebus->upah = $data['bakiupah'];
-              $lelongtebus->jbg = $data['jbg'];
-              $lelongtebus->jenis_tebus = 'T';
-              $lelongtebus->save();
+            $bycaw = 
+            $senaraisag = SimulasiBid::where('simulasibid.simulasi_id', $simulasi_id)
+            ->whereNotIn('simulasibid.norujukan', function($datagadai) {
+                $datagadai = Gadai::all();
+            })
+            ->get()->toArray();
+            dd($senaraisag);
 
-            // dd($data['norujukan']);
-            $updatesimulasi = SimulasiBid::where('norujukan','=',$data['norujukan'])->first();
-            $updatesimulasi->delete();
-             //insert loguser
-             $loguser = new LogUser;
-             $loguser->user_id = $user->id;
-             $loguser->date = $currentdate;
-             $loguser->username = $user->username;
-             $loguser->nama_user = $user->name;
-             $loguser->norujukan = $data['norujukan'];
-             $loguser->nota = ' Kemaskini Data Simulasi '.$simulasi_id;
-             $loguser->save();
+            foreach($senaraisag as $data)
+            {
+                //insert lelong_tebus
+                $lelongtebus = new LelongTebus;
+                $lelongtebus->tarikh = $currentdate;
+                $lelongtebus->kodcaw = $data['kodcaw'];
+                $lelongtebus->teller = $user->name;
+                $lelongtebus->norujukan = $data['norujukan'];
+                $lelongtebus->batch_no = $simulasi_id;
+                $lelongtebus->nilaimarhun = $data['nilaimarhun'];
+                $lelongtebus->pinjaman = $data['pinjaman'];
+                $lelongtebus->upah = $data['bakiupah'];
+                $lelongtebus->jbg = $data['jbg'];
+                $lelongtebus->jenis_tebus = 'T';
+                $lelongtebus->save();
+
+                // dd($data['norujukan']);
+                $updatesimulasi = SimulasiBid::where('norujukan','=',$data['norujukan'])->first();
+                $updatesimulasi->delete();
+                //insert loguser
+                $loguser = new LogUser;
+                $loguser->user_id = $user->id;
+                $loguser->date = $currentdate;
+                $loguser->username = $user->username;
+                $loguser->nama_user = $user->name;
+                $loguser->norujukan = $data['norujukan'];
+                $loguser->nota = ' Kemaskini Data Simulasi '.$simulasi_id;
+                $loguser->save();
 
 
+            }
+
+            $datatempoh = [];
+            $senaraisagtempoh = SimulasiBid::join('gadai','gadai.norujukan','=','simulasibid.norujukan')
+            ->where('simulasibid.simulasi_id', $simulasi_id)
+            ->whereIn('simulasibid.norujukan', function($query) {
+                $query->select('norujukan')
+                    ->from('gadai');
+            })
+            ->select('gadai.tempoh','gadai.tempohbayar','gadai.kadarupah','gadai.norujukan','gadai.tempoh','gadai.bakipjm')
+            ->get()->toArray();
+            // dd($senaraisagtempoh);
+
+            foreach($senaraisagtempoh as $datatempoh)
+            {
+                //kemaskini keuntungan
+                $total_untung_rebet = TransaksiKeuntungan::on('mysql2')->where('norujukan','=',$datatempoh['norujukan'])->sum('keuntungan_rebet');
+                $total_untung_asal = TransaksiKeuntungan::on('mysql2')->where('norujukan','=',$datatempoh['norujukan'])->sum('bayaran_keuntungan');
+                $beza_keuntungan = $total_untung_asal - $total_untung_rebet;
+                $keuntungan = bcdiv(($datatempoh['tempoh']-$datatempoh['tempohbayar'])*$datatempoh['kadarupah']/100*$datatempoh['bakipjm'],1,1)-$beza_keuntungan;
+                // dd($keuntungan);
+                //update dalam simulasibid
+                $updatetempoh = SimulasiBid::where('norujukan', $datatempoh['norujukan'])
+                                ->where('simulasi_id', $simulasi_id)
+                                ->first();
+                $updatetempoh->jbg = $datatempoh['tempoh'];
+                $updatetempoh->pinjaman = $datatempoh['bakipjm'];
+                $updatetempoh->bakiupah = bcdiv($keuntungan,1,1);
+                $updatetempoh->update();
+
+                //insert loguser
+                $loguser = new LogUser;
+                $loguser->user_id = $user->id;
+                $loguser->date = $currentdate;
+                $loguser->username = $user->username;
+                $loguser->nama_user = $user->name;
+                $loguser->norujukan = $datatempoh['norujukan'];
+                $loguser->nota = $simulasi_id.' Kemaskini Tempoh/Bakipjm/Keuntungan' ;
+                $loguser->save();
+            }
+
+
+
+            $date = Carbon::now()->toDateTimeString();
+            $simulasi = Simulasi::where('id','=',$simulasi_id)->first();
+            $simulasi->masakemaskini_data = $date;
+            $simulasi->save();
+
+            return redirect()->route('analisa.senaraisimulasi')
+                            ->with('success','Kemaskini Berjaya');
         }
-
-        $datatempoh = [];
-        $senaraisagtempoh = SimulasiBid::join('gadai','gadai.norujukan','=','simulasibid.norujukan')
-        ->where('simulasibid.simulasi_id', $simulasi_id)
-        ->whereIn('simulasibid.norujukan', function($query) {
-            $query->select('norujukan')
-                  ->from('gadai');
-        })
-        ->select('gadai.tempoh','gadai.tempohbayar','gadai.kadarupah','gadai.norujukan','gadai.tempoh','gadai.bakipjm')
-        ->get()->toArray();
-        // dd($senaraisagtempoh);
-
-        foreach($senaraisagtempoh as $datatempoh)
-        {
-            //kemaskini keuntungan
-            $total_untung_rebet = TransaksiKeuntungan::on('mysql2')->where('norujukan','=',$datatempoh['norujukan'])->sum('keuntungan_rebet');
-            $total_untung_asal = TransaksiKeuntungan::on('mysql2')->where('norujukan','=',$datatempoh['norujukan'])->sum('bayaran_keuntungan');
-            $beza_keuntungan = $total_untung_asal - $total_untung_rebet;
-            $keuntungan = bcdiv(($datatempoh['tempoh']-$datatempoh['tempohbayar'])*$datatempoh['kadarupah']/100*$datatempoh['bakipjm'],1,1)-$beza_keuntungan;
-            // dd($keuntungan);
-            //update dalam simulasibid
-            $updatetempoh = SimulasiBid::where('norujukan', $datatempoh['norujukan'])
-                            ->where('simulasi_id', $simulasi_id)
-                            ->first();
-            $updatetempoh->jbg = $datatempoh['tempoh'];
-            $updatetempoh->pinjaman = $datatempoh['bakipjm'];
-            $updatetempoh->bakiupah = bcdiv($keuntungan,1,1);
-            $updatetempoh->update();
-
-             //insert loguser
-             $loguser = new LogUser;
-             $loguser->user_id = $user->id;
-             $loguser->date = $currentdate;
-             $loguser->username = $user->username;
-             $loguser->nama_user = $user->name;
-             $loguser->norujukan = $datatempoh['norujukan'];
-             $loguser->nota = $simulasi_id.' Kemaskini Tempoh/Bakipjm/Keuntungan' ;
-             $loguser->save();
-        }
-
-
-
-        $date = Carbon::now()->toDateTimeString();
-        $simulasi = Simulasi::where('id','=',$simulasi_id)->first();
-        $simulasi->masakemaskini_data = $date;
-        $simulasi->save();
-
-        return redirect()->route('analisa.senaraisimulasi')
-                        ->with('success','Kemaskini Berjaya');
     }
 
     public function listsagbycust($simulasi_id, $cawid)
     {
         $keuntungan = 0;
-
-        $marhuns = SimulasiBid::join('cawangan', 'simulasibid.caw_id', '=', 'cawangan.id')
-        ->join('gadai','simulasibid.norujukan','=','gadai.norujukan')
+        $arraylistgadai = 0;
+       $marhun = SimulasiBid::join('cawangan', 'simulasibid.caw_id', '=', 'cawangan.id')
         ->where('simulasi_id','=',$simulasi_id)
-        ->where('caw_id','=',$cawid)
-        ->groupBy('gadai.nokp')
-        ->select('gadai.nokp')
-        ->get()->toArray();
-        // dd($marhuns);
+        ->where('caw_id','=',$cawid);
 
-        foreach($marhuns as $index1=>$cal){
-            $customer =  Customer::on('mysql2')
-            ->where('kpbaru','=',$cal['nokp'])
+        $arraynorujukan = $marhun->pluck('norujukan')->toArray();
+        $datasimulasi = $marhun->get();
+        $marhuns = Gadai::on($datasimulasi[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
+        ->select('nokp')
+        ->groupBy('nokp')->get();
+        // dd($datagadai); 
+        $arraysag = [];
+       
+        foreach($marhuns as $index1=>$cal)
+        {
+            $customer =  Customer::where('kpbaru','=',$cal['nokp'])
             ->orWhere('kplama','=',$cal['nokp'])
             ->first();
+            // dd($customer);
 
-            $listsag = SimulasiBid::join('gadai', 'gadai.norujukan','=','simulasibid.norujukan')
-            ->where('gadai.nokp','=',$cal['nokp'])
+            $listsag = Gadai::on($datasimulasi[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
+            ->where('nokp','=',$cal['nokp'])
             ->get();
+            // dd($listgadai);
+            foreach($listsag as $index=>$listing){
+                $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; 
+            }
+
+            
+            
+
+
+            
+
+            // $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']) );
@@ -1173,8 +1223,13 @@ class SimulasiController extends Controller
             $marhuns[$index1]['nama'] = $customer;
             $marhuns[$index1]['listsag'] = $listsag;
 
+            // array_push($arraylistgadai,[
+            //     'hargaasas' => $cal[0]['hargaasas']
+            
+            // ]);
+
 
         }
-        return view('simulasi.listsagbycust',compact('marhuns','simulasi_id','cawid','listsag'));
+        return view('simulasi.listsagbycust',compact('marhuns','simulasi_id','cawid','ktlhbyr'));
     }
 }
diff --git a/app/Models/Customer.php b/app/Models/Customer.php
index 443204a7..a7dc8963 100644
--- a/app/Models/Customer.php
+++ b/app/Models/Customer.php
@@ -8,7 +8,7 @@ use Illuminate\Database\Eloquent\Model;
 class Customer extends Model
 {
     use HasFactory;
-    protected $connection = 'mysql2';
+    protected $connection = 'main';
     protected $table = 'customer';
 
     protected $fillable = [
diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index 1eb03aeb..777b7d4b 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/resources/views/includes/sidebar.blade.php
@@ -157,9 +157,9 @@
       <li class="{{ (request()->is('tetapan/*')) ? 'active' : '' }}">
         <a href="{{url('tetapan/parameter')}}">Tetapan</a>
       </li>
-      <li class="{{ (request()->is('importdata/*')) ? 'active' : '' }}">
+      <!-- <li class="{{ (request()->is('importdata/*')) ? 'active' : '' }}">
         <a href="{{url('importdata/importdatacawangan')}}">Import Data</a>
-      </li>
+      </li> -->
       <!-- <li class="{{ (request()->is('notistamatkontrak/*')) ? 'active' : '' }}">
         <a href="{{url('notistamatkontrak/sebelumtamatkont')}}">Notis Tamat Kontrak</a>
       </li> -->
diff --git a/resources/views/lelong/listsagbycust.blade.php b/resources/views/lelong/listsagbycust.blade.php
new file mode 100644
index 00000000..2b2bb73c
--- /dev/null
+++ b/resources/views/lelong/listsagbycust.blade.php
@@ -0,0 +1,263 @@
+@extends('layouts.app')
+
+@section('content')
+
+<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>
+            @endif
+            <div class="text-left pt-4">
+            <a  href="{{ route('lelong.listsagbycust',[$lelongid,'cawid'=>$cawid]) }}" class="btn btn-success">Senarai 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">
+                        <tr>
+                            <th>No</th>
+                            <th>Nama Pelanggan</th>   
+                            <th>No.Rujukan</th>   
+                            <th>Tempoh</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> -->
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @foreach ($marhuns as $index=> $marhun)
+                            <tr>
+                                <td>{{$loop->iteration}}</td>                              
+                                <td style='word-wrap'>{{ $marhun['nama']['nama']}}</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> 
+                                <td align = 'right'>
+                                    @php $jumberat = 0;@endphp 
+                                    @foreach ($marhun['listsag'] as $item)
+                                        @php 
+                                        $jumberat = $jumberat + $item['berat'];
+                                        @endphp
+                                        {{ number_format($item['berat'], 2, '.', ',') }}<br>
+                                    @endforeach
+                                        <strong>Total: {{ number_format($jumberat, 2, '.', ',') }}</strong>
+                                </td> 
+                                <td align = 'right'>
+                                    @php $jumnilaimarhun = 0;@endphp 
+                                    @foreach ($marhun['listsag'] as $item)
+                                    @php 
+                                        $jumnilaimarhun = $jumnilaimarhun + $item['nilaimarhun'];
+                                        @endphp
+                                        {{ number_format($item['nilaimarhun'], 2, '.', ',') }}<br>
+                                    @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 
+                                    @foreach ($marhun['listsag'] as $item)
+                                    @php 
+                                        $jumcajlelong = $jumcajlelong + $item['cajlelong'];
+                                        @endphp
+                                        {{ number_format($item['cajlelong'], 2, '.', ',') }}<br>
+                                    @endforeach
+                                        <strong>Total: {{ 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>Total: {{ number_format($jumbaki, 2, '.', ',') }}</strong>
+                               
+                                </td>  -->
+                                
+                                
+                               
+                            </tr>
+                        @endforeach
+                    </tbody>
+                    
+                </table>
+              
+            </form>
+        </div>
+        
+    </div>
+</div>
+<script>
+    $("#btndelete").prop("disabled", true);
+    function btnDelete(e) {
+        var count = 0;
+        tablemarhun.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
+            if($(this).prop('checked') === true)
+            {
+                count = count + 1;
+            }
+            // $(this).prop('checked', e.checked);
+        })
+        if(count != 0)
+        {
+            $("#btndelete").prop("disabled", false);
+        }
+        else
+        {
+            $("#btndelete").prop("disabled", true);
+        }
+        // let checkbox = $('#checkboxdata').val();
+        // console.log(checkbox)
+        // $("#btndelete").prop("disabled", checkboxdata.length === 0);
+    }
+    function confirm() {
+        $.confirm({
+        title: 'Confirmation',
+        content: 'Anda pasti?',
+        type: 'red',
+        typeAnimated: true,
+        buttons: {
+            Delete: {
+                btnClass: 'btn-danger',
+                action: function () {
+                    $("#deletesag").submit();
+                }
+            },  
+            Batal: {
+                btnClass: 'btn-default',
+                action: function () {}
+            }
+        }
+    });
+    }
+
+    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();
+            //         }
+            //     }
+            // ]
+        });
+    
+</script>
+@endsection
diff --git a/resources/views/lelong/senaraimarhun.blade.php b/resources/views/lelong/senaraimarhun.blade.php
index 3a92f283..f5d2553c 100644
--- a/resources/views/lelong/senaraimarhun.blade.php
+++ b/resources/views/lelong/senaraimarhun.blade.php
@@ -39,6 +39,9 @@
                     <p>{{ $message }}</p>
                 </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>
             <form id="deletesag" action="{{route('lelong.deletemarhun')}}" method="POST">
                 @csrf
                 <input type="hidden" name="lelongid" value="{{$lelongid}}">
@@ -55,8 +58,11 @@
                             <th>Tarikh Jual (RM)</th>
                             <th>Harga Asas (RM)</th>
                             <th>Harga Jual (RM)</th>
-                            <th>Pembiayaan (RM)</th>
-                            <th>Keuntungan (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>
@@ -70,16 +76,19 @@
                                 <td>{{ $marhun['norujukan']}}</td>
                                 <td>{{ $marhun['nama']['nama']}}</td>
                                 <td>{{ $marhun['jbg']}}</td>
-                                <td>{{ $marhun['berat'] }}</td>
-                                <td>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
-                                <td>{{ $marhun['t_jual'] }}</td>
-                                <td>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
-                                <td>{{ number_format($marhun['hargajual'], 2, '.', ',') }}</td>
-                                <td>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
-                                <td>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</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>{{ $marhun['cajlelong'] }}</td>
+                                <td align = 'right'>{{ $marhun['cajlelong'] }}</td>
                                 <?php
                                     $rugi = 0;
                                     $baki = 0;
@@ -91,8 +100,8 @@
                                         $baki = $marhun['baki'];
                                      }
                                 ?>
-                                <td>{{$rugi}}</td>
-                                <td>{{$baki}}</td>
+                                <td align = 'right'>{{$rugi}}</td>
+                                <td align = 'right'>{{$baki}}</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/lelong/showsimulasi.blade.php b/resources/views/lelong/showsimulasi.blade.php
index 5b049c56..fa5b6881 100644
--- a/resources/views/lelong/showsimulasi.blade.php
+++ b/resources/views/lelong/showsimulasi.blade.php
@@ -39,12 +39,11 @@
                                     <tr>
                                         @foreach($data as $data1)
                                         <td>Tarikh Lelong : 
-                                            @php 
-                                            $myDateTime = DateTime::createFromFormat('Y-m-d', $data1['tarikh_lelong'] );
-                                              $datez = $myDateTime->format('d-m-Y');
-                                              echo($datez);
-                                          
-                                          @endphp
+                                            @php
+                                                $myDateTime = DateTime::createFromFormat('Y-m-d', $data1['tarikh_lelong'] );
+                                                $t_lelong =  $myDateTime->format('d-m-Y');
+                                                echo($t_lelong);
+                                            @endphp
                                         </td>
                                         @endforeach
                                     </tr>
diff --git a/resources/views/simulasi/listsagbycust.blade.php b/resources/views/simulasi/listsagbycust.blade.php
index 422074e7..c15c99c9 100644
--- a/resources/views/simulasi/listsagbycust.blade.php
+++ b/resources/views/simulasi/listsagbycust.blade.php
@@ -26,13 +26,16 @@
                             <th>Nama Pelanggan</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>Keuntungan (RM)</th>
-                            <th>Caj Lelong (%)</th>
-                            <th>Baki Lelong (RM)</th>
+                            <!-- <th>Harga Asas (RM)</th> -->
+                            <!-- <th>Caj Lelong (%)</th>
+                            <th>Baki Lelong (RM)</th> -->
                             <!-- <th>Tindakan</th> -->
                         </tr>
                     </thead>
@@ -46,7 +49,63 @@
                                 @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)
@@ -68,7 +127,7 @@
                                         <strong>Total: {{ number_format($jumnilaimarhun, 2, '.', ',') }}</strong>
                                
                                 </td> 
-                                <td align = 'right'>
+                                <!-- <td align = 'right'>
                                     @php $jumhargaasas = 0;@endphp 
                                     @foreach ($marhun['listsag'] as $item)
                                     @php 
@@ -78,51 +137,8 @@
                                     @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 $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 
-                                    @foreach ($marhun['listsag'] as $item)
-                                    @php 
-                                        $jumcajlelong = $jumcajlelong + $item['cajlelong'];
-                                        @endphp
-                                        {{ number_format($item['cajlelong'], 2, '.', ',') }}<br>
-                                    @endforeach
-                                        <strong>Total: {{ 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>Total: {{ number_format($jumbaki, 2, '.', ',') }}</strong>
-                               
-                                </td> 
+                                </td>  -->
+                                
                                 
                                 
                                
diff --git a/resources/views/simulasi/senaraimarhunlel.blade.php b/resources/views/simulasi/senaraimarhunlel.blade.php
index 72b66b63..26830635 100644
--- a/resources/views/simulasi/senaraimarhunlel.blade.php
+++ b/resources/views/simulasi/senaraimarhunlel.blade.php
@@ -38,11 +38,11 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach ($marhuns as $index=> $marhun)
+                        @foreach ($arraymarhun as $index=> $marhun)
                             <tr>
                                 <td>{{$loop->iteration}}</td>                              
                                 <td>{{ $marhun['norujukan']}}</td>
-                                <td>{{ $marhun['nama']['nama']}}</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>
diff --git a/resources/views/simulasi/senaraisimulasi.blade.php b/resources/views/simulasi/senaraisimulasi.blade.php
index 1a8edba4..e87e34d9 100644
--- a/resources/views/simulasi/senaraisimulasi.blade.php
+++ b/resources/views/simulasi/senaraisimulasi.blade.php
@@ -30,11 +30,13 @@
                         <tr>
                             <td>{{$loop->iteration}}</td>
                             <td>{{$info['info']['simulasi_id']}}</td>
-                            <td>@php
-                                $myDateTime = DateTime::createFromFormat('Y-m-d H:i:s', $info['info']['tarikh_lelong'] );
-                                $t_lelong =  $myDateTime->format('d-m-Y');
-                                echo($t_lelong);
-                            @endphp</td>
+                            <td>
+                                @php
+                                    $myDateTime = DateTime::createFromFormat('Y-m-d', $info['info']['tarikh_lelong'] );
+                                    $t_lelong =  $myDateTime->format('d-m-Y');
+                                    echo($t_lelong);
+                                @endphp
+                            </td>
                             <td>{{$info['info']['fasa']}}</td>
                             <td align = 'left'>
                             @foreach($info['detailsinfo'] as $info2)
diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php
index ee5024c3..f5720d78 100644
--- a/resources/views/simulasi/showsimulasi.blade.php
+++ b/resources/views/simulasi/showsimulasi.blade.php
@@ -35,13 +35,12 @@
                                         <td>Keuntungan Keseluruhan : RM{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
                                     </tr>
                                     <tr>
-                                        <td>Tarikh Lelong :
-                                            @php
-                                                $myDateTime = DateTime::createFromFormat('Y-m-d H:i:s', $data['tarikh_lelong'] );
-                                                // dd($data['tarikh_lelong'])
-                                                $datez = $myDateTime->format('d-m-Y');
-                                                echo($datez);
+                                        <td>Tarikh Lelong :  @php
+                                                $myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
+                                                $t_lelong =  $myDateTime->format('d-m-Y');
+                                                echo($t_lelong);
                                             @endphp
+                                           
                                         </td>
                                     </tr>
                                 </table>
diff --git a/routes/web.php b/routes/web.php
index e28c36eb..d026112b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -128,7 +128,8 @@ Route::group(['prefix'=>'lelong'], function () {
     Route::post('/renewxlakujanadata',['as'=>'lelong.renewxlakujanadata','uses'=>'LelongController@renewxlakujanadata']);
 //export data lelong to live
     Route::get('/exportdata/{lelong_id}',['as'=>'lelong.exportdata','uses'=>'LelongController@exportdata']); 
-
+ //listsagbycust
+ Route::get('/listsagbycust/{lelongid}/{cawid}',['as'=>'lelong.listsagbycust','uses'=>'LelongController@listsagbycust']);
 
 });
     Route::get('/showsimulasi/{id}',['as'=>'lelong.showsimulasi','uses'=>'LelongController@showsimulasi']);