diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index a8b454f0..37564a17 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -52,54 +52,76 @@ class AccountController extends Controller
 
     public function listbayaranonline($lelong_id, $kodcaw)
     {
-        // $getkodcaw = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
-        // ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
-        // ->where('lelong.id', $lelong_id)
-        // ->where('caw_code')
-        // ->select('cawangan.caw_name')
-        // ->get();
-
         $getkodcaw = Cawangan::where('caw_code', $kodcaw)->select('caw_name')->first();
 
+        $listwinner2 = Payment::join('lelongbid', 'payment.kodcaw', '=', 'lelongbid.kodcaw')
+        ->join('lelongbidder', 'payment.id', '=', 'lelongbidder.payment_id')
+        ->where('lelongbidder.status_bidder', 1)
+        ->where('lelongbid.lelong_id', $lelong_id)
+        ->where('lelongbidder.status_payment', 2)
+        ->where('payment.status', 2)
+        ->whereNull('payment.disahkan_pada')
+        ->orWhere(function ($query) {
+            $query->where('payment.status_payment_opt', 3)
+            ->where('payment.status_payment_opt', 2);
+        })
+        ->select('lelongbidder.user_id', 'payment.user_id')
+        ->groupBy('lelongbidder.user_id', 'payment.user_id')
+        ->get();
+        // dd($listwinner2);
+
         $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
-        ->join('payment', 'lelongbidder.payment_id', 'payment.id')
+        ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
         ->where('lelongbidder.status_bidder', 1)
         ->where('lelongbid.lelong_id', $lelong_id)
         ->where('lelongbid.kodcaw', $kodcaw)
         ->where('lelongbidder.status_payment', 2)
+        ->where('payment.status', 2)
         ->whereNull('payment.disahkan_pada')
-        ->select('lelongbidder.user_id')
-        ->groupBy('lelongbidder.user_id')
+        ->select('lelongbidder.user_id', 'payment.user_id')
+        ->groupBy('lelongbidder.user_id', 'payment.user_id')
+        ->orWhere(function ($query) {
+            $query->where('payment.status_payment_opt', 3)
+                  ->where('payment.status_payment_opt', 2);
+        })
         ->get();
-        // dd($listwinner);
 
         foreach($listwinner as $index1=>$winner){
 
             $userdetails = User::where('id', $winner['user_id'])->first();
+            // dd($userdetails);
 
-            $SAGWin = LelongBidder::join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
+            $SAGWin = LelongBidder::join('payment', 'lelongbidder.user_id', '=', 'payment.user_id')
             ->join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
             ->where('lelongbidder.user_id', $winner['user_id'])
+            ->where('payment.user_id', $winner['user_id'])
+            ->where('payment.kodcaw',$kodcaw)
             ->where('lelongbid.kodcaw',$kodcaw)
             ->where('lelongbidder.status_bidder', 1)
             ->where('lelongbid.lelong_id', $lelong_id)
-            // ->where('payment.status_payment_opt', 3)
-            // ->orWhere('payment.status_payment_opt', 2)
+            ->orWhere(function ($query) {
+                $query->where('payment.status_payment_opt', 3)
+                      ->where('payment.status_payment_opt', 2);
+            })
             ->get();
-            // dd($SAGWin);
 
             $id_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+            ->join('payment', 'lelongbidder.user_id', '=', 'payment.user_id')
             ->where('lelongbidder.user_id', $winner['user_id'])
             ->where('lelongbidder.status_bidder', 1)
             ->where('lelongbid.lelong_id', $lelong_id)
-            ->where('lelongbidder.kodcaw',$kodcaw)
+            ->where('lelongbid.kodcaw',$kodcaw)
+            ->where('payment.kodcaw',$kodcaw)
+            ->where('lelongbid.lelong_id', $lelong_id)
             ->select('lelongbidder.payment_id')
             ->groupBy('lelongbidder.payment_id')
             ->get();
-            // dd($id_payment);
+
             $total_payment = 0;
             foreach($id_payment as $id){
-                $payment = Payment::where('id', $id->payment_id)
+                $payment = Payment::where('id', $id['payment_id'])
+                ->where('user_id', $userdetails['id'])
+                ->where('kodcaw', $kodcaw)
                 ->first();
 
                 if($payment){
@@ -124,24 +146,80 @@ class AccountController extends Controller
         $senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
         ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
         ->where('lelongbid.lelong_id', $lelong_id)
-        ->where('lelongbidder.user_id', $user_id)
+        ->where('lelongbidder.user_id', $userdetails['id'])
         ->where('lelongbid.kodcaw', $caw_code)
         ->where('lelongbidder.status_bidder', 1)
         // ->where('payment.status_payment_opt', 3)
         // ->orWhere('payment.status_payment_opt', 2)
         ->where('lelongbidder.status_payment', 2)
-        ->get()->toArray();
+        ->select('lelongbidder.id as lelongbidder_id',
+                 'lelongbidder.user_id', 
+                 'lelongbidder.hargabida',
+                 'lelongbidder.status_bidder',
+                 'lelongbidder.status_payment',
+                 'lelongbidder.masa_bidaan', 
+                 'lelongbid.id as lelongbid_id',
+                 'lelongbid.lelong_id',
+                 'lelongbid.caw_id',
+                 'lelongbid.kodcaw',
+                 'lelongbid.norujukan',
+                 'lelongbid.t_lelong',
+                 'lelongbid.hargaasas',
+                 'lelongbid.hargajual',
+                 'lelongbid.t_jual',
+                 'lelongbid.status_jual', 
+                 'lelongbid.status_payment as sts_payment_lelbid', 
+                 'lelongbid.status_semak',
+                 'payment.id as payment_id',
+                 'payment.remark',
+                 'payment.kodcaw',
+                 'payment.status_payment_opt',
+                 'payment.resit_id',
+                 'payment.status',
+                 'payment.remark',
+                 'payment.total_payment',
+                 'payment.disahkan_pada',
+                 'payment.disahkan_oleh'
+        )
+        ->get();
+        // dd($senaraisag);
+
+        // $senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+        // ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
+        // ->where('payment.user_id', $user_id)
+        // ->where('payment.kodcaw', $caw_code)
+        // ->where('lelongbidder.status_bidder', 1)
+        // ->where('payment.status_payment_opt', 3)
+        // ->orWhere('payment.status_payment_opt', 2)
+        // ->where('lelongbidder.status_payment', 2)
+        // ->where('payment.lelong_id', $lelong_id)
+        // ->where('payment.kodcaw', $caw_code)
+        // ->where('payment.user_id', $user_id) 
+        // ->get()->toArray();
         // dd($senaraisag);
 
         foreach($senaraisag as $index1=>$sag)
         {
-            $checking = Payment::join('lelongbid', 'payment.lelong_id', '=', 'lelongbid.lelong_id')
-            ->where('lelongbid.status_jual', 1)
-            ->where('lelongbid.status_payment', 1)
-            ->whereNotNull('payment.disahkan_pada')
-            ->whereNotNull('payment.disahkan_pada')
-            ->first();
-            // dd($checking);
+
+            if($sag)
+            {
+                // dd($sag);
+                $checking = Payment::join('lelongbid', 'payment.lelong_id', '=', 'lelongbid.lelong_id')
+                ->where('payment.id', $sag['payment_id'])
+                ->where('lelongbid.status_jual', 1)
+                ->where('payment.kodcaw', $caw_code)
+                ->where('lelongbid.status_payment', 1)
+                ->whereNotNull('payment.disahkan_pada')
+                ->whereNotNull('payment.disahkan_pada')
+                ->first();
+
+                $senaraisag[$index1]['checking_payment'] = $checking;
+                // dd($checking);
+            }
+            else
+            {
+                //
+            }
         }
 
         $saggroupbyid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
@@ -173,7 +251,7 @@ class AccountController extends Controller
             $getresit[$index1]['resit64'] = 'data:image/' . $resit['file_type'] . ';base64' . base64_encode($resit['filename']);
         }
 
-        return view('account.sahsagonline', compact('senaraisag', 'lelong_id', 'user_id', 'total_payment', 'caw_code', 'userdetails', 'getresit', 'checking'));
+        return view('account.sahsagonline', compact('senaraisag', 'lelong_id', 'user_id', 'total_payment', 'caw_code', 'userdetails', 'getresit'));
     }
 
     public function sahbayaronline(Request $request)
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index 7cc7f5ef..280845aa 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -137,6 +137,7 @@ class PaymentController extends Controller
         ->where('lelongbid.lelong_id', $lelong_id)
         ->where('lelongbid.kodcaw', $user->kodcaw)
         ->select('lelongbidder.hargabida',
+                    'lelongbidder.user_id',
                     'lelongbid.hargaasas',
                     'lelongbid.norujukan',
                     'lelongbidder.lelongbid_id',
@@ -144,6 +145,31 @@ class PaymentController extends Controller
                     )
         ->get();
 
+        foreach($eachbid as $bid)
+        {
+            // dd($bid);
+            $paymentstatus = Payment::where('lelong_id', $lelong_id)  
+            ->where('user_id', $bid['user_id'])
+            ->where('status', 2)
+            ->where('status_payment_opt', 2)
+            ->orWhere('status_payment_opt', 3)
+            ->get();
+
+            if($payment)
+            {
+                $total_payment = 0;
+                foreach($paymentstatus as $index1=>$payemnt)
+                {
+                    $payment = Payment::where('id', $id->payment_id)
+                    ->first();
+    
+                    if($payment){
+                        $total_payment = $total_payment + $payment->total_payment;
+                    }
+                    $listwinner[$index1]['totalPay'] = $total_payment;
+                }
+            }
+        }
         // foreach($gettunai as $index1=>$cash)
         // {
         //     // dd($cash);
diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php
index f73dfd9c..985c0610 100644
--- a/app/Http/Controllers/PembidaController.php
+++ b/app/Http/Controllers/PembidaController.php
@@ -216,7 +216,10 @@ class PembidaController extends Controller
         // dd($request->all());
         $getkodcaw = Cawangan::where('caw_code', $request->kodcaw)->select('caw_name')->first();
         $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', $request->lelong_id)
         ->where('lelongbid.kodcaw', $request->kodcaw)
         ->select('lelongbidder.user_id')
@@ -236,12 +239,15 @@ class PembidaController extends Controller
             ->get();
             // dd($SAGWin);
 
-            // foreach($SAGWin as $index2=>$sag)
-            // {
+            foreach($SAGWin as $index2=>$sag)
+            {
 
-            //     $detailspayment = Payment::where('id', $sag->payment_id)->first();
-            //     // dd($detailspayment);
-            // }
+                if($sag)
+                {
+                    $detailspayment = Payment::where('id', $sag->payment_id)->first();
+                    // dd($detailspayment);
+                }
+            }
 
             $payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
             ->where('lelongbidder.user_id', $winner['user_id'])
@@ -272,7 +278,9 @@ class PembidaController extends Controller
             $listwinner[$index1]['total_surat'] = sizeof($SAGWin);
             $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
             $listwinner[$index1]['totalPay'] = $total_payment;
-            
+            $listwinner[$index1]['payment_id'] = $payment_id;
+            $listwinner[$index1]['jenisbayaran']['status_payment'] = $sag->status_payment;
+            $listwinner[$index1]['jenisbayaran']['status'] = ($detailspayment) ? $detailspayment['status'] : 0;
 
         }
        
@@ -292,9 +300,10 @@ class PembidaController extends Controller
         $infos = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
         ->join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
         ->where('lelongbidder.user_id', $user_id)
-        // ->where('lelongbidder.payment_id', $payment_id)
+        ->where('lelongbidder.payment_id', $payment_id)
+        ->where('cawangan.caw_code', $kodcaw)
         ->where('lelongbid.kodcaw', $kodcaw)
-        ->where('lelongbidder.status_payment', 1)
+        // ->where('lelongbidder.status_payment', 1)
         ->select('lelongbid.id as lelongbid_id',
                  'lelongbidder.id as lelongbidder_id',
                  'lelongbid.lelong_id',
diff --git a/resources/views/account/listbayaranonline.blade.php b/resources/views/account/listbayaranonline.blade.php
index d393db9d..08015fcb 100644
--- a/resources/views/account/listbayaranonline.blade.php
+++ b/resources/views/account/listbayaranonline.blade.php
@@ -32,7 +32,7 @@
                 @foreach($listwinner as $winner)
                         <tr>
                             <td> {{ $loop->iteration }} </td>
-                            <td align = 'left'>{{ $winner['details']['name']}}</td>
+                            <td class="text-left">{{ $winner['details']['name']}}</td>
                             <td>{{ $winner['details']['nokp']}}</td>
                             <td>{{ $winner['details']['notelbimbit']}}</td>
                             <td>{{ $winner['total_surat']}}</td>
diff --git a/resources/views/account/sahsagonline.blade.php b/resources/views/account/sahsagonline.blade.php
index 171c4939..32cf9318 100644
--- a/resources/views/account/sahsagonline.blade.php
+++ b/resources/views/account/sahsagonline.blade.php
@@ -64,7 +64,7 @@
                 <tr>
                     <td colspan="2"><b> Jumlah Bayaran</b></td>
                     <td colspan="2"></td>
-                    <td colspan="1"><b>RM<input type="text" id="total" value="{{ $total_payment }}" style="border: none;" readonly></b></td>
+                    <td colspan="1"><b>RM<input type="text" id="total" value="{{ number_format($senaraisag->sum('hargabida'), 2, '.', ',') }}" style="border: none;" readonly></b></td>
                     <td></td>
                     <td>
                         @if($getresit)
@@ -79,7 +79,13 @@
                 </table>
                 <div class="modal-footer" style="margin-top:2%;">
                     {{-- <a  href="{{ route('account.listbayaranonline', [$lelong_id,$caw_code]) }}" class="btn btn-primary">Kembali</a> --}}
-                        <button type="button" class="btn btn-warning" onclick="confirm()" >Sahkan</button>
+                    {{-- @foreach($senaraisag as $senarai) --}}
+                        @if($sag['checking_payment'])
+                            <button type="button" class="btn btn-success" disabled>Berjaya Disahkan</button>
+                        @else
+                            <button type="button" class="btn btn-warning" onclick="confirm()" >Sahkan</button>
+                        @endif
+                    {{-- @endforeach --}}
                 </div>
             </form> 
         </div>
@@ -93,7 +99,7 @@
           <h5 class="modal-title" id="exampleModalLabel">Resit Bayaran CDM</h5>
           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
             <span aria-hidden="true">&times;</span>
-          </button>
+          </button> 
         </div>
         <div class="modal-body text-center" style="padding:3rem">
           @foreach($getresit as $resit)
diff --git a/resources/views/marhun/senaraimarhun.blade.php b/resources/views/marhun/senaraimarhun.blade.php
index c6494635..44488c80 100644
--- a/resources/views/marhun/senaraimarhun.blade.php
+++ b/resources/views/marhun/senaraimarhun.blade.php
@@ -15,7 +15,7 @@
                         <div class="col-6 col-sm-4">
                             <p><u><b>Bilangan SAG : </b></u><p>
                             <p><b>Keseluruhan : {{ sizeof($lelongbid) }}</b> </p>
-                            <p><b>Belum Disemak : {{ sizeof($sag) }}</b></p>
+                            {{-- <p><b>Belum Disemak : {{ sizeof($sag) }}</b></p> --}}
                             <p><b>Dalam Proses : {{ sizeof($dalamproses) }}</b></p>
                             <p><b>Sudah Disemak : {{ sizeof($sdhdisemak) }}</b></p>
                             <p><b>Sudah Disahkan Oleh Operasi : {{ sizeof($sdhdisahkan) }}</b></p>
diff --git a/resources/views/pembida/pembayaranbidaan.blade.php b/resources/views/pembida/pembayaranbidaan.blade.php
index 02d39940..fd1d08e5 100644
--- a/resources/views/pembida/pembayaranbidaan.blade.php
+++ b/resources/views/pembida/pembayaranbidaan.blade.php
@@ -18,29 +18,45 @@
         <table class="table table-striped  table-xl text-center" id="sahsagonline" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
-                        <th>No</th>
+                        <th>Bil</th>
                         <th>Nama</th>
                         <th>No Kad Pengenalan</th>
                         <th>No Telefon</th>
                         <th>Bilangan Surat</th>
                         <th>Jumlah Pembayaran(RM)</th>
                         <th>Jumlah Bidaan(RM)</th>
+                        <th>Jenis Bayaran</th>
+                        <th>Status</th>
                         <th class="text-center">Maklumat</th>
                     </tr>
             </thead>
             <tbody>
                 @foreach($listwinner as $winner)
                         <tr>
-                            <td> {{ $loop->iteration }} </td>
-                            <td align = 'left'>{{ $winner['details']['name']}}</td>
-                            <td>{{ $winner['details']['nokp']}}</td>
-                            <td>{{ $winner['details']['notelbimbit']}}</td>
-                            <td>{{ $winner['total_surat']}}</td>
-                            <td>{{ number_format($winner['totalPay'], 2, '.', ',')}}</td>
-                            <td>{{ number_format($winner['totalBid'], 2, '.', ',')}}</td>
-                            <td>
-                                <a href=" {{ route('pembida.detailsbidaan', ['user_id'=>$winner['details']['id'], 'kodcaw'=>$kodcaw]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
-                            </td>
+                        <td>{{ $loop->iteration }}</td>
+                        <td class="text-left">{{ $winner['details']['name'] }}</td>
+                        <td>{{ $winner['details']['nokp'] }}</td>
+                        <td>{{ $winner['details']['notelbimbit']}}</td>
+                        <td>{{ $winner['total_surat'] }}</td>
+                        <td>{{ number_format($winner['totalBid'], 2, '.', ',') }}</td>
+                        <td>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td>
+                        <td>
+                            @if($winner['jenisbayaran']['status'] == 1)
+                                <button class="btn btn-info btn-sm" disabled>YURAN</button>
+                            @elseif($winner['jenisbayaran']['status'] == 2)
+                                <button class="btn btn-info btn-sm" disabled>BIDAAN MENANG</button>
+                            @endif
+                        </td>
+                        <td>
+                            @if($winner['jenisbayaran']['status_payment'] == 1)
+                                <button class="btn btn-success btn-sm" disabled>BERJAYA</button>
+                            @else 
+                                <button class="btn btn-secondary btn-sm" disabled>BELUM SELESAI</button>
+                            @endif
+                        </td>
+                        <td>
+                            <a  href="{{ route('pembida.detailsbidaan', [ 'user_id'=>$winner['details']['id'], 'payment_id'=>$winner['payment_id'][0]['payment_id'], $kodcaw ]) }}"  data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-list-alt"></i></a>
+                        </td>
                         </tr>
                 @endforeach
             </tbody>
@@ -62,7 +78,7 @@
                 "orderable": false
                 }, 
                 {
-                "targets": 7,
+                "targets": 9,
                 "orderable": false
                 }
             ],
