diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 597d5790..77e76d4b 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -93,7 +93,10 @@ class AccountController extends Controller
             
             $SAGWin = Payment::join('lelongbidder', 'payment.id', '=', 'lelongbidder.payment_id')
             ->where('payment.kodcaw', $kodcaw)
+            ->where('payment.lelong_id', $lelong_id)
+            ->where('payment.user_id',  $winner['user_id'])
             ->get();
+            // dd($SAGWin);
 
             $id_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
             ->join('payment', 'lelongbidder.user_id', '=', 'payment.user_id')
@@ -282,7 +285,7 @@ class AccountController extends Controller
             $bidder->update();
         }
         
-        return redirect()->route('account.senarailelongan')->with('success','Pembayaran Berjaya');
+        return redirect()->route('home')->with('success','Pembayaran Berjaya');
 
     }
 
@@ -467,7 +470,6 @@ class AccountController extends Controller
                 if($payment){
                     $total_payment = $total_payment + $payment->total_payment;
                 }
-
                 $disahkanoleh = User::where('id', $payment->disahkan_oleh)->first();
                 // dd($disahkanoleh);
             }
diff --git a/app/Http/Controllers/AuthMobile/AuthController.php b/app/Http/Controllers/AuthMobile/AuthController.php
index b64bfd75..ae27b0fa 100644
--- a/app/Http/Controllers/AuthMobile/AuthController.php
+++ b/app/Http/Controllers/AuthMobile/AuthController.php
@@ -7,6 +7,7 @@ use Carbon\Carbon;
 use App\Models\User;
 use App\Models\File;
 use App\Http\Controllers\Controller;
+use App\Models\Staff;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Validator;
@@ -22,11 +23,9 @@ class AuthController extends Controller
             'password' => 'required|string|min:8',
             'email' => 'required|string|unique:users|email',
             'notelbimbit' => 'required|string|unique:users',
-            'register_agree' => 'required|integer'
-            
+            'register_agree' => 'required|integer',
+            'alamat' => 'required'
         ]);
-        
-        
 
         if ($validator->fails()) {
             $errors = [
@@ -37,7 +36,20 @@ class AuthController extends Controller
         }
         // Retrieve the validated input...
         $fields = $validator->validated();
-        
+
+        $convert_ic_to_hyphen = (substr_replace(substr_replace($fields['nokp'], '-', 6, 0), '-', 9, 0));
+        $check_staff = Staff::where('nokp', '=', $convert_ic_to_hyphen)
+        ->orWhere('nokp', '=', $fields['nokp'])
+        ->first();
+        if($check_staff)
+        {
+            $errors = [
+                'success' => "Staff",
+                'message' => "Staff tidak dibenarkan mendaftar."
+            ];
+            return response($errors, 201);
+
+        }
         
         $currentdate = Carbon::now();
         $currentdate = $currentdate->toDateString();
@@ -53,6 +65,7 @@ class AuthController extends Controller
         $user->t_daftar = $currentdate;
         $user->status = 'active';
         $user->user_type = 2; //type 2 = pembida
+        $user->alamat = $fields['alamat'];
         
 
         if($user->save())
diff --git a/app/Http/Controllers/CartController.php b/app/Http/Controllers/CartController.php
index 4fc07354..b2ab259a 100644
--- a/app/Http/Controllers/CartController.php
+++ b/app/Http/Controllers/CartController.php
@@ -81,7 +81,9 @@ class CartController extends Controller
 
             foreach ($cart as $index1 => $data) {
                 $fileMarhun = FileMarhun::where('lelongbid_id', $data['id'])->get();
-                $cart[$index1]['filemarhun'] = $fileMarhun;
+                if ($fileMarhun->isNotEmpty()) {
+                    $cart[$index1]['filemarhun'] = $fileMarhun;
+                }
 
                 $total_hargabida += $data['hargabida'];
                 $total_berat += $data['berat'];
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index b39fe12e..98368cfd 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -176,16 +176,61 @@ class HomeController extends Controller
         {
 
             $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
-            ->select('cawangan_lelong.lelong_id','cawangan_lelong.caw_id','caw_name','caw_code','cawangan_lelong.export_data_sts')
+            ->select('cawangan_lelong.lelong_id','cawangan_lelong.caw_id','caw_name','cawangan.caw_code','cawangan_lelong.export_data_sts')
             ->where('lelong_id',$details['lelong_id'])    
             ->distinct()
             ->orderBy('lelong_id')
-            ->get()
-            ->toArray();
-            // dd($detailsinfo);
+            ->get();
+           
+           
+           
+            foreach($detailsinfo as $index1=>$cal){
+                $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+                // ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
+                ->where('lelongbidder.status_bidder', 1)
+                // ->where('payment.status', 1)
+                // ->where('lelongbidder.status_payment', 1)
+                ->where('lelongbid.lelong_id', $details['lelong_id'])
+                ->where('lelongbid.kodcaw', $cal['caw_code'])
+                ->select('lelongbidder.user_id', 'lelongbid.lelong_id','lelongbid.kodcaw')
+                ->groupBy('lelongbidder.user_id')
+                ->get();
+                foreach($listwinner as $index=>$listing){
+                    $total_payment = 0;
+                    $userdetails = User::where('id', $listing['user_id'])->first();
+                    $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+                    ->where('lelongbid.nopembeli', $listing['user_id'])
+                    ->where('lelongbid.kodcaw', $listing['kodcaw'])
+                    ->where('lelongbidder.status_bidder', 1)
+                    ->where('lelongbid.lelong_id', $listing['lelong_id'])
+                    ->get();
+                    foreach($SAGWin as $index2=>$sag1)
+                    {
+                        // dd($detailspayment);
+                        $detailspayment  = null;
+                        if($sag1['payment_id'] != null)
+                        {
+                            $detailspayment = Payment::where('id', $sag1['payment_id'])->first();
+                            $total_payment = $total_payment + $detailspayment->total_payment;
+                            // dd($total_payment);
+                        }else
+                        {
+                            $total_payment = '0.00';
+                        }
+
+                    }
+                    $listwinner[$index]['details'] = $userdetails; 
+                    $listwinner[$index]['total_surat'] = sizeof($SAGWin);
+                    $listwinner[$index]['totalBid'] = $SAGWin->sum('hargabida');
+                    $listwinner[$index]['totalPay'] = $total_payment;
+                    $listwinner[$index]['jenisbayaran'] = $detailspayment ;
+                }
+                $detailsinfo[$index1]['nama'] = $userdetails;
+                $detailsinfo[$index1]['listwinner'] = $listwinner;
+            }
           
-            
-            array_push($arrayinfomenang,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
+            array_push($arrayinfomenang,['detail'=>$details, 'detailsinfo'=>$detailsinfo, 'listwinner'=>$listwinner]);
+            //array_push($arrayinfomenang,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
         }
         //end paparan pemenang lelongan harini
 
@@ -207,15 +252,14 @@ class HomeController extends Controller
 
         foreach($senarai as $details)
         {
+            // dd($details['lelong_id']);
             $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
-            ->join('lelongbid', 'lelongbid.caw_id', '=', 'cawangan_lelong.caw_id')
-            ->join('payment','payment.norujukan','=','lelongbid.norujukan')
-            ->select('cawangan_lelong.lelong_id','cawangan_lelong.caw_id','caw_name','caw_code')
-            ->where('lelongbid.lelong_id',$details['lelong_id'])    
+            ->select('cawangan_lelong.lelong_id','cawangan_lelong.caw_id','caw_name','cawangan.caw_code','cawangan_lelong.export_data_sts')
+            ->where('lelong_id',$details['lelong_id'])    
             ->distinct()
             ->orderBy('lelong_id')
-            ->get()
-            ->toArray();
+            ->get();
+           
             // dd($detailsinfo);
             foreach($detailsinfo as $index1=>$details1)
             {
@@ -225,7 +269,7 @@ class HomeController extends Controller
                 ->where('lelongbidder.status_bidder', 1)
                 ->where('lelongbid.lelong_id', $details1['lelong_id'])
                 ->where('payment.kodcaw', $details1['caw_code'])
-                ->where('lelongbidder.status_payment', 2)
+                // ->where('lelongbidder.status_payment', 2)
                 ->where('payment.status', 2)
                 ->whereNull('payment.disahkan_pada')
                 ->orWhere(function ($query) {
@@ -241,12 +285,41 @@ class HomeController extends Controller
                 {
                     $namawinner = User::where('id', $listwin['user_id'])
                     ->first();
+                    $total_payment = 0;
+                    $userdetails = User::where('id', $listwin['user_id'])->first();
+                    $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+                    ->where('lelongbid.nopembeli', $listwin['user_id'])
+                    ->where('lelongbid.kodcaw', $listwin['kodcaw'])
+                    ->where('lelongbidder.status_bidder', 1)
+                    ->where('lelongbid.lelong_id', $listwin['lelong_id'])
+                    ->get();
+                    foreach($SAGWin as $index2=>$sag)
+                    {
+                        // dd($detailspayment);
+                        $detailspayment  = null;
+                        if($sag['payment_id'] != null)
+                        {
+                            $detailspayment = Payment::where('id', $sag['payment_id'])->first();
+                            $total_payment = $total_payment + $detailspayment->total_payment;
+                            // dd($total_payment);
+                        }else
+                        {
+                            $total_payment = '0.00';
+                        }
+                        $listwinner[$index]['jenisbayaran'] = $detailspayment ;
+
+                    }
                     // dd($namawinner);
                     // $listwinner[$index]['namawinner'] = sizeof($namawinner);
-                    $listwinner[$index]['nama'] = $namawinner['name'];
+                    $listwinner[$index]['details'] = $userdetails; 
+                    $listwinner[$index]['nama'] = $userdetails['name'];
                     $listwinner[$index]['caw_code'] = $details1['caw_code'];
+                    $listwinner[$index]['totalPay'] = $total_payment;
+                    $detailsinfo[$index1]['nama'] = $userdetails;
                    
                 }
+                // $detailsinfo[$index1]['nama'] = $namawinner['name'];
+                $detailsinfo[$index1]['listwinner'] = $listwinner;
             // dd($listwinner[$index]['nama']);
             }
 
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 9083d022..6a24c074 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -49,6 +49,7 @@ use App\Models\TangguhLelong;
 use App\Models\Tetapan;
 use App\Models\TransaksiKeuntungan;
 use DateTime;
+// use Nexmo\Laravel\Facade\Nexmo;
 
 class LelongController extends Controller
 {
@@ -125,7 +126,7 @@ class LelongController extends Controller
     {
         $lelongDetails = Lelong::find($request->lelong_id);
         $cawanganLelong = CawanganLelong::with('cawangan')->where('caw_id', $request->cawangan)->where('lelong_id', $request->lelong_id)->first();
-        $lelongBidMaster = LelongBid::with('payment:norujukan,status_payment_opt,remark')
+        $lelongBidMaster = LelongBid::with(['payment:norujukan,status_payment_opt,remark', 'lelongBidderMenang:lelongbid_id,user_id'])
         ->where('lelong_id', $request->lelong_id)
             ->where('status_jual', 1)
             ->where('status_payment', 1)
@@ -141,6 +142,10 @@ class LelongController extends Controller
                 $lelongBidMaster[$index]['payment_method'] =  "BAYARAN ONLINE";
                 $lelongBidMaster[$index]['teller'] =  "LELONG ONLINE";
             }
+
+            $userDetails = User::find($lelongBid->lelongBidderMenang->user_id, ['name', 'nokp', 'alamat', 'notelbimbit']);
+            $lelongBidMaster[$index]['user_details'] =  $userDetails->toArray();
+
         }
 
         $lelongbid = $lelongBidMaster->pluck('id');
@@ -1932,7 +1937,14 @@ class LelongController extends Controller
 
                                 
                             }
-                            Mail::to($userdetails['email'])->send(new Pemenang($userdetails['name']));
+                            //noti emel
+                            // Mail::to($userdetails['email'])->send(new Pemenang($userdetails['name']));
+                            // //noti sms
+                            // Nexmo::message()->send([
+                            //     'to' => $userdetails['notelbimbit'],
+                            //     'from' => 'Sender',
+                            //     'text' => 'ArrahnBid-Tahniah Anda Berjaya Bidaan Lelongan Hari Ini, Sila Semak Dalam Pautan Ini. https://bid.arrahn.com.my'
+                            // ]);
                         }
                         else
                         {
@@ -1950,6 +1962,16 @@ class LelongController extends Controller
 
             }
         }
+         //hantar notifikasi kpd pembida
+         $notifikasi = LelongBid::where('lelong_id', '=', $lelong_id)->where('status_jual', '=', 1)
+         ->where('caw_id', '=', $cawid)
+         ->groupBy('nopembeli')->get();
+         // dd($notifikasi);
+         foreach ($notifikasi as $key => $noti) {
+             $userdetailsnoti = User::where('id', $noti['nopembeli'])->first();
+             // dd($userdetailsnoti);
+             Mail::to($userdetailsnoti['email'])->send(new Pemenang($userdetailsnoti['name']));
+         }
         $lelong->sts_lelong = 3; //siap jana pemenang
         $lelong->save();
 
@@ -2155,7 +2177,14 @@ class LelongController extends Controller
                             // dd("sni");
                             //sending notify emel kepada pembida
                         }
-                        Mail::to($userdetails['email'])->send(new Pemenang($userdetails['name']));
+                        //send email
+                        // Mail::to($userdetails['email'])->send(new Pemenang($userdetails['name']));
+                        // //send sms
+                        // Nexmo::message()->send([
+                        //     'to' => $userdetails['notelbimbit'],
+                        //     'from' => 'Sender',
+                        //     'text' => 'ArrahnBid-Tahniah Anda Pemenang ArrahnBid, sila semak dalam pautan ini. https://bid.arrahn.com.my'
+                        // ]);
                     } else {
                         $kalah = LelongBidder::where('id', '=', $bidder->id)
                         ->first();
@@ -2169,6 +2198,16 @@ class LelongController extends Controller
 
             }
         }
+        //hantar notifikasi kpd pembida
+        $notifikasi = LelongBid::where('lelong_id', '=', $lelong_id)->where('status_jual', '=', 1)
+        ->groupBy('nopembeli')->get();
+        // dd($notifikasi);
+        foreach ($notifikasi as $key => $noti) {
+            $userdetailsnoti = User::where('id', $noti['nopembeli'])->first();
+            // dd($userdetailsnoti);
+            Mail::to($userdetailsnoti['email'])->send(new Pemenang($userdetailsnoti['name']));
+        }
+
         $lelong->sts_lelong = 3; //siap jana pemenang
         $lelong->save();
 
@@ -2605,7 +2644,7 @@ class LelongController extends Controller
         $lelong = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
         ->select('lelong_id','tarikh_lelong','lelong.fasa','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')   
         ->groupBy('lelong_id')  
-        // ->where('lelong.sts_lelong', 3)  
+        ->where('lelong.sts_lelong', 0)  
         ->get()->toArray();
 
         foreach($lelong as $laporan)
@@ -2721,55 +2760,30 @@ class LelongController extends Controller
         $lelongasal = Lelong::where('id','=',$lelongidasal)->first();
         $cawanganasal = CawanganLelong::join('cawangan','cawangan.id','=', 'cawangan_lelong.caw_id')
         ->where('cawangan_lelong.lelong_id','=',$lelongidasal)
-        ->where('cawangan.caw_code','=',$request->caw)
         ->get();
-        // dd($cawanganasal);
-        // dd( $lelongidbaru);
-
-        // $lelongnew = new Lelong();
-        // $lelongnew->tarikh_lelong = $tarikhlelongbaru;
-        // $lelongnew->harga_emas_asas = $lelongasal->harga_emas_asas;
-        // $lelongnew->jbg = $lelongasal->jbg;
-        // $lelongnew->cajlelong = $lelongasal->cajlelong;
-        // $lelongnew->fasa = $lelongasal->fasa;
-        // $lelongnew->kali = $lelongasal->kali;
-        // $lelongnew->save();
-
-          
-        // foreach($lelkarat as $lelongKarat)
-        // {
-        //     $lelkarat = new LelKarat;
-        //     $lelkarat->lelong_id = $lelongnew->id;
-        //     $lelkarat->karat = $lelongKarat->karat;
-        //     $lelkarat->keterangan = $lelongKarat->keterangan;
-        //     $lelkarat->harga = $lelongKarat->harga;
-        //     $lelkarat->harga2 = $lelongKarat->harga2;
-        //     $lelkarat->save();
-        // }
-
-
-        //tukartarikh ID lelong
-       if($request->caw)
-        {
+       
             // dd($request->caw);
-            $caw = Cawangan::whereIn('caw_code',$request->caw)->get();
+            // $caw = Cawangan::whereIn('caw_code',$request->caw)->get();
             
             // dd($caw);
-            foreach($caw as $index=>$cawtukartarikh){ 
-                // dd($cawpindah->caw_id);
-           
-            // dd($cawtukartarikh->caw_id);
+            foreach($cawanganasal as $index=>$cawtukartarikh)
+            { 
+                $namacaw = CawanganLelong::join('cawangan','cawangan.id','=','cawangan_lelong.caw_id')
+                ->where('cawangan_lelong.lelong_id','=',$lelongidasal)
+                ->where('cawangan_lelong.caw_id','=',$cawtukartarikh->caw_id)
+                ->select('cawangan.caw_code')
+                ->first();
                 
             $caw_tukartarikh = Lelong::where('id', $request->lelongidasal)->first();
             $caw_tukartarikh->tarikh_lelong = $tarikhlelongbaru;
             $caw_tukartarikh->update();
 
             $surat = LelongBid::where('lelong_id','=',$lelongidasal)
-            ->where('kodcaw','=',$request->caw)
+            // ->where('kodcaw','=',$request->caw)
             ->get(); 
             // dd($surat); 
 
-            $suratcaw = $surat->where('kodcaw','=',$cawtukartarikh->caw_code)->all();
+            $suratcaw = $surat->all();
             foreach(array_chunk($suratcaw,100) as $data_chunk)
             {
                 //dd($data);
@@ -2782,12 +2796,8 @@ class LelongController extends Controller
                 }
             }
            
-        }
-        }
-        else
-        {
-        // dd('error');
-        }
+            }
+       
 
         return redirect()->route('lelong.tukartarikhlelong');
     }
@@ -3085,6 +3095,7 @@ class LelongController extends Controller
                         $caw_pindahsag = LelongBid::where('norujukan', $data->norujukan)
                         ->where('status_jual','=', 0)->first();
                         $caw_pindahsag->lelong_id = $request->lelongidbaru;
+                        $caw_pindahsag->t_lelong = $request->tarikhlelongbaru;
                         $caw_pindahsag->update();
                 }
             }
@@ -3175,9 +3186,10 @@ class LelongController extends Controller
                    {
                             //dd($simulasi->id);
                             $caw_lelsag = LelongBid::where('norujukan', $data->norujukan)
-                            ->first();
+                            ->where('status_jual','=', 0)->first();
                             // dd($caw_lelsag);
                             $caw_lelsag->lelong_id = $lelong1->id;
+                            $caw_lelsag->t_lelong = $request->tarikhlelongbaru;
                             $caw_lelsag->update();
 
                     }
diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index 4864ba24..8f80c0ba 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -1634,6 +1634,7 @@ class MarhunController extends Controller
 
         $cawangan = Pengesahan::where('pengesahan.lelong_id', $id)
         ->where('pengesahan.status', 1)
+        ->where('pengesahan.norujukan', 'LIKE', '%'.$user->kodcaw.'%')
         ->whereNotNull('pengesahan.disahkan_oleh')
         ->select('pengesahan.lelongbid_id','pengesahan.diminta_oleh','pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id')
         ->orderBy('pengesahan.lelongbid_id')
@@ -2037,6 +2038,8 @@ class MarhunController extends Controller
     {
         $user = Auth::user();
         $arrayinfo = [];
+        $arraydetails0 = [];
+        $arraydetails1 = [];
 
         $lelong = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
             ->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
@@ -2045,35 +2048,60 @@ class MarhunController extends Controller
             ->select('lelong_id', 'tarikh_lelong', 'cawangan_lelong.masatamat_lelong', 'harga_emas_asas', 'jbg', 'cajlelong', 'sts_lelong')
             ->get()
             ->toArray();
+
+        $currentdate = Carbon::now();
+        $currentdate = $currentdate->toDateTimeString();
+
+        $tarikhlelong_semasa = $currentdate;
+
+        $lelongAll = Lelong::with('cawangan')->get();
+
+
         if($lelong){
-        foreach ($lelong as $info) {
+        foreach ($lelong as $info) 
+        {
             $lelong_id = $info['lelong_id'];
-            // dd( $lelong_id );
 
             $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
             ->where('lelongbidder.status_bidder', 1)
+            ->where('lelongbidder.status_payment', 1)
             ->where('lelongbid.kodcaw',$user->kodcaw)
-            // ->where('lelongbid.lelong_id', $info->lelong_id)
+            ->where('lelongbid.lelong_id', $lelong_id)
             ->select('lelongbidder.user_id')
             ->groupBy('lelongbidder.user_id')
             ->get()->toArray();
+
            
             foreach($listwinner as $index1=>$winner){
 
                 $userdetails = User::where('id', $winner['user_id'])->first();
                 $listwinner[$index1]['details'] = $userdetails;
             }
-            }
 
             $detailsinfo = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id')
-                ->where('lelong_id', $info['lelong_id'])
-                ->where('cawangan.caw_code', $user->kodcaw)
-                ->get()
-                ->toArray();
+            ->where('lelong_id', $info['lelong_id'])
+            ->where('cawangan.caw_code', $user->kodcaw)
+            ->get()
+            ->toArray();
             array_push($arrayinfo, ['info' => $info, 'detailsinfo' => $detailsinfo, 'listwinner' => $listwinner]);
-            }
+        }
 
-        return view('marhun.senarailelongscanjual', compact('lelong', 'arrayinfo'));
+        }
+        foreach ($arrayinfo as $lelong) {
+           
+
+            if ($info['tarikh_lelong'] == $tarikhlelong_semasa) {
+                array_push($arraydetails0, $lelong);
+            } 
+            else
+            {
+                array_push($arraydetails1, $lelong);
+            } 
+        }
+        
+
+
+        return view('marhun.senarailelongscanjual', compact('lelong', 'arrayinfo','arraydetails0','arraydetails1','lelongAll'));
     }
 
     public function listScanBarcodejual($lelong_id)
diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php
index 0b23095b..390d78cd 100644
--- a/app/Http/Controllers/Mobile/LelongMobileController.php
+++ b/app/Http/Controllers/Mobile/LelongMobileController.php
@@ -75,7 +75,9 @@ class LelongMobileController extends Controller
         if (isset($activeLelong)) {
             $getKarat = LelKarat::where('lelong_id', '=' ,$activeLelong['id'])->get();
             
-            $updatedDateTime = $getKarat[0]['updated_at']->toDateTimeString();
+            $date_convert = strtotime($getKarat[0]['updated_at']);
+            $updatedDateTime = date("d-m-Y H:i", $date_convert);
+
             return response()->json([
                 'success' => true,
                 'karat' => $getKarat,
@@ -211,7 +213,12 @@ class LelongMobileController extends Controller
                 $total_berat = 0;
                 foreach ($lelongBidder as $index1 => $data) {
                     $fileMarhun = FileMarhun::where('lelongbid_id', $data['id'])->get();
-                    $lelongBidder[$index1]['filemarhun'] = $fileMarhun;
+                    if ($fileMarhun->isNotEmpty()) {
+                        $lelongBidder[$index1]['filemarhun'] = $fileMarhun;
+                    }
+
+                    $date_convert = strtotime($data['masa_bidaan']);
+                    $lelongBidder[$index1]['masa_bidaan'] = date("d-m-Y H:i", $date_convert);
 
                     $total_hargabida += $data['hargabida'];
                     $total_berat += $data['berat'];
@@ -222,7 +229,8 @@ class LelongMobileController extends Controller
                 $groupCawangan[$index]['total_bidaan'] = number_format((float)$total_hargabida, 2, '.', '');
                 $groupCawangan[$index]['lelongbid'] = $lelongBidder;
             }
-
+        }
+        if ($groupCawangan) {
             return response()->json([
                 'success' => true,
                 'lelongbidder' => $groupCawangan
@@ -433,12 +441,25 @@ class LelongMobileController extends Controller
     {
         $lelong = Lelong::where('sts_lelong', '=', 1)->first();
         if ($lelong) {
+            $date_convert = strtotime($lelong->masatamat_lelong);
+            $lelong->masatamat_lelong = date("H:i", $date_convert);
+
             return response()->json(['success' => true, 'lelong' => $lelong]);
         } else {
             return response()->json(['success' => false,]);
         }
     }
 
+    public function itemInCart(Request $request)
+    {
+        $cart = Cart::where('user_id', $request->user_id)->count();
+        if ($cart) {
+            return response()->json(['success' => true, 'cart' => $cart]);
+        } else {
+            return response()->json(['success' => false,]);
+        }
+    }
+
     public function searchLelongByCawangan(Request $request){
 
         $currentdate = Carbon::now();
@@ -518,6 +539,43 @@ class LelongMobileController extends Controller
         // dd($winner);
         return response()->json($data);
     }
+
+    public function resultInCawangan(Request $request)
+    {
+
+        $user = User::find($request->user_id, ['name', 'nokp']);
+        
+        $lelongbid = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
+        ->where('lelongbid.lelong_id', $request->lelong_id)
+            ->where('lelongbidder.user_id', $request->user_id)
+            ->where('lelongbidder.status_bidder', 1)
+            ->where('lelongbid.kodcaw', $request->kodcaw)
+            ->select(
+                'lelongbid.id AS id',
+                'lelongbidder.id AS bidder_id',
+                'lelongbid.norujukan',
+                'lelongbid.kodcaw',
+                'lelongbidder.hargabida',
+                'lelongbid.marhun',
+                'lelongbid.berat',
+            )
+            ->get();
+
+        foreach ($lelongbid as $index => $data) {
+            $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $data->id)->get();
+            foreach ($lelongbidmarhun as $index1 => $lelbidmarhun) {
+                $jenis_emas = JenisEmas::where('marhun', '=', $lelbidmarhun->marhun)->select('descpt')->first();
+                $lelongbidmarhun[$index1]['marhun_desc'] = $jenis_emas->descpt;
+            }
+            $lelongbid[$index]['lelongbidmarhun'] = $lelongbidmarhun->toArray();
+        }
+        // dd($lelongbid->toArray(), $user->toArray());
+        return response()->json([
+            'success' => true,
+            'user' => $user,
+            'lelongbid' => $lelongbid
+        ]);
+    }
    
     public function bidresults($user_id, $lelong_id)
     {
@@ -530,10 +588,12 @@ class LelongMobileController extends Controller
             )
             ->groupBy('lelongbid.kodcaw')
             ->get();
-            // dd($sag->toArray());
         $getTarikhLelong = Lelong::where('id', $lelong_id)->select('tarikh_lelong')->first();
         $tarikhLelong = $getTarikhLelong->tarikh_lelong;
 
+        $tarikhLelong = strtotime($tarikhLelong);
+        $tarikhLelong = date("d-m-Y", $tarikhLelong);
+
         $data = [];
 
         foreach ($sag as $index1 => $kodcaw) {
@@ -543,11 +603,14 @@ class LelongMobileController extends Controller
             ->where('lelongbidder.status_bidder', 1)
             ->where('lelongbid.kodcaw', $kodcaw->kodcaw)
             ->select(
-                'lelongbidder.id AS id',
+                'lelongbid.id AS id',
+                'lelongbidder.id AS bidder_id',
                 'lelongbid.norujukan AS norujukan',
                 'lelongbid.kodcaw AS kodcaw',
                 'lelongbidder.hargabida AS total_payment',
                 'lelongbid.marhun AS marhun',
+                'lelongbid.hargaasas',
+                'lelongbid.berat',
                 'lelongbidder.status_payment')
             ->get();
             
@@ -557,21 +620,33 @@ class LelongMobileController extends Controller
             $namaCawangan = $getCawangan->caw_name;
             $kodCawangan = $getCawangan->caw_code;
 
-            $sag = $groupBycaw;
-
+            
             $total_hargabida = 0;
-            foreach ($groupBycaw as $hargabida) {
-                $totalbida = Lelongbidder::where('id', $hargabida['id'])
+            $status_payment_cawangan = 1;
+            foreach ($groupBycaw as $index => $hargabida) {
+                $fileMarhun = FileMarhun::where('lelongbid_id', $hargabida->id)->get();
+                if ($fileMarhun->isNotEmpty()) {
+                    $groupBycaw[$index]['filemarhun'] = $fileMarhun;
+                }
+                $marhun = LelongBidMarhun::where('lelongbid_id', '=', $hargabida->id)->get()->toArray();
+                $groupBycaw[$index]['lelongbidmarhun'] = $marhun;
+
+                $totalbida = Lelongbidder::where('id', $hargabida->bidder_id)
                 ->select('hargabida')
                 ->first();
+                $groupBycaw[$index]['hargabida'] = number_format($totalbida['hargabida'], 2, '.', ',');
                 $total_hargabida = $total_hargabida + $totalbida['hargabida'];
+                if($hargabida->status_payment == null) {
+                    $status_payment_cawangan = null;
+                }
             }
-
+            $sag = $groupBycaw;
             array_push($data, [
                 'kodcaw' => $kodCawangan,
                 'cawangan' => $namaCawangan,
                 'sag' => $sag,
-                'total_hargabida' => $total_hargabida
+                'total_hargabida' => number_format($total_hargabida, 2, '.', ','),
+                'status_payment_cawangan' => $status_payment_cawangan
             ]);
         }
 
@@ -601,6 +676,9 @@ class LelongMobileController extends Controller
         $getTarikhLelong = Lelong::where('id', $lelong_id)->select('tarikh_lelong')->first();
         $tarikhLelong = $getTarikhLelong->tarikh_lelong;
 
+        $date_convert = strtotime($tarikhLelong);
+        $tarikhLelong = date("d-m-Y", $date_convert);
+
         $data = [];
 
         foreach ($sag as $index1 => $kodcaw) {
@@ -773,6 +851,19 @@ class LelongMobileController extends Controller
                 'cawangan_lelong.masatamat_lelong',
             )
             ->get();
+
+        foreach($lelong as $index => $data)
+        {
+            if($data['masamula_lelong'] != null)
+            {
+            $date_convert = strtotime($data['masamula_lelong']);
+            $lelong[$index]['masamula_lelong'] = date("H:i", $date_convert);
+
+            $date_convert_2 = strtotime($data['masatamat_lelong']);
+            $lelong[$index]['masatamat_lelong'] = date("H:i", $date_convert_2);
+            }
+        }
+
         if ($lelong->isNotEmpty()) {
             return response()->json([
                 'success' => true,
@@ -838,6 +929,12 @@ class LelongMobileController extends Controller
             ->orderBy('lelong.tarikh_lelong', 'ASC')
             ->get()->toArray();
 
+        foreach($lelong as $index => $data)
+        {
+            $date_convert = strtotime($data['tarikh_lelong']);
+            $lelong[$index]['tarikh_lelong'] = date("d-m-Y", $date_convert);
+        }
+
         if ($lelong) {
             return response()->json([
                 'success' => true,
@@ -1027,11 +1124,16 @@ class LelongMobileController extends Controller
 
     public function getInvoiceId(Request $request) {
         $invoice = Invoice::where('user_id', $request->user_id)->where('lelong_id', $request->lelong_id)->first();
+        $lelong = Lelong::find($request->lelong_id);
+
+        $date_convert = strtotime($lelong->tarikh_lelong);
+        $lelong->tarikh_lelong = date("d/m/Y", $date_convert);
 
         if ($invoice) {
             return response()->json([
                 'success' => true,
                 'invoice' => $invoice,
+                'lelong' => $lelong
             ]);
         } else {
             return response()->json([
@@ -1071,6 +1173,9 @@ class LelongMobileController extends Controller
 
             }
 
+            $date_convert = strtotime($tarikhLelong->tarikh_lelong);
+            $lelong[$index]['tarikh_lelong'] = date("d-m-Y", $date_convert);
+
             $lelong[$index]['jumlah'] = number_format($jumlah, 2, '.', ',');
             $lelong[$index]['status'] = $status;
         }
diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php
index 86908cec..17a87383 100644
--- a/app/Http/Controllers/PembidaController.php
+++ b/app/Http/Controllers/PembidaController.php
@@ -823,6 +823,164 @@ class PembidaController extends Controller
         return view('home.kaunterpembayaran',compact('listwinner','lelong_id','kodcaw'));
 
     }
+
+    public function statuspembayaran(Request $request)
+    {
+        $kodcaw = $request->kodcaw;
+        
+        
+        $sumtotalpayment = 0;
+        $arrayinfo = [];
+
+        $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        ->select('lelong_id','tarikh_lelong','lelong.fasa','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->distinct()
+        ->orderBy('lelong_id')
+        ->where('lelong.sts_lelong', 3)     
+        ->get()
+        ->toArray();
+        // dd($lelong);
+
+        foreach($lelong as $details)
+        {
+            $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            ->select('cawangan_lelong.lelong_id','cawangan_lelong.caw_id','caw_name','cawangan.caw_code','cawangan_lelong.export_data_sts')
+            ->where('lelong_id',$details['lelong_id'])    
+            ->distinct()
+            ->orderBy('lelong_id')
+            ->get();
+           
+            array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
+           
+            foreach($detailsinfo as $index1=>$cal){
+                $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+                // ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
+                ->where('lelongbidder.status_bidder', 1)
+                // ->where('payment.status', 1)
+                // ->where('lelongbidder.status_payment', 1)
+                ->where('lelongbid.lelong_id', $details['lelong_id'])
+                ->where('lelongbid.kodcaw', $cal['caw_code'])
+                ->select('lelongbidder.user_id', 'lelongbid.lelong_id','lelongbid.kodcaw')
+                ->groupBy('lelongbidder.user_id')
+                ->get();
+                foreach($listwinner as $index=>$listing){
+                    $total_payment = 0;
+                    $userdetails = User::where('id', $listing['user_id'])->first();
+                    $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+                    ->where('lelongbid.nopembeli', $listing['user_id'])
+                    ->where('lelongbid.kodcaw', $listing['kodcaw'])
+                    ->where('lelongbidder.status_bidder', 1)
+                    ->where('lelongbid.lelong_id', $listing['lelong_id'])
+                    ->get();
+                    foreach($SAGWin as $index2=>$sag)
+                    {
+                        // dd($detailspayment);
+                        $detailspayment  = null;
+                        if($sag['payment_id'] != null)
+                        {
+                            $detailspayment = Payment::where('id', $sag['payment_id'])->first();
+                            $total_payment = $total_payment + $detailspayment->total_payment;
+                            // dd($total_payment);
+                        }else
+                        {
+                            $total_payment = '0.00';
+                        }
+
+                    }
+                    $listwinner[$index]['details'] = $userdetails; 
+                    $listwinner[$index]['total_surat'] = sizeof($SAGWin);
+                    $listwinner[$index]['totalBid'] = $SAGWin->sum('hargabida');
+                    $listwinner[$index]['totalPay'] = $total_payment;
+                    $listwinner[$index]['jenisbayaran'] = $detailspayment ;
+                }
+               
+                $detailsinfo[$index1]['nama'] = $userdetails;
+                $detailsinfo[$index1]['listwinner'] = $listwinner;
+            }
+        }
+        // $sumtotalpayment += $total_payment;
+        // dd($sumtotalpayment);
+        // dd($arrayinfo);
+        return view('pembida.statuspembayaran',compact('listwinner','lelong','arrayinfo','detailsinfo'));
+    }
+
+    public function statuspembayaranbypembida(Request $request)
+    {
+        $kodcaw = $request->kodcaw;
+        
+        
+       
+        $arrayinfo = [];
+        
+        $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        ->select('lelong_id','tarikh_lelong','lelong.fasa','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->distinct()
+        ->orderBy('lelong_id')
+        ->where('lelong.sts_lelong', 3)     
+        ->get()
+        ->toArray();
+        // dd($lelong);
+        
+        foreach($lelong as $details)
+        {
+            $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+            ->where('lelongbidder.status_bidder', 1)
+            ->where('lelongbid.lelong_id', $details['lelong_id'])
+            ->select('lelongbidder.user_id', 'lelongbid.lelong_id','lelongbid.kodcaw')
+            ->groupBy('lelongbid.nopembeli')
+            ->get();
+            // dd($listwinner);
+           
+            array_push($arrayinfo,['detail'=>$details, 'listwinner'=>$listwinner]);
+           
+            foreach($listwinner as $index1=>$cal){
+                   
+                   
+                    $userdetails = User::where('id', $cal['user_id'])->first();
+                    $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+                    ->where('lelongbid.nopembeli', $cal['user_id'])
+                    // ->where('lelongbid.kodcaw', $cal['kodcaw'])
+                    ->where('lelongbidder.status_bidder', 1)
+                    ->where('lelongbid.lelong_id', $cal['lelong_id'])
+                    ->get();
+                    // dd($SAGWin);
+                    $total_payment = 0;
+                    foreach($SAGWin as $index2=>$sag)
+                    {
+                        // dd($detailspayment);
+                        $detailspayment  = null;
+                        if($sag['payment_id'] != null)
+                        {
+                            $detailspayment = Payment::where('id', $sag['payment_id'])
+                            ->get();
+                            $total_payment += $detailspayment->sum('total_payment');
+                            // dd($total_payment);
+                        }else
+                        {
+                            $total_payment = '0.00';
+                        }
+
+                    }
+                    $cawanganbidder = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+                    ->select('cawangan_lelong.lelong_id','cawangan_lelong.caw_id','caw_name','cawangan.caw_code','cawangan_lelong.export_data_sts')
+                    ->where('lelong_id',$details['lelong_id'])  
+                    ->where('cawangan.caw_code',$cal['kodcaw'])    
+                    ->distinct()
+                    ->orderBy('lelong_id')
+                    ->get();
+                    foreach($cawanganbidder as $index=>$listing){
+                        
+                        $listwinner[$index]['cawangan'] = $cawanganbidder;
+                    }
+                    $listwinner[$index1]['details'] = $userdetails; 
+                    $listwinner[$index1]['total_surat'] = sizeof($SAGWin);
+                    $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
+                    $listwinner[$index1]['totalPay'] = $total_payment;
+                    $listwinner[$index1]['jenisbayaran'] = $detailspayment ;
+            }
+        }
+        return view('pembida.statuspembayaranbypembida',compact('listwinner','lelong','arrayinfo','cawanganbidder'));
+    }
     
 }
        
\ No newline at end of file
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 267b06c5..907bc39d 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -93,7 +93,7 @@ class ReportController extends Controller
         ->find($lelong_id);
 
         $cawangan = $test->cawangan
-        ->where('caw_code','=',$kodcaw);
+        ->where('caw_code','=',$kodcaw)->first();
         // dd($cawangan[0]['caw_name']);
 
         $lelong_bid = $test->lelongBid
@@ -197,19 +197,17 @@ class ReportController extends Controller
             $lelongs[$index1]['detailmarhun']=$marhun;
         
         }
-
         array_push($arraycaw,[
             'berat'=>$berat,
             'harga'=>$harga,
             'n_marhun'=>$nilai_marhun,
-            'hargaasas'=>$hargaasas
-   
+            'hargaasas'=>$hargaasas,
         ]);
 
       
 
           
-        $pdf = PDF::loadView('pdf.listlelongdetails',compact('lelongs','arraycaw','total_nmarhun','total_berat','total_harga','total_hargaasas','arrayinfo','nilai_marhun'
+        $pdf = PDF::loadView('pdf.listlelongdetails',compact('lelongs','arraycaw','total_nmarhun','total_berat','total_harga','total_hargaasas','arrayinfo'
                                                         ))->setPaper('a4', 'potrait');
         
         return $pdf->download('Senarai Lelong Details.pdf');
@@ -301,6 +299,72 @@ class ReportController extends Controller
    
 
 
+        // $pdf = PDF::loadView('pdf.pdfsenarailapbidaan', compact('lelongid','arraydetails','lelong_id','lelongid','cawangan','arrayinfocaw','total_hargaasas','total_hargabida'))
+        // ->setPaper('a4', 'potrait');
+            
+        // return $pdf->download('Senarai Nama Bidaan Pembida.pdf');
+
+        return view('lelong.senarailapbidaanpembida',compact('kodcaw','lelongid','arraydetails','lelong_id','lelongid','cawangan','arrayinfocaw','total_hargaasas','total_hargabida'));
+
+
+        
+        
+    }
+
+    public function senarailapbidaanpdf ($lelong_id, $kodcaw){
+
+    
+        $arraydetails = [];
+        $arrayinfocaw = [];
+        $total_hargaasas = 0;
+        $total_hargabida = 0;
+
+        $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
+        ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+        ->where('cawangan_lelong.lelong_id','=',$lelong_id)
+        ->where('cawangan.caw_code',$kodcaw)
+        ->select('lelong_id','tarikh_lelong','lelong.fasa')
+        ->groupBy('lelong_id')
+        ->get();
+
+        foreach($lelongid as $laporancaw)
+        {
+            $cawangan = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            ->where('lelong_id',$laporancaw['lelong_id'])
+            ->where('cawangan.caw_code',$kodcaw)
+            ->get()
+            ->toArray();
+            array_push($arrayinfocaw,['laporancaw' => $laporancaw,'cawangan' => $cawangan]);
+        }
+        
+
+        $laporanpembida= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
+        ->select('lelongbid_id','norujukan','hargaasas')
+        ->where('lelongbid.kodcaw',$kodcaw)
+        ->where('lelongbid.lelong_id','=',$lelong_id)
+        ->groupBy('lelongbid_id')
+        ->get()
+        ->toArray();
+          
+        foreach( $laporanpembida as $index1=>$totlappembida){
+
+            $total_hargaasas = $total_hargaasas + $totlappembida['hargaasas'];
+            // $total_hargabida = $total_hargabida + $totlappembida['hargabida'];
+
+        }
+        foreach($laporanpembida as $laporan)
+        {
+            $details = LelongBidder::where('lelongbid_id',$laporan['lelongbid_id'])
+            ->orderBy('hargabida','desc')
+            ->orderBy('masa_bidaan','asc')
+            ->get()
+            ->toArray();
+            array_push($arraydetails,['laporan' => $laporan,'details' => $details]);
+        }
+
+   
+
+
         $pdf = PDF::loadView('pdf.pdfsenarailapbidaan', compact('lelongid','arraydetails','lelong_id','lelongid','cawangan','arrayinfocaw','total_hargaasas','total_hargabida'))
         ->setPaper('a4', 'potrait');
             
@@ -908,6 +972,7 @@ class ReportController extends Controller
 
         $cawangan = Pengesahan::where('pengesahan.lelong_id', $lelong_id)
         ->where('pengesahan.status', 1)
+        ->where('pengesahan.norujukan', 'LIKE', '%'.$kodcaw.'%')
         ->whereNotNull('pengesahan.disahkan_oleh')
         ->select('pengesahan.lelongbid_id','pengesahan.diminta_oleh','pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id')
         ->orderBy('pengesahan.lelongbid_id')
diff --git a/app/Models/LelongBid.php b/app/Models/LelongBid.php
index af22f092..f7684318 100644
--- a/app/Models/LelongBid.php
+++ b/app/Models/LelongBid.php
@@ -86,4 +86,9 @@ class LelongBid extends Model
     {
         return $this->hasMany(ScanSemak::class, 'lelongbid_id', 'id')->whereNotNull('serahkpdpembida');
     }
+
+    public function lelongBidderMenang()
+    {
+        return $this->hasOne(LelongBidder::class, 'lelongbid_id', 'id')->where('status_bidder', 1);
+    }
 }
diff --git a/app/Models/Staff.php b/app/Models/Staff.php
new file mode 100644
index 00000000..0ecf8e80
--- /dev/null
+++ b/app/Models/Staff.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Staff extends Model
+{
+    use HasFactory;
+
+    protected $table = 'staffs';
+
+    protected $fillable = [
+        
+    ];
+}
diff --git a/app/Models/User.php b/app/Models/User.php
index 293389b5..b6cf6a5c 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -30,7 +30,7 @@ class User extends Authenticatable
         'nokp',
         'bank_acc_pembeli',
         'bank_acc_no_pembeli',
-        'alamat_rumah',
+        'alamat',
         'notelpejabat',
         'notelbimbit',
         'note',
diff --git a/config/laravel-webp.php b/config/laravel-webp.php
new file mode 100644
index 00000000..2eaa2194
--- /dev/null
+++ b/config/laravel-webp.php
@@ -0,0 +1,58 @@
+<?php
+
+return [
+    /*
+    |--------------------------------------------------------------------------
+    | Default Quality
+    |--------------------------------------------------------------------------
+    |
+    | This is a default quality unless you provide while generation of the WebP
+    |
+    */
+    'default_quality' => 70,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Default Driver
+    |--------------------------------------------------------------------------
+    |
+    | This is a default image processing driver. Available: ['cwebp', 'php-gd']
+    |
+    */
+    'default_driver' => 'php-gd',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Drivers
+    |--------------------------------------------------------------------------
+    |
+    | Available drivers which can be selected
+    |
+    */
+    'drivers' => [
+
+        /*
+        |--------------------------------------------------------------------------
+        | Cwebp Driver
+        |--------------------------------------------------------------------------
+        |
+        | If you choose cwebp driver it is required to specify the path to the executable.
+        |
+        */
+        'cwebp' => [
+            'path' => '/usr/local/bin/cwebp',
+        ],
+
+        /*
+        |--------------------------------------------------------------------------
+        | Cwebp Driver
+        |--------------------------------------------------------------------------
+        |
+        | If you choose PHP GD driver no configuration is necessary.
+        |
+        */
+        'php-gd' => [
+            //
+        ],
+    ],
+];
diff --git a/public/css/neon.css b/public/css/neon.css
index 0145998c..b3b6690d 100644
--- a/public/css/neon.css
+++ b/public/css/neon.css
@@ -60,7 +60,7 @@ article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
   display: block; }
 
 .bg-image {
-  background-image: url("/img/bg1.jpg");
+  background-image: url("/img/background_2.jpg");
   background-position: top left;	
   background-size: 100%;	
   background-repeat: repeat;
diff --git a/public/img/background_2.jpg b/public/img/background_2.jpg
new file mode 100644
index 00000000..01654b67
Binary files /dev/null and b/public/img/background_2.jpg differ
diff --git a/public/js/marhun-photo-viewer.js b/public/js/marhun-photo-viewer.js
index 5af3bb23..46a73aa0 100644
--- a/public/js/marhun-photo-viewer.js
+++ b/public/js/marhun-photo-viewer.js
@@ -2,8 +2,12 @@ function marhunPhotoViewerFactory(button_selector) {
 
     return {
         attachPhotoViewer: function () {
+
+            if(! document.querySelector(button_selector)){
+                return;
+            };
+
             document.querySelector(button_selector).addEventListener('click', (event) => {
-            // document.querySelector('a.btn-view-marhun-photo').addEventListener('click', (event) => {
                 event.preventDefault();
 
                 const image = new Image();
diff --git a/resources/views/account/listbayaranonlinesah.blade.php b/resources/views/account/listbayaranonlinesah.blade.php
index e3296645..f9cf6d52 100644
--- a/resources/views/account/listbayaranonlinesah.blade.php
+++ b/resources/views/account/listbayaranonlinesah.blade.php
@@ -35,7 +35,7 @@
                     </tr>
             </thead>
             <tbody>
-                @foreach($listwinner as $winner)
+                @forelse($listwinner as $winner)
                         <tr>
                             <td> {{ $loop->iteration }} </td>
                             <td class="text-left">{{ $winner['details']['name']}}</td>
@@ -46,7 +46,11 @@
                             {{-- <td>{{ number_format($winner['totalBid'], 2, '.', ',')}}</td> --}}
                             <td>{{ $winner['disahkanoleh']['name']}}</td>
                         </tr>
-                @endforeach
+                        @empty
+                        <tr>
+                            <td colspan="7">No Data</td>
+                        </tr>
+                @endforelse
             </tbody>
         </table>
         {{-- <div class="modal-footer" style="margin-top:2%;">
diff --git a/resources/views/account/sahsagonline.blade.php b/resources/views/account/sahsagonline.blade.php
index f0d219d1..4f1f9101 100644
--- a/resources/views/account/sahsagonline.blade.php
+++ b/resources/views/account/sahsagonline.blade.php
@@ -65,7 +65,7 @@
                                 </tr>
                         @endforeach
                     </tbody> --}}
-                <tr>
+                {{-- <tr>
                     
                     <td colspan="2"><b> No.Resit</b></td>
                     <td colspan="2"></td>
@@ -73,9 +73,9 @@
                     <td></td>
                     <td></td>
                     <td></td>
-                </tr>
+                </tr> --}}
                 <tr>
-                    
+                    {{-- {{dd($senaraisag->sum('hargabida'))}} --}}
                     <td colspan="2"><b> Jumlah Bayaran</b></td>
                     <td colspan="2"></td>
                     <td><b>RM{{ number_format($senaraisag->sum('hargabida'), 2, '.', ',') }}</b></td>
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index 7eb3930b..8983eda1 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -108,7 +108,7 @@
                     @endphp
 
                     @if(count($arrayinfomutu)> 0)
-                        KELULUSAN UBAH MARHUN
+                        <b>KELULUSAN SEMAKAN MARHUN</b>
                         <table class="table table-striped  table-xl text-center" id="tablelelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
@@ -315,7 +315,7 @@
                             </div>
                         </div>
                         @if(count($arrayinfomenang)> 0)
-                        SENARAI PEMENANG BIDAAN MENGIKUT CAWANGAN
+                        <b>SENARAI PEMENANG BIDAAN MENGIKUT CAWANGAN</b>
                         <table class="table table-bordered  table-xl text-center" id="senarailelongonline" style="width:100%">
                             <thead class="bg-primary text-white">
                                     <tr>
@@ -323,10 +323,9 @@
                                         <th>Batch Lelong</th>
                                         <th>Tarikh Lelong</th>
                                         <th>Cawangan</th>
-                                        <th>Status Export</th>
-                                        <th>Harga Emas Semasa</th>
-                                        <th>Tempoh</th>
-                                        <th>Caj Lelong</th>
+                                        <th>Jumlah Bayaran(RM)</th>
+                                        <th>Jenis Bayaran</th>
+                                        <th>Status Bayaran</th>
                                         <th>Status Lelong</th>
                                     </tr>
                             </thead>
@@ -342,24 +341,81 @@
                                     @endphp</td>
                                     <td class="text-left">
                                         @foreach($lel['detailsinfo'] as $details)
-                                        <a class="btn m-1 btn-primary" href=" {{ route('pembida.kaunterpembayaran', ['lelong_id'=>$lel['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
-                                       <span class="m-2">{{ $details['caw_name']}}
-                                        </span><br>
+                                        <a class="btn btn-info btn-sm" href=" {{ route('pembida.senaraipemenangbycaw', ['lelong_id'=>$lel['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
+                                        <span class="m-2"><b>{{ $details['caw_name']}}</b>
+                                        </span><br> 
+                                        {{-- {{dd($listwinner)}} --}}
+                                            @forelse($details['listwinner'] as $winner)
+                                            <i class="fas fa-caret-right"></i> {{ $winner['details']['name'] }}
+                                            <br>
+                                            @empty
+                                            - <br>
+                                            @endforelse
                                         @endforeach
                                     </td>
-                                    <td class="text-left">
+                                
+                                    <td class="text-right">
                                         @foreach($lel['detailsinfo'] as $details)
-                                        <span class="m-2"> @if($details['export_data_sts'] == '1')
-                                        <i class="far fa-flag"></i> Selesai Export
-                                        
-                                        @endif
-                                    
+                                        <a href=""></a>
+                                        <span class="m-2">
                                         </span><br>
+                                            @forelse($details['listwinner'] as $winner)
+                                            {{ number_format($winner['totalPay'], 2, '.', ',') }}
+                                            <br>
+                                            @empty
+                                            - <br>
+                                            @endforelse                        
+                                        @endforeach
+                                    </td>
+                                    <td class="text-center">
+                                        @foreach($lel['detailsinfo'] as $details)
+                                        <a href=""></a>
+                                        <span class="m-2">
+                                        </span><br>
+                                        
+                                            @forelse($details['listwinner'] as $winner)
+                                            @if($winner['jenisbayaran'] != NULL)
+                                        {{-- {{ dump($winner['jenisbayaran'])}} --}}
+                                                @if($winner['jenisbayaran']['status_payment_opt'] == 1)
+                                                TUNAI
+                                                @elseif($winner['jenisbayaran']['status_payment_opt'] == 2)
+                                                FPX
+                                                @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
+                                                KAUNTER BANK/CDM
+                                                
+                                                @endif
+                                            @else
+                                                -
+                                            @endif
+                                            <br>
+                                            @empty
+                                            - <br>
+                                            @endforelse     
+                                        @endforeach
+                                    </td>
+                                    <td class="text-center">
+                                        @foreach($lel['detailsinfo'] as $details)
+                                        <a href=""></a>
+                                        <span class="m-2">
+                                        </span><br>
+                                            @forelse($details['listwinner'] as $winner)
+                                            @if($winner['jenisbayaran'] != NULL)
+                                                @if($winner['jenisbayaran']['disahkan_oleh'] != NULL)
+                                                    SELESAI
+                                                @elseif($winner['jenisbayaran']['disahkan_oleh'] == NULL)
+                                                    TUNGGU PENGESAHAN
+                                                @else 
+                                                    BELUM SELESAI
+                                                @endif
+                                            @else 
+                                            BELUM SELESAI
+                                            @endif
+                                                <br>
+                                            @empty
+                                            - <br>
+                                            @endforelse 
                                         @endforeach
                                     </td>
-                                    <td>{{ $lel['detail']['harga_emas_asas'] }}</td>
-                                    <td>{{ $lel['detail']['jbg'] }}</td>
-                                    <td>{{ $lel['detail']['cajlelong'] }}</td>
                                     <td>
                                         @if($lel['detail']['sts_lelong'] == 3)
                                             <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
@@ -376,8 +432,8 @@
                     @hasrole('account')
                         I am a account!<br>
                         @if(count($arrayinfoaccount)> 0)
-                        PENGESAHAN BAYARAN ONLINE
-        <table class="table table-striped  table-xl text-center" id="senarailelongan" style="width:100%">
+                        <b>PENGESAHAN BAYARAN ONLINE</b>
+        <table class="table table-bordered  table-xl text-center" id="senarailelongan" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
@@ -385,7 +441,8 @@
                         <th>Tarikh Lelong</th>
                         {{-- <th>Cawangan</th> --}}
                         <th>Nama</th>
-                        <th>Fasa</th>
+                        {{-- <th>Jumlah Bayaran</th> --}}
+                        {{-- <th>Jenis Bayaran</th> --}}
                         <th>Status Lelong</th>
                     </tr>
             </thead>
@@ -402,14 +459,26 @@
                     <td align='left'>
                         @foreach($data['detailsinfo'] as $details)
                         {{-- <a href=" {{ route('account.listbayaranonline', ['lelong_id'=>$data['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a> --}}
-                       <strong><span class="m-2">{{ $details['caw_name']}}</span></strong><br>
-                           
-                        @endforeach
-                        @foreach($data['listwinner'] as $details)
-                        <a href=" {{ route('account.sahsagonline', ['lelong_id'=>$data['detail']['lelong_id'],'user_id'=>$details['user_id'], 'caw_code'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Pengesahan"><i class="far fa-edit"></i></a>
-                        <span class="m-2">{{ $details['caw_name']}}</span> {{$details['nama']}}<img src="{{ asset('img/new.gif') }}" alt="description of myimage"><br>
-                        @endforeach
+                        <strong><span class="m-2">{{ $details['caw_name']}}</span></strong><br>
+                        @forelse($details['listwinner'] as $winner)
+                            <a href=" {{ route('account.sahsagonline', ['lelong_id'=>$data['detail']['lelong_id'],'user_id'=>$winner['user_id'], 'caw_code'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Pengesahan"><i class="far fa-edit"></i></a>
+                           {{$winner['nama']}}<img src="{{ asset('img/new.gif') }}" alt="description of myimage"><br>
+                            <br>
+                            @empty
+                             <br>
+                            @endforelse
+                         @endforeach
                     </td>
+                    {{-- <td align='left'>
+                        @foreach($data['detailsinfo'] as $details)                           
+                            @forelse($details['listwinner'] as $winner)
+                            {{ number_format($winner['totalPay'], 2, '.', ',') }}
+                            <br>
+                            @empty
+                             <br>
+                            @endforelse   
+                         @endforeach
+                    </td> --}}
                     {{-- <td align='left'>
                         @foreach($data['listwinner'] as $details)
                         <a href=" {{ route('account.sahsagonline', ['lelong_id'=>$data['detail']['lelong_id'],'user_id'=>$details['user_id'], 'caw_code'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Pengesahan"><i class="far fa-edit"></i></a>
@@ -417,7 +486,27 @@
                         @endforeach
                         
                     </td> --}}
-                    <td>{{ $data['detail']['fasa'] }}</td>
+                    {{-- <td align='left'>
+                        @foreach($data['detailsinfo'] as $details)
+                            @forelse($details['listwinner'] as $winner)
+                            @if($winner['jenisbayaran'] != NULL)
+                                @if($winner['jenisbayaran']['status_payment_opt'] == 1)
+                                TUNAI
+                                @elseif($winner['jenisbayaran']['status_payment_opt'] == 2)
+                                FPX
+                                @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
+                                KAUNTER BANK/CDM
+                                
+                                @endif
+                            @else
+                              
+                            @endif
+                            <br>
+                            @empty
+                            <br>
+                            @endforelse     
+                         @endforeach
+                    </td> --}}
                     <td>
                         @if($data['detail']['sts_lelong'] == 3)
                             <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php
index 6646f801..4358e8ab 100644
--- a/resources/views/includes/sidebar.blade.php
+++ b/resources/views/includes/sidebar.blade.php
@@ -455,6 +455,9 @@
         <li class="{{ (request()->is('pembida/senlelpembayaranbidaan/*') || request()->is('pembida/senlelpembayaranbidaan') ) ? 'active' : '' }}">
           <a href="{{url('pembida/senlelpembayaranbidaan')}}">Pembayaran Bidaan</a>
         </li>
+        <li class="{{ (request()->is('pembida/statuspembayaran/*') || request()->is('pembida/statuspembayaran') ) ? 'active' : '' }}">
+          <a href="{{url('pembida/statuspembayaran')}}">Status Pembayaran</a>
+        </li>
         <li class="{{ (request()->is('pembida/senlelbelumbayarbidaan/*') || request()->is('pembida/senlelbelumbayarbidaan') ) ? 'active' : '' }}">
           <a href="{{url('pembida/senlelbelumbayarbidaan')}}">Bidaan Belum Bayar</a>
         </li>
@@ -623,6 +626,16 @@
         </div>
       </a>
     </li>
+    <li {{ (request()->is('account/statuspembayaran/*') || request()->is('account/statuspembayaran') ) ? 'active' : '' }}">
+      <a href="{{url('account/statuspembayaran')}}">
+        <div class="sidebar-menu-main-title">
+          <span class="material-symbols-rounded sidebar-menu-item-main">
+            published_with_changes
+          </span>
+           Status Pembayaran Pembida
+        </div>
+      </a>
+    </li>
     @endhasrole
     @hasrole('pembida')
     @endhasrole
diff --git a/resources/views/lelong/laporanbidaanindex.blade.php b/resources/views/lelong/laporanbidaanindex.blade.php
index a2488557..6a8fefd1 100644
--- a/resources/views/lelong/laporanbidaanindex.blade.php
+++ b/resources/views/lelong/laporanbidaanindex.blade.php
@@ -46,7 +46,7 @@
                                     <td>{{ $bid['laporan']['fasa']}}</td>
                                     <td>
                                     @foreach($bid['details'] as $details)
-                                    <a  class="confirmrefresh btn m-1 btn-danger" href=" {{ route('report.senarailapbidaan', ['lelong_id'=>$bid['laporan']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="fas fa-download"></i></a>
+                                    <a  class="btn m-1 btn-primary" href=" {{ route('report.senarailapbidaan', ['lelong_id'=>$bid['laporan']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="far fa-edit"></i></a>
 
                                     <span class="badge badge-pill badge-info text-white" style="font-size:100%"> {{ $details['caw_name']}}</span><br>
                                     
diff --git a/resources/views/lelong/senarailapbidaanpembida.blade.php b/resources/views/lelong/senarailapbidaanpembida.blade.php
new file mode 100644
index 00000000..f1eb082d
--- /dev/null
+++ b/resources/views/lelong/senarailapbidaanpembida.blade.php
@@ -0,0 +1,114 @@
+@extends('layouts.app')
+
+@section('content')
+
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col mx-auto p-4">
+            <div class="card">
+        {{-- <div class="col-md-11 mx-auto card p-4"> --}}
+        @if ($message = Session::get('success'))
+                <div class="alert alert-success">
+                    <p>{{ $message }}</p>
+                </div>
+        @endif
+        <div class="card-body">
+            <div class="card-header header-style">
+                <a href="javascript:window.history.go(-1);" class="header-style-icon">
+                    <i class="fas fa-arrow-left"></i>
+                </a>
+                <div class="header-style-title">
+                    SENARAI BIDAAN PEMBIDA
+                </div>
+            </div>
+        
+            <div class="card-body">
+                <div class="mb-3">
+                    <a href=" {{ route('report.senarailapbidaanpdf',[$lelong_id,$kodcaw]) }}" class="btn btn-outline-danger">Muat Turun PDF</a>
+                </div>
+        <table class="table table-bordered" id="tablekaunter" style="width:100%">
+            <thead class="bg-primary text-white">
+                    <tr>
+                        
+                        <th width="5%" align="left">No</th> 
+                        <th width="12%" align="left">No Rujukan</th> 
+                        <th width="12%" align="right">Harga Asas(RM)</th>
+                        <th width="12%" align="left">Nama Pembida</th> 
+                        <th width="15%" align="right">Harga Bidaan(RM)</th> 
+                        <th width="12%" align="left">Masa Bidaan</th>
+                     
+                    </tr>
+            </thead>
+            <tbody>
+                @forelse($arraydetails as $laporan)
+                <tr>
+                    <td>{{ $loop->iteration }}</td>
+                    <td>{{ $laporan['laporan']['norujukan']}}</td>
+                    <td align="right">{{ number_format($laporan['laporan']['hargaasas'], 2, '.', ',')}}</td>
+                    <td style="white-space: nowrap;">
+                        @foreach($laporan['details'] as $details)
+                            <span class="m-2">{{ $loop->iteration }}.{{ $details['nama_bidder']}}</span><br>
+                        @endforeach
+                    </td>
+                    
+                    <td align="right">
+                        @foreach($laporan['details'] as $details)
+                        <span class="m-2">{{ number_format($details['hargabida'], 2, '.', ',')}}</span><br>
+                        @endforeach
+                    </td>
+                    <td align="right">
+                      @foreach($laporan['details'] as $details)
+                      <span class="m-2"> @php
+                        $myDateTime = DateTime::createFromFormat('Y-m-d H:i:s', $details['masa_bidaan'] );
+                        $t_lelong =  $myDateTime->format('h:i:s');
+                        echo($t_lelong);
+                    @endphp</span><br>
+                  @endforeach
+                    </td>
+                </tr>  
+                @empty
+                <td colspan="9"> No Data </td>
+                @endforelse
+            </tbody>
+        </table>
+  
+    </div>
+    </div>
+</div>
+
+<script>
+      $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
+    var tablekaunter = $('#tablekaunter').DataTable({
+            "columnDefs": [ 
+                {
+                "targets": 0,
+                "orderable": false
+                }, 
+                {
+                "targets": 8,
+                "orderable": false
+                },
+                {
+                "targets": 9,
+                "orderable": false
+                },
+                {
+                "targets": 10,
+                "orderable": false
+                }
+            ],
+            order: [[0, 'asc']],
+            "info": false,
+            "lengthChange": false,
+            "pageLength": 15,
+            dom: 'Bfrtip',
+          
+    });
+
+       
+</script>
+
+@endsection
+
diff --git a/resources/views/lelong/showtukartarikh.blade.php b/resources/views/lelong/showtukartarikh.blade.php
index 2721e49e..51dbeb81 100644
--- a/resources/views/lelong/showtukartarikh.blade.php
+++ b/resources/views/lelong/showtukartarikh.blade.php
@@ -38,7 +38,7 @@
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="jbg" class="col-sm-2 col-form-label">Batch Lelong Asal</label>
+                        <label for="jbg" class="col-sm-2 col-form-label">Batch Lelong</label>
                         <div class="col-sm-2">
                         {{$lelong_id}}
                     </div>
@@ -46,7 +46,7 @@
                         <table  class="table text-right table-bordered" id="simulasi" style="width:100%">
                             <thead class="bg-primary text-white">
                                 <tr class="text-center">
-                                    <th>Pilih</th>
+                                    {{-- <th>Pilih</th> --}}
                                     <th>No</th>
                                     <th>Cawangan</th>
                                     <th>Bil SAG</th>
@@ -59,7 +59,7 @@
                                 
                                 @foreach ($arraycaw as $index=>$caw)
                                 <tr>                                    
-                                    <td><input type="radio" aria-label="Checkbox for following text input" name="caw[]" id="caw" value = "{{ $caw['kodcaw'] }}" class="custom_name"></td>
+                                    {{-- <td><input type="radio" aria-label="Checkbox for following text input" name="caw[]" id="caw" value = "{{ $caw['kodcaw'] }}" class="custom_name"></td> --}}
                                     <td>{{$index+1}}</td>
                                     <td><a href=" {{ route('lelong.senaraimarhunsimulasi',['lelongid'=>$lelong_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
                                     <td align = 'center'>{{ $caw['bil_marhun'] }}</td>
@@ -71,7 +71,7 @@
                             </tbody>
                             <tfoot>
                                 <tr>
-                                    <td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
+                                    <td colspan="2"><b>JUMLAH KESELURUHAN</b></td>
                                     <td align = 'center'>{{ $total_marhun }}</td>
                                     <td align = 'right'>{{ number_format($total_berat, 2, '.', ',') }}</td>
                                     <td align = 'right'>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
diff --git a/resources/views/marhun/scanbarcodejualbycust.blade.php b/resources/views/marhun/scanbarcodejualbycust.blade.php
index bc5c921e..ef03bf6e 100644
--- a/resources/views/marhun/scanbarcodejualbycust.blade.php
+++ b/resources/views/marhun/scanbarcodejualbycust.blade.php
@@ -53,7 +53,7 @@
                                         @csrf
 
                                         <div style="text-align: center;">Scan Barcode Marhun Untuk Serah Kepada Pembida</div>
-                                        <input type="text" style="text-align: center;" class="form-control" name="norujukan_barcode" autocomplete="off" id="norujukan_barcode" placeholder="SILA SCAN BARCODE PADA SAG" />
+                                        <input type="text" style="text-align: center;" class="form-control" name="norujukan_barcode" autofocus autocomplete="off" id="norujukan_barcode" placeholder="SILA SCAN BARCODE PADA SAG" />
                                         <input type="hidden" name="lelong_id" value="{{$lelong_id}}">
                                         <input type="hidden" name="userid" value="{{$userid}}">
                                     </form>
diff --git a/resources/views/marhun/senarailelongscanjual.blade.php b/resources/views/marhun/senarailelongscanjual.blade.php
index 48ff25c1..906c195c 100644
--- a/resources/views/marhun/senarailelongscanjual.blade.php
+++ b/resources/views/marhun/senarailelongscanjual.blade.php
@@ -1,7 +1,6 @@
 @extends('layouts.app')
 
 @section('content')
-
 <div class="container-fluid">
     <div class="row ">
         <div class="col">
@@ -21,82 +20,228 @@
                         {{ $message }}
                     </div>
                     @endif
-            {{-- <h4> Senarai Lelongan Scan Kepada Pembida</h4> --}}
-            <table class="table table-bordered text-center" id="senarailelongonline" style="width:100%">
-                <thead class="bg-primary text-white">
-                    <tr>
-                        <th>No</th>
-                        <th>Batch Lelong</th>
-                        <th>Tarikh Lelong</th>
-                        <th>Nama Pembida</th>
-                        <th>Status Lelong</th>
-                        <th>Tindakan</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    @forelse($arrayinfo as $lel)
-                    <tr>
-                        <td>{{$loop->iteration}}</td>
-                        <td>{{ $lel['info']['lelong_id']}}</td>
-                        <td>@php
-                            $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] );
-                            $t_lelong = $myDateTime->format('d-m-Y');
-                            echo($t_lelong);
-                            @endphp</td>
-                         <td style='white-space:nowrap;' align = 'left'>
-                            {{-- @if(!empty($listwinner)) --}}
-                                @foreach($lel['listwinner'] as $winner)
-                                <a  class="btn m-1 btn-info"  href=" {{ route('marhun.scanbarcodejualbycust', ['lelong_id'=>$lel['info']['lelong_id'], 'userid'=>$winner['details']['id']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
-                                {{ $winner['details']['name']}}<br>
-                                @endforeach
-                            {{-- @endif --}}
-                        </td>
-                        <td>
-                            @if($lel['info']['sts_lelong'] == 3)
-                            <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
-                            @endif
-                        </td>
-                        <td>
-                            @if($lel['info']['sts_lelong'] == 3)
-                            <a class="btn m-1 btn-warning" href="{{ route('marhun.exportmarhundetailspembida', ['lelong_id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun" style="margin-right:40px"><i class="fas fa-download"></i></a>
-                            {{-- <a class="btn m-1 btn-info" href=" {{ route('marhun.scanbarcodejual', ['lelong_id'=>$lel['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Serahan Kepada Pembida"><i class="far fa-edit"></i></a> --}}
-                            @endif
-                        </td>
-                    </tr>
-                    @empty
-                    <tr>
-                        <td colspan="6">No Data</td>
-                    </tr>
 
-                     @endforelse
-                </tbody>
-            </table>
+                    <ul class="nav mb-2 nav-tabs" id="myTab" role="tablist">
+                        <li class="nav-item">
+                            <a class="nav-link active" id="scan-keluar-tab" data-toggle="tab" href="#scan-keluar" role="tab" aria-controls="scan-keluar" aria-selected="false">
+                                Lelong Hari Ini ( {{sizeof($arraydetails0)}}/{{sizeof($lelongAll)}} )
+
+                            </a>
+                        </li>
+                        <li class="nav-item">
+                            <a class="nav-link" id="sedang-lelong-tab" data-toggle="tab" href="#sedang-lelong" role="tab" aria-controls="sedang-lelong" aria-selected="false">
+                                Lelong Selesai ( {{sizeof($arraydetails1)}}/{{sizeof($lelongAll)}} )
+
+                            </a>
+                        </li>
+                   
+                    </ul>
+
+
+                    <div class="tab-content" style="overflow-x: auto;" id="myTabContent">
+                        <div class="tab-pane fade show active" id="scan-keluar" role="tabpanel" aria-labelledby="scan-keluar-tab">
+                            <div style="overflow-x: auto;">
+                                <table class="table table-bordered text-center" id="lelong-belum">
+                                    <thead class="bg-primary text-white">
+                                        <tr>
+                                            <th>No</th>
+                                            <th>Batch Lelong</th>
+                                            <th>Tarikh Lelong</th>
+                                            <th>Nama Pembida</th>
+                                            <th>Status Lelong</th>
+                                            <th>Tindakan</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                    @forelse($arraydetails0 as $lel)
+                                    <tr>
+                                        <td>{{$loop->iteration}}</td>
+                                        <td>{{ $lel['info']['lelong_id']}}</td>
+                                        <td>@php
+                                            $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] );
+                                            $t_lelong = $myDateTime->format('d-m-Y');
+                                            echo($t_lelong);
+                                            @endphp</td>
+                                         <td style='white-space:nowrap;' align = 'left'>
+                                            {{-- @if(!empty($listwinner)) --}}
+                                                @foreach($lel['listwinner'] as $winner)
+                                                <a  class="btn m-1 btn-info"  href=" {{ route('marhun.scanbarcodejualbycust', ['lelong_id'=>$lel['info']['lelong_id'], 'userid'=>$winner['details']['id']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
+                                                {{ $winner['details']['name']}}<br>
+                                                @endforeach
+                                            {{-- @endif --}}
+                                        </td>
+                                        <td>
+                                            @if($lel['info']['sts_lelong'] == 3)
+                                            <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
+                                            @endif
+                                        </td>
+                                        <td>
+                                            @if($lel['info']['sts_lelong'] == 3)
+                                            <a class="btn m-1 btn-warning" href="{{ route('marhun.exportmarhundetailspembida', ['lelong_id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun" style="margin-right:40px"><i class="fas fa-download"></i></a>
+                                            {{-- <a class="btn m-1 btn-info" href=" {{ route('marhun.scanbarcodejual', ['lelong_id'=>$lel['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Serahan Kepada Pembida"><i class="far fa-edit"></i></a> --}}
+                                            @endif
+                                        </td>
+                                    </tr>
+                                    @empty
+                                    <tr>
+                                        <td colspan="6">No Data</td>
+                                    </tr>
+                                
+                                     @endforelse
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                        <div class="tab-pane fade" id="sedang-lelong" role="tabpanel" aria-labelledby="sedang-keluar-tab">
+                            <div style="overflow-x: auto;">
+
+                                <table class="table table-bordered text-center" id="lelong-sedang">
+                                    <thead class="bg-primary text-white">
+                                        <tr>
+                                            <th>No</th>
+                                            <th>Batch Lelong</th>
+                                            <th>Tarikh Lelong</th>
+                                            <th>Nama Pembida</th>
+                                            <th>Status Lelong</th>
+                                            <th>Tindakan</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        @forelse($arraydetails1 as $lel)
+                                        <tr>
+                                            <td>{{$loop->iteration}}</td>
+                                            <td>{{ $lel['info']['lelong_id']}}</td>
+                                            <td>@php
+                                                $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] );
+                                                $t_lelong = $myDateTime->format('d-m-Y');
+                                                echo($t_lelong);
+                                                @endphp</td>
+                                             <td style='white-space:nowrap;' align = 'left'>
+                                                {{-- @if(!empty($listwinner)) --}}
+                                                    @foreach($lel['listwinner'] as $winner)
+                                                    <a  class="btn m-1 btn-info"  href=" {{ route('marhun.scanbarcodejualbycust', ['lelong_id'=>$lel['info']['lelong_id'], 'userid'=>$winner['details']['id']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
+                                                    {{ $winner['details']['name']}}<br>
+                                                    @endforeach
+                                                {{-- @endif --}}
+                                            </td>
+                                            <td>
+                                                @if($lel['info']['sts_lelong'] == 3)
+                                                <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
+                                                @endif
+                                            </td>
+                                            <td>
+                                                @if($lel['info']['sts_lelong'] == 3)
+                                                <a class="btn m-1 btn-warning" href="{{ route('marhun.exportmarhundetailspembida', ['lelong_id'=>$lel['info']['lelong_id']]) }}" data-toggle="tooltip" data-placement="top" title="Muat Turun Senarai Marhun" style="margin-right:40px"><i class="fas fa-download"></i></a>
+                                                {{-- <a class="btn m-1 btn-info" href=" {{ route('marhun.scanbarcodejual', ['lelong_id'=>$lel['info']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Serahan Kepada Pembida"><i class="far fa-edit"></i></a> --}}
+                                                @endif
+                                            </td>
+                                        </tr>
+                                        @empty
+                                        <tr>
+                                            <td colspan="6">No Data</td>
+                                        </tr>
+                                    
+                                         @endforelse
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                     
+                                
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </div>
 
 <script>
+    //Enable tooltips everywhere
     $(function() {
         $('[data-toggle="tooltip"]').tooltip()
     })
 
-    var tablesenarailelongonline = $('#senarailelongonline').DataTable({
-        "columnDefs": [{
-                "targets": 0,
-                "orderable": false
+    $('a.confirmdel').confirm({
+        title: 'Padam Simulasi',
+        content: 'Adakah anda pasti? Tindakan ini tidak dapat dikembalikan.',
+        icon: 'fa fa-exclamation-triangle',
+        type: 'red',
+        boxWidth: '500px',
+        useBootstrap: false,
+        typeAnimated: true,
+        buttons: {
+
+            Batal: {
+                btnClass: 'btn-default',
+                action: function() {}
             },
-            {
-                "targets": 3,
-                "orderable": false
-            }
-        ],
-        order: [
-            [1, 'asc']
-        ],
-        "info": false,
-        "lengthChange": false,
-        "pageLength": 15,
-        dom: 'Bfrtip',
+            Padam: {
+                btnClass: 'btn-red',
+                action: function() {
+                    location.href = this.$target.attr('href');
+                    $.dialog({
+                        icon: 'fa fa-spinner fa-spin',
+                        title: 'Dalam Proses !',
+                        content: 'Halaman akan dikemaskini selepas proses selesai.',
+                        closeIcon: false,
+                        boxWidth: '500px',
+                        useBootstrap: false,
+                    });
+                }
+            },
+        }
+    });
+    $('a.confirmrefresh').confirm({
+        title: 'Kemaskini Simulasi',
+        content: 'Adakah anda pasti? Tindakan ini tidak dapat dikembalikan.',
+        icon: 'fa fa-exclamation-triangle',
+        type: 'orange',
+        boxWidth: '500px',
+        useBootstrap: false,
+        typeAnimated: true,
+        buttons: {
+            Batal: {
+                btnClass: 'btn-default',
+                action: function() {}
+
+            },
+            Kemaskini: {
+                btnClass: 'btn-orange',
+                action: function() {
+                    location.href = this.$target.attr('href');
+                    $.dialog({
+                        icon: 'fa fa-spinner fa-spin',
+                        title: 'Dalam Proses !',
+                        content: 'Halaman akan dikemaskini selepas proses selesai.',
+                        closeIcon: false,
+                        boxWidth: '500px',
+                        useBootstrap: false,
+                    });
+                }
+            },
+        }
+    });
+
+    $('.addsim').tooltip();
+    $('.export').tooltip();
+    // $( '.dt-buttons').addClass('btn-group');
+    $('.addsim').removeClass('dt-button');
+    $('.export').removeClass('dt-button');
+
+    var tableLelongSemasa = $('#lelong-semasa').DataTable({
+        "pageLength": 100,
+    });
+    var tableLelongSedang = $('#lelong-sedang').DataTable({
+        "pageLength": 100,
+    });
+    var tableLelongBelum = $('#lelong-belum').DataTable({
+        "pageLength": 100,
+    });
+    var tableLelongJanaPemenang = $('#lelong-jana-pemenang').DataTable({
+        "pageLength": 100,
+    });
+    var tableLelongSelesai = $('#lelong-selesai').DataTable({
+        "pageLength": 100,
     });
 </script>
 
diff --git a/resources/views/pdf/laporanbrgleldetailscaw.blade.php b/resources/views/pdf/laporanbrgleldetailscaw.blade.php
index 5903f0a1..ad34e50d 100644
--- a/resources/views/pdf/laporanbrgleldetailscaw.blade.php
+++ b/resources/views/pdf/laporanbrgleldetailscaw.blade.php
@@ -167,6 +167,7 @@ tr:nth-child(even) {
   
   		
                         @foreach ($lelongs as $marhun)
+                        @php $nilaimarhun = 0; @endphp
                         <tr>
                             <td>{{ $loop->iteration }} </td>
                             <td>{{ $marhun['norujukan'] }}</td>
@@ -183,6 +184,9 @@ tr:nth-child(even) {
                               {{ $item['harga'] }}<br>
                             @endforeach</td>   
                             <td align="right">@foreach ($marhun['detailmarhun'] as $item)
+                              @php
+                              $nilaimarhun +=  $item['n_marhun'];   
+                              @endphp
                               {{ number_format($item['n_marhun'], 2, '.', ',') }}<br>
                             @endforeach</td>           
                             <td align="right">@foreach ($marhun['detailmarhun'] as $item)
@@ -199,7 +203,7 @@ tr:nth-child(even) {
                           <td colspan="4" align="left"></td>
                           <td align="right"><b>{{ number_format($marhun['berat'], 2, '.', ',') }}</b></td>
                           <td></td>
-                          <td align="right"><b>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</b></td>
+                          <td align="right"><b>{{ number_format($nilaimarhun, 2, '.', ',') }}</b></td>
                           <td align="right"><b>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</b></td>
                           <td></td>
                         </tr>  
diff --git a/resources/views/pdf/listlelong.blade.php b/resources/views/pdf/listlelong.blade.php
index 1f14162d..a80c449e 100644
--- a/resources/views/pdf/listlelong.blade.php
+++ b/resources/views/pdf/listlelong.blade.php
@@ -92,7 +92,7 @@ tr:nth-child(even) {
                       <br>
                       <tr>
                         <td>Batch Lelong: {{$test['id']}}</td>
-                        <td>Cawangan : {{$cawangan[0]['caw_name']}}    
+                        <td>Cawangan : {{$cawangan['caw_name']}}  
                         <tr>
                         <td>Tarikh Lelong : @php
                           $myDateTime = DateTime::createFromFormat('Y-m-d', $test['tarikh_lelong'] );
diff --git a/resources/views/pdf/listlelongdetails.blade.php b/resources/views/pdf/listlelongdetails.blade.php
index b172b053..d3cb988e 100644
--- a/resources/views/pdf/listlelongdetails.blade.php
+++ b/resources/views/pdf/listlelongdetails.blade.php
@@ -163,9 +163,10 @@ tr:nth-child(even) {
                         </tr>
                         </thead>
           
-  
+                       
   		
                         @foreach ($lelongs as $marhun)
+                        @php $nilaimarhun = 0; @endphp
                         <tr>
                           <td>{{ $loop->iteration }} </td>
                           <td>{{ $marhun['norujukan'] }}</td>
@@ -182,6 +183,9 @@ tr:nth-child(even) {
                             {{ $item['harga'] }}<br>
                           @endforeach</td>   
                           <td align="right">@foreach ($marhun['detailmarhun'] as $item)
+                            @php
+                                  $nilaimarhun +=  $item['n_marhun'];   
+                            @endphp
                             {{ number_format($item['n_marhun'], 2, '.', ',') }}<br>
                           @endforeach</td>           
                           <td align="right">@foreach ($marhun['detailmarhun'] as $item)
@@ -198,7 +202,7 @@ tr:nth-child(even) {
                           <td colspan="4" align="left"></td>
                           <td align="right"><b>{{ number_format($marhun['berat'], 2, '.', ',') }}</td>
                           <td></td>
-                          <td align="right"><b>{{ number_format($marhun['nmarhuns'], 2, '.', ',') }}</td>
+                          <td align="right"><b>{{ number_format($nilaimarhun, 2, '.', ',') }}</td>
                           <td align="right"><b>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
                           <td></td>
                         </tr>  
diff --git a/resources/views/pdf/pdfsenarailapbidaan.blade.php b/resources/views/pdf/pdfsenarailapbidaan.blade.php
index c16e7a95..f5ea0410 100644
--- a/resources/views/pdf/pdfsenarailapbidaan.blade.php
+++ b/resources/views/pdf/pdfsenarailapbidaan.blade.php
@@ -198,13 +198,7 @@ tr:nth-child(even) {
         
                         @endforeach
 
-                        {{-- <tr>
-                          <td colspan="2" align="left"><strong>Jumlah Keseluruhan</strong></td>
-                          <td><strong>{{ number_format($total_hargaasas, 2, '.', ',') }}</strong></td>
-                          <td></td>
-                          <td></td>
-                          <td></td>
-                        </tr>                 --}}
+                    
                        
 
                       </table>  
diff --git a/resources/views/pembida/senaraipemenangbycaw.blade.php b/resources/views/pembida/senaraipemenangbycaw.blade.php
index 5c11ea8f..ccdf795c 100644
--- a/resources/views/pembida/senaraipemenangbycaw.blade.php
+++ b/resources/views/pembida/senaraipemenangbycaw.blade.php
@@ -44,7 +44,7 @@
                     </tr>
             </thead>
             <tbody>
-                @foreach($listwinner as $winner)
+                @forelse($listwinner as $winner)
                         <tr>
                             <td> {{ $loop->iteration }} </td>
                             <td  style="white-space: nowrap;" align = 'left'>{{ $winner['details']['name']}}</td>
@@ -75,7 +75,9 @@
                                     <a class="btn m-1 btn-info" href=" {{ route('pembida.SAGBidItembycaw', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id, 'kodcaw'=>$caw_code]) }} " data-toggle="tooltip" data-placement="top" title="Buat Pembayaran"><i class="far fa-edit"></i></a>
                             </td>
                         </tr>
-                @endforeach
+                @empty
+                <td colspan="9"> No Data </td>
+                @endforelse
             </tbody>
         </table>
         {{-- <div class="modal-footer" style="margin-top:2%;">
diff --git a/resources/views/pembida/statuspembayaran.blade.php b/resources/views/pembida/statuspembayaran.blade.php
new file mode 100644
index 00000000..d468d914
--- /dev/null
+++ b/resources/views/pembida/statuspembayaran.blade.php
@@ -0,0 +1,215 @@
+@extends('layouts.app')
+
+@section('content')
+
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="header-style-title">
+                        Senarai Status Pembayaran
+                    </div>
+                </div>
+                <div class="card-body">
+        @if ($message = Session::get('success'))
+                <div class="alert alert-success">
+                    <p>{{ $message }}</p>
+                </div>
+        @endif
+        <div class="mb-3">
+            {{-- <a href=" {{ route('report.lelongreport',[$lelongid,$cawid]) }}" class="btn btn-outline-success">Muat Turun PDF</a> --}}
+            @hasrole('operasi')
+            <a href="{{ route('pembida.statuspembayaranbypembida') }}" class="btn btn-success">Status Pembayaran Mengikut Nama Pembida</a>
+            @endhasrole
+            @hasrole('account')
+            <a href="{{ route('account.statuspembayaranbypembida') }}" class="btn btn-success">Status Pembayaran Mengikut Nama Pembida</a>
+            @endhasrole
+
+        </div>
+        <table class="table table-bordered text-center" id="tablestatuspembayaran" style="width:100%">
+            <thead class="bg-primary text-white">
+                    <tr>
+                        <th>No</th>
+                        <th>Batch Lelong</th>
+                        <th>Tarikh Lelong</th>
+                        <th>Cawangan</th>
+                        <th>Jumlah Bayaran(RM)</th>
+                        <th>Jenis Bayaran</th>
+                        <th>Status Bayaran</th>
+                        <th>Status Lelong</th>
+                    </tr>
+            </thead>
+            <tbody>
+                @foreach($arrayinfo as $lel)
+                <tr>
+                    <td>{{ $loop->iteration }}</td>
+                    <td>{{ $lel['detail']['lelong_id']}}</td>
+                    <td>@php
+                        $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['detail']['tarikh_lelong'] );
+                        $t_lelong =  $myDateTime->format('d-m-Y');
+                        echo($t_lelong);
+                    @endphp</td>
+                    <td class="text-left">
+                        @foreach($lel['detailsinfo'] as $details)
+                        @hasrole('operasi')
+                        <a class="btn btn-info btn-sm" href=" {{ route('pembida.pembayaranbidaan', ['lelong_id'=>$lel['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
+                       @endhasrole
+                        <span class="m-2"><b>{{ $details['caw_name']}}</b>
+                        </span><br> 
+                        {{-- {{dd($listwinner)}} --}}
+                            @forelse($details['listwinner'] as $winner)
+                            <i class="fas fa-caret-right"></i> {{ $winner['details']['name'] }}
+                            <br>
+                            @empty
+                            - <br>
+                            @endforelse
+                         @endforeach
+                    </td>
+                  
+                    <td class="text-right">
+                        @php $totalall = 0; @endphp
+                        @foreach($lel['detailsinfo'] as $details)
+                        <a href=""></a>
+                        <span class="m-2">
+                        </span><br>
+                            @forelse($details['listwinner'] as $winner)
+                            {{ number_format($winner['totalPay'], 2, '.', ',') }}
+                            @php
+                                $totalall += $winner['totalPay'];
+                            @endphp
+                            <br>
+                            @empty
+                            - <br>
+                            @endforelse                        
+                        @endforeach
+                        {{-- <b>{{number_format($totalall, 2, '.', ',')}}</b> --}}
+                    </td>
+                   
+                    <td class="text-center">
+                        @foreach($lel['detailsinfo'] as $details)
+                        <a href=""></a>
+                        <span class="m-2">
+                        </span><br>
+                        
+                            @forelse($details['listwinner'] as $winner)
+                            @if($winner['jenisbayaran'] != NULL)
+                           {{-- {{ dump($winner['jenisbayaran'])}} --}}
+                                @if($winner['jenisbayaran']['status_payment_opt'] == 1)
+                                TUNAI
+                                @elseif($winner['jenisbayaran']['status_payment_opt'] == 2)
+                                FPX
+                                @elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
+                                KAUNTER BANK/CDM
+                                
+                                @endif
+                            @else
+                                -
+                            @endif
+                            <br>
+                            @empty
+                            - <br>
+                            @endforelse     
+                        @endforeach
+                    </td>
+                    <td class="text-center">
+                        @foreach($lel['detailsinfo'] as $details)
+                        <a href=""></a>
+                        <span class="m-2">
+                        </span><br>
+                            @forelse($details['listwinner'] as $winner)
+                            @if($winner['jenisbayaran'] != NULL)
+                                @if($winner['jenisbayaran']['disahkan_oleh'] != NULL)
+                                    SELESAI
+                                @elseif($winner['jenisbayaran']['disahkan_oleh'] == NULL)
+                                    TUNGGU PENGESAHAN
+                                @else 
+                                    BELUM SELESAI
+                                @endif
+                            @else 
+                            BELUM SELESAI
+                            @endif
+                                <br>
+                            @empty
+                            - <br>
+                            @endforelse 
+                        @endforeach
+                    </td>
+                    <td>
+                        @if($lel['detail']['sts_lelong'] == 3)
+                            <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
+                        @endif
+                    </td>
+                    <tr>
+                        <td colspan="4"></td>
+                        <td class="text-right"><b>{{number_format($totalall, 2, '.', ',')}}</b> </td>
+                        <td colspan="3"></td>
+
+        
+                        </tr>
+                </tr>
+                @endforeach
+                
+            </tbody>
+        </table>
+        </div>
+    </div>
+</div>
+
+<script>
+     //Enable tooltips everywhere
+     $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
+    var tablestatuspembayaran = $('#senarailelongonline').DataTable({
+            "columnDefs": [ 
+                {
+                "targets": 0,
+                "orderable": false
+                }, 
+                {
+                "targets": 7,
+                "orderable": false
+                }
+            ],
+            order: [[1, 'asc']],
+            // "ordering": false,
+            "info": false,
+            "lengthChange": false,
+            "pageLength": 15,
+            dom: 'Bfrtip',
+            // buttons: [
+            //     {
+            //         className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
+            //         text: '<i class="fas fa-plus" id="test"></i>',
+            //         titleAttr: 'Tambah Cawangan',
+            //         action: function ( e, dt, node, config ) {
+            //             // alert( 'Button activated' );
+            //             // console.log('hye');
+                        
+            //             $('#myModal').modal("show");
+            //             $('#myModal').on('shown.bs.modal', function () {
+            //                 $('#rolename').trigger('focus')
+            //             })
+            //         }
+            //     },
+            //     {
+            //         className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
+            //         titleAttr: 'Export to CSV',
+            //         text: '<i class="fas fa-download"></i>',
+            //         action: function ( e, dt, node, config ) {
+            //             $("#exportform").submit();
+            //         }
+            //     }
+            // ]
+    });
+
+        // $('.addcaw').tooltip();
+        // $('.export').tooltip();
+        // // $( '.dt-buttons').addClass('btn-group');
+        // $( '.addcaw').removeClass('dt-button');
+        // $( '.export').removeClass('dt-button');
+
+</script>
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/pembida/statuspembayaranbypembida.blade.php b/resources/views/pembida/statuspembayaranbypembida.blade.php
new file mode 100644
index 00000000..b0ef2f4c
--- /dev/null
+++ b/resources/views/pembida/statuspembayaranbypembida.blade.php
@@ -0,0 +1,166 @@
+@extends('layouts.app')
+
+@section('content')
+
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col">
+            <div class="card">
+                <div class="card-header header-style">
+                    <div class="header-style-title">
+                        Senarai Status Pembayaran
+                    </div>
+                </div>
+                <div class="card-body">
+        @if ($message = Session::get('success'))
+                <div class="alert alert-success">
+                    <p>{{ $message }}</p>
+                </div>
+        @endif
+        <div class="mb-3">
+            {{-- <a href=" {{ route('report.lelongreport',[$lelongid,$cawid]) }}" class="btn btn-outline-success">Muat Turun PDF</a> --}}
+            @hasrole('operasi')
+            <a href="{{ route('pembida.statuspembayaran') }}" class="btn btn-success">Status Pembayaran Mengikut Cawangan</a>
+            @endhasrole
+            @hasrole('account')
+            <a href="{{ route('account.statuspembayaran') }}" class="btn btn-success">Status Pembayaran Mengikut Cawangan</a>
+            @endhasrole
+
+        </div>
+        <table class="table table-bordered  table-xl text-center" id="senarailelongonline" style="width:100%">
+            <thead class="bg-primary text-white">
+                    <tr>
+                        <th>No</th>
+                        <th>Batch Lelong</th>
+                        <th>Tarikh Lelong</th>
+                        <th>Nama Pembida</th>
+                        <th>Jumlah Bayaran(RM)</th>
+                        {{-- <th>Jenis Bayaran</th>
+                        <th>Status Bayaran</th> --}}
+                        {{-- <th>Status Lelong</th> --}}
+                    </tr>
+            </thead>
+            <tbody>
+                
+                @foreach($arrayinfo as $lel)
+                @php $totalall = 0; @endphp
+                <tr>
+                    <td>{{ $loop->iteration }}</td>
+                    <td>{{ $lel['detail']['lelong_id']}}</td>
+                    <td>@php
+                        $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['detail']['tarikh_lelong'] );
+                        $t_lelong =  $myDateTime->format('d-m-Y');
+                        echo($t_lelong);
+                    @endphp</td>
+                    <td class="text-left">
+                        {{-- {{dd($lel['listwinner'])}} --}}
+                       
+                        @foreach($lel['listwinner'] as $winner)
+                        @hasrole('operasi')
+                        {{-- <a class="btn btn-info btn-sm" href=" {{ route('pembida.pembayaranbidaan', ['lelong_id'=>$lel['detail']['lelong_id'], 'kodcaw'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a> --}}
+                       @endhasrole
+                        <span class="m-2">{{ $winner['details']['name'] }}
+                        </span><br> 
+                        {{-- {{dd($listwinner)}} --}}
+                            {{-- @forelse($winner as $caw)
+                            <i class="fas fa-caret-right"></i>{{ $caw['caw_name']}}
+                            <br>
+                            @empty
+                            - <br>
+                            @endforelse --}}
+                         @endforeach
+                    </td>
+                  
+                    <td class="text-right">
+                        
+                       
+                        @forelse($lel['listwinner'] as $winner)
+                            {{ number_format($winner['totalPay'], 2, '.', ',') }}
+                            @php
+                            $totalall += $winner['totalPay'];
+                        @endphp   
+                            <br>
+                            @empty
+                            - <br>
+                            @endforelse 
+                                               
+                        {{-- <b>{{number_format($totalall, 2, '.', ',')}}</b> --}}
+                    </td>
+                   
+                   
+                    {{-- <td>
+                        @if($lel['detail']['sts_lelong'] == 3)
+                            <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
+                        @endif
+                    </td> --}}
+                    <tr>
+                        <td colspan="4"></td>
+                        <td class="text-right"><b>{{number_format($totalall, 2, '.', ',')}}</b> </td>
+
+        
+                        </tr>
+                </tr>
+                @endforeach
+                
+            </tbody>
+        </table>
+        </div>
+    </div>
+</div>
+
+<script>
+     //Enable tooltips everywhere
+     $(function () {
+        $('[data-toggle="tooltip"]').tooltip()
+    })
+    var tablesenarailelongonline = $('#senarailelongonline').DataTable({
+            "columnDefs": [ 
+                {
+                "targets": 0,
+                "orderable": false
+                }, 
+                {
+                "targets": 7,
+                "orderable": false
+                }
+            ],
+            order: [[0, 'asc']],
+            "info": false,
+            "lengthChange": false,
+            "pageLength": 15,
+            dom: 'Bfrtip',
+            // buttons: [
+            //     {
+            //         className: 'btn btn-outline-success pl-4 pr-4 btn-sm addcaw',
+            //         text: '<i class="fas fa-plus" id="test"></i>',
+            //         titleAttr: 'Tambah Cawangan',
+            //         action: function ( e, dt, node, config ) {
+            //             // alert( 'Button activated' );
+            //             // console.log('hye');
+                        
+            //             $('#myModal').modal("show");
+            //             $('#myModal').on('shown.bs.modal', function () {
+            //                 $('#rolename').trigger('focus')
+            //             })
+            //         }
+            //     },
+            //     {
+            //         className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm  export',
+            //         titleAttr: 'Export to CSV',
+            //         text: '<i class="fas fa-download"></i>',
+            //         action: function ( e, dt, node, config ) {
+            //             $("#exportform").submit();
+            //         }
+            //     }
+            // ]
+    });
+
+        // $('.addcaw').tooltip();
+        // $('.export').tooltip();
+        // // $( '.dt-buttons').addClass('btn-group');
+        // $( '.addcaw').removeClass('dt-button');
+        // $( '.export').removeClass('dt-button');
+
+</script>
+
+@endsection
\ No newline at end of file
diff --git a/resources/views/template/pemenang.blade.php b/resources/views/template/pemenang.blade.php
index b9395ffd..1b95fdea 100644
--- a/resources/views/template/pemenang.blade.php
+++ b/resources/views/template/pemenang.blade.php
@@ -53,7 +53,7 @@
                                             Kepada {{ $user ? $user['name'] : '' }},</h1>
                                         <p
                                             style="margin:0 0 12px 0;font-size:14px;line-height:24px;font-family:Arial,sans-serif;">
-                                            Tahniah, Nama Anda Telah Menang Dalam Bidaan Emas Hari Ini, Sila Semak Bidaan Anda Dalam Pautan ini.
+                                            Tahniah, Nama Anda Telah Berjaya Dalam Bidaan Emas Hari Ini, Sila Semak Bidaan Anda Dalam Pautan ini.
                                             </p>
 
                                         <p style="text-align: center;">
diff --git a/routes/api.php b/routes/api.php
index 168ae91e..e59c31ea 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -73,6 +73,8 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
     Route::post('/updateItem', [CartController::class, 'updateItem']);
     //delete item in cart
     Route::post('/deleteItem', [CartController::class, 'deleteItem']);
+    //number of item in cart
+    Route::get('/itemInCart', [LelongMobileController::class, 'itemInCart']);
     
     //===========STALE CART=====================
     Route::post('/removeFromCart', [CartController::class, 'removeFromCart']);
@@ -95,6 +97,8 @@ Route::group(['middleware' => ['auth:sanctum']], function () {
     Route::get('/resultLelong', [LelongMobileController::class, 'resultLelong']);
     //get status result
     Route::get('/resultStatus/{userId}/{lelongId}', [LelongMobileController::class, 'resultStatus']);
+    //get win surat in cawangan to print pdf
+    Route::get('/resultInCawangan', [LelongMobileController::class, 'resultInCawangan']);
     
     //===========PAY======================
     //get invoice detail
diff --git a/routes/web.php b/routes/web.php
index 97f7725f..f0a74a00 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -3,6 +3,8 @@
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Http;
 use App\Http\Controllers\SendSMSController;
+// use App\Http\Controllers\SmsController;
+
 
 /*
 |--------------------------------------------------------------------------
@@ -329,6 +331,8 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid
     Route::get('/SAGBidItembycaw/{user_id}/{lelong_id}/{kodcaw}', ['as'=>'pembida.SAGBidItembycaw','uses'=>'PembidaController@SAGBidItembycaw']);
     Route::post('/benarkantunai', ['as'=>'pembida.benarkantunai','uses'=>'PembidaController@benarkantunai']);
     Route::get('/kaunterpembayaran/{lelong_id}/{kodcaw}', ['as'=>'pembida.kaunterpembayaran','uses'=>'PembidaController@SenaraiPemenang']);
+    Route::get('/statuspembayaran',['as'=>'pembida.statuspembayaran','uses'=>'PembidaController@statuspembayaran']);
+    Route::get('/statuspembayaranbypembida',['as'=>'pembida.statuspembayaranbypembida','uses'=>'PembidaController@statuspembayaranbypembida']);
 
 
 });
@@ -442,7 +446,8 @@ Route::group(['middleware' => ['permission:pengesahanbayaran'],'prefix'=>'accoun
     Route::post('/sahbayaronline', ['as'=>'account.sahbayaronline','uses'=>'AccountController@sahbayaronline']);
     Route::get('/listbayaranonlinehome', ['as'=>'account.listbayaranonlinehome','uses'=>'AccountController@listbayaranonlinehome']);
     Route::get('/listpengesahanakaun/{lelong_id}/{kodcaw}',['as'=>'account.listpengesahanakaun','uses'=>'AccountController@listpengesahanakaun']);
-
+    Route::get('/statuspembayaran',['as'=>'account.statuspembayaran','uses'=>'PembidaController@statuspembayaran']);
+    Route::get('/statuspembayaranbypembida',['as'=>'account.statuspembayaranbypembida','uses'=>'PembidaController@statuspembayaranbypembida']);
 });
 
 // Pengurus Cawangan 
@@ -496,6 +501,8 @@ Route::get('/senaraibrglelongdetails/{lelong_id}/{kodcaw}',['as'=>'report.senara
 
 Route::get('/lapbidaanpembidaindex', ['as'=>'report.lapbidaanpembidaindex','uses'=>'ReportController@lapbidaanpembidaindex']);
 Route::get('/senarailapbidaan/{lelong_id}/{kodcaw}',['as' =>'report.senarailapbidaan','uses'=>'ReportController@senarailapbidaan']);
+Route::get('/senarailapbidaanpdf/{lelong_id}/{kodcaw}',['as' =>'report.senarailapbidaanpdf','uses'=>'ReportController@senarailapbidaanpdf']);
+
 
 Route::get('/laplelongindex',['as' =>'report.laplelongindex','uses'=>'ReportController@laplelongindex']);
 Route::get('/laplelong/{lelong_id}/{kodcaw}',['as' =>'report.laplelong','uses'=>'ReportController@laplelong']);
@@ -596,3 +603,5 @@ Route::group(['middleware' => ['permission:backdate'],'prefix'=>'backdate'], fun
 
 });
 
+// Route::get('/sms', [SmsController::class, 'index']);
+