diff --git a/app/Http/Controllers/DatabaseController.php b/app/Http/Controllers/DatabaseController.php
index 22551c58..1a79f6a4 100644
--- a/app/Http/Controllers/DatabaseController.php
+++ b/app/Http/Controllers/DatabaseController.php
@@ -44,12 +44,12 @@ class DatabaseController extends Controller
         $roles_harian_penilai = Http::get(config('app.api_url_kaunter') . 'api/roles_harian/KB2', [
             'role_harian' => 'penilai',
         ])->json();
-        // $customer_details = Http::withOptions(['verify' => config('app.api_verify')])
-        // ->get('https://api.arrahn.com.my/api/customers/960403065465')->json();
+         $customer_details = Http::withOptions(['verify' => config('app.api_verify')])
+         ->get('http://api.arrahn.com.my/api/customers/960403065465')->json();
 
         // dd($gadai, $transaksi_keuntungan, $roles_harian_penilai, $customer_details);
 
-        return view('pengurusandatabase.senaraidb',compact('caw', 'gadai', 'transaksi_keuntungan', 'roles_harian_penilai'));
+        return view('pengurusandatabase.senaraidb',compact('caw', 'gadai', 'transaksi_keuntungan', 'roles_harian_penilai', 'customer_details'));
     }
 
     public function showConn($id)
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 8d9b35df..e69be024 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -2588,7 +2588,7 @@ class LelongController extends Controller
         $tarikhlelongbaru = $request->tarikhlelongbaru;
         // dd($tarikhlelongbaru);
         $lelongidasal = $request->lelongidasal;
-        $lelongidbaru = $request->lelongidbaru;
+        // $lelongidbaru = $request->lelongidbaru;
         // dd($request->caw);
         $lelkarat = LelKarat::where('lelong_id','=',$lelongidasal)->get();
 
@@ -2601,26 +2601,26 @@ class LelongController extends Controller
         // dd($cawanganasal);
         // dd( $lelongidbaru);
 
-        $lelongnew = new Lelong();
-        $lelongnew->tarikh_lelong = $tarikhlelongbaru;
-        $lelongnew->harga_emas_asas = $lelongasal->harga_emas_asas;
-        $lelongnew->jbg = $lelongasal->jbg;
-        $lelongnew->cajlelong = $lelongasal->cajlelong;
-        $lelongnew->fasa = $lelongasal->fasa;
-        $lelongnew->kali = $lelongasal->kali;
-        $lelongnew->save();
+        // $lelongnew = new Lelong();
+        // $lelongnew->tarikh_lelong = $tarikhlelongbaru;
+        // $lelongnew->harga_emas_asas = $lelongasal->harga_emas_asas;
+        // $lelongnew->jbg = $lelongasal->jbg;
+        // $lelongnew->cajlelong = $lelongasal->cajlelong;
+        // $lelongnew->fasa = $lelongasal->fasa;
+        // $lelongnew->kali = $lelongasal->kali;
+        // $lelongnew->save();
 
           
-        foreach($lelkarat as $lelongKarat)
-        {
-            $lelkarat = new LelKarat;
-            $lelkarat->lelong_id = $lelongnew->id;
-            $lelkarat->karat = $lelongKarat->karat;
-            $lelkarat->keterangan = $lelongKarat->keterangan;
-            $lelkarat->harga = $lelongKarat->harga;
-            $lelkarat->harga2 = $lelongKarat->harga2;
-            $lelkarat->save();
-        }
+        // foreach($lelkarat as $lelongKarat)
+        // {
+        //     $lelkarat = new LelKarat;
+        //     $lelkarat->lelong_id = $lelongnew->id;
+        //     $lelkarat->karat = $lelongKarat->karat;
+        //     $lelkarat->keterangan = $lelongKarat->keterangan;
+        //     $lelkarat->harga = $lelongKarat->harga;
+        //     $lelkarat->harga2 = $lelongKarat->harga2;
+        //     $lelkarat->save();
+        // }
 
 
         //tukartarikh ID lelong
@@ -2635,10 +2635,8 @@ class LelongController extends Controller
            
             // dd($cawtukartarikh->caw_id);
                 
-            $caw_tukartarikh = CawanganLelong::where('caw_id', $cawtukartarikh->id)
-            ->where('lelong_id', $request->lelongidasal)->first();
-            // dd($caw_tukartarikh);
-            $caw_tukartarikh->lelong_id = $request->lelongidbaru;
+            $caw_tukartarikh = Lelong::where('id', $request->lelongidasal)->first();
+            $caw_tukartarikh->tarikh_lelong = $tarikhlelongbaru;
             $caw_tukartarikh->update();
 
             $surat = LelongBid::where('lelong_id','=',$lelongidasal)
@@ -2654,7 +2652,6 @@ class LelongController extends Controller
                 {
                     // dd($request->lelongidbaru);
                         $caw_pindahsag = LelongBid::where('norujukan', $data->norujukan)->first();
-                        $caw_pindahsag->lelong_id = $request->lelongidbaru;
                         $caw_pindahsag->t_lelong = $tarikhlelongbaru;
                         $caw_pindahsag->update();
                 }
@@ -4779,6 +4776,7 @@ class LelongController 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)
@@ -4804,6 +4802,9 @@ class LelongController extends Controller
         ->get()->toArray();
         // dd($marhuns);
         $arraymarhun = [];
+        $cajlelong = 0;
+        $rugilelong = 0;
+        $bakilelong = 0;
         foreach ($marhuns as $index1=> $cal) {
             // dd($cal);
             $gadai = Gadai::on($cal['kodcaw'])
@@ -4814,10 +4815,13 @@ class LelongController extends Controller
             ->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']) );
+            $lelonglel = Lelong::where('id','=',$lelongid)->first();
+            $sumcajlelong =  $cal['hargaasas'] * ($lelonglel->cajlelong/100);
+            $cajlelongnew = round($sumcajlelong,1,1);
+            $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - $cal['bakiupah'] - $cajlelongnew;
+            $marhuns[$index1]['cajlelong'] = $cajlelongnew;
+            $marhuns[$index1]['baki'] =  $totalbaki;
             $marhuns[$index1]['keuntungan'] = $keuntungan;
-            $marhuns[$index1]['nama'] = $customer;
 
             array_push($arraymarhun,[
                 'norujukan' => $cal['norujukan'],
@@ -4831,8 +4835,8 @@ class LelongController extends Controller
                 'pinjaman' => $cal['pinjaman'],
                 'pinjasal' => $gadai['pinjaman'],
                 'bakiupah' => $cal['bakiupah'],
-                'cajlelong' => $cal['cajlelong'],
-                'baki' => $cal['baki'],
+                'cajlelong' => $cajlelongnew,
+                'baki' =>  $totalbaki,
                 'upah6bulan' => $gadai['bakiupah']
             ]);
             // $total_marhun = $total_marhun + sizeof($databid);
@@ -4841,6 +4845,7 @@ class LelongController extends Controller
             $total_hargaasas = $total_hargaasas  +  $cal['hargaasas'];
             $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
             $total_bakiupah = $total_bakiupah + $cal['bakiupah'];
+            $total_cazlelong += $cajlelongnew;
         }
 
         $arrayinfo = [];
@@ -4861,12 +4866,14 @@ class LelongController extends Controller
             ->toArray();
             array_push($arrayinfo,['laporan' => $laporan,'details' => $details]);
         }
-        return view('lelong.senaraimarhunpc',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo','total_berat',
+        return view('lelong.senaraimarhunpc',compact('totalbaki','arraymarhun','marhuns','lelongid','cawid','arrayinfo','total_berat',
         'total_pinjaman',
         'total_upah',
         'total_hargaasas',
         'total_bakiupah',
-        'total_nilaimarhun'));
+        'total_nilaimarhun',
+        'total_cazlelong',
+       ));
     }
 
     public function showlelongpc(Request $request, $id)
@@ -4935,20 +4942,21 @@ class LelongController extends Controller
                 $pinjaman =$pinjaman + $bid['pinjaman'];
                 $bakiupah = $bakiupah + $bid['bakiupah'];
                 $hargaasas = $hargaasas + $bid['hargaasas'];
-                $cajlelong = $cajlelong + $bid['cajlelong'];
+                // $cajlelong = $cajlelong + $bid['cajlelong'];
                 
                 $lelongsim = Lelong::where('id',$id)->get();
                 $sumcajlelong =  $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100);
-                $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
-                $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - bcdiv($sumcajlelong,1,1);
+                $cajlelongnew = round($sumcajlelong, 1, 1);
+                // $cajlelong = $cajlelong + bcdiv($sumcajlelong, 1, 1);
+                $cajlelong = $cajlelong + $cajlelongnew;
+                $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - $bid['bakiupah'] - $cajlelongnew;
                                  
-                if($totalbaki > 0)
-                {
-                    $bakilelong = $bakilelong + $totalbaki;  
-                }
-                else
-                {
-                    $rugilelong = $rugilelong - $totalbaki;
+                if (strpos($totalbaki, '-') !== false) {
+                    $rugi  = -$totalbaki;
+                    $rugilelong += $rugi;
+                } else {
+                    $baki = $totalbaki;
+                    $bakilelong += $baki;
                 }
                 
                 
diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index bd357345..691f083a 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -2045,15 +2045,33 @@ class MarhunController extends Controller
             ->select('lelong_id', 'tarikh_lelong', 'cawangan_lelong.masatamat_lelong', 'harga_emas_asas', 'jbg', 'cajlelong', 'sts_lelong')
             ->get()
             ->toArray();
-
+        if($lelong){
         foreach ($lelong as $info) {
+            $lelong_id = $info['lelong_id'];
+            // dd( $lelong_id );
+
+            $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+            ->where('lelongbidder.status_bidder', 1)
+            ->where('lelongbid.kodcaw',$user->kodcaw)
+            // ->where('lelongbid.lelong_id', $info->lelong_id)
+            ->select('lelongbidder.user_id')
+            ->groupBy('lelongbidder.user_id')
+            ->get()->toArray();
+           
+            foreach($listwinner as $index1=>$winner){
+
+                $userdetails = User::where('id', $winner['user_id'])->first();
+                $listwinner[$index1]['details'] = $userdetails;
+            }
+            }
+
             $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
                 ->where('lelong_id', $info['lelong_id'])
                 ->where('cawangan.caw_code', $user->kodcaw)
                 ->get()
                 ->toArray();
-            array_push($arrayinfo, ['info' => $info, 'detailsinfo' => $detailsinfo]);
-        }
+            array_push($arrayinfo, ['info' => $info, 'detailsinfo' => $detailsinfo, 'listwinner' => $listwinner]);
+            }
 
         return view('marhun.senarailelongscanjual', compact('lelong', 'arrayinfo'));
     }
@@ -2369,6 +2387,136 @@ class MarhunController extends Controller
         return $pdf->download('Senarai Marhun Pembida.pdf');
     }
 