diff --git a/resources/views/pembida/senlelpembayaranbidaan.blade.php b/resources/views/pembida/senlelpembayaranbidaan.blade.php
index 4e6a577e..75ad4b09 100644
--- a/resources/views/pembida/senlelpembayaranbidaan.blade.php
+++ b/resources/views/pembida/senlelpembayaranbidaan.blade.php
@@ -21,7 +21,6 @@
                         <th>Tempoh</th>
                         <th>Caj Lelong</th>
                         <th>Status Lelong</th>
-                        <!-- <th class="text-center">Tindakan</th> -->
                     </tr>
             </thead>
             <tbody>
@@ -34,7 +33,7 @@
                         $t_lelong =  $myDateTime->format('d-m-Y');
                         echo($t_lelong);
                     @endphp</td>
-                    <td align='left'>
+                    <td class="text-left">
                         @foreach($lel['detailsinfo'] as $details)
                         <a 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>
                         <span class="m-2">{{ $details['caw_name']}}
diff --git a/resources/views/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php
index 48d0d358..03d173b8 100644
--- a/resources/views/pengesahan/mutumarhun.blade.php
+++ b/resources/views/pengesahan/mutumarhun.blade.php
@@ -36,9 +36,9 @@
                         <th>Marhun</th>
                         <th>Karat</th> 
                         <th>Berat</th> 
-                        <th>Harga Asal (RM)</th> 
+                        <th>Harga Gadai (RM)</th> 
                         <th>Harga Lelong (RM)</th> 
-                        <th>N. Marhun Asal</th> 
+                        <th>N. Marhun Gadai</th> 
                         <th>N. Marhun Lelong</th> 
                         <th>Harga Asas</th> 
                         <th>Status</th>