diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 9b6a93e9..6965b653 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -3330,6 +3330,7 @@ class LelongController extends Controller
         $total_pinjaman = 0;
         $total_upah = 0;
         $total_hargaasas = 0;
+        $total_hargajual = 0;
         $total_cazlelong = 0;
         $total_rugilelong = 0;
         $total_bakilelong = 0;
@@ -3353,7 +3354,7 @@ class LelongController extends Controller
         {
             $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first();
             $databid = LelongBid::select('lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun',
-            'lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','lelongbid.bakiupah')
+            'lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.hargajual','lelongbid.cajlelong','lelongbid.bakiupah')
             ->where('caw_id','=',$cawlel->caw_id)->where('status_jual','=',1)->where('lelong_id','=',$lelong_id)->get();
             
             // dd($databid->toArray());
@@ -3363,6 +3364,7 @@ class LelongController extends Controller
             $nilai_marhun = 0;
             $bakiupah = 0;
             $hargaasas = 0;
+            $hargajual = 0;
             $cajlelong = 0;
             $rugilelong = 0;
             $bakilelong = 0;
@@ -3376,11 +3378,13 @@ class LelongController extends Controller
                 $bakiupah = $bakiupah + $bid['bakiupah'];
                 $hargaasas = $hargaasas + $bid['hargaasas'];
                 $cajlelong = $cajlelong + $bid['cajlelong'];
+                $hargajual = $hargajual + $bid['hargajual'];
+                $totalbaki = $bid['baki'];
 
-                $lelongsim = Lelong::where('id', $lelong_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);
+                // $lelongsim = Lelong::where('id', $lelong_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);
                 
                 if($totalbaki > 0)
                 {
@@ -3450,6 +3454,7 @@ class LelongController extends Controller
                 'upahsimpan'=>$bakiupah,
                 'bakiupah'=>$bakiupah,
                 'hargaasas'=>$hargaasas,
+                'hargajual'=>$hargajual,
                 'cajlelong'=>$cajlelong,
                 'rugilelong'=>$rugilelong,
                 'bakilelong'=>$bakilelong,
@@ -3459,6 +3464,7 @@ class LelongController extends Controller
             $total_berat = $total_berat + $berat;
             $total_pinjaman = $total_pinjaman + $pinjaman;
             $total_hargaasas = $total_hargaasas  + $hargaasas;
+            $total_hargajual = $total_hargajual  + $hargajual;
             $total_cazlelong = $total_cazlelong + $cajlelong;
             $total_rugilelong = $total_rugilelong + $rugilelong;
             $total_bakilelong = $total_bakilelong + $bakilelong;
@@ -3481,6 +3487,7 @@ class LelongController extends Controller
                                                     'total_pinjaman',
                                                     'total_upah',
                                                     'total_hargaasas',
+                                                    'total_hargajual',
                                                     'total_cazlelong',
                                                     'total_rugilelong',
                                                     'total_bakilelong',
@@ -3501,8 +3508,8 @@ class LelongController extends Controller
                                                     'data',
                                                     'total_bakiupah',
                                                     'total_nilaimarhun'
-                                                    ))->setPaper('a4', 'potrait');
-                        return $pdf->download('Lelong Keseluruhan.pdf');
+                                                    ))->setPaper('a4', 'landscape');
+                        return $pdf->download('Laporan Lelong Keseluruhan.pdf');
 
     }
     public function senarailelongall()
@@ -5065,6 +5072,7 @@ class LelongController extends Controller
         $total_cazlelong = 0;
         $total_rugilelong = 0;
         $total_bakilelong = 0;
+        $total_hargajual = 0;
 
         $total24Kgb = 0;
         $total24K = 0;
@@ -5092,6 +5100,7 @@ class LelongController extends Controller
             $pinjaman = 0;
             $bakiupah = 0;
             $hargaasas = 0;
+            $hargajual = 0;
             $cajlelong = 0;
             $rugilelong = 0;
             $bakilelong = 0;
@@ -5107,12 +5116,13 @@ class LelongController extends Controller
                 $bakiupah += $lel_bid->bakiupah;
                 $berat += $lel_bid->berat;
                 $hargaasas += $lel_bid->hargaasas;
+                $hargajual += $lel_bid->hargajual;
                 $cajlelong += $lel_bid->cajlelong;
 
                 // $lelongcaj = Lelong::where('id',$id)->get();
                 // $sumcajlelong =  $lel_bid['hargaasas'] * ($lelongcaj[0]['cajlelong']/100);
                 // $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
-                $totalbaki = $lel_bid['hargaasas'] - $lel_bid['pinjaman'] - $lel_bid['bakiupah'] - $lel_bid['cajlelong'];
+                $totalbaki = $lel_bid['baki'];
                 
                 if($totalbaki > 0)
                 {
@@ -5162,6 +5172,7 @@ class LelongController extends Controller
                 'upahsimpan'=>$bakiupah,
                 'bakiupah'=>$bakiupah,
                 'hargaasas'=>$hargaasas,
+                'hargajual'=>$hargajual,
                 'cajlelong'=>$cajlelong,
                 'rugilelong'=>$rugilelong,
                 'bakilelong'=>$bakilelong,
@@ -5186,6 +5197,7 @@ class LelongController extends Controller
             $total_cazlelong += $cajlelong;
             $total_berat += $berat;
             $total_hargaasas += $hargaasas;
+            $total_hargajual += $hargajual;
             
             
             $data = Lelong::where('lelong.id','=',$lelong_id)
@@ -5208,6 +5220,7 @@ class LelongController extends Controller
                                                 'total_cazlelong',
                                                 'total_rugilelong',
                                                 'total_bakilelong',
+                                                'total_hargajual',
                                                 'total24Kgb',
                                                 'total24K',
                                                 'total23k',
@@ -5375,6 +5388,583 @@ class LelongController extends Controller
 
     }
 
+    public function senaraimarhundone($lelongid, $cawid){
+        $total_berat = 0;
+        $total_pinjaman = 0;
+        $total_upah = 0;
+        $total_hargaasas = 0;
+        $total_bakiupah = 0;
+        $total_nilaimarhun = 0;
+        $keuntungan = 0;
+        $bakilelong = 0;
+        $total_cazlelong = 0;
+        $total_hargajual = 0;
+        // dd($cawid);
+
+        $lelonglel = Lelong::with('cawangan')->find($lelongid);
+
+        $cawanganDetail = $lelonglel->cawangan->find($cawid);
+
+        $marhuns = LelongBid::where('caw_id', '=', $cawid)
+        ->where('lelong_id', '=', $lelongid)
+        ->where('status_jual', '=', 1)
+        ->get();
+        // dd($marhuns);
+        $arraymarhun = [];
+        foreach ($marhuns as $index1=> $cal) {
+            // $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;
+
+            
+            array_push($arraymarhun,[
+                'norujukan' => $cal['norujukan'],
+                'tempoh' => $cal['jbg'],
+                'berat' => $cal['berat'],
+                'nilaimarhun' => $cal['nilaimarhun'],
+                'hargaasas' => $cal['hargaasas'],
+                'hargajual' => $cal['hargajual'],
+                'pinjaman' => $cal['pinjaman'],
+                'bakiupah' => $cal['bakiupah'],
+                'cajlelong' => $cal['cajlelong'],
+                'baki' => $cal['baki'],
+            ]);
+            $total_berat = $total_berat + $cal['berat'];
+            $total_pinjaman = $total_pinjaman + $cal['pinjaman'];
+            $total_hargaasas = $total_hargaasas  +  $cal['hargaasas'];
+            $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
+            $total_bakiupah = $total_bakiupah + $cal['bakiupah'];
+            $total_cazlelong = $total_cazlelong +  $cal['bakiupah'];
+            $total_hargajual = $total_hargajual  +  $cal['hargajual'];
+        }
+
+        $arrayinfo = [];
+
+        $lelong_id = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        ->where('cawangan_lelong.lelong_id','=',$lelongid)
+        ->select('lelong_id','tarikh_lelong','lelong.fasa')
+        ->groupBy('lelong_id')
+        ->get()->toArray();
+
+
+        foreach($lelong_id as $laporan)
+        {
+            $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            ->where('lelong_id',$laporan['lelong_id'])
+            ->where('caw_id',$cawid)
+            ->get()
+            ->toArray();
+            array_push($arrayinfo,['laporan' => $laporan,'details' => $details]);
+        }
+        return view('lelong.senaraimarhundone',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo','total_berat',
+        'total_pinjaman',
+        'total_upah',
+        'total_hargaasas',
+        'total_bakiupah',
+        'total_nilaimarhun',
+        'lelonglel',
+        'cawanganDetail',
+        'total_cazlelong',
+        'total_hargajual'));
+    }
+
+    public function showlelongpcdone(Request $request, $id)
+    {
+        $lelong_id = $id;
+        $user =  Auth::user();
+        $caw = Cawangan::where('caw_code','=',$user->kodcaw)->first();
+        $cawid = $caw->id;
+        $kodcaw = $user->kodcaw;
+        $lelong = Lelong::where('id','=',$id)->first();
+        $cawanganlel = CawanganLelong::with(['cawangan', 'lelongBid' => function ($query1) use($kodcaw) {
+            $query1->where('status_jual', '=', 1)
+            ->where('kodcaw','=',$kodcaw);
+            
+        }])
+        ->where('lelong_id', '=', $id)
+        ->where('caw_id', '=', $cawid)
+        ->get();
+        // dd($cawanganlel);
+        $lelkarat = LelKarat::where('lelong_id','=',$id)->get();
+        $jeniskarat = JenisKarat::all();
+
+        $arraydata = [];
+        $arraycaw = [];
+        $data = [];
+
+      
+        $total_berat = 0;
+        $total_nmarhun = 0;
+        $total_pinjaman = 0;
+        $total_upah = 0;
+        $total_hargaasas = 0;
+        $total_cazlelong = 0;
+        $total_rugilelong = 0;
+        $total_bakilelong = 0;
+        $total_hargajual = 0;
+
+        $total24Kgb = 0;
+        $total24K = 0;
+        $total23k = 0;
+        $total22K = 0;
+        $total21K = 0;
+        $total20K = 0;
+        $total18Kp = 0;
+        $total18K = 0;
+        $total14Kp = 0;
+        $total14K = 0;
+        $total9K = 0;
+
+        $keuntungan = 0;
+        $total_bakiupah = 0;
+        $total_nilaimarhun = 0;
+        $nilai_marhun = 0;
+
+        $totalkeuntungan2 = 0;
+        $total_marhun = 0;
+
+           foreach ($cawanganlel as $cawlel) {
+            $berat = 0;
+            $nilai_marhun = 0;
+            $pinjaman = 0;
+            $bakiupah = 0;
+            $hargaasas = 0;
+            $hargajual = 0;
+            $cajlelong = 0;
+            $rugilelong = 0;
+            $bakilelong = 0;
+           
+            
+
+            $databid = LelongBid::where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$id)->where('status_jual','=',1)->get();
+            // dd($databid);
+            foreach ($databid as $lel_bid) {
+               
+                $nilai_marhun += $lel_bid->nilaimarhun;
+                $pinjaman += $lel_bid->pinjaman;
+                $bakiupah += $lel_bid->bakiupah;
+                $berat += $lel_bid->berat;
+                $hargaasas += $lel_bid->hargaasas;
+                $hargajual += $lel_bid->hargajual;
+                $cajlelong += $lel_bid->cajlelong;
+
+                // $lelongcaj = Lelong::where('id',$id)->get();
+                // $sumcajlelong =  $lel_bid['hargaasas'] * ($lelongcaj[0]['cajlelong']/100);
+                // $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1);
+                $totalbaki = $lel_bid['baki'];
+                
+                if($totalbaki > 0)
+                {
+                    $bakilelong += $totalbaki;  
+                }
+                else
+                {
+                    $rugilelong -= $totalbaki;
+                }
+                // dd($totalbaki);
+                
+
+                foreach ($lel_bid->lelongBidMarhun as $lel_bid_marhun) {
+                    if ($lel_bid_marhun->karat == "24.0Kgb") {
+                        $total24Kgb += $lel_bid_marhun->berat;
+                    } else if ($lel_bid_marhun->karat == "24.0K") {
+                        $total24K += $lel_bid_marhun->berat;
+                    } else if ($lel_bid_marhun->karat == "23.0K") {
+                        $total23k += $lel_bid_marhun->berat;
+                    } else if ($lel_bid_marhun->karat == "22.0K") {
+                        $total22K += $lel_bid_marhun->berat;
+                    } else if ($lel_bid_marhun->karat == "21.0K") {
+                        $total21K += $lel_bid_marhun->berat;
+                    } else if ($lel_bid_marhun->karat == "20.0Kp") {
+                        $total20K += $lel_bid_marhun->berat;
+                    } else if ($lel_bid_marhun->karat == "18.0Kp") {
+                        $total18Kp += $lel_bid_marhun->berat;
+                    } else if ($lel_bid_marhun->karat == "18.0K") {
+                        $total18K += $lel_bid_marhun->berat;
+                    } else if ($lel_bid_marhun->karat == "14.0Kp") {
+                        $total14Kp += $lel_bid_marhun->berat;
+                    } else if ($lel_bid_marhun->karat == "14.0K") {
+                        $total14K += $lel_bid_marhun->berat;
+                    }
+                }
+            }
+            // dd($cawlel->cawangan);
+            // $total_marhun += sizeof($cawlel->lelongBid);
+            array_push($arraycaw,[
+                'id_cawangan'=> $cawlel['caw_id'],
+                'cawangan' => $cawlel->cawangan->caw_name,
+                't_lelong'=>$lelong['tarikh_lelong'],
+                'bil_marhun'=>sizeof($cawlel->lelongBid),
+                'berat'=>$berat,
+                'n_marhun'=>$nilai_marhun,
+                'pinjaman'=>$pinjaman,
+                'upahsimpan'=>$bakiupah,
+                'bakiupah'=>$bakiupah,
+                'hargaasas'=>$hargaasas,
+                'hargajual'=>$hargajual,
+                'cajlelong'=>$cajlelong,
+                'rugilelong'=>$rugilelong,
+                'bakilelong'=>$bakilelong,
+            ]);
+
+            $total_marhun += sizeof($cawlel->lelongBid);
+
+            // $total_marhun = $total_marhun + sizeof($databid);
+            // $total_berat = $total_berat + $berat;
+            // $total_pinjaman = $total_pinjaman + $pinjaman;
+            // $total_hargaasas = $total_hargaasas  + $hargaasas;
+            // $total_cazlelong = $total_cazlelong + $cajlelong;
+            // $total_rugilelong = $total_rugilelong + $rugilelong;
+            // $total_bakilelong = $total_bakilelong + $bakilelong;
+            // $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
+            // $total_bakiupah = $total_bakiupah + $bakiupah;
+            $total_nilaimarhun += $nilai_marhun;
+            $total_pinjaman += $pinjaman;
+            $total_bakiupah += $bakiupah;
+            $total_rugilelong += $rugilelong;
+            $total_bakilelong += $bakilelong;
+            $total_cazlelong += $cajlelong;
+            $total_berat += $berat;
+            $total_hargaasas += $hargaasas;
+            $total_hargajual += $hargajual;
+            
+            
+            $data = Lelong::where('lelong.id','=',$lelong_id)
+            ->get();
+
+            $tarikhkemaskini = LelKarat::where('lelong_id','=',$id)
+            ->where('karat','=',"22.0K")->first();
+            // dd($tarikhkemaskini);
+        }
+        
+
+        return view('lelong.showlelongpcdone',compact(
+                                                'arraycaw',
+                                                'total_marhun',
+                                                'total_berat',
+                                                'total_nmarhun',
+                                                'total_pinjaman',
+                                                'total_upah',
+                                                'total_hargaasas',
+                                                'total_cazlelong',
+                                                'total_rugilelong',
+                                                'total_bakilelong',
+                                                'total_hargajual',
+                                                'total24Kgb',
+                                                'total24K',
+                                                'total23k',
+                                                'total22K',
+                                                'total21K',
+                                                'total20K',
+                                                'total18Kp',
+                                                'total18K',
+                                                'total14Kp',
+                                                'total14K',
+                                                'total9K',
+                                                'lelkarat',
+                                                'lelong_id',
+                                                'jeniskarat',
+                                                'data',
+                                                'total_bakiupah',
+                                                'total_nilaimarhun','tarikhkemaskini'));
+    }
+    public function senaraimarhunpcdone($lelongid, $cawid){
+        $total_berat = 0;
+        $total_pinjaman = 0;
+        $total_upah = 0;
+        $total_hargaasas = 0;
+        $total_hargajual = 0;
+        $total_bakiupah = 0;
+        $total_nilaimarhun = 0;
+        $keuntungan = 0;
+        $bakilelong = 0;
+        $total_cazlelong = 0;
+
+        $lelonglel = Lelong::with('cawangan')->find($lelongid);
+
+        $cawanganDetail = $lelonglel->cawangan->find($cawid);
+
+        $marhuns = LelongBid::where('caw_id', '=', $cawid)
+        ->where('lelong_id', '=', $lelongid)
+        ->where('caw_id','=',$cawid)
+        ->where('status_jual', '=', 1)
+        ->get();
+        // dd($marhuns);
+        $arraymarhun = [];
+        foreach ($marhuns as $index1=> $cal) {
+            //  $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;
+
+            $total_berat = $total_berat + $cal['berat'];
+            $total_pinjaman = $total_pinjaman + $cal['pinjaman'];
+            $total_hargaasas = $total_hargaasas  +  $cal['hargaasas'];
+            $total_hargajual = $total_hargajual  +  $cal['hargajual'];
+            $total_nilaimarhun = $total_nilaimarhun + $cal['nilaimarhun'];
+            $total_bakiupah = $total_bakiupah + $cal['bakiupah'];
+            $total_cazlelong = $total_cazlelong +  $cal['cajlelong'];
+
+            array_push($arraymarhun,[
+                'norujukan' => $cal['norujukan'],
+                'tempoh' => $cal['jbg'],
+                'berat' => $cal['berat'],
+                'nilaimarhun' => $cal['nilaimarhun'],
+                'hargaasas' => $cal['hargaasas'],
+                'hargajual' => $cal['hargajual'],
+                'pinjaman' => $cal['pinjaman'],
+                'bakiupah' => $cal['bakiupah'],
+                'cajlelong' => $cal['cajlelong'],
+                'baki' => $cal['baki'],
+            ]);
+         
+        }
+
+        $arrayinfo = [];
+
+        $lelong_id = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        ->where('cawangan_lelong.lelong_id','=',$lelongid)
+        ->select('lelong_id','tarikh_lelong','lelong.fasa')
+        ->groupBy('lelong_id')
+        ->get()->toArray();
+
+
+        foreach($lelong_id as $laporan)
+        {
+            $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            ->where('lelong_id',$laporan['lelong_id'])
+            ->where('caw_id',$cawid)
+            ->get()
+            ->toArray();
+            array_push($arrayinfo,['laporan' => $laporan,'details' => $details]);
+        }
+        return view('lelong.senaraimarhunpcdone',compact('arraymarhun','marhuns','lelongid','cawid','arrayinfo','total_berat',
+        'total_pinjaman',
+        'total_upah',
+        'total_hargaasas',
+        'total_bakiupah',
+        'total_nilaimarhun',
+        'lelonglel',
+        'total_cazlelong',
+        'total_hargajual'));
+    }
+
+    public function exportlelongpcdone(Request $request)
+    {
+
+        $lelong_id = $request->lelongid;
+        $user =  Auth::user();
+        $caw = Cawangan::where('caw_code','=',$user->kodcaw)->first();
+        $lelong = Lelong::where('id','=',$lelong_id)->first();
+        $cawanganlel = CawanganLelong::where('lelong_id','=',$lelong_id)
+        ->where('caw_id','=',$caw->id)->get();
+        $lelkarat = LelKarat::where('lelong_id','=',$lelong_id)->get();
+        $jeniskarat = JenisKarat::all();
+
+        $arraydata = [];
+        $arraycaw = [];
+        $data = [];
+
+        $total_marhun = 0;
+        $total_berat = 0;
+        $total_nmarhun = 0;
+        $total_pinjaman = 0;
+        $total_upah = 0;
+        $total_hargaasas = 0;
+        $total_cazlelong = 0;
+        $total_rugilelong = 0;
+        $total_bakilelong = 0;
+        $total_hargajual = 0;
+
+        $total24Kgb = 0;
+        $total24K = 0;
+        $total23k = 0;
+        $total22K = 0;
+        $total21K = 0;
+        $total20K = 0;
+        $total18Kp = 0;
+        $total18K = 0;
+        $total14Kp = 0;
+        $total14K = 0;
+        $total9K = 0;
+        $total_nilaimarhun = 0;
+        $nilai_marhun = 0;
+        $total_bakiupah = 0;
+
+        foreach($cawanganlel as $cawlel)
+        {
+            $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first();
+            $databid = LelongBid::select('lelongbid.jbg','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun',
+            'lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.hargajual','lelongbid.cajlelong','lelongbid.bakiupah')
+            ->where('caw_id','=',$cawlel->caw_id)
+            ->where('status_jual','=',1)
+            ->where('caw_id','=',$cawlel->caw_id)
+            ->get();
+            
+            // dd($databid->toArray());
+            $packet = 0;
+            $berat = 0;
+            $pinjaman =0;
+            $nilai_marhun = 0;
+            $bakiupah = 0;
+            $hargaasas = 0;
+            $cajlelong = 0;
+            $rugilelong = 0;
+            $bakilelong = 0;
+            $hargajual = 0;
+            $totalbaki = 0;
+
+            foreach($databid as $index1=>$bid)
+            {
+                $marhun = LelongBidMarhun::where('lelongbid_id','=',$bid['id'])->get();
+                $berat = $berat + $bid['berat']; 
+                $nilai_marhun = $nilai_marhun + $bid['nilaimarhun'];
+                $pinjaman =$pinjaman + $bid['pinjaman'];
+                $bakiupah = $bakiupah + $bid['bakiupah'];
+                $hargaasas = $hargaasas + $bid['hargaasas'];
+                $cajlelong = $cajlelong + $bid['cajlelong'];
+                $hargajual = $hargajual + $bid['hargajual'];
+                $totalbaki = $bid['baki'];
+
+                // $lelongsim = Lelong::where('id', $lelong_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);
+                
+                if($totalbaki > 0)
+                {
+                    $bakilelong = $bakilelong + $totalbaki;  
+                }
+                else
+                {
+                    $rugilelong = $rugilelong - $totalbaki;
+                }
+                
+                
+                $total24Kgb += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','24.0Kgb')
+                                            ->sum('berat');
+                
+                $total24K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','24.0K')
+                                            ->sum('berat');
+                                            
+                $total23k += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','23.0K')
+                                            ->sum('berat');
+                                            
+                $total22K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','22.0K')
+                                            ->sum('berat');
+                                            
+                $total21K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','21.0K')
+                                            ->sum('berat');
+                                            
+                $total20K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','20.0K')
+                                            ->sum('berat');
+                                            
+                $total18Kp += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','18.0Kp')
+                                            ->sum('berat');
+                                            
+                $total18K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','18.0K')
+                                            ->sum('berat');
+                                            
+                $total14Kp += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','14.0Kp')
+                                            ->sum('berat');
+                                            
+                $total14K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','14.0K')
+                                            ->sum('berat');
+                                            
+                $total9K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
+                                            ->where('karat','=','9.0K')
+                                            ->sum('berat');
+                            
+                            
+                
+            }
+            array_push($arraycaw,[
+                'id_cawangan'=> $cawangan['id'],
+                'cawangan'=>$cawangan['caw_name'],
+                't_lelong'=>$lelong['tarikh_lelong'],
+                'bil_marhun'=>sizeof($databid),
+                'berat'=>$berat,
+                'n_marhun'=>$nilai_marhun,
+                'pinjaman'=>$pinjaman,
+                'upahsimpan'=>$bakiupah,
+                'bakiupah'=>$bakiupah,
+                'hargaasas'=>$hargaasas,
+                'hargajual'=>$hargajual,
+                'cajlelong'=>$cajlelong,
+                'rugilelong'=>$rugilelong,
+                'bakilelong'=>$bakilelong,
+            ]);
+
+            $total_marhun = $total_marhun + sizeof($databid);
+            $total_berat = $total_berat + $berat;
+            $total_pinjaman = $total_pinjaman + $pinjaman;
+            $total_hargaasas = $total_hargaasas  + $hargaasas;
+            $total_hargajual = $total_hargajual  + $hargajual;
+            $total_cazlelong = $total_cazlelong + $cajlelong;
+            $total_rugilelong = $total_rugilelong + $rugilelong;
+            $total_bakilelong = $total_bakilelong + $bakilelong;
+            $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
+            $total_bakiupah = $total_bakiupah + $bakiupah;
+            
+            
+            $data = Lelong::where('lelong.id','=',$lelong_id)
+            ->first();
+        }
+        $datacaw = Cawangan::where('id','=',$caw->id)
+        ->get();
+
+
+        $pdf = PDF::loadView('pdf.lelreportpcdone',compact('datacaw','arraycaw',
+                                                    'total_marhun',
+                                                    'total_berat',
+                                                    'total_nmarhun',
+                                                    'total_pinjaman',
+                                                    'total_upah',
+                                                    'total_hargaasas',
+                                                    'total_hargajual',
+                                                    'total_cazlelong',
+                                                    'total_rugilelong',
+                                                    'total_bakilelong',
+                                                    'total24Kgb',
+                                                    'total24K',
+                                                    'total23k',
+                                                    'total22K',
+                                                    'total21K',
+                                                    'total20K',
+                                                    'total18Kp',
+                                                    'total18K',
+                                                    'total14Kp',
+                                                    'total14K',
+                                                    'total9K',
+                                                    'lelkarat',
+                                                    'lelong_id',
+                                                    'jeniskarat',
+                                                    'data',
+                                                    'total_bakiupah',
+                                                    'total_nilaimarhun'
+                                                    ))->setPaper('a4', 'potrait');
+                        return $pdf->download('Laporan Lelong Cawangan.pdf');
+
+    }
+
+
+    
+
 
 
 
diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php
index 982a6717..85dd8b65 100644
--- a/resources/views/lelong/senarailelong.blade.php
+++ b/resources/views/lelong/senarailelong.blade.php
@@ -219,7 +219,7 @@
                                             <td>{{$lelong->cajlelong}}</td>
                                             <td><span class="badge badge-pill badge-success">LELONG SELESAI</span></td>
                                             <td style="white-space: nowrap;">
-                                                <a class="btn m-1 btn-info" href="{{ route('lelong.showsimulasi',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Lihat Simulasi"><i class="far fa-edit"></i></a>
+                                                {{-- <a class="btn m-1 btn-info" href="{{ route('lelong.showsimulasi',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Lihat Simulasi"><i class="far fa-edit"></i></a> --}}
                                                 <a class="btn m-1 btn-warning" href="{{ route('lelong.showlelongdone',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Lihat Senarai Lelong Selesai"><i class="far fa-calendar"></i></a>
                                                 <a class="btn m-1 btn-success" href="{{ route('lelong.exportDataByCawangan',$lelong->id) }}" data-toggle="tooltip" data-placement="top" title="Export Data"><i class="fas fa-file-export"></i></a>
                                             </td>
diff --git a/resources/views/lelong/senarailelongpc.blade.php b/resources/views/lelong/senarailelongpc.blade.php
index caef7795..7f7f5d11 100644
--- a/resources/views/lelong/senarailelongpc.blade.php
+++ b/resources/views/lelong/senarailelongpc.blade.php
@@ -31,6 +31,7 @@
                             <th>Harga Emas Asas</th>
                             <th>Tempoh</th>
                             <th>Caj Lelong</th>
+                            <th>Status</th>
                             <th class="text-center">Tindakan</th>
                     </tr>
             </thead>
@@ -71,12 +72,11 @@
                             @hasrole('pengurus-cawangan')
                             <div class="row justify-content-center">
                                 @if($data['laporan']['sts_lelong'] == 0)
-                                 {{-- <a  href="{{ route('lelonghargajual.kemaskinidata',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a> --}}
-                                <a  class="btn m-1 btn-primary" href="{{ route('jananotis.showlelongpc',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Senarai Lelong" style="margin-right:40px" ><i class="far fa-edit"></i></a>
+                                <button class="btn btn-info btn-sm" disabled>LELONGAN BELUM MULA</button>
                                 @elseif($data['laporan']['sts_lelong'] == 1)
                                 <button class="btn btn-warning btn-sm" disabled>LELONGAN SEDANG DIJALANKAN</button>
                                 @elseif($data['laporan']['sts_lelong'] == 2)
-                                <button class="btn btn-info btn-sm" disabled>JANA PEMENANG</button>
+                                <button class="btn btn-primary btn-sm" disabled>JANA PEMENANG</button>
                                 @elseif($data['laporan']['sts_lelong'] == 3)
                                 <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
                                 {{-- <a href="{{ route('lelong.exportDataByCawangan', $data['laporan']['lelong_id']) }}" class="btn btn-primary btn-sm">EXPORT <i class="fas fa-file-export"></i></a> --}}
@@ -84,6 +84,20 @@
                             </div>
                             @endhasrole
                         </td>
+                        <td class="text-center">
+                            @hasrole('pengurus-cawangan')
+                            <div class="row justify-content-center">
+                                @if($data['laporan']['sts_lelong'] == 0)
+                                 {{-- <a  href="{{ route('lelonghargajual.kemaskinidata',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a> --}}
+                                <a  class="btn m-1 btn-primary" href="{{ route('jananotis.showlelongpc',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Senarai Lelong" style="margin-right:40px" ><i class="far fa-edit"></i></a>
+                                @elseif($data['laporan']['sts_lelong'] == 3)
+                                {{-- <a  href="{{ route('lelonghargajual.kemaskinidata',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a> --}}
+                               <a  class="btn m-1 btn-success" href="{{ route('jananotis.showlelongpcdone',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Senarai Lelong" style="margin-right:40px" ><i class="far fa-calendar"></i></a>
+                                @endif
+                            </div>
+                            @endhasrole
+                        </td>
+                        
                     </tr>
                 @endforeach
             </tbody>
diff --git a/resources/views/lelong/senaraimarhundone.blade.php b/resources/views/lelong/senaraimarhundone.blade.php
new file mode 100644
index 00000000..d27d8cf7
--- /dev/null
+++ b/resources/views/lelong/senaraimarhundone.blade.php
@@ -0,0 +1,188 @@
+@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('lelong.showlelongdone',$lelongid) }}" class="header-style-icon">
+                    <i class="fas fa-arrow-left"></i>
+                </a>
+                <div class="header-style-title">
+                    senarai Sag : {{ $cawanganDetail->caw_name }}
+                </div>
+            </div>
+            <div class="card-body">
+                @if ($message = Session::get('success'))
+                <div class="alert alert-success">
+                    {{ $message }}
+                </div>
+                @endif
+                @php
+                $myDateTime = DateTime::createFromFormat('Y-m-d', $lelonglel->tarikh_lelong );
+                $t_lelong = $myDateTime->format('d-m-Y');
+                @endphp
+                <div class="col-3">
+                    <div class="form-group row">
+                        <label class="col-6 col-form-label text-left">Tarikh Lelong</label>
+                        <div class="col-6">
+                            <div class="input-group">
+                                <input type="text" readonly class="form-control bg-light" value="{{$t_lelong}}">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-3">
+                    <div class="form-group row">
+                        <label class="col-6 col-form-label text-left">JBG</label>
+                        <div class="col-6">
+                            <div class="input-group">
+                                <input type="text" readonly class="form-control bg-light" value="{{$lelonglel->jbg}}">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-3">
+                    <div class="form-group row">
+                        <label class="col-6 col-form-label text-left">Bil SAG Cawangan</label>
+                        <div class="col-6">
+                            <div class="input-group">
+                                <input type="text" readonly class="form-control bg-light" value="{{sizeof($arraymarhun)}}">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                {{-- <div class="mb-3">
+                    <a href=" {{ route('report.lelongreport',[$lelongid,$cawid]) }}" class="btn btn-outline-success">Muat Turun PDF</a>
+                    <a href="{{ route('lelong.listsagbycust',[$lelongid,'cawid'=>$cawid]) }}" class="btn btn-primary">Senarai Mengikut Nama Pelanggan</a>
+                </div> --}}
+            <form id="deletesag" method="POST">
+                @csrf
+                <input type="hidden" name="lelongid" value="{{$lelongid}}">
+                <input type="hidden" name="cawid" value="{{$cawid}}">
+                <table class="table text-right table-bordered" id="marhun" style="width:100%">
+                    <thead class="bg-primary text-white">
+                        <tr>
+                            <th>No</th>
+                            <th>No Rujukan</th>
+                            {{-- <th>Nama Pelanggan</th> --}}
+                            <th>Tempoh</th>
+                            <th>Berat (gm)</th>
+                            <th>Nilai Marhun Asal(RM)</th>
+                            <th>Pembiayaan (RM)</th>
+                            <th>Keuntungan (RM)</th>
+                            <th>Caj Lelong (RM)</th>
+                            <th>Harga Asas (RM)</th>
+                            <th>Harga Jual (RM)</th>
+                            <th>Baki Lelong (RM)</th>
+                            {{-- <th>Tindakan</th> --}}
+                        </tr>
+                    </thead>
+                    <tbody>
+                    @php     
+                        $rugilelong = 0;
+                        $bakilelong = 0; 
+                    @endphp
+                        @foreach ($marhuns as $index=> $marhun)
+                        <tr>
+                            <td>{{$loop->iteration}}</td>
+                            <td align = 'left' style="white-space: nowrap;">{{ $marhun['norujukan']}}</td>
+                            {{-- <td align = 'left' style="white-space: nowrap;">{{ $marhun['nama']['nama']}}</td> --}}
+                            <td>{{ number_format($marhun['jbg'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['hargajual'], 2, '.', ',') }}</td>
+                            @php
+                            $rugi = 0;
+                                $baki = 0;
+                                 if(strpos($marhun['baki'], '-') !== false)
+                                 {
+                                    $baki  = -$marhun['baki'];
+                                    $bakilelong += $marhun['baki'];
+                                 }
+                                 else {
+                                    $baki = $marhun['baki'];
+                                    $bakilelong += $marhun['baki'];
+                                 }
+                            @endphp
+                            <td align = 'right'>@if($marhun['baki'] > 0)
+                                {{number_format($marhun['baki'], 2, '.', ',')}}
+                                @elseif($marhun['baki'] < 0 )
+                                ({{number_format(-($marhun['baki']), 2, '.', ',')}})
+                                @endif
+                            </td>
+
+                            {{-- <td class="text-center">
+                                <input type="checkbox" aria-label="Checkbox for following text input" id="checkboxdata[]" name="checkboxdata[]" value="{{ $marhun['norujukan'] }}">
+                            </td> --}}
+
+                        </tr>
+                        @endforeach
+                    </tbody>
+                    <tfoot>
+                        <tr>
+                            <td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
+                            <td align = 'right'><b><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_hargajual, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>@if($bakilelong > 0)
+                                {{ number_format($bakilelong, 2, '.', ',') }}
+                            @else
+                                 ({{number_format(-($bakilelong), 2, '.', ',')}})
+                            @endif</b></td>
+                            {{-- <td align = 'right'></td> --}}
+                        </tr>
+                    </tfoot>
+
+
+                </table>
+               
+                {{-- <a href="{{url('lelong/senarailelong')}}" class="btn btn-primary">Kembali</a> --}}
+
+            </form>
+        </div>
+    </div>
+    </div>
+    </div>
+</div>
+<script>
+
+    function confirm() {
+        $.confirm({
+            title: 'Hapus No.Rujukan',
+            content: 'Anda pasti?',
+            type: 'red',
+            typeAnimated: true,
+            buttons: {
+                Hapus: {
+                    btnClass: 'btn-danger',
+                    action: function() {
+                        $("#deletesag").submit();
+                    }
+                },
+                Batal: {
+                    btnClass: 'btn-default',
+                    action: function() {}
+                }
+            }
+        });
+    }
+
+    var tablemarhun = $('#marhun').DataTable({
+        "info": false,
+        "lengthChange": false,
+        "pageLength": 999999,
+        dom: 'Bfrtip',
+    });
+</script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/lelong/senaraimarhunpcdone.blade.php b/resources/views/lelong/senaraimarhunpcdone.blade.php
new file mode 100644
index 00000000..377359d3
--- /dev/null
+++ b/resources/views/lelong/senaraimarhunpcdone.blade.php
@@ -0,0 +1,204 @@
+@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('jananotis.showlelongpcdone',$lelongid) }}" class="header-style-icon">
+                    <i class="fas fa-arrow-left"></i>
+                </a>
+                <div class="header-style-title">
+                    senarai Lelongan
+                </div>
+            </div>
+            <div class="card-body">
+                @if ($message = Session::get('success'))
+                <div class="alert alert-success">
+                    {{ $message }}
+                </div>
+                @endif
+                
+                <div class="col-3">
+                    @foreach ($arrayinfo as $laporan)
+                    @php
+                $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] );
+                $datez = $myDateTime->format('d-m-Y');
+                // echo($datez);
+                @endphp
+                    <div class="form-group row">
+                        <label class="col-6 col-form-label text-left">Tarikh Lelong</label>
+                        <div class="col-6">
+                            <div class="input-group">
+                                <input type="text" readonly class="form-control bg-light" value="{{$datez}}">
+                            </div>
+                        </div>
+                    </div>
+                    @endforeach
+                </div>
+
+                <div class="col-3">
+                    <div class="form-group row">
+                        <label class="col-6 col-form-label text-left">Bil SAG Cawangan</label>
+                        <div class="col-6">
+                            <div class="input-group">
+                                <input type="text" readonly class="form-control bg-light" value="{{sizeof($arraymarhun)}}">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                {{-- <div class="mb-3">
+                    <a href=" {{ route('report.lelongreport',[$lelongid,$cawid]) }}" class="btn btn-outline-success">Muat Turun PDF</a>
+                    <a href="{{ route('jananotis.listsagbycust',[$lelongid,$cawid])  }}" class="btn btn-primary">Senarai Mengikut Nama Pelanggan</a>
+                </div> --}}
+
+      
+
+
+
+
+            @if ($message = Session::get('success'))
+            <div class="alert alert-success">
+                <p>{{ $message }}</p>
+            </div>
+            @endif
+            {{-- <div class="text-left pt-4">
+                <a href=" {{ route('jananotis.lelongreportpc',[$lelongid,$cawid]) }}" class="btn btn-success">PDF</a>
+                <a href="{{ route('jananotis.senaraimarhunsimulasi',[$lelongid,$cawid]) }}" class="btn btn-success">Simulasi Lelong</a>
+                <a href="{{ route('jananotis.listsagbycust',[$lelongid,$cawid])  }}" class="btn btn-success">Senarai Mengikut Nama Pelangan</a>
+                <a href="{{ route('lelonghargajual.senaraimarhunkhasbelumjual',[$lelongid,$cawid])  }}" class="btn btn-success">Belum Jual</a>
+                <a href="{{ route('lelonghargajual.senaraimarhunkhastelahjual',[$lelongid,$cawid])  }}" class="btn btn-success">Telah Jual</a> 
+
+            </div> --}}
+            <form id="deletesag" action="{{route('lelonghargajual.deletemarhun')}}" method="POST">
+                @csrf
+                <input type="hidden" name="lelongid" value="{{$lelongid}}">
+                <input type="hidden" name="cawid" value="{{$cawid}}">
+                <table class="table text-right table-bordered" id="marhun" style="width:100%">
+                    <thead class="bg-primary text-white">
+                        <tr>
+                            <th>No</th>
+                            <th>No Rujukan</th>
+                            {{-- <th>Nama Pelanggan</th> --}}
+                            <th>Tempoh</th>
+                            <th>Berat (gm)</th>
+                            <th>Nilai Marhun Asal(RM)</th>
+                            <th>Pembiayaan (RM)</th>
+                            <th>Keuntungan (RM)</th>
+                            <th>Caj Lelong (RM)</th>
+                            <th>Harga Asas (RM)</th>
+                            <th>Harga Jual (RM)</th>
+                            <th>Baki Lelong (RM)</th>
+                            {{-- <th>Tindakan</th> --}}
+                        </tr>
+                    </thead>
+                    <tbody>
+                        @php     
+                        $rugilelong = 0;
+                        $bakilelong = 0; 
+                    @endphp
+                        @foreach ($arraymarhun as $index=> $marhun)
+                        <tr>
+                            <td>{{$loop->iteration}}</td>
+                            <td align = 'left' style="white-space: nowrap;">{{ $marhun['norujukan']}}</td>
+                            {{-- <td align = 'left' style="white-space: nowrap;">{{ $marhun['nama']['nama']}}</td> --}}
+                            <td>{{ number_format($marhun['tempoh'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['pinjaman'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
+                            <td align = 'right'>{{ number_format($marhun['hargajual'], 2, '.', ',') }}</td>
+                            @php
+                            $rugi = 0;
+                                $baki = 0;
+                                 if(strpos($marhun['baki'], '-') !== false)
+                                 {
+                                    $baki  = -$marhun['baki'];
+                                    $bakilelong += $marhun['baki'];
+                                 }
+                                 else {
+                                    $baki = $marhun['baki'];
+                                    $bakilelong += $marhun['baki'];
+                                 }
+                            @endphp
+                            <td align = 'right'>@if($marhun['baki'] > 0)
+                                {{number_format($marhun['baki'], 2, '.', ',')}}
+                                @elseif($marhun['baki'] < 0 )
+                                ({{number_format(-($marhun['baki']), 2, '.', ',')}})
+                                @endif
+                            </td>
+                           
+
+                            {{-- <td class="text-center">
+                                <input type="checkbox" aria-label="Checkbox for following text input" id="checkboxdata[]" name="checkboxdata[]" value="{{ $marhun['norujukan'] }}">
+                            </td> --}}
+
+                        </tr>
+                        @endforeach
+                    </tbody>
+                    <tfoot>
+                        <tr>
+                            <td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
+                            <td align = 'right'><b><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>{{ number_format($total_hargajual, 2, '.', ',') }}</b></td>
+                            <td align = 'right'><b>@if($bakilelong > 0)
+                                {{ number_format($bakilelong, 2, '.', ',') }}
+                            @else
+                                 ({{number_format(-($bakilelong), 2, '.', ',')}})
+                            @endif</b></td>
+                            {{-- <td align = 'right'></td> --}}
+                        </tr>
+                    </tfoot>
+
+                </table>
+                <div class="text-right pt-4">
+                    {{-- <a  href="{{ route('lelong.show',$lelongid) }}" class="btn btn-primary">Kembali</a> --}}
+                    {{-- <button type="button" class="btn btn-danger" onclick="confirm()">Hapus</button> --}}
+                </div>
+                {{-- <a href="{{url('lelong/senarailelong')}}" class="btn btn-primary">Kembali</a> --}}
+
+            </form>
+        </div>
+
+    </div>
+</div>
+<script>
+
+    function confirm() {
+        $.confirm({
+            title: 'Confirmation',
+            content: 'Anda pasti?',
+            type: 'red',
+            typeAnimated: true,
+            buttons: {
+                Delete: {
+                    btnClass: 'btn-danger',
+                    action: function() {
+                        $("#deletesag").submit();
+                    }
+                },
+                Batal: {
+                    btnClass: 'btn-default',
+                    action: function() {}
+                }
+            }
+        });
+    }
+
+    var tablemarhun = $('#marhun').DataTable({
+        "info": false,
+        "lengthChange": false,
+        "pageLength": 999999,
+        dom: 'Bfrtip',
+    });
+</script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/lelong/showlelongdone.blade.php b/resources/views/lelong/showlelongdone.blade.php
index 5a275ae5..afe868c0 100644
--- a/resources/views/lelong/showlelongdone.blade.php
+++ b/resources/views/lelong/showlelongdone.blade.php
@@ -5,7 +5,7 @@
     <div class="row ">
         <div class="col-md-11 mx-auto card p-4">
             <div class="card-header header-style">
-                <a href="{{ route('jananotis.senarailelongpc') }}" class="header-style-icon">
+                <a href="{{ route('lelong.senarailelong',) }}" class="header-style-icon">
                     <i class="fas fa-arrow-left"></i>
                 </a>
                 <div class="header-style-title">
@@ -176,8 +176,9 @@
                                     <th>N. Marhun (RM)</th>
                                     <th>Pembiayaan (RM)</th>
                                     <th>Keuntungan (RM)</th>
-                                    <th>Harga Asas (RM)</th>
                                     <th>Caj (RM)</th>
+                                    <th>Harga Asas (RM)</th>
+                                    <th>Harga Jual (RM)</th>
                                     <th>Baki (RM)</th>
                                     <th>Rugi (RM)</th>
                                 </tr>
@@ -187,14 +188,15 @@
                                 @foreach ($arraycaw as $index=>$caw)
                                 <tr>
                                     <td>{{$index+1}}</td>
-                                    <td><a href=" {{ route('jananotis.senaraimarhunpc',['lelongid'=>$lelong_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
+                                    <td><a href=" {{ route('jananotis.senaraimarhundone',['lelongid'=>$lelong_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
                                     <td>{{ $caw['bil_marhun'] }}</td>
                                     <td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['bakiupah'], 2, '.', ',') }}</td>
-                                    <td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['hargajual'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
                                     <td>({{ number_format($caw['rugilelong'], 2, '.', ',') }})</td>
                                 </tr>
@@ -208,8 +210,9 @@
                                     <td><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
                                     <td><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
                                     <td><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
-                                    <td><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
                                     <td><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_hargajual, 2, '.', ',') }}</b></td>
                                     <td><b>{{ number_format($total_bakilelong, 2, '.', ',') }}</b></td>
                                     <td><b>({{ number_format($total_rugilelong, 2, '.', ',') }})</b></td>
                                 </tr>
diff --git a/resources/views/lelong/showlelongpcdone.blade.php b/resources/views/lelong/showlelongpcdone.blade.php
new file mode 100644
index 00000000..811db7ff
--- /dev/null
+++ b/resources/views/lelong/showlelongpcdone.blade.php
@@ -0,0 +1,473 @@
+@extends('layouts.app')
+
+@section('content')
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col-md-11 mx-auto card p-4">
+            <div class="card-header header-style">
+                <a href="{{ route('jananotis.senarailelongpcdone') }}" class="header-style-icon">
+                    <i class="fas fa-arrow-left"></i>
+                </a>
+                <div class="header-style-title">
+                    @foreach($data as $data1)
+                    @php 
+                        $today = date('d-m-Y');
+                        $kemaskini = date('d-m-Y', strtotime($tarikhkemaskini->updated_at));
+                        $myDateTime = DateTime::createFromFormat('Y-m-d', $data1['tarikh_lelong'] );
+                        $datez = $myDateTime->format('d-m-Y');
+                    @endphp
+                    @endforeach
+                    butiran lelong : {{$datez}}
+                </div>
+            </div>
+              <div class="card-body">
+                @if ($message = Session::get('success'))
+                <div class="alert alert-success">
+                    {{ $message }}
+                </div>
+                @endif
+                <form id="exportform" action="{{route('jananotis.exportlelongpcdone')}}" method="POST">
+                    @csrf
+                    <input type="hidden" name="type" value="User">
+                    <input type="hidden" name="lelongid" value="{{ $lelong_id }}">
+                    <div class="row">
+                        <div class="col-md-12 col-lg">
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Tarikh Lelong</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        @foreach($data as $data1)
+                                            @php 
+                                            $today = date('d-m-Y');
+                                            $kemaskini = date('d-m-Y', strtotime($tarikhkemaskini->updated_at));
+                                            $myDateTime = DateTime::createFromFormat('Y-m-d', $data1['tarikh_lelong'] );
+                                              $datez = $myDateTime->format('d-m-Y');
+                                            //   echo($datez);
+                                          
+                                          @endphp
+                                        @endforeach
+                                        <input type="text" readonly class="form-control bg-light" value="{{$datez}}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">JBG</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        @foreach($data as $data)
+                                        {{-- <td>Tempoh : {{$data['jbg'] }}</td> --}}
+                                        <input type="text" readonly class="form-control bg-light" value="{{$data['jbg']}}">
+                                        @endforeach
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Bilangan SAG</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <input type="text" readonly class="form-control bg-light" value="{{$total_marhun}}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Harga Emas Per Gram</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="{{$tarikhkemaskini->harga2}}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Nilai Marhun Keseluruhan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_nilaimarhun, 2, '.', ',') }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Pembiayaan Keseluruhan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_pinjaman, 2, '.', ',') }}">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="col-lg-1"></div>
+                        <div class="col-md-12 col-lg">
+                           
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Keuntungan Keseluruhan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_bakiupah, 2, '.', ',') }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Harga Asas Keseluruhan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_hargaasas, 2, '.', ',') }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Caj Lelong Keseluruhan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_cazlelong, 2, '.', ',') }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Baki Lelong Keseluruhan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="{{ number_format($total_bakilelong, 2, '.', ',') }}">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="form-group row">
+                                <label class="col-6 col-form-label">Rugi Lelong Keseluruhan</label>
+                                <div class="col-6">
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <div class="input-group-text">RM</div>
+                                        </div>
+                                        <input type="text" readonly class="form-control bg-light" value="(RM{{ number_format($total_rugilelong, 2, '.', ',') }})">
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    
+                        
+                    <button class="btn mb-5 btn-outline-success" type="submit">Muat Turun PDF</button>
+                        <table class="table text-right table-bordered" id="simulasi">
+                            <thead class="bg-primary text-white">
+                                <tr class="text-center">
+                                    <th>No</th>
+                                    <th>Cawangan</th>
+                                    <th>Bil SAG</th>
+                                    <th>Berat (gm)</th>
+                                    <th>N. Marhun (RM)</th>
+                                    <th>Pembiayaan (RM)</th>
+                                    <th>Keuntungan (RM)</th>
+                                    <th>Caj (RM)</th>
+                                    <th>Harga Asas (RM)</th>
+                                    <th>Harga jual (RM)</th>
+                                    <th>Baki (RM)</th>
+                                    <th>Rugi (RM)</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                
+                                @foreach ($arraycaw as $index=>$caw)
+                                <tr>
+                                    <td>{{$index+1}}</td>
+                                    <td><a href=" {{ route('jananotis.senaraimarhunpcdone',['lelongid'=>$lelong_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
+                                    <td>{{ $caw['bil_marhun'] }}</td>
+                                    <td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['bakiupah'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['hargajual'], 2, '.', ',') }}</td>
+                                    <td>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
+                                    <td>({{ number_format($caw['rugilelong'], 2, '.', ',') }})</td>
+                                </tr>
+                                @endforeach
+                            </tbody>
+                            <tfoot>
+                                <tr>
+                                    <td colspan="2"><b>JUMLAH KESELURUHAN</b></td>
+                                    <td><b>{{ $total_marhun }}</b></td>
+                                    <td><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_hargajual, 2, '.', ',') }}</b></td>
+                                    <td><b>{{ number_format($total_bakilelong, 2, '.', ',') }}</b></td>
+                                    <td><b>({{ number_format($total_rugilelong, 2, '.', ',') }})</b></td>
+                                </tr>
+                            </tfoot>
+                            
+                        </table>
+
+                        <h6 class="mt-5">Jumlah Berat Mengikut Mutu (Keseluruhan)</h6>
+                        <table class="table table-bordered text-center" id="jumlahberat">
+                            <thead class="bg-light">
+                                <!-- <tr class="text-center">
+                                    <th colspan="12">JUMLAH BERAT MENGIKUT MUTU (KESELURUHAN)</th>
+                                </tr> -->
+                                <tr>
+                                    <th>MUTU</th>
+                                    @foreach ($lelkarat as $index=>$karat)
+                                    <th>{{$karat->karat}}</th>
+                                    @endforeach
+                                </tr>
+                            </thead>
+                            <tbody>
+
+                                <tr>
+                                    <td>BERAT (gm)</td>
+                                    <td>{{$total24Kgb}}</td>
+                                    <td>{{$total24K}}</td>
+                                    <td>{{$total23k}}</td>
+                                    <td>{{$total22K}}</td>
+                                    <td>{{$total21K}}</td>
+                                    <td>{{$total20K}}</td>
+                                    <td>{{$total18Kp}}</td>
+                                    <td>{{$total18K}}</td>
+                                    <td>{{$total14Kp}}</td>
+                                    <td>{{$total14K}}</td>
+
+                                </tr>
+                            </tbody>
+
+                        </table>
+                    </form>
+                    <div class="row">
+                        <div class="text-center">
+                            {{-- <a class="btn btn-primary" href="{{ route('lelong.create',$lelong_id) }}">Create Lelong</a> --}}
+                        </div>
+                    </div>
+                </div>
+                <div class="tab-pane fade" id="nav-hargaasas" role="tabpanel" aria-labelledby="nav-hargaasas-tab">
+                    <br>
+                    <div class="row ">
+                        <div class="col-md-10 mx-auto ">
+                            <button class="btn btn-primary float-right " onclick="kemaskini()" id="btnkemaskini" >Kemaskini</button>
+                            
+                            <div id="hideform">
+                                <label for="hargaasas" class="d-inline float-left pr-2 pl-2 pt-2" id="lblhargaasas">Harga Emas Asas</label>
+                                <input type="text" class="form-control col-md-4 d-inline float-left" id="txthargaasas" name="hargaasas" placeholder="RM" data-jeniskarat="{{$jeniskarat}}" oninput="calculate(this)">
+                                <button class="btn btn-success float-right" onclick="save()" id="btnsimpan">Simpan</button>
+                                <button class="btn btn-danger float-right" onclick="kemaskini()" id="btncancel">Cancel</button>
+                            </div>
+                            
+                        </div>
+                    </div>
+              
+                    {{-- <a class="btn btn-primary" href="{{ route('lelong.kemaskinihargaasas',$lelong_id) }}">Kemaskini</a> --}}
+                    
+                    
+                </div>
+              </div>
+            @if ($message = Session::get('success'))
+            <div class="alert alert-success">
+                <p>{{ $message }}</p>
+            </div>
+            @endif
+            {{-- {{$cawangan[0] }} --}}
+        </div>
+        <div class="modal fade" tabindex="-1" id="modalfilter">
+            <div class="modal-dialog modal-lg">
+              <div class="modal-content">
+                <div class="modal-header">
+                  <h5 class="modal-title">Filter By</h5>
+                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                  </button>
+                </div>
+                <div class="modal-body">
+                    <form action="{{ route('analisa.filter') }}" method="POST" id="formfilter">
+                        @csrf
+                        <div class="row justify-content-center">
+                            <div class="col-md-8">
+                                <div class="form-group row">
+                                    <input type="hidden" name="idmarhun" id="idmarhun" >
+                                    
+                                </div>
+                            </div>                       
+                          </div>
+                      </form>
+                </div>
+                <div class="modal-footer">
+                  <button type="button" class="btn btn-secondary" data-dismiss="modal">Tutup</button>
+                  <button type="button" class="btn btn-primary" onclick="">Jana Semula Simulasi</button>
+                </div>
+              </div>
+            </div>
+          </div>
+    </div>
+</div>
+<script>
+    $("#hideform").hide();
+    $('#btnsimpan').prop('disabled', true)
+    function kemaskini() {
+       var inputdata =  $("td.input").find("input");
+       if(inputdata.length ==0)
+       {
+        $("td.input").each(function(index) {
+            // console.log(index)
+            var la = $(this).html();
+            // if(index%2 ==0 ) //even-0-2-4
+            // { 
+                $(this).html("<input type='text' name='harga2[]' id=harga2"+index+" value="+la+" />");
+            // }
+            // else //odd-1-3-5-7
+            // {
+            //     $(this).html("<input type='text' name='harga[]' id=harga"+index+" value="+la+" />");
+            // }
+            
+        })
+        $("#hideform").show();
+        $("#btnkemaskini").hide();
+       }
+       else
+       {
+            $("td.input").each(function() {
+                var la = $(this).html();
+                $(this).html($(la).val());
+            })
+            $("#hideform").hide();
+            $("#btnkemaskini").show();
+       }
+        
+    }
+
+    function calculate(e)
+    {
+        let hargaasasbaru = $('#txthargaasas').val();
+
+        let jeniskarat = $(e).data('jeniskarat');
+        
+        // let maxcolumn = 2;
+        let count = 0;
+        let indexarray = 0;
+        $("td.input").each(function(index) {
+            if(hargaasasbaru)
+            {
+                $('#btnsimpan').prop('disabled', false)
+                // if(index%2 == 0)
+                // {
+                    let harga1 = parseFloat(hargaasasbaru);
+                    let harga2 = parseFloat(jeniskarat[indexarray]['dariharga916']);
+                    let newhargaasas = harga1 + (harga2); 
+                    count++;
+                    $('#harga2'+index).val(newhargaasas.toFixed(2));
+                // }
+                // else
+                // {
+                //     let harga1 = parseFloat(hargaasasbaru);
+                //     let harga2 = parseFloat(jeniskarat[indexarray]['dariharga916']);
+                //     let newhargaasas = (harga1 + (harga2))/2.72;; 
+                //     count++;
+                //     $('#harga'+index).val(newhargaasas.toFixed(2));
+                // }
+
+                // if(count == maxcolumn)
+                // {
+                //     count = 0;
+                    indexarray++;
+                // }
+            }
+            else
+            {
+                $('#btnsimpan').prop('disabled', true)
+                let dummy =0;
+                if(index%2 == 0)
+                {
+                    $('#harga2'+index).val(dummy.toFixed(2));
+                }
+                // else
+                // {
+
+                //     $('#harga'+index).val(dummy.toFixed(2));
+                // }
+            }
+            
+        })
+        
+    }
+
+    function save(){
+        $('#formhargaasas').submit();
+    }
+
+    $('a.confirmdel').confirm({
+        title: 'Confirmation',
+        content: 'Anda pasti?',
+        type: 'orange',
+        typeAnimated: true,
+        buttons: {
+            Delete: {
+                btnClass: 'btn-warning',
+                action: function () {
+                    location.href = this.$target.attr('href');
+                }
+            },  
+            Batal: {
+                btnClass: 'btn-default',
+                action: function () {}
+            }
+        }
+    });
+
+    var tablesimulasi = $('#simulasi').DataTable( {
+            "columnDefs": [ 
+                {
+                "targets": 0,
+                "orderable": false,
+                "width": 100%
+                }
+            ],
+            order: [[0, 'asc']],
+            // "ordering": false,
+            "searching":true,
+            "info": false,
+            "lengthChange": false,
+            "scrollX": true,
+            "paging": false,
+
+    });
+        var tableJumlahBerat = $('#jumlahberat').DataTable({
+        "scrollX": true,
+        "info": false,
+        "paging": false,
+        "searching": false,
+        "ordering": false
+    });
+
+        $('.addsim').tooltip();
+        $('.export').tooltip();
+        // $( '.dt-buttons').addClass('btn-group');
+        $( '.addsim').removeClass('dt-button');
+        $( '.export').removeClass('dt-button');
+
+
+    function selectall(cb) {
+        tablesimulasi.rows().nodes().to$().find('input[type="checkbox"]').each(function(){
+            $(this).prop('checked', cb.checked);
+        })
+    }
+</script>
+     
+@endsection
diff --git a/resources/views/marhun/senarailelongscanjual.blade.php b/resources/views/marhun/senarailelongscanjual.blade.php
index e574951a..080490b5 100644
--- a/resources/views/marhun/senarailelongscanjual.blade.php
+++ b/resources/views/marhun/senarailelongscanjual.blade.php
@@ -4,8 +4,24 @@
 
 <div class="container-fluid">
     <div class="row ">
-        <div class="col-md-11 mx-auto card p-4">
-            <h4> Senarai Lelongan Scan Kepada Pembida</h4>
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="header-style-title">
+                        Senarai Lelongan Scan Kepada Pembida
+                    </div>
+                </div>
+                <div class="card-body">
+                    @if ($message = Session::get('success'))
+                    <div class="alert mt-2 alert-success">
+                        {{ $message }}
+                    </div>
+                    @elseif ($message = Session::get('failed'))
+                    <div class="alert mt-2 alert-danger">
+                        {{ $message }}
+                    </div>
+                    @endif
+            {{-- <h4> Senarai Lelongan Scan Kepada Pembida</h4> --}}
             <table class="table table-striped  table-xl text-center" id="senarailelongonline" style="width:100%">
                 <thead class="bg-primary text-white">
                     <tr>
diff --git a/resources/views/pdf/cetakmasukscanbarcode.blade.php b/resources/views/pdf/cetakmasukscanbarcode.blade.php
index 2f43fcb3..e0c63e14 100644
--- a/resources/views/pdf/cetakmasukscanbarcode.blade.php
+++ b/resources/views/pdf/cetakmasukscanbarcode.blade.php
@@ -90,11 +90,11 @@
                           <tr>
                             <th>Bil</th>
                             <th>No Rujukan</th>
-                            <th>Status</th>
                             <th>Tarikh/Masa Scan Keluar</th>
                             <th>Tarikh/Masa Terima Marhun</th>
                             <th>Tarikh/Masa Serah Marhun</th>
                             <th>Tarikh/Masa Scan Masuk</th>
+                            <th>Status</th>
                         </tr>
                         </thead>
           
diff --git a/resources/views/pdf/lelreportdone.blade.php b/resources/views/pdf/lelreportdone.blade.php
index c033cebc..f3b11ba4 100644
--- a/resources/views/pdf/lelreportdone.blade.php
+++ b/resources/views/pdf/lelreportdone.blade.php
@@ -34,6 +34,8 @@
   .row {
     margin-right:-5px;
     margin-right:-5px;
+    font-size:10px;
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
   }
     
   .column {
@@ -54,6 +56,7 @@
     border-spacing: 0;
     width: 200%;
     border: 1px solid #ddd;
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
   }
   
   td {
@@ -80,33 +83,15 @@
     @endforeach
     </header>
                                           
-                      <table cellspacing="" cellpadding="5" text-align="left" border="0" height="25" align="left" id="sim">
-                        <thead>
-                          <tr>
-                            <td>Bilangan Lelong:  {{$total_marhun}}</td>
-                            <td>Nilai Marhun Keseluruhan: RM{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
-                            <td>Pembiayaan Keseluruhan: RM{{ number_format($total_pinjaman, 2, '.', ',')  }} </td>
-                            <td>Keuntungan Keseluruhan:RM{{ number_format($total_bakiupah, 2, '.', ',') }}</td>                                                  
-                        </thead>
-                      </table>
+                    
 
-                      <table cellspacing="" cellpadding="5" text-align="left" border="0"  height="25" align="left" id="sim">
-                            <thead>
-                            <tr>
-                              <td>Harga Asas Keseluruhan: RM{{ number_format($total_hargaasas, 2, '.', ',')  }}</td>
-                              <td>Caj Lelong Keseluruhan: RM{{ number_format($total_cazlelong, 2, '.', ',')  }}</td>
-                            <td>Baki Lelong Keseluruhan: RM{{ number_format($total_bakilelong, 2, '.', ',') }}</td>
-                            <td>Rugi Lelong Keseluruhan: RM{{ number_format($total_rugilelong, 2, '.', ',') }}</td>
-                            <td>Tempoh: {{ $data['jbg']}}</td> 
-                            <td>Tarikh Lelong :@php 
+                      <div class = 'row'>Tarikh Lelong :@php 
                               $myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
-                                $datez = $myDateTime->format('d-m-Y');
-                                echo($datez);                            
-                            @endphp
-                          </td> 
-                            </tr>
-                        </thead>
-                      </table>             
+                              $datez = $myDateTime->format('d-m-Y');
+                              echo($datez);                            
+                              @endphp</div>
+                      <div class = 'row'>Tempoh: {{ $data['jbg']}}</div>
+                   
                   
               
                       <br>
@@ -121,11 +106,12 @@
                                 <th>Cawangan</th>
                                 <th>Bil SAG</th>
                                 <th>Berat (gm)</th>
-                                <th>Nilai Marhun (RM)</th>
-                                <th>Pinjaman (RM)</th>
+                                <th>Nilai Marhun Asal(RM)</th>
+                                <th>Pembiayaan(RM)</th>
                                 <th>Keuntungan (RM)</th>
-                                <th>Harga Asas (RM)</th>
                                 <th>Caj Lelong (RM)</th>
+                                <th>Harga Asas (RM)</th>
+                                <th>Harga Jual (RM)</th>
                                 <th>Baki Lelong (RM)</th>
                                 <th>Rugi Lelong (RM)</th>
                             </tr>
@@ -141,8 +127,9 @@
                                 <td align = 'right'>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
                                 <td align = 'right'>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
                                 <td align = 'right'>{{ number_format($caw['upahsimpan'], 2, '.', ',') }}</td>
-                                <td align = 'right'>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
                                 <td align = 'right'>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['hargajual'], 2, '.', ',') }}</td>
                                 <td align = 'right'>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
                                 <td align = 'right'>({{ number_format($caw['rugilelong'], 2, '.', ',') }})</td>
                             </tr>
@@ -156,8 +143,9 @@
                                     <td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
                                     <td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
                                     <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
-                                    <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
                                     <td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_hargajual, 2, '.', ',') }}</b></td>
                                     <td align = 'right'><b>{{ number_format($total_bakilelong, 2, '.', ',') }}</b></td>
                                     <td align = 'right'><b>({{ number_format($total_rugilelong, 2, '.', ',') }})</b></td>
                             </tr>
diff --git a/resources/views/pdf/lelreportpcdone.blade.php b/resources/views/pdf/lelreportpcdone.blade.php
new file mode 100644
index 00000000..2e374a31
--- /dev/null
+++ b/resources/views/pdf/lelreportpcdone.blade.php
@@ -0,0 +1,193 @@
+
+<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: center;
+      border: 0px solid;
+    table-layout:auto;
+      color: black;
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+  }
+  
+  * {
+    box-sizing: border-box;
+  }
+  
+  .row {
+    margin-right:-5px;
+    margin-right:-5px;
+    font-size:10px;
+    font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+  }
+    
+  .column {
+    float: right;
+    width: 100%;
+    padding: 5px;
+  }
+  
+  /* Clearfix (clear floats) */
+  .row::after {
+    content: "";
+    clear: both;
+    display: table;
+  }
+  
+  table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    width: 200%;
+    border: 1px solid #ddd;
+  }
+  
+  td {
+    text-align: right;
+    padding: 16px;
+    border: 1px solid #ddd;
+  }
+  
+  th{
+    text-align: center;
+    padding: 16px;
+    border: 1px solid #ddd;
+  }
+  
+  tr:nth-child(even) {
+  }
+  
+  </style>
+
+<body>
+
+  <header>
+    @foreach($datacaw as $data1)
+    <u><b><h5>LAPORAN LELONGAN CAWANGAN: {{$data1['caw_name']}}</h5></b></u>
+    @endforeach
+    </header>
+                                          
+                    <div class = 'row'>Tarikh Lelong :@php 
+                        $myDateTime = DateTime::createFromFormat('Y-m-d', $data['tarikh_lelong'] );
+                        $datez = $myDateTime->format('d-m-Y');
+                        echo($datez);                            
+                        @endphp</div>
+                    <div class = 'row'>Tempoh: {{ $data['jbg']}}</div>
+          
+                  
+              
+                      <br>
+                      <table width="100%" id="sim">      
+                        <thead>
+                                    
+                        {{-- <tr>                       
+                          <th style="text-align:center;" colspan="12"><h3><b>SIMULASI KESELURUHAN</b></h3></th>   
+                        </tr> --}}
+                            <tr >
+                                <th>No</th>
+                                <th>Cawangan</th>
+                                <th>Bil SAG</th>
+                                <th>Berat (gm)</th>
+                                <th>Nilai Marhun (RM)</th>
+                                <th>Pinjaman (RM)</th>
+                                <th>Keuntungan (RM)</th>
+                                <th>Caj Lelong (RM)</th>
+                                <th>Harga Asas (RM)</th>
+                                <th>Harga Jual (RM)</th>
+                                <th>Baki Lelong (RM)</th>
+                                <th>Rugi Lelong (RM)</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            
+                            @foreach ($arraycaw as $index=>$caw)
+                            <tr>
+                                <td>{{$index+1}}</td>
+                                <td align = 'left' style="white-space: nowrap;">{{ $caw['cawangan'] }}</td>
+                                <td align = 'center'>{{ $caw['bil_marhun'] }}</td>
+                                <td align = 'right'>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['pinjaman'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['upahsimpan'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['cajlelong'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['hargaasas'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['hargajual'], 2, '.', ',') }}</td>
+                                <td align = 'right'>{{ number_format($caw['bakilelong'], 2, '.', ',') }}</td>
+                                <td align = 'right'>({{ number_format($caw['rugilelong'], 2, '.', ',') }})</td>
+                            </tr>
+                            @endforeach
+                        </tbody>
+                        <tfoot>
+                            <tr>
+                                    <td colspan="2"><b>JUMLAH KESELURUHAN</b></td>
+                                    <td align = 'center'><b>{{ $total_marhun }}</td>
+                                    <td align = 'right'><b>{{ number_format($total_berat, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_pinjaman, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_bakiupah, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_cazlelong, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_hargaasas, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_hargajual, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>{{ number_format($total_bakilelong, 2, '.', ',') }}</b></td>
+                                    <td align = 'right'><b>({{ number_format($total_rugilelong, 2, '.', ',') }})</b></td>
+                            </tr>
+                        </tfoot>
+                        
+                    </table>
+
+                    <br>
+                      <table width="100%" border="0" id="sim">
+                    
+                      <thead>
+
+                        <tr>
+                          <th style="text-align:center;" colspan="10"><b>JUMLAH BERAT MENGIKUT MUTU (KESELURUHAN)</b></h5></th>   
+                      </tr>
+                      <tr>
+                        <td colspan="1" align="left"><strong>MUTU &nbsp;</strong></td>
+                        <td colspan="1" align="center">24Kgb</td>
+                        <td colspan="1" align="center">24K</td>
+                        <td colspan="1" align="center">23K</td>
+                        <td colspan="1" align="center">22K</td>
+                        <td colspan="1" align="center">21K</td>
+                        <td colspan="1" align="center">20K</td>
+                        <td colspan="1" align="center">18K</td>
+                        <td colspan="1" align="center">14K</td>
+                        <td colspan="1" align="center">9K</td>
+                      </tr>
+                      <tr>
+                        <td colspan="1" align="left"><strong>BERAT(gm)</strong></td>
+                        <td colspan="1" align="center">{{$total24Kgb}}</td>
+                        <td colspan="1" align="center">{{$total24K}}</td>
+                        <td colspan="1" align="center">{{$total23k}}</td>
+                        <td colspan="1" align="center">{{$total22K}}</td>
+                        <td colspan="1" align="center">{{$total21K}}</td>
+                        <td colspan="1" align="center">{{$total20K}}</td>
+                        <td colspan="1" align="center">{{$total18Kp}}</td>
+                        <td colspan="1" align="center">{{$total14K}}</td>
+                        <td colspan="1" align="center">{{$total9K}}</td>
+                      </tr>
+                    </thead>
+
+                      </table>
+               
+                      
+                    
+</tbody>
+
diff --git a/routes/web.php b/routes/web.php
index 6fd670a4..9694aeac 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -470,6 +470,11 @@ Route::group(['middleware' => ['permission:jananotis'],'prefix'=>'jananotis'], f
     Route::get('/senaraimarhunsimulasi/{lelongid}/{cawid}', ['as'=>'jananotis.senaraimarhunsimulasi','uses'=>'LelongController@senaraimarhunsimulasi']);
     Route::post('/exportlelongpc',['as'=>'jananotis.exportlelongpc','uses'=>'LelongController@exportlelongpc']);
     Route::get('/lelongreportpc/{lelongid}/{cawid}',['as'=>'jananotis.lelongreportpc','uses'=>'ReportController@lelongreportpc']);
+    Route::get('/senaraimarhundone/{lelongid}/{cawid}', ['as'=>'jananotis.senaraimarhundone','uses'=>'LelongController@senaraimarhundone']);
+    Route::get('/senarailelongpcdone',['as'=>'jananotis.senarailelongpcdone','uses'=>'LelongController@senarailelongpcdone']);
+    Route::get('/showlelongpcdone/{id}',['as'=>'jananotis.showlelongpcdone','uses'=>'LelongController@showlelongpcdone']); 
+    Route::get('/senaraimarhunpcdone/{lelongid}/{cawid}', ['as'=>'jananotis.senaraimarhunpcdone','uses'=>'LelongController@senaraimarhunpcdone']);
+    Route::post('/exportlelongpcdone',['as'=>'jananotis.exportlelongpcdone','uses'=>'LelongController@exportlelongpcdone']);
 
 });