+    public function scanbarcodejualbycust($lelong_id,$userid)
+    {
+        $user = Auth::user();
+        $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
+
+        $lelongDetail = Lelong::where('id', '=', $lelong_id)->first();
+        $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id)
+            ->where('status_payment', '=', '1')
+            ->where('nopembeli', '=', $userid)
+            ->where('caw_id', '=', $caw->id)
+            ->select('id')
+            ->get()
+            ->keyBy('id');
+        foreach ($lelongbid as $index => $value) {
+            $namabidder = LelongBidder::
+            where('lelongbid_id', '=',  $value['id'])
+            // ->where('lelongbid.kodcaw', '=', $user->kodcaw)
+            ->where('lelongbidder.status_bidder','=','1')
+            ->where('user_id', '=', $userid)
+            ->select('lelongbidder.lelongbid_id','lelongbidder.nama_bidder') 
+            ->get();
+            // dump($namabidder);
+            foreach ($namabidder as $namabid) {
+                $userdetails = User::where('id', $userid)->first();
+                // dd($userdetails);
+            }
+            $lelongbid[$index]['nama_bidder'] = $namabidder;
+            $lelongbid[$index]['namabid'] = $userdetails;
+        }
+        // dd($namabidder);
+        $senaraiScanKeluar = ScanSemak::join('lelongbidder', 'lelongbidder.lelongbid_id', '=', 'scan_semak.lelongbid_id')
+            ->where('scan_semak.lelong_id', '=', $lelong_id)
+            ->where('lelongbidder.status_bidder', '=', 1)
+            ->where('scan_semak.kodcaw', '=', $caw->caw_code)
+            ->where('lelongbidder.user_id', '=', $userid)
+            ->where('scan_semak.serahkpdpembida', '=', '1')
+            // ->whereNull('scan_masuk')
+            ->get();
+
+        $pluckLelongBid = $lelongbid->pluck('id')->toArray();
+        $pluckScanKeluar = $senaraiScanKeluar->pluck('lelongbid_id')->toArray();
+        $diff_lelong_bid = array_diff($pluckLelongBid, $pluckScanKeluar);
+
+        $new_lelong_bid = LelongBid::with('scanSemakSelesaiJual')
+            ->whereIn('id', $diff_lelong_bid)
+            // ->whereIn('nopembeli', $userid)
+            ->get();
+        // dd($new_lelong_bid);
+
+        return view('marhun.scanbarcodejualbycust', compact('userid','userdetails','namabidder','new_lelong_bid','lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar'));
+    }
+
+
+    public function scanKeluarMarhunjualbycust(Request $request)
+    {
+        $user = Auth::user();
+        $current = Carbon::now();
+
+        $checkExisting = ScanSemak::where('norujukan', '=', $request->norujukan_barcode)
+            ->where('serahkpdpembida', '=', '1')
+            ->get();
+
+        if ($checkExisting->isEmpty()) {
+            $lelongbidItem = LelongBid::where('norujukan', '=', $request->norujukan_barcode)->first();
+
+            $scanKeluar = new ScanSemak();
+            $scanKeluar->kodcaw = $lelongbidItem['kodcaw'];
+            $scanKeluar->lelong_id = $lelongbidItem['lelong_id'];
+            $scanKeluar->lelongbid_id = $lelongbidItem['id'];
+            $scanKeluar->norujukan = $lelongbidItem['norujukan'];
+            $scanKeluar->khazanah_id = $user['id'];
+            $scanKeluar->scan_keluar = $current->toDateTimeString();
+            $scanKeluar->serahkpdpembida = 1;
+            $scanKeluar->save();
+
+            $scanJualKeluar = new ScanJual();
+            $scanJualKeluar->kodcaw = $lelongbidItem['kodcaw'];
+            $scanJualKeluar->lelong_id = $lelongbidItem['lelong_id'];
+            $scanJualKeluar->lelongbid_id = $lelongbidItem['id'];
+            $scanJualKeluar->norujukan = $lelongbidItem['norujukan'];
+            $scanJualKeluar->khazanah_id = $user['id'];
+            $scanJualKeluar->scan_keluar = $current->toDateTimeString();
+            $scanJualKeluar->serah_marhun = $current->toDateTimeString();
+            $scanJualKeluar->serahkpdpembida = 1;
+            $scanJualKeluar->save();
+
+            return redirect()
+                ->route('marhun.scanbarcodejualbycust', ['lelong_id'=>$request->lelong_id,'userid'=>$request->userid])
+                ->with('success', 'Marhun Berjaya Di Scan Keluar Serahan Kepada Pembida.');
+        } else {
+            return redirect()
+                ->route('marhun.scanbarcodejualbycust', ['lelong_id'=>$request->lelong_id,'userid'=>$request->userid])
+                ->with('failed', 'Maaf,Marhun Telah Serah Kepada Pembida.');
+        }
+    }
+
+    public function cetakkeluarscanbarcodejualbycust($lelong_id,$userid)
+    {
+        $user = Auth::user();
+        $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first();
+
+        $lelongDetail = Lelong::where('id', '=', $lelong_id)->first();
+        $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id)
+            ->where('status_payment', '=', '1')
+            ->where('caw_id', '=', $caw->id)
+            ->get();
+        
+        $userdetails = User::where('id', $userid)->first();
+
+        // $senaraiScanKeluar = ScanSemak::where('lelong_id', '=', $lelong_id)
+        //     ->where('kodcaw', '=', $caw->caw_code)
+        //     ->where('serahkpdpembida', '=', '1')
+        //     ->orderBy('id', 'desc')
+        //     ->get();
+        $senaraiScanKeluar = ScanSemak::join('lelongbidder', 'lelongbidder.lelongbid_id', '=', 'scan_semak.lelongbid_id')
+        ->where('scan_semak.lelong_id', '=', $lelong_id)
+        ->where('lelongbidder.status_bidder', '=', 1)
+        ->where('scan_semak.kodcaw', '=', $caw->caw_code)
+        ->where('lelongbidder.user_id', '=', $userid)
+        ->where('scan_semak.serahkpdpembida', '=', '1')
+        // ->whereNull('scan_masuk')
+        ->get();
+        // dd($senaraiScanKeluar);
+        // return view('pdf.cetakkeluarscanbarcode', compact('lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar', 'senaraiScanMasuk','caw'));
+        $pdf = PDF::loadView('pdf.cetakkeluarscanbarcodejualbycust', compact('caw', 'lelong_id', 'lelongDetail', 'lelongbid', 'senaraiScanKeluar','userdetails'))->setPaper('a4', 'potrait');
+
+        return $pdf->download('Senarai SAG Telah Serah Kepada Pembida.pdf');
+    }
+
+
    
     
 }
diff --git a/app/Http/Controllers/ReportCawanganController.php b/app/Http/Controllers/ReportCawanganController.php
index 0a9024ac..a15d9e0e 100644
--- a/app/Http/Controllers/ReportCawanganController.php
+++ b/app/Http/Controllers/ReportCawanganController.php
@@ -252,6 +252,7 @@ class ReportCawanganController extends Controller
         $laporanpembida= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
         ->select('lelongbid_id','norujukan','hargaasas')
         ->where('lelongbid.lelong_id','=',$lelong_id)
+        ->where('lelongbid.kodcaw','=',$user['kodcaw'])
         ->groupBy('lelongbid_id')
         ->get()
         ->toArray();
@@ -350,7 +351,7 @@ class ReportCawanganController extends Controller
         $pdf = PDF::loadView('pdf.laporanlelfullcaw',compact('info','lelong_id','laporanlelong','lelong_id','total_nmarhun','total_pembiayaan',
         'total_upahsimpan','total_cajlelong','total_hargalelong','total_bakirugi','total_hargaasas','arrayinfocaw'))
 
-        ->setPaper('a4', 'potrait');
+        ->setPaper('a4', 'landscape');
         return $pdf->download('Laporan Lelong Keseluruhan.pdf');
 
 
diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php
index fba19143..65c38c9d 100644
--- a/app/Http/Controllers/TangguhLelongController.php
+++ b/app/Http/Controllers/TangguhLelongController.php
@@ -286,10 +286,10 @@ class TangguhLelongController extends Controller
         ->where('lelong.sts_lelong',0)
         ->select('cawangan_lelong.lelong_id', 'cawangan_lelong.caw_id','lelong.sts_lelong','cawangan.caw_name','lelong.tarikh_lelong','cawangan.caw_code','lelong.jbg')
         ->distinct()
-        ->get()
-        ->toArray();
+        ->get();
+        // ->toArray();
 
-        foreach($tangguh as $t)
+        foreach($tangguh as $index=>$t)
         {
             $sag = TangguhLelong::where('lelong_id', $t['lelong_id'])
             ->where('kodcaw', $t['caw_code'])
@@ -298,12 +298,13 @@ class TangguhLelongController extends Controller
             ->get()
             ->count();
 
+            $tangguh[$index]['bilsag'] = $sag;
             array_push($arrayinfo,['t'=>$t, 'sag'=>$sag]);
         }
 
         
 
-        return view('tangguhlelong.senleltangguh',compact('tangguh','sag'));
+        return view('tangguhlelong.senleltangguh',compact('tangguh','arrayinfo'));
 
     }
 
@@ -726,6 +727,7 @@ class TangguhLelongController extends Controller
        
        $tangguh = TangguhLelong::where('tangguhlelong.kodcaw', $user->kodcaw)
        ->get();
+    //    dd($tangguh);
 
        foreach($tangguh as $index1=>$t)
        {
@@ -963,17 +965,19 @@ class TangguhLelongController extends Controller
         ->where('kodcaw','=',$caw_code)
         ->get();
 
-        // dd($pengesahan);
+        // dd($tangguh);
+        if($tangguh){
+            foreach($tangguh as $index1=>$sah)
+            {
+                $lelongbid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
+                ->where('lelong.id', $sah->lelong_id)
+                ->get();
+                //  dd($lelongbid);
 
-        foreach($tangguh as $index1=>$sah)
-        {
-            $lelongbid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
-            ->where('lelong.id', $sah->lelong_id)
-            ->get();
-            //  dd($lelongbid);
-
-            $tangguh[$index1]['bid_details'] = $lelongbid;    
+                $tangguh[$index1]['bid_details'] = $lelongbid; 
+                $tangguh[$index1]['status'] = $sah['status']; 
 
+            }
         }
 
         // $filter_null = function($x){
diff --git a/app/Mail/ResetPassword.php b/app/Mail/ResetPassword.php
index 668d5b9d..4932239a 100644
--- a/app/Mail/ResetPassword.php
+++ b/app/Mail/ResetPassword.php
@@ -36,8 +36,8 @@ class ResetPassword extends Mailable
         $user['name'] = $this->name;
         $user['token'] = $this->token;
 
-        return $this->from("masterlelongpkb@gmail.com", "Admin Lelong")
-        ->subject('Sistem Lelong Online PKB-Tukar Katalaluan')
+        return $this->from("masterlelongpkb@gmail.com", "Admin ArrahnBid")
+        ->subject('ArrahnBid -Tukar Katalaluan')
         ->view('template.reset-password', ['user' => $user]);
     }
 }
diff --git a/resources/views/account/listbayaranonline.blade.php b/resources/views/account/listbayaranonline.blade.php
index 08015fcb..68141115 100644
--- a/resources/views/account/listbayaranonline.blade.php
+++ b/resources/views/account/listbayaranonline.blade.php
@@ -4,10 +4,17 @@
 
 <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><br>
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                     <a href="javascript:window.history.go(-1);" class="header-style-icon">
+                            <i class="fas fa-arrow-left"></i>
+                        </a>
+                    <div class="header-style-title">
+                        Senarai Bayaran Atas Talian
+                    </div>
+                </div>
+                <div class="card-body">
         @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -15,7 +22,7 @@
         @endif
         <h4> Senarai Bayaran Atas Talian </h4>
             <p><i class="fas fa-caret-right"></i>  {{ $getkodcaw['caw_name'] }}</p>
-        <table class="table table-striped  table-xl text-center" id="sahsagonline" style="width:100%">
+        <table class="table table-bordered text-center" id="sahsagonline" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
@@ -39,17 +46,17 @@
                             <td>{{ number_format($winner['totalPay'], 2, '.', ',')}}</td>
                             <td>{{ number_format($winner['totalBid'], 2, '.', ',')}}</td>
                             <td>
-                                <a href=" {{ route('account.sahsagonline', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id, 'caw_code'=>$kodcaw]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
+                                <a  href=" {{ route('account.sahsagonline', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id, 'caw_code'=>$kodcaw]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
                             </td>
                         </tr>
                 @endforeach
             </tbody>
         </table>
-        <div class="modal-footer" style="margin-top:2%;">
+        {{-- <div class="modal-footer" style="margin-top:2%;">
                     <a  href="{{ route('account.senarailelongan') }}" class="btn btn-primary">Kembali</a>
                 </div>
         </div>
-    </div>
+    </div> --}}
 </div>
 
 <script>
diff --git a/resources/views/account/senarailelongan.blade.php b/resources/views/account/senarailelongan.blade.php
index 918cb77d..ae215d64 100644
--- a/resources/views/account/senarailelongan.blade.php
+++ b/resources/views/account/senarailelongan.blade.php
@@ -3,15 +3,23 @@
 @section('content')
 
 <div class="container-fluid">
-    <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
+    <div class="row">
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                 
+                    <div class="header-style-title">
+                        Senarai Lelongan
+                    </div>
+                </div>
+                <div class="card-body">
         @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
                 </div>
         @endif
-        <h4 style="margin-left:1%;"> Senarai Lelongan </h4>
-        <table class="table table-striped  table-xl text-center" id="senarailelongan" style="width:100%">
+
+        <table class="table text-center table-bordered" id="senarailelongan" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
@@ -34,7 +42,7 @@
                     @endphp</td>
                     <td align='left'>
                         @foreach($data['detailsinfo'] as $details)
-                        <a href=" {{ route('account.listbayaranonline', ['lelong_id'=>$data['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
+                        <a class="btn m-1 btn-primary" href=" {{ route('account.listbayaranonline', ['lelong_id'=>$data['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
                         <span class="m-2">{{ $details['caw_name']}}
                         </span><br>
                         @endforeach
diff --git a/resources/views/home/listbayaranonline.blade.php b/resources/views/home/listbayaranonline.blade.php
index 08015fcb..23761e48 100644
--- a/resources/views/home/listbayaranonline.blade.php
+++ b/resources/views/home/listbayaranonline.blade.php
@@ -39,16 +39,16 @@
                             <td>{{ number_format($winner['totalPay'], 2, '.', ',')}}</td>
                             <td>{{ number_format($winner['totalBid'], 2, '.', ',')}}</td>
                             <td>
-                                <a href=" {{ route('account.sahsagonline', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id, 'caw_code'=>$kodcaw]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
+                                <a class="btn m-1 btn-primary"  href=" {{ route('account.sahsagonline', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id, 'caw_code'=>$kodcaw]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
                             </td>
                         </tr>
                 @endforeach
             </tbody>
         </table>
-        <div class="modal-footer" style="margin-top:2%;">
+        {{-- <div class="modal-footer" style="margin-top:2%;">
                     <a  href="{{ route('account.senarailelongan') }}" class="btn btn-primary">Kembali</a>
                 </div>
-        </div>
+        </div> --}}
     </div>
 </div>
 
diff --git a/resources/views/lelong/indexbrgleldetailscaw.blade.php b/resources/views/lelong/indexbrgleldetailscaw.blade.php
index cceca29d..82f3752b 100644
--- a/resources/views/lelong/indexbrgleldetailscaw.blade.php
+++ b/resources/views/lelong/indexbrgleldetailscaw.blade.php
@@ -3,10 +3,17 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            @foreach($cawname as $cawname)
-            <h4 class="pt-3" style="margin-left:1%;">Butiran Laporan Barang Lelong: {{$cawname->caw_name}} </h4>
-            @endforeach
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="header-style-title">
+                        @foreach($cawname as $cawname)
+                        BUTIRAN BARANG LELONGAN: {{$cawname->caw_name}}
+                        @endforeach
+                    </div>
+                </div>
+                <div class="card-body">
+          
             @if ($message = Session::get('success'))
             <div class="alert alert-success">
                 <p>{{ $message }}</p>
@@ -14,7 +21,7 @@
             @endif
             <form id="exportform" action="" method="POST">
                 <input type="hidden" name="type" value="User">
-                <table class="table table-striped  table-xl" id="tablenotislelong" style="width:100%">
+                <table class="table table-bordered text-center" id="tablenotislelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Bil</th>
@@ -37,7 +44,7 @@
                             @endphp</td>
                             <td>{{ $bid->fasa }}</td>
                             <td class="text-center">
-                            <a  href="{{ route('reportcaw.laporanbrgleldetailscaw',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Butiran Laporan Barang Lelong" ><i class="fas fa-download"></i></a>
+                            <a class="btn m-1 btn-info"  href="{{ route('reportcaw.laporanbrgleldetailscaw',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Maklumat Lanjut" ><i class="fas fa-download"></i></a>
                             </td>
                         </tr>
                         @endforeach
diff --git a/resources/views/lelong/indexbrglelpembidacaw.blade.php b/resources/views/lelong/indexbrglelpembidacaw.blade.php
index bd835699..e5fc83d2 100644
--- a/resources/views/lelong/indexbrglelpembidacaw.blade.php
+++ b/resources/views/lelong/indexbrglelpembidacaw.blade.php
@@ -3,10 +3,17 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            @foreach($cawname as $cawname)
-            <h4 class="pt-3" style="margin-left:1%;">Laporan Barang Lelong Pembida: {{$cawname->caw_name}} </h4>
-            @endforeach
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="header-style-title">
+                        @foreach($cawname as $cawname)
+                        BARANG LELONGAN PEMBIDA: {{$cawname->caw_name}}
+                        @endforeach
+                    </div>
+                </div>
+                <div class="card-body">
+           
             @if ($message = Session::get('success'))
             <div class="alert alert-success">
                 <p>{{ $message }}</p>
@@ -14,7 +21,7 @@
             @endif
             <form id="exportform" action="" method="POST">
                 <input type="hidden" name="type" value="User">
-                <table class="table table-striped  table-xl" id="tablenotislelong" style="width:100%">
+                <table class="table table-bordered text-center" id="tablenotislelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Bil</th>
@@ -37,7 +44,7 @@
                             @endphp</td>
                             <td>{{ $bid->fasa }}</td>
                             <td class="text-center">
-                            <a  href="{{ route('reportcaw.laporanbrglelpembidacaw',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Nama Pembida" ><i class="fas fa-download"></i></a>
+                            <a class="btn m-1 btn-info"  href="{{ route('reportcaw.laporanbrglelpembidacaw',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Nama Pembida" ><i class="fas fa-download"></i></a>
                             </td>
                         </tr>
                         @endforeach
diff --git a/resources/views/lelong/indexlelfullcaw.blade.php b/resources/views/lelong/indexlelfullcaw.blade.php
index c1768832..e16076ca 100644
--- a/resources/views/lelong/indexlelfullcaw.blade.php
+++ b/resources/views/lelong/indexlelfullcaw.blade.php
@@ -3,10 +3,17 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            @foreach($cawname as $cawname)
-            <h4 class="pt-3" style="margin-left:1%;">Laporan Lelong Keseluruhan: {{$cawname->caw_name}} </h4>
-            @endforeach
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="header-style-title">
+                        @foreach($cawname as $cawname)
+                        LAPORAN LELONGAN: {{$cawname->caw_name}}
+                        @endforeach
+                    </div>
+                </div>
+                <div class="card-body">
+          
             @if ($message = Session::get('success'))
             <div class="alert alert-success">
                 <p>{{ $message }}</p>
@@ -14,7 +21,7 @@
             @endif
             <form id="exportform" action="" method="POST">
                 <input type="hidden" name="type" value="User">
-                <table class="table table-striped  table-xl" id="tablenotislelong" style="width:100%">
+                <table class="table table-bordered text-center" id="tablenotislelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Bil</th>
@@ -37,7 +44,7 @@
                             @endphp</td>
                             <td>{{ $bid->fasa }}</td>
                             <td class="text-center">
-                            <a  href="{{ route('reportcaw.laporanlelfullcaw',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Nama Pembida" ><i class="fas fa-download"></i></a>
+                            <a class="btn m-1 btn-info" href="{{ route('reportcaw.laporanlelfullcaw',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Nama Pembida" ><i class="fas fa-download"></i></a>
                             </td>
                         </tr>
                         @endforeach
diff --git a/resources/views/lelong/indexnamapembidacaw.blade.php b/resources/views/lelong/indexnamapembidacaw.blade.php
index 78d3bdee..971c44c6 100644
--- a/resources/views/lelong/indexnamapembidacaw.blade.php
+++ b/resources/views/lelong/indexnamapembidacaw.blade.php
@@ -3,10 +3,17 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            @foreach($cawname as $cawname)
-            <h4 class="pt-3" style="margin-left:1%;">Laporan Nama Pembida: {{$cawname->caw_name}} </h4>
-            @endforeach
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="header-style-title">
+                        @foreach($cawname as $cawname)
+                        Laporan Nama Pembida: {{$cawname->caw_name}}
+                        @endforeach
+                    </div>
+                </div>
+                <div class="card-body">
+           
             @if ($message = Session::get('success'))
             <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -14,7 +21,7 @@
             @endif
             <form id="exportform" action="" method="POST">
                 <input type="hidden" name="type" value="User">
-                <table class="table table-striped  table-xl" id="tablenotislelong" style="width:100%">
+                <table class="table table-bordered text-center" id="tablenotislelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Bil</th>
@@ -37,7 +44,7 @@
                             @endphp</td>
                             <td>{{ $bid->fasa }}</td>
                             <td class="text-center">
-                            <a  href="{{ route('reportcaw.laporannamapembidacaw',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Nama Pembida" ><i class="fas fa-download"></i></a>
+                            <a class="btn m-1 btn-info" href="{{ route('reportcaw.laporannamapembidacaw',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Nama Pembida" ><i class="fas fa-download"></i></a>
                             </td>
                         </tr>
                         @endforeach
diff --git a/resources/views/lelong/laporancawindex.blade.php b/resources/views/lelong/laporancawindex.blade.php
index 09d15f52..30928448 100644
--- a/resources/views/lelong/laporancawindex.blade.php
+++ b/resources/views/lelong/laporancawindex.blade.php
@@ -3,10 +3,18 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            @foreach($cawname as $cawname)
-            <h4 class="pt-3" style="margin-left:1%;">Laporan Barang Lelong: {{$cawname['caw_name']}} </h4>
-            @endforeach
+        <div class="col mx-auto p-4">
+            <div class="card">
+            <div class="card-header header-style">
+                
+                <div class="header-style-title">
+                    @foreach($cawname as $cawname)
+                        SENARAI BARANG LELONGAN : {{$cawname['caw_name']}}
+                    @endforeach
+                </div>
+            </div>
+            <div class="card-body">
+           
             @if ($message = Session::get('success'))
             <div class="alert alert-success">
                 <p>{{ $message }}</p>
@@ -14,7 +22,7 @@
             @endif
             <form id="exportform" action="" method="POST">
                 <input type="hidden" name="type" value="User">
-                <table class="table table-striped  table-xl" id="tablenotislelong" style="width:100%">
+                <table class="table table-bordered text-center" id="tablenotislelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Bil</th>
@@ -37,7 +45,7 @@
                             @endphp</td>
                             <td>{{ $bid->fasa }}</td>
                             <td class="text-center">
-                            <a  href="{{ route('reportcaw.laporanbrglelcaw',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Senarai Nama Pembida" ><i class="fas fa-download"></i></a>
+                            <a class="btn m-1 btn-info" href="{{ route('reportcaw.laporanbrglelcaw',$bid->lelong_id) }}" data-toggle="tooltip" data-placement="top" title="Maklumat Lanjut" ><i class="fas fa-download"></i></a>
                             </td>
                         </tr>
                         @endforeach
diff --git a/resources/views/lelong/listsagpindah.blade.php b/resources/views/lelong/listsagpindah.blade.php
index 774b8024..f1f50317 100644
--- a/resources/views/lelong/listsagpindah.blade.php
+++ b/resources/views/lelong/listsagpindah.blade.php
@@ -4,25 +4,27 @@
 
 <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>             
-        <span class="pt-3" style="margin-left:1%; font-size:20px"><b>Senarai Lelong(Pindah Batch Lelong)</b></span>
-             @foreach ($arrayinfo as $laporan)
+        <div class="col mx-auto p-4">
+            <div class="card">
+            <div class="card-header header-style">
+                <a href="javascript:window.history.go(-1);" class="header-style-icon">
+                    <i class="fas fa-arrow-left"></i>
+                </a>
+                @foreach ($arrayinfo as $laporan)
+                <div class="header-style-title">
+                    Senarai SAG(Pindah Batch Lelong) : @foreach($laporan['details'] as $details)
+                    <b>{{ $details['caw_name']}}</b>
+                    @endforeach
+                </div>
+            </div>
+            <div class="card-body">
         
-            <span class="pt-3" style="margin-left:1%;"><b>Batch Lelong : {{ $laporan['laporan']['lelong_id']}}</b></span>
+            <span class="pt-3" style="margin-left:1%;"><b>Batch Lelong : {{ $laporan['laporan']['lelong_id']}}</b></span><br>
             <span class="pt-3" style="margin-left:1%;"><b>Tarikh Lelong : @php 
                 $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
                   $datez = $myDateTime->format('d-m-Y');
                   echo($datez);
-              
               @endphp</b></span>
-            @foreach($laporan['details'] as $details)
-            <span class="pt-3" style="margin-left:1%;"><b>Nama Cawangan : {{ $details['caw_name']}}</b></span>
-            <span class="pt-3" style="margin-left:1%;"><b>Kod Cawangan : {{ $details['caw_code']}}</b></span>
-            @endforeach
-           
         @endforeach
             
             @if ($message = Session::get('success'))
@@ -34,15 +36,15 @@
                 @csrf
                 <input type="hidden" name="lelongid" value="{{$lelongid}}">
                 <input type="hidden" name="cawid" value="{{$cawid}}">
-                <div> Pindah Ke-</div>
+                <div><span class="pt-3" style="margin-left:1%;>" Pindah Ke-</div>
                     <select class="js-states browser-default select2" name="lelongidbaru" required id="lelongidbaru">
-                        <option value="option_select" disabled selected>SILA PILIH BATCH LELONG</option>
+                        <option value="option_select" disabled selected>SILA PILIH BATCH LELONG UNTUK PINDAH BATCH</option>
                         @foreach($datapindah as $data)
                             <option value="{{ $data['id'] }}">Batch Lelong:{{ $data['id']}} / Tarikh: {{ $data['tarikh_lelong']}}  / Kali Ke-: {{ $data['kali']}}</option>
                         @endforeach
-                    </select>
+                    </select></span>
                     <button type="submit" class="btn btn-success">Pindah Lelong</button>
-                <table class="table table-striped  table-xl" id="marhun" style="width:100%">
+                <table class="table text-right table-bordered"  id="marhun" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>Pilih</th>
@@ -51,10 +53,10 @@
                             <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>Harga Asas (RM)</th>
                             <th>Rugi Lelong (RM)</th>
                             <th>Baki Lelong (RM)</th>
                            
@@ -67,7 +69,7 @@
                                     <input type="checkbox" aria-label="Checkbox for following text input" onclick="btnDelete(this)" name="checkboxdata[]" value="{{ $marhun['norujukan'] }}">
                                 </td>
                                 <td>{{$loop->iteration}}</td>
-                                <td>{{ $marhun['norujukan']}}</td>
+                                <td style="white-space: nowrap;">{{ $marhun['norujukan']}}</td>
                                 <td>{{ $marhun['jbg']}}</td>
                                 <td>{{ $marhun['berat'] }}</td>
                                 <td>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
diff --git a/resources/views/lelong/showtukartarikh.blade.php b/resources/views/lelong/showtukartarikh.blade.php
index f26ba272..2721e49e 100644
--- a/resources/views/lelong/showtukartarikh.blade.php
+++ b/resources/views/lelong/showtukartarikh.blade.php
@@ -85,13 +85,13 @@
                             <input type="date" class="form-control" id="tarikhlelongbaru" name="tarikhlelongbaru"  value = "">
                         </div>
                     </div>
-                    <div class="form-group row">
+                    {{-- <div class="form-group row">
                         <label for="jbg" class="col-sm-2 col-form-label">Batch Lelong Baru</label>
                         <div class="col-sm-2">
                             <input type="text" class="form-control" id="lelongidbaru" name="lelongidbaru" value = "{{$idlelongbaru}}" readonly>
  
                         </div>
-                    </div>
+                    </div> --}}
                     <button type="submit" class="btn btn-success">Tukar Tarikh Lelong</button>
                 </form>
 
diff --git a/resources/views/marhun/scanbarcodejual.blade.php b/resources/views/marhun/scanbarcodejual.blade.php
index 17b66d44..acda254d 100644
--- a/resources/views/marhun/scanbarcodejual.blade.php
+++ b/resources/views/marhun/scanbarcodejual.blade.php
@@ -67,7 +67,7 @@
                                     </tr>
                                 </thead>
                                 <tbody>
-                                    @foreach($new_lelong_bid as $index)
+                                    @forelse($new_lelong_bid as $index)
                                     <tr>
                                         <td>{{$loop->iteration}}</td>
                                         <td>{{$index->norujukan}}</td>
@@ -81,7 +81,12 @@
                                         </td> --}}
                                         
                                     </tr>
-                                    @endforeach
+                                    @empty
+                                    <tr>
+                                        <td colspan="5">No Data</td>
+                                    </tr>
+                
+                                     @endforelse
                                 </tbody>
                             </table>
                         </div>
diff --git a/resources/views/marhun/scanbarcodejualbycust.blade.php b/resources/views/marhun/scanbarcodejualbycust.blade.php
new file mode 100644
index 00000000..bc5c921e
--- /dev/null
+++ b/resources/views/marhun/scanbarcodejualbycust.blade.php
@@ -0,0 +1,145 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col mx-auto p-4">
+            <div class="card">
+                <div class="card-header header-style">
+                    <a href="{{ route('marhun.senarailelongscanjual') }}" class="header-style-icon">
+                        <i class="fas fa-arrow-left"></i>
+                    </a>
+                    <div class="header-style-title">
+                     Scan Barcode Keluar Kepada Pembida
+                    </div>
+                </div>
+                <div class="card-body">
+                    @if ($message = Session::get('success'))
+                    <div class="alert mt-2 alert-success">
+                        <p>{{ $message }}</p>
+                    </div>
+                    @elseif ($message = Session::get('failed'))
+                    <div class="alert mt-2 alert-danger">
+                        <p>{{ $message }}</p>
+                    </div>
+                    @endif
+                    {{-- <a class="btn btn-secondary mb-1" href="{{route('marhun.senarailelongscan')}}">Kembali</a> --}}
+                    
+                    <p>Tarikh Lelong:
+                        @php
+                        $myDateTime = DateTime::createFromFormat('Y-m-d', $lelongDetail['tarikh_lelong'] );
+                        $t_lelong = $myDateTime->format('d-m-Y');
+                        echo($t_lelong);
+                        @endphp
+                    </p>
+                    <p>Nama Pembida:
+                       <b> {{$userdetails['name']}}</b>
+                    </p>
+
+                    <ul class="nav mb-2 nav-tabs" id="myTab" role="tablist">
+                        <li class="nav-item">
+                            <a class="nav-link active" id="senarai-tab" data-toggle="tab" href="#senarai" role="tab" aria-controls="senarai" aria-selected="true">Senarai SAG Telah Jual</a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" id="scan-keluar-tab" data-toggle="tab" href="#scan-keluar" role="tab" aria-controls="scan-keluar" aria-selected="false">SAG Keluar Untuk Serahan Kpd Pembida</a>
+                        </li>
+                        
+                    </ul>
+                    <div class="tab-content" id="myTabContent">
+                        <div class="tab-pane fade show active" id="senarai" role="tabpanel" aria-labelledby="senarai-tab">
+                            <div class="row justify-content-center mb-4">
+                                <div class="col-5">
+                                    <form action="{{ route('marhun.scankeluarmarhunjualbycust') }}" method="POST">
+                                        @csrf
+
+                                        <div style="text-align: center;">Scan Barcode Marhun Untuk Serah Kepada Pembida</div>
+                                        <input type="text" style="text-align: center;" class="form-control" name="norujukan_barcode" autocomplete="off" id="norujukan_barcode" placeholder="SILA SCAN BARCODE PADA SAG" />
+                                        <input type="hidden" name="lelong_id" value="{{$lelong_id}}">
+                                        <input type="hidden" name="userid" value="{{$userid}}">
+                                    </form>
+                                </div>
+                            </div>
+                            <table class="table text-center table-bordered" id='table-scan-jual'>
+                                <thead class="bg-primary text-white">
+                                    <tr>
+                                        <th>Bil</th>
+                                        <th>No Rujukan</th>
+                                        <th>Marhun</th>
+                                        <th>N. Marhun</th>
+                                        <th>Berat</th>
+                                        {{-- <th>Nama Pembida</th> --}}
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @forelse($new_lelong_bid as $index)
+                                    <tr>
+                                        <td>{{$loop->iteration}}</td>
+                                        <td>{{$index->norujukan}}</td>
+                                        <td>{{$index->marhun}}</td>
+                                        <td>{{ number_format($index->nilaimarhun, 2, '.', ',')}}</td>
+                                        <td>{{$index->berat}}</td>
+                                        {{-- <td> 
+                                            @foreach($namabidder as $index=>$nama)
+                                            {{ $namabidder[0]['nama_bidder']}}
+                                            @endforeach
+                                        </td> --}}
+                                        
+                                    </tr>
+                                    @empty
+                                        <tr>
+                                            <td colspan="5">No Data</td>
+                                        </tr>
+                    
+                                         @endforelse
+                                </tbody>
+                            </table>
+                        </div>
+                        <div class="tab-pane fade" id="scan-keluar" role="tabpanel" aria-labelledby="scan-keluar-tab">
+                            <div class="row justify-content-center mb-4">
+                                <div class="col-5">
+                                    {{-- <form action="{{ route('marhun.scankeluarmarhunjual') }}" method="POST">
+                                        @csrf
+                                        
+                                        <div style="text-align: center;">Scan Barcode Marhun Serahan Kepada Pembida</div>
+                                        <input type="text" style="text-align: center;" class="form-control" name="norujukan_barcode" autocomplete="off" id="norujukan_barcode" placeholder="SILA SCAN BARCODE PADA SAG" />
+                                        <input type="hidden" name="lelong_id" value="{{$lelong_id}}">
+                                    </form> --}}
+                                </div>
+                            </div>
+                            <div style="text-align: left;"> <a  href="{{ route('marhun.cetakkeluarscanbarcodejualbycust', ['lelong_id'=>$lelong_id, 'userid'=>$userid]) }}" class="btn btn-info">Laporan Serahan Kepada Pembida</a><br></div>
+                            <table class='table table-bordered table-hover' id='table-scan-keluar'>
+                                <thead class="bg-primary text-white">
+                                    <tr>
+                                        <th>Bil</th>
+                                        <th>No Rujukan</th>
+                                        <th>Tarikh/Masa Scan Keluar</th>
+                                        <th>Status</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    @foreach ($senaraiScanKeluar as $index)
+                                    <tr>
+                                        <td>{{$loop->iteration}}</td>
+                                        <td>{{$index->norujukan}}</td>
+                                        <td>{{$index->scan_keluar}}</td>
+                                        <td><span class="badge badge-pill badge-success">Telah Serah Kepada Pembida</span></td>
+                                    </tr>
+                                    @endforeach
+                                </tbody>
+                            </table>
+                        </div>
+                        
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+    var tableSenarai = $('#table-senarai').DataTable({});
+    var tableScanKeluar = $('#table-scan-keluar').DataTable({});
+    // var tableScanMasuk = $('#table-scan-masuk').DataTable({});
+</script>
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/marhun/senarailelongscanjual.blade.php b/resources/views/marhun/senarailelongscanjual.blade.php
index b4b29d7c..48ff25c1 100644
--- a/resources/views/marhun/senarailelongscanjual.blade.php
+++ b/resources/views/marhun/senarailelongscanjual.blade.php
@@ -28,12 +28,13 @@
                         <th>No</th>
                         <th>Batch Lelong</th>
                         <th>Tarikh Lelong</th>
+                        <th>Nama Pembida</th>
                         <th>Status Lelong</th>
                         <th>Tindakan</th>
                     </tr>
                 </thead>
                 <tbody>
-                    @foreach($arrayinfo as $lel)
+                    @forelse($arrayinfo as $lel)
                     <tr>
                         <td>{{$loop->iteration}}</td>
                         <td>{{ $lel['info']['lelong_id']}}</td>
@@ -42,6 +43,14 @@
                             $t_lelong = $myDateTime->format('d-m-Y');
                             echo($t_lelong);
                             @endphp</td>
+                         <td style='white-space:nowrap;' align = 'left'>
+                            {{-- @if(!empty($listwinner)) --}}
+                                @foreach($lel['listwinner'] as $winner)
+                                <a  class="btn m-1 btn-info"  href=" {{ route('marhun.scanbarcodejualbycust', ['lelong_id'=>$lel['info']['lelong_id'], 'userid'=>$winner['details']['id']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
+                                {{ $winner['details']['name']}}<br>
+                                @endforeach
+                            {{-- @endif --}}
+                        </td>
                         <td>
                             @if($lel['info']['sts_lelong'] == 3)
                             <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
@@ -50,11 +59,16 @@
                         <td>
                             @if($lel['info']['sts_lelong'] == 3)
                             <a class="btn m-1 btn-warning" href="{{ route('marhun.exportmarhundetailspembida', ['lelong_id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun" style="margin-right:40px"><i class="fas fa-download"></i></a>
-                            <a class="btn m-1 btn-info" href=" {{ route('marhun.scanbarcodejual', ['lelong_id'=>$lel['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Serahan Kepada Pembida"><i class="far fa-edit"></i></a>
+                            {{-- <a class="btn m-1 btn-info" href=" {{ route('marhun.scanbarcodejual', ['lelong_id'=>$lel['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Serahan Kepada Pembida"><i class="far fa-edit"></i></a> --}}
                             @endif
                         </td>
                     </tr>
-                    @endforeach
+                    @empty
+                    <tr>
+                        <td colspan="6">No Data</td>
+                    </tr>
+
+                     @endforelse
                 </tbody>
             </table>
         </div>
diff --git a/resources/views/pdf/brglelcaw.blade.php b/resources/views/pdf/brglelcaw.blade.php
index e85ff781..6a4af57a 100644
--- a/resources/views/pdf/brglelcaw.blade.php
+++ b/resources/views/pdf/brglelcaw.blade.php
@@ -11,7 +11,7 @@
 #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
     border: 0px solid;
     padding: 1px;
-    text-align: left;
+    /* text-align: left; */
     
 }
 
@@ -20,7 +20,7 @@
 #sim tr:hover {}
 
 #sim th {
-    text-align: left;
+    /* text-align: left; */
     border: 0px solid;
 	table-layout:auto;
     color: black;
@@ -37,7 +37,7 @@
 }
   
 .column {
-  float: left;
+  /* float: left; */
   width: 100%;
   padding: 5px;
 }
@@ -57,18 +57,18 @@ table {
 }
 
 td {
-  text-align: left;
+  /* text-align: left; */
   padding: 16px;
 }
 
 th{
-  text-align: left;
+  /* text-align: left; */
   padding: 16px;
-  background-color:gainsboro;
+  /* background-color:gainsboro; */
 }
 
 tr:nth-child(even) {
-  background-color: #f2f2f2;
+  /* background-color: #f2f2f2; */
 }
 
 </style>
@@ -81,7 +81,7 @@ tr:nth-child(even) {
                         </tr>
 
                         <tr>
-                          <td colspan="2"><u><b>LAPORAN BARANG LELONG</b></u></td>
+                          <td colspan="2"><u><b>SENARAI BARANG LELONG</b></u></td>
 
                         </tr>
                     </table>
@@ -92,13 +92,16 @@ tr:nth-child(even) {
                         <tr>
                           @foreach ($info as $info)
                           <td>Batch Lelong: {{$info['lelong_id']}}</td>
+                          <td>Cawangan : {{$info['caw_name']}}    
+                          <tr>
                           <td>Tarikh Lelong : @php
                             $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
                             $t_lelong =  $myDateTime->format('d-m-Y');
                             echo($t_lelong);
                         @endphp</td>
-                          <td>Fasa: {{$info['fasa']}}
-                          <td>Nama Cawangan : {{$info['caw_name']}}                          
+                        <tr>
+                          {{-- <td>Fasa: {{$info['fasa']}} --}}
+                          {{-- <td>Nama Cawangan : {{$info['caw_name']}}                           --}}
                         @endforeach
                         </tr>
                       </thead>
@@ -111,10 +114,11 @@ tr:nth-child(even) {
                         <thead>
                         <tr> 
                           <th width="5%" align="left">No</th> 
-                          <th width="25%" align="left">No Rujukan</th> 
+                          <th width="25%" align="center">No Rujukan</th> 
                           <th width="25%" align="left">Marhun</th>
-                          <th width="25%" align="left">Berat (gm)</th>
-                          <th width="25%" align="left">Harga Asas</th>
+                          <th width="25%" align="right">Berat (gm)</th>
+                          <th width="25%" align="right">Harga Asas</th>
+                          <th width="25%" align="center">Harga Tawaran</th>
                         </tr>
                         </thead>
 
@@ -123,16 +127,17 @@ tr:nth-child(even) {
 
                             <td width="5%" align="center">{{ $loop->iteration }} </td>
                             <td width="14%" align="center">{{ $brg['norujukan']}}</td>
-                            <td width="17%" align="center">{{ $brg['marhun']}}</td>  
-                            <td width="17%" align="center">{{ number_format($brg['berat'], 2, '.', ',') }}</td>
-                            <td width="12%" align="center">{{ number_format($brg['hargaasas'], 2, '.', ',') }}</td>
+                            <td width="17%" align="left">{{ $brg['marhun']}}</td>  
+                            <td width="17%" align="right">{{ number_format($brg['berat'], 2, '.', ',') }}</td>
+                            <td width="12%" align = 'right'>{{ number_format($brg['hargaasas'], 2, '.', ',') }}</td>
+                            <td width="12%" align = 'center'>________________</td>
                         </tr>
                         @endforeach
 
                         <tr>
                           <td colspan="3"><b>JUMLAH KESELURUHAN</b></td> 
-                          <td>{{ number_format($total_berat, 2, '.', ',') }}</td>
-                          <td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>          
+                          <td align = 'right'><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                          <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>          
                         </tr>
                        
 
diff --git a/resources/views/pdf/cetakkeluarscanbarcodejualbycust.blade.php b/resources/views/pdf/cetakkeluarscanbarcodejualbycust.blade.php
new file mode 100644
index 00000000..f3e08a0f
--- /dev/null
+++ b/resources/views/pdf/cetakkeluarscanbarcodejualbycust.blade.php
@@ -0,0 +1,116 @@
+
+<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: left;
+    
+}
+
+#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;
+}
+  
+.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: left;
+  padding: 16px;
+}
+
+tr:nth-child(even) {
+  /* background-color: #f2f2f2; */
+}
+
+</style>
+
+<body>
+
+                      <table width="100%" border="0" id="sim">
+                        <tr>
+                          <td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
+                        </tr>
+
+                        <tr>
+                          <td colspan="2"><u><b>LAPORAN SERAHAN KEPADA PEMBIDA</b></u></td>
+                        </tr>
+                        <tr>
+                          <td colspan="2"><b>Cawangan: {{$caw['caw_name']}}</b></td>
+                        </tr>
+                        <tr>
+                          <td colspan="2"><b>Batch Lelong: {{$lelong_id}}</b></td>
+                        </tr>
+                        <tr>
+                          <td colspan="2"><b>Nama Pembida: {{$userdetails['name']}}</b></td>
+                        </tr>
+                      </table>
+
+                      <br>
+                      <table cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">
+                        <thead>
+                          <tr>
+                            <th>Bil</th>
+                            <th>No Rujukan</th>
+                            <th>Tarikh/Masa Scan Keluar</th>
+                            <th>Status</th>
+                        </tr>
+                        </thead>
+          
+                        <tbody>
+                          @foreach ($senaraiScanKeluar as $index)
+                          <tr>
+                              <td>{{$loop->iteration}}</td>
+                              <td>{{$index->norujukan}}</td>
+                              <td>{{$index->scan_keluar}}</td>
+                              <td><span class="badge badge-pill badge-danger">Telah Serah Kepada Pembida</span></td>
+                          </tr>
+                          @endforeach
+                      </tbody>
+                      </table> 
+              
+                                
+                    
+</tbody>
diff --git a/resources/views/pdf/laporanbrgleldetailscaw.blade.php b/resources/views/pdf/laporanbrgleldetailscaw.blade.php
index c8c7f626..dd7a626e 100644
--- a/resources/views/pdf/laporanbrgleldetailscaw.blade.php
+++ b/resources/views/pdf/laporanbrgleldetailscaw.blade.php
@@ -11,19 +11,54 @@
 #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
     border: 0px solid;
     padding: 1px;
-    text-align: left;
+    
+    /* text-align: left; */
     
 }
 
-#sim tr:nth-child(even){}
+#sim tr:nth-child(even){
+  border-bottom: 1px solid #ddd;
+}
 
 #sim tr:hover {}
 
 #sim th {
-    text-align: left;
+    /* text-align: left; */
     border: 0px solid;
 	table-layout:auto;
     color: black;
+    
+	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+}
+
+
+#sim2 {
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+	font-size:10px;
+	border-collapse: collapse;
+    width: 100%;
+}
+
+#sim2 td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+    border: 0px solid;
+    padding: 1px;
+    
+    /* text-align: left; */
+    
+}
+
+#sim2 tr:nth-child(even){
+  /* border-bottom: 1px solid #ddd; */
+}
+
+#sim2 tr:hover {}
+
+#sim2 th {
+    /* text-align: left; */
+    border: 0px solid;
+	table-layout:auto;
+    color: black;
+    
 	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
 }
 
@@ -37,7 +72,7 @@
 }
   
 .column {
-  float: left;
+  /* float: left; */
   width: 100%;
   padding: 5px;
 }
@@ -57,18 +92,24 @@ table {
 }
 
 td {
-  text-align: left;
+  /* text-align: left; */
   padding: 16px;
 }
 
 th{
-  text-align: left;
+  /* text-align: left; */
   padding: 16px;
-  background-color:gainsboro;
+  /* text-align: left; */
+	table-layout:auto
+    color: black;
+    border-bottom: 1px solid #ddd;
+  /* background-color:gainsboro; */
 }
 
+
 tr:nth-child(even) {
-  background-color: #f2f2f2;
+  /* background-color: #f2f2f2; */
+
 }
 
 </style>
@@ -76,18 +117,18 @@ tr:nth-child(even) {
 
 <body>
 
-  <table width="100%" border="0" id="sim">
+  <table width="100%" border="0" id ="sim2">
     <tr>
       <td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
     </tr>
 
     <tr>
-      <td colspan="2"><u><b>BUTIRAN LAPORAN BARANG LELONG </b></u></td>
+      <td colspan="2"><u><b>BUTIRAN SENARAI BARANG LELONG </b></u></td>
 
     </tr>
 </table>
 
-<table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
+{{-- <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id ="sim2">
   <thead>
     <br>
     <tr>
@@ -106,21 +147,44 @@ tr:nth-child(even) {
     @endforeach
     </tr>
   </thead>
-</table>
+</table> --}}
+
+<table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim2">
+  <thead>
+    <br>
+    <tr>
+      @foreach ($arrayinfo as $laporan)
+      <td>Batch Lelong: {{$laporan['laporan']['lelong_id']}}</td>
+      @foreach ($laporan['details'] as $details)
+      <td>Cawangan : {{$details['caw_name']}}
+      @endforeach
+      <tr>
+      <td>Tarikh Lelong : @php
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
+        $t_lelong =  $myDateTime->format('d-m-Y');
+        echo($t_lelong);
+    @endphp</td>
+    <tr>
+      {{-- <td>Fasa: {{$info['fasa']}} --}}
+      {{-- <td>Nama Cawangan : {{$info['caw_name']}}                           --}}
+    @endforeach
+    </tr>
+  </thead>
+</table> 
 
   <br>
                 
-                      <table cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">
+                      <table cellspacing="0" cellpadding="5" style="float:right;" width="100%" height="80" align="left" id="sim">
                         <thead>
                         <tr> 
                           <th width="2%" align="left">No</th> 
                               <th width="15%" align="left">No Rujukan </th> 
                               <th width="10%" align="left">Jenis Marhun</th>
-                              <th width="10%" align="left">Karat</th> 
-                              <th width="10%" align="left">Berat(gm)</th> 
-                              <th width="12%" align="left">Harga(RM)</th>
-                              <th width="12%" align="left">Nilai Marhun(RM)</th>
-                              <th width="14%" align="left">Harga Asas(RM)</th>
+                              <th width="10%" align="center">Karat</th> 
+                              <th width="10%" align="right">Berat(gm)</th> 
+                              <th width="12%" align="right">Harga(RM)</th>
+                              <th width="12%" align="right">Nilai Marhun(RM)</th>
+                              <th width="14%" align="right">Harga Asas(RM)</th>
                               <th width="13%" align="left">Nota</th>
                         </tr>
                         </thead>
@@ -134,20 +198,20 @@ tr:nth-child(even) {
                             <td>@foreach ($marhun['detailmarhun'] as $item)
                               {{ $item['marhun'] }}<br>
                             @endforeach</td>
-                            <td>@foreach ($marhun['detailmarhun'] as $item)
+                            <td align="center">@foreach ($marhun['detailmarhun'] as $item)
                               {{ $item['karat'] }}<br>
                             @endforeach</td>
-                            <td>@foreach ($marhun['detailmarhun'] as $item)
+                            <td align="right">@foreach ($marhun['detailmarhun'] as $item)
                               {{ $item['berat'] }}<br>
                             @endforeach</td>  
-                            <td>@foreach ($marhun['detailmarhun'] as $item)
+                            <td align="right">@foreach ($marhun['detailmarhun'] as $item)
                               {{ $item['harga'] }}<br>
                             @endforeach</td>   
-                            <td>@foreach ($marhun['detailmarhun'] as $item)
-                              {{ $item['n_marhun'] }}<br>
+                            <td align="right">@foreach ($marhun['detailmarhun'] as $item)
+                              {{ number_format($item['n_marhun'], 2, '.', ',') }}<br>
                             @endforeach</td>           
-                            <td>@foreach ($marhun['detailmarhun'] as $item)
-                              {{ $item['hargaasas'] }}<br>
+                            <td align="right">@foreach ($marhun['detailmarhun'] as $item)
+                              {{ number_format($item['hargaasas'], 2, '.', ',') }}<br>
                             @endforeach</td>        
                             <td>@foreach ($marhun['detailmarhun'] as $item)
                               {{ $item['nota'] }}<br>
@@ -157,22 +221,22 @@ tr:nth-child(even) {
                         </tr>
 
                         <tr>
-                          <td colspan="4" align="left"></td>
-                          <td>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
-                          <td></td>
-                          <td>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
-                          <td>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
+                          {{-- <td colspan="4" align="left"></td>
+                          <td align="right">{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
                           <td></td>
+                          <td align="right">{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
+                          <td align="right">{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
+                          <td></td> --}}
                         </tr>  
                         @endforeach      
                         @foreach ($arraycaw as $index=>$caw)
 
                         <tr>
                           <td colspan="4" align="left"><strong>Jumlah Keseluruhan</strong></td>
-                          <td><strong>{{ number_format($total_berat, 2, '.', ',') }}</strong></td>
-                          <td><strong>{{ number_format($total_harga, 2, '.', ',') }}</strong></td>
-                          <td><strong>{{ number_format($total_nmarhun, 2, '.', ',') }}</strong></td>
-                          <td><strong>{{ number_format($total_hargaasas, 2, '.', ',') }}</strong></td>
+                          <td align="right"><strong>{{ number_format($total_berat, 2, '.', ',') }}</strong></td>
+                          <td align="right"><strong>{{ number_format($total_harga, 2, '.', ',') }}</strong></td>
+                          <td align="right"><strong>{{ number_format($total_nmarhun, 2, '.', ',') }}</strong></td>
+                          <td align="right"><strong>{{ number_format($total_hargaasas, 2, '.', ',') }}</strong></td>
                           <td></td>
                         </tr>                                         
       @endforeach
diff --git a/resources/views/pdf/laporanbrglelpembidacaw.blade.php b/resources/views/pdf/laporanbrglelpembidacaw.blade.php
index 95c14b8a..8747be39 100644
--- a/resources/views/pdf/laporanbrglelpembidacaw.blade.php
+++ b/resources/views/pdf/laporanbrglelpembidacaw.blade.php
@@ -11,19 +11,54 @@
 #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
     border: 0px solid;
     padding: 1px;
-    text-align: left;
+    
+    /* text-align: left; */
     
 }
 
-#sim tr:nth-child(even){}
+#sim tr:nth-child(even){
+  /* border-bottom: 1px solid #ddd; */
+}
 
 #sim tr:hover {}
 
 #sim th {
-    text-align: left;
+    /* text-align: left; */
     border: 0px solid;
 	table-layout:auto;
     color: black;
+    
+	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+}
+
+
+#sim2 {
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+	font-size:10px;
+	border-collapse: collapse;
+    width: 100%;
+}
+
+#sim2 td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+    border: 0px solid;
+    padding: 1px;
+    
+    /* text-align: left; */
+    
+}
+
+#sim2 tr:nth-child(even){
+  /* border-bottom: 1px solid #ddd; */
+}
+
+#sim2 tr:hover {}
+
+#sim2 th {
+    /* text-align: left; */
+    border: 0px solid;
+	table-layout:auto;
+    color: black;
+    
 	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
 }
 
@@ -37,7 +72,7 @@
 }
   
 .column {
-  float: left;
+  /* float: left; */
   width: 100%;
   padding: 5px;
 }
@@ -57,25 +92,31 @@ table {
 }
 
 td {
-  text-align: left;
+  /* text-align: left; */
   padding: 16px;
 }
 
 th{
-  text-align: left;
+  /* text-align: left; */
   padding: 16px;
-  background-color:gainsboro;
+  /* text-align: left; */
+	table-layout:auto
+    color: black;
+    border-bottom: 1px solid #ddd;
+  /* background-color:gainsboro; */
 }
 
+
 tr:nth-child(even) {
-  background-color: #f2f2f2;
+  /* background-color: #f2f2f2; */
+
 }
 
 </style>
 
 <body>
 
-          <table width="100%" border="0" id="sim">
+          <table width="100%" border="0" id="sim2">
                         <tr>
                           <td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
                         </tr>
@@ -86,32 +127,34 @@ tr:nth-child(even) {
                         </tr>
                     </table>
 
-                    <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
+                    <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim2">
                       <thead>
                         <br>
                         <tr>
                           <td>Batch Lelong:  {{$lelong_id}}</td>
-                          @foreach ($info as $info)                     
-                                
-                          <td>Tarikh Lelong : @php
-                            $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
-                            $t_lelong =  $myDateTime->format('d-m-Y');
-                            echo($t_lelong);
-                        @endphp</td>
-                          <td>Fasa: {{$info['fasa']}}                  
-                          @endforeach
+                          @foreach ($info as $info)  
                           @foreach ($arrayinfocaw as $laporancaw)
                           @foreach ($laporancaw['cawangan'] as $details)
                           <td>Cawangan : {{$details['caw_name']}}
                           @endforeach
+                          @endforeach                   
+                          <tr>  
+                          <td>Tarikh Lelong : @php
+                            $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
+                            $t_lelong =  $myDateTime->format('d-m-Y');
+                            echo($t_lelong);
+                            @endphp</td>
+                          </tr>
+                          {{-- <td>Fasa: {{$info['fasa']}}                   --}}
                           @endforeach
+                          
                          
                       </thead>
                     </table>
 
                       <br>
           
-                      <table  cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">
+                      <table  cellspacing="0" cellpadding="5" style="float:right;"  width="100%" height="80" align="left" id="sim">
                         
                         <thead>
                         <tr> 
@@ -128,11 +171,11 @@ tr:nth-child(even) {
               @foreach ($brglelpembida as $laporan)
                 <tr>
                     <td>{{ $loop->iteration }}</td>
-                    <td>{{ $laporan['norujukan'] }}</td>
+                    <td style="white-space: nowrap;">{{ $laporan['norujukan'] }}</td>
                     <td>{{ $laporan['marhun']}}</td>
-                    <td>{{ number_format($laporan['berat'], 2, '.', ',')}}</td>
-                    <td>{{ number_format($laporan['hargaasas'], 2, '.', ',')}}</td>
-                    <td>{{ number_format($laporan['hargabida'], 2, '.', ',')}}</td>
+                    <td align = 'right'>{{ number_format($laporan['berat'], 2, '.', ',')}}</td>
+                    <td align = 'right'>{{ number_format($laporan['hargaasas'], 2, '.', ',')}}</td>
+                    <td align = 'right'>{{ number_format($laporan['hargabida'], 2, '.', ',')}}</td>
                      <td>{{$laporan['nama_bidder']}}</td>
                     
                 </tr>                
@@ -142,9 +185,9 @@ tr:nth-child(even) {
 
               <tr>
                 <td colspan="3" align="left"><strong>Jumlah Keseluruhan</strong></td>
-                <td><strong>{{ number_format($total_berat, 2, '.', ',') }}</strong></td>
-                <td><strong>{{ number_format($total_hargaasas, 2, '.', ',') }}</strong></td>
-                <td><strong>{{ number_format($total_hargalelong, 2, '.', ',') }}</strong></td>               
+                <td align = 'right'><strong>{{ number_format($total_berat, 2, '.', ',') }}</strong></td>
+                <td align = 'right'><strong>{{ number_format($total_hargaasas, 2, '.', ',') }}</strong></td>
+                <td align = 'right'><strong>{{ number_format($total_hargalelong, 2, '.', ',') }}</strong></td>               
                 <td></td>
               </tr>                                        
                        
diff --git a/resources/views/pdf/laporanlelfullcaw.blade.php b/resources/views/pdf/laporanlelfullcaw.blade.php
index c87022a9..5747456d 100644
--- a/resources/views/pdf/laporanlelfullcaw.blade.php
+++ b/resources/views/pdf/laporanlelfullcaw.blade.php
@@ -11,19 +11,54 @@
 #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
     border: 0px solid;
     padding: 1px;
-    text-align: left;
+    
+    /* text-align: left; */
     
 }
 
-#sim tr:nth-child(even){}
+#sim tr:nth-child(even){
+  /* border-bottom: 1px solid #ddd; */
+}
 
 #sim tr:hover {}
 
 #sim th {
-    text-align: left;
+    /* text-align: left; */
     border: 0px solid;
 	table-layout:auto;
     color: black;
+    
+	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+}
+
+
+#sim2 {
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+	font-size:10px;
+	border-collapse: collapse;
+    width: 100%;
+}
+
+#sim2 td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+    border: 0px solid;
+    padding: 1px;
+    
+    /* text-align: left; */
+    
+}
+
+#sim2 tr:nth-child(even){
+  /* border-bottom: 1px solid #ddd; */
+}
+
+#sim2 tr:hover {}
+
+#sim2 th {
+    /* text-align: left; */
+    border: 0px solid;
+	table-layout:auto;
+    color: black;
+    
 	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
 }
 
@@ -37,7 +72,7 @@
 }
   
 .column {
-  float: left;
+  /* float: left; */
   width: 100%;
   padding: 5px;
 }
@@ -57,25 +92,31 @@ table {
 }
 
 td {
-  text-align: left;
+  /* text-align: left; */
   padding: 16px;
 }
 
 th{
-  text-align: left;
+  /* text-align: left; */
   padding: 16px;
-  background-color:gainsboro;
+  /* text-align: left; */
+	table-layout:auto
+    color: black;
+    border-bottom: 1px solid #ddd;
+  /* background-color:gainsboro; */
 }
 
+
 tr:nth-child(even) {
-  background-color: #f2f2f2;
+  /* background-color: #f2f2f2; */
+
 }
 
 </style>
 
 <body>
 
-          <table width="100%" border="0" id="sim">
+          <table width="100%" border="0" id="sim2">
                         <tr>
                           <td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
                         </tr>
@@ -86,74 +127,80 @@ tr:nth-child(even) {
                         </tr>
                     </table>
 
-                    <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
+                    <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim2">
                       <thead>
                         <br>
                         <tr>
                         <td>Batch Lelong:  {{$lelong_id}}</td>
-                        @foreach ($info as $info)                     
-                              
-                        <td>Tarikh Lelong : @php
-                          $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
-                          $t_lelong =  $myDateTime->format('d-m-Y');
-                          echo($t_lelong);
-                      @endphp</td>
-                        <td>Fasa: {{$info['fasa']}}                
-                        @endforeach
                         @foreach ($arrayinfocaw as $laporancaw)
                         @foreach ($laporancaw['cawangan'] as $details)
                         <td>Cawangan : {{$details['caw_name']}}
                         @endforeach
                         @endforeach
+                        @foreach ($info as $info)                     
+                          <tr>    
+                        <td>Tarikh Lelong : @php
+                          $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
+                          $t_lelong =  $myDateTime->format('d-m-Y');
+                          echo($t_lelong);
+                      @endphp</td>
+                          </tr>
+                        {{-- <td>Fasa: {{$info['fasa']}}                 --}}
+                        @endforeach
+                      
                          
                       </thead>
                     </table>
 
                       <br>
           
-                      <table  cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">
+                      <table  cellspacing="0" cellpadding="5" style="float:right;" width="100%" height="80" align="left" id="sim">
                         
                         <thead>
                         <tr> 
                             <th>No</th>
                             <th>No Rujukan</th>
-                            <th>Nilai Marhun</th>
-                            <th>Pembiayaan</th>
-                            <th>Upah Simpan</th>
-                            <th>Caj Lelong</th>
-                            <th>Harga Lelong</th>
-                            <th>Baki</th>
-                            <th>Rugi</th>
-                            <th>Harga Asas</th>
+                            <th>Nilai Marhun Asal(RM)</th>
+                            <th>Pembiayaan(RM)</th>
+                            <th>Keuntungan(RM)</th>
+                            <th>Caj Lelong(RM)</th>
+                            <th>Harga Lelong(RM)</th>
+                            <th>Baki Lelong(RM)</th>
+                            {{-- <th>Rugi</th> --}}
+                            <th>Harga Asas(RM)</th>
                             <th>Nama Pembeli</th>                        >
 
                         </tr>
                         </thead>
-
+              @php $total_baki = 0; @endphp
               @foreach ($laporanlelong as $laporan)
                 <tr>
                     <td>{{ $loop->iteration }}</td>
                     <td>{{ $laporan['norujukan'] }}</td>
-                    <td>{{ number_format($laporan['nilaimarhun'], 2, '.', ',')}}</td>
-                    <td>{{ number_format($laporan['pinjaman'], 2, '.', ',')}}</td>
-                    <td>{{ number_format($laporan['upahsimpan'], 2, '.', ',')}}</td>
-                    <td>{{ number_format($laporan['cajlelong'], 2, '.', ',')}}</td>
-                    <td>{{ number_format($laporan['hargabida'], 2, '.', ',')}}</td>
+                    <td align="right">{{ number_format($laporan['nilaimarhun'], 2, '.', ',')}}</td>
+                    <td align="right">{{ number_format($laporan['pinjaman'], 2, '.', ',')}}</td>
+                    <td align="right">{{ number_format($laporan['upahsimpan'], 2, '.', ',')}}</td>
+                    <td align="right">{{ number_format($laporan['cajlelong'], 2, '.', ',')}}</td>
+                    <td align="right">{{ number_format($laporan['hargabida'], 2, '.', ',')}}</td>
                     <?php
-                        $rugi = 0;
-                        $baki = 0;
-                         if(strpos($laporan['baki'], '-') !== false)
-                         {
-                            $rugi  = $laporan['baki'];
-                         }
-                         else {
-                            $baki = $laporan['baki'];
-                         }
-                    ?>
-                     <td>{{ number_format($baki, 2, '.', ',') }}</td>
-                     <td>{{ number_format($rugi, 2, '.', ',') }}</td>
-                     <td>{{ number_format($laporan['hargaasas'], 2, '.', ',')}}</td>
-                     <td>{{$laporan['nama_bidder']}}</td>
+                // $total_rugi = 0;
+                
+                 if(strpos($laporan['baki'], '-') !== false)
+                 {
+                     $total_baki  += $laporan['baki'];
+                     
+                    }
+                    else {
+                    $total_baki += $laporan['baki'];
+
+                 }
+            ?>
+                     <td align="right">@if($laporan['baki'] > 0)
+                      {{number_format($laporan['baki'], 2, '.', ',')}}
+                      @elseif($laporan['baki'] < 0 ) ({{number_format(-($laporan['baki']), 2, '.', ',')}}) @endif </td>
+                     {{-- <td align="right">{{ number_format($rugi, 2, '.', ',') }}</td> --}}
+                     <td align="right">{{ number_format($laporan['hargaasas'], 2, '.', ',')}}</td>
+                     <td align="right">{{$laporan['nama_bidder']}}</td>
                     
                 </tr>                
               @endforeach
@@ -162,27 +209,19 @@ tr:nth-child(even) {
 
               <tr>
                 <td colspan="2" align="left"><strong>Jumlah Keseluruhan</strong></td>
-                <td><strong>{{ number_format($total_nmarhun, 2, '.', ',') }}</strong></td>
-                <td><strong>{{ number_format($total_pembiayaan, 2, '.', ',') }}</strong></td>
-                <td><strong>{{ number_format($total_upahsimpan, 2, '.', ',') }}</strong></td>
-                <td><strong>{{ number_format($total_cajlelong, 2, '.', ',') }}</strong></td>
-                <td><strong>{{ number_format($total_hargalelong, 2,'.',',') }}</strong></td>
-                <?php
-                $total_rugi = 0;
-                $total_baki = 0;
-                 if(strpos($total_bakirugi, '-') !== false)
-                 {
-                     $total_rugi  = $total_bakirugi;
-                     
-                    }
-                    else {
-                    $total_baki = $total_bakirugi;
-
-                 }
-            ?>
-                <td><strong>{{number_format($total_baki, 2, '.', ',')}}</strong></td>
-                <td><strong>{{number_format($total_rugi, 2, '.', ',')}}</strong></td>
-                <td><strong>{{number_format($total_hargaasas, 2, '.', ',')}}</strong></td>
+                <td align="right"><strong>{{ number_format($total_nmarhun, 2, '.', ',') }}</strong></td>
+                <td align = 'right'><strong>{{ number_format($total_pembiayaan, 2, '.', ',') }}</strong></td>
+                <td align = 'right'><strong>{{ number_format($total_upahsimpan, 2, '.', ',') }}</strong></td>
+                <td align = 'right'><strong>{{ number_format($total_cajlelong, 2, '.', ',') }}</strong></td>
+                <td align = 'right'><strong>{{ number_format($total_hargalelong, 2,'.',',') }}</strong></td>
+              
+                <td align = 'right'><b>@if($total_baki > 0)
+                  {{ number_format($total_baki, 2, '.', ',') }}
+              @else
+                   ({{number_format(-($total_baki), 2, '.', ',')}})
+              @endif</b></td>
+                {{-- <td align = 'right'><strong>{{number_format($total_rugi, 2, '.', ',')}}</strong></td> --}}
+                <td align = 'right'><strong>{{number_format($total_hargaasas, 2, '.', ',')}}</strong></td>
                 <td></td>
               </tr>                                         
                        
diff --git a/resources/views/pdf/laporannamapembidacaw.blade.php b/resources/views/pdf/laporannamapembidacaw.blade.php
index 8ef1e93e..0499b07a 100644
--- a/resources/views/pdf/laporannamapembidacaw.blade.php
+++ b/resources/views/pdf/laporannamapembidacaw.blade.php
@@ -11,19 +11,54 @@
 #sim td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
     border: 0px solid;
     padding: 1px;
-    text-align: left;
+    
+    /* text-align: left; */
     
 }
 
-#sim tr:nth-child(even){}
+#sim tr:nth-child(even){
+  /* border-bottom: 1px solid #ddd; */
+}
 
 #sim tr:hover {}
 
 #sim th {
-    text-align: left;
+    /* text-align: left; */
     border: 0px solid;
 	table-layout:auto;
     color: black;
+    
+	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+}
+
+
+#sim2 {
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+	font-size:10px;
+	border-collapse: collapse;
+    width: 100%;
+}
+
+#sim2 td {padding:3px 5px 3px 5px; padding-right:10px;}, #sim th {
+    border: 0px solid;
+    padding: 1px;
+    
+    /* text-align: left; */
+    
+}
+
+#sim2 tr:nth-child(even){
+  /* border-bottom: 1px solid #ddd; */
+}
+
+#sim2 tr:hover {}
+
+#sim2 th {
+    /* text-align: left; */
+    border: 0px solid;
+	table-layout:auto;
+    color: black;
+    
 	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
 }
 
@@ -37,7 +72,7 @@
 }
   
 .column {
-  float: left;
+  /* float: left; */
   width: 100%;
   padding: 5px;
 }
@@ -57,53 +92,60 @@ table {
 }
 
 td {
-  text-align: left;
+  /* text-align: left; */
   padding: 16px;
 }
 
 th{
-  text-align: left;
+  /* text-align: left; */
   padding: 16px;
-  background-color:gainsboro;
+  /* text-align: left; */
+	table-layout:auto
+    color: black;
+    border-bottom: 1px solid #ddd;
+  /* background-color:gainsboro; */
 }
 
+
 tr:nth-child(even) {
-  background-color: #f2f2f2;
+  /* background-color: #f2f2f2; */
+
 }
 
 </style>
-
 <body>
 
-                    <table width="100%" border="0" id="sim">
+                    <table width="100%" border="0" id="sim2">
                         <tr>
                           <td width="50%"><h3>PERMODALAN KELANTAN BERHAD</h3></td>
                         </tr>
 
                         <tr>
-                          <td colspan="2"><u><b>LAPORAN SENARAI BIDAAN PEMBIDA</b></u></td>
+                          <td colspan="2"><u><b>SENARAI BIDAAN PEMBIDA</b></u></td>
 
                         </tr>
                     </table>
 
-                    <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
+                    <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim2">
                       <thead>
                         <br>
                         <tr>
                           <td>Batch Lelong:  {{$lelong_id}}</td>
+                          @foreach ($arrayinfocaw as $laporancaw)
+                          @foreach ($laporancaw['cawangan'] as $details)
+                          <td>Cawangan : {{$details['caw_name']}}
+                          @endforeach
+                        @endforeach
+                        </tr>
                           @foreach ($lelongid as $info)                        
                           <td>Tarikh Lelong : @php
                             $myDateTime = DateTime::createFromFormat('Y-m-d', $info['tarikh_lelong'] );
                             $t_lelong =  $myDateTime->format('d-m-Y');
                             echo($t_lelong);
-                        @endphp</td>
-                          <td>Fasa: {{$info['fasa']}}                
-                          @endforeach
-                          @foreach ($arrayinfocaw as $laporancaw)
-                          @foreach ($laporancaw['cawangan'] as $details)
-                          <td>Cawangan : {{$details['caw_name']}}
-                          @endforeach
+                            @endphp</td>
                           @endforeach
+                          </tr>
+                         
                         </tr>
                          
                       </thead>
@@ -111,15 +153,15 @@ tr:nth-child(even) {
 
                       <br>
           
-                      <table  cellspacing="0" cellpadding="5" style="float:right;" border="0" width="100%" height="80" align="left" id="sim">
+                      <table  cellspacing="0" cellpadding="5" style="float:right;" width="100%" height="80" align="left" id="sim">
                         
                         <thead>
                         <tr> 
                             <th width="5%" align="left">No</th> 
                             <th width="12%" align="left">No Rujukan</th> 
-                            <th width="12%" align="left">Harga Asas(RM)</th>
+                            <th width="12%" align="right">Harga Asas(RM)</th>
                             <th width="12%" align="left">Nama Pembida</th> 
-                            <th width="15%" align="left">Harga Bidaan(RM)</th> 
+                            <th width="15%" align="right">Harga Bidaan(RM)</th> 
                             <th width="12%" align="left">Masa Bidaan</th>
                         </tr>
                         </thead>
@@ -128,23 +170,23 @@ tr:nth-child(even) {
                         <tr>
                             <td>{{ $loop->iteration }}</td>
                             <td>{{ $laporan['laporan']['norujukan']}}</td>
-                            <td>{{ $laporan['laporan']['hargaasas']}}</td>
-                            <td>
+                            <td align="right">{{ number_format($laporan['laporan']['hargaasas'], 2, '.', ',')}}</td>
+                            <td style="white-space: nowrap;">
                                 @foreach($laporan['details'] as $details)
-                                    <span class="m-2">{{ $details['nama_bidder']}}</span><br>
+                                    <span class="m-2">{{ $loop->iteration }}.{{ $details['nama_bidder']}}</span><br>
                                 @endforeach
                             </td>
                             
-                            <td>
+                            <td align="right">
                                 @foreach($laporan['details'] as $details)
-                                    <span class="m-2">{{ $details['hargabida']}}</span><br>
+                                    <span class="m-2">{{ number_format($details['hargabida'], 2, '.', ',')}}</span><br>
                                 @endforeach
                             </td>
                             <td>
                                 @foreach($laporan['details'] as $details)
                                     <span class="m-2"> @php
                                       $myDateTime = DateTime::createFromFormat('Y-m-d H:i:s', $details['masa_bidaan'] );
-                                      $t_lelong =  $myDateTime->format('d-m-Y h:i:s');
+                                      $t_lelong =  $myDateTime->format('h:i:s');
                                       echo($t_lelong);
                                   @endphp</span><br>
                                 @endforeach
diff --git a/resources/views/pembida/senaraipembida.blade.php b/resources/views/pembida/senaraipembida.blade.php
index 3d829a63..a46bd3e6 100644
--- a/resources/views/pembida/senaraipembida.blade.php
+++ b/resources/views/pembida/senaraipembida.blade.php
@@ -3,8 +3,15 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            
+        <div class="col mx-auto p-4">
+            <div class="card">
+            <div class="card-header header-style">
+                
+                <div class="header-style-title">
+                    Senarai Pembida
+                </div>
+            </div>
+            <div class="card-body"> 
             @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -16,7 +23,7 @@
             <form id="exportform" action="{{route('pengguna.export')}}" method="POST">
                 @csrf
                 <input type="hidden" name="type" value="User">
-                <table class="table table-striped  table-xl text-center" id="pengguna" style="width:100%">
+                <table class="table text-center table-bordered" id="pengguna" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
diff --git a/resources/views/pembida/senaraipembidakeseluruhan.blade.php b/resources/views/pembida/senaraipembidakeseluruhan.blade.php
index dfae7378..bd63563c 100644
--- a/resources/views/pembida/senaraipembidakeseluruhan.blade.php
+++ b/resources/views/pembida/senaraipembidakeseluruhan.blade.php
@@ -3,8 +3,15 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            
+        <div class="col mx-auto p-4">
+            <div class="card">
+            <div class="card-header header-style">
+               
+                <div class="header-style-title">
+                    Senarai pembida
+                </div>
+            </div>
+            <div class="card-body">
             @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -16,7 +23,7 @@
             <form id="exportform" action="{{route('pengguna.export')}}" method="POST">
                 @csrf
                 <input type="hidden" name="type" value="User">
-                <table class="table table-striped  table-xl text-center" id="pengguna" style="width:100%">
+                <table class="table text-center table-bordered"  id="pengguna" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <!-- <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th> -->
@@ -49,7 +56,7 @@
                                 @endif
                             </td>
                             <td class="text-center">
-                                <a  href="{{ route('pembida.kemaskini',$user->id) }}"  data-toggle="tooltip" data-placement="top" title="Kemaskini Pembida"><i class="fas fa-edit"></i></a>
+                                <a  class="btn btn-info" href="{{ route('pembida.kemaskini',$user->id) }}"  data-toggle="tooltip" data-placement="top" title="Kemaskini Pembida"><i class="fas fa-edit"></i></a>
                             </td>
                         </tr>
                         @endforeach
diff --git a/resources/views/pengurusandatabase/senaraidb.blade.php b/resources/views/pengurusandatabase/senaraidb.blade.php
index d7c03bfc..2cff3cf7 100644
--- a/resources/views/pengurusandatabase/senaraidb.blade.php
+++ b/resources/views/pengurusandatabase/senaraidb.blade.php
@@ -96,7 +96,7 @@
                 @endif
               </tbody>
             </table>
-            {{--<div>api_arrahn</div>
+            <div>api_arrahn</div>
             <table class="table table-bordered" style="width: 35%;">
               <tbody>
               <tr class="bg-light">
@@ -104,11 +104,11 @@
                   <td>(ic)</td>
                 </tr>
                 <tr>
-                  <td>{{$roles_harian_penilai[0]['role_harian']}}</td>
-                  <td>{{$roles_harian_penilai[0]['name']}}</td>
+                  <td>{{$customer_details['nama']}}</td>
+                  <td>{{$customer_details['kpbaru']}}</td>
                 </tr>
               </tbody>
-            </table>--}}
+            </table>
         </div>
         
     </div>
diff --git a/resources/views/simulasi/tempbycawsimulasi.blade.php b/resources/views/simulasi/tempbycawsimulasi.blade.php
index 59bf443f..551818dc 100644
--- a/resources/views/simulasi/tempbycawsimulasi.blade.php
+++ b/resources/views/simulasi/tempbycawsimulasi.blade.php
@@ -51,8 +51,8 @@
                                 <td style='white-space:nowrap;'>{{ $surat['list_norujukan'][0]['norujukan'] }}</td>
                                 <td>{{ $surat['list_norujukan'][0]['nokp'] }}</td>
                                 <td>{{ $surat['list_norujukan'][0]['tempoh'] }}</td>
-                                <td>{{ number_format($surat['list_norujukan'][0]['nilaimarhun'], 2, '.', ',') }}</td>
                                 <td>{{ number_format($surat['list_norujukan'][0]['berat'] , 2, '.', ',') }}</td>
+                                <td>{{ number_format($surat['list_norujukan'][0]['nilaimarhun'], 2, '.', ',') }}</td>
                                 <td>{{ number_format($surat['list_norujukan'][0]['pinjaman'] , 2, '.', ',') }}</td>
                                 <td>{{ number_format($surat['list_norujukan'][0]['bakipjm'] , 2, '.', ',') }}</td>
                                 <td>{{ number_format($surat['ktlhbyr'] , 2, '.', ',')}}</td>
diff --git a/resources/views/tangguhlelong/senactionoperasi.blade.php b/resources/views/tangguhlelong/senactionoperasi.blade.php
index f4f79507..eec663dc 100644
--- a/resources/views/tangguhlelong/senactionoperasi.blade.php
+++ b/resources/views/tangguhlelong/senactionoperasi.blade.php
@@ -3,11 +3,18 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            <h3 class="pt-3">Senarai Permohonan Tangguh Lelong</h3>
-            <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>
+        <div class="col mx-auto p-4">
+                <div class="card">
+                    <div class="card-header header-style">
+                        <a href="javascript:window.history.go(-1);" class="header-style-icon">
+                            <i class="fas fa-arrow-left"></i>
+                        </a>
+                        <div class="header-style-title">
+                            Senarai Permohonan Tangguh Lelong
+
+                        </div>
+                    </div>
+                    <div class="card-body">
             @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -15,7 +22,7 @@
             @endif
             
             <form id="uploadform" action="" method="POST">
-                <table class="table table-striped  table-xl text-center" id="tablelelong" style="width:100%">
+                <table class="table table-striped table-bordered table-xl text-center"  id="tablelelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No</th>
diff --git a/resources/views/tangguhlelong/senleltangguh.blade.php b/resources/views/tangguhlelong/senleltangguh.blade.php
index a481fc35..7fe8dae1 100644
--- a/resources/views/tangguhlelong/senleltangguh.blade.php
+++ b/resources/views/tangguhlelong/senleltangguh.blade.php
@@ -49,7 +49,9 @@
                                 <span class="m-2">{{$lel['caw_name']}}</span><br>
                                
                             </td>
-                            <td>{{$sag}}</td>
+                            <td>
+                                {{$lel['bilsag']}}
+                            </td>
                             <td>{{$lel['jbg']}}</td>
                                                 
                             <td> 
diff --git a/resources/views/tangguhlelong/senleltlhtangguh.blade.php b/resources/views/tangguhlelong/senleltlhtangguh.blade.php
index 2b13adc7..56dcd5bc 100644
--- a/resources/views/tangguhlelong/senleltlhtangguh.blade.php
+++ b/resources/views/tangguhlelong/senleltlhtangguh.blade.php
@@ -3,8 +3,15 @@
 @section('content')
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            <h3 class="pt-3">Senarai Telah Tangguh Lelong</h3> 
+        <div class="col mx-auto p-4">
+            <div class="card">
+            <div class="card-header header-style">
+              
+                <div class="header-style-title">
+                    Senarai Telah Tangguh Lelong
+                </div>
+            </div>
+            <div class="card-body">
             @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -12,7 +19,7 @@
             @endif
             <form id="exportform" action="" method="POST">
                 <input type="hidden" name="type" value="User">
-                <table class="table table-striped  table-xl text-center" id="tablelelong" style="width:100%">
+                <table class="table text-center table-bordered" id="tablelelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No</th>
diff --git a/resources/views/tangguhlelong/sentangguhoperasi.blade.php b/resources/views/tangguhlelong/sentangguhoperasi.blade.php
index 6816144a..cbc209d6 100644
--- a/resources/views/tangguhlelong/sentangguhoperasi.blade.php
+++ b/resources/views/tangguhlelong/sentangguhoperasi.blade.php
@@ -3,10 +3,17 @@
 @section('content')
 <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>
+        <div class="col mx-auto p-4">
+            <div class="card">
+            <div class="card-header header-style">
+                <a href="javascript:window.history.go(-1);" class="header-style-icon">
+                    <i class="fas fa-arrow-left"></i>
+                </a>
+                <div class="header-style-title">
+                   Pengesahan Tangguh Lelong
+                </div>
+            </div>
+            <div class="card-body">
             @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
@@ -14,7 +21,7 @@
             @endif
             
             <form id="uploadform" action="" method="POST">
-                <table class="table table-striped  table-xl text-center" id="tangguhlelong" style="width:100%">
+                <table class="table text-center table-bordered" id="tangguhlelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
                             <th>No</th>
@@ -31,7 +38,7 @@
                     <tbody>
                         
                         
-                        @foreach ($tangguh as $index1=>$sah)
+                        @forelse ($tangguh as $index1=>$sah)
                         <tr>
                         <input type="hidden" name="lelongbidid" id="lelongbidid" value="{{ $sah['lelongbid_id'] }}"  />
                         <input type="hidden" name="norujukan" id="norujukan" value="{{ $sah['norujukan'] }}" />
@@ -71,16 +78,16 @@
                             <td><a href=" {{ route('tangguhlelong.operasidownloadboranglulus', ['lelongbid_id'=>$sah['lelongbid_id']]) }} " data-toggle="tooltip" data-placement="top" title="Muat Turun Borang"><i class="fas fa-download"></i></a>
                             </td>
                         </tr>
-                        @endforeach
+                        @empty
+                        <tr>
+                            <td colspan="5">No Data</td>
+                        </tr>
+    
+                         @endforelse
                     </tbody>
                 </table>
                 </form>
-                <div class="modal-footer" style="margin-top:2%;">
-                    <!-- {{-- <a  href="{{ route('pengesahan.senarailelongtangguh') }}" class="btn btn-primary">Kembali</a> --}} -->
-                    <!-- @if($sah['status'] == 3)
-                    <button type="submit" onclick="confirm()" class="btn btn-warning">Sahkan</button>
-                    @endif -->
-                </div>
+               
            
         </div>
     </div>
diff --git a/routes/web.php b/routes/web.php
index 344f5a6e..66d3e91e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -282,7 +282,9 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim
     Route::get('/cetakkeluarscanbarcodejual/{lelong_id}',['as'=>'marhun.cetakkeluarscanbarcodejual','uses'=>'MarhunController@cetakkeluarscanbarcodejual']);
     Route::get('/senaraiscanbarcode',['as'=>'marhun.senaraiscanbarcode','uses'=>'MarhunController@senaraiscanbarcode']); 
     Route::post('/cetakscanbarcode',['as'=>'marhun.cetakscanbarcode','uses'=>'MarhunController@cetakscanbarcode']); 
-
+    Route::get('/scanbarcodejualbycust/{lelong_id}/{userid}',['as'=>'marhun.scanbarcodejualbycust','uses'=>'MarhunController@scanbarcodejualbycust']); 
+    Route::post('/scankeluarmarhunjualbycust',['as'=>'marhun.scankeluarmarhunjualbycust','uses'=>'MarhunController@scankeluarmarhunjualbycust']); 
+    Route::get('/cetakkeluarscanbarcodejualbycust/{lelong_id}/{userid}',['as'=>'marhun.cetakkeluarscanbarcodejualbycust','uses'=>'MarhunController@cetakkeluarscanbarcodejualbycust']);
 
     //Penilai
     Route::post('/addphotomarhun',['as'=>'marhun.addphotomarhun','uses'=>'MarhunController@addPhotoMarhun']);