diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 37564a17..b886086f 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -85,6 +85,7 @@ class AccountController extends Controller
                   ->where('payment.status_payment_opt', 2);
         })
         ->get();
+        // dd($listwinner);
 
         foreach($listwinner as $index1=>$winner){
 
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index 280845aa..52561a7c 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -99,6 +99,7 @@ class PaymentController extends Controller
                     $total_payment = $total_payment + $payment->total_payment;
                 }
             }
+            // dd($total_payment);
 
             $listwinner[$index1]['details'] = $userdetails;
             $listwinner[$index1]['total_surat'] = sizeof($SAGWin);
@@ -155,12 +156,12 @@ class PaymentController extends Controller
             ->orWhere('status_payment_opt', 3)
             ->get();
 
-            if($payment)
+            if($paymentstatus)
             {
                 $total_payment = 0;
                 foreach($paymentstatus as $index1=>$payemnt)
                 {
-                    $payment = Payment::where('id', $id->payment_id)
+                    $payment = Payment::where('id', $payemnt->payment_id)
                     ->first();
     
                     if($payment){
diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 551cd469..d88ed0f9 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -509,9 +509,9 @@ class ReportController extends Controller
         
         $arraydetails = [];
         
-        $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
-        ->join('lelong_tebus','lelong.id','=','lelong_tebus.batch_no')
-        ->select('lelong.id','lelong_id','tarikh_lelong','lelong.fasa','lelong_tebus.batch_no')
+        $lelongid = LelongTebus::join('lelong','lelong_tebus.batch_no','=','lelong.id')
+        ->join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        ->select('lelong.id','tarikh_lelong','lelong.fasa','lelong_tebus.batch_no')
         ->distinct()
         ->orderBy('batch_no')       
         ->get()
diff --git a/app/Http/Controllers/SerahanController.php b/app/Http/Controllers/SerahanController.php
index 6b12b032..b6e0a0f5 100644
--- a/app/Http/Controllers/SerahanController.php
+++ b/app/Http/Controllers/SerahanController.php
@@ -126,16 +126,19 @@ class SerahanController extends Controller
 
         $invois = Payment::join('resit','payment.resit_id','=','resit.id')
         ->where('payment.id',$lelong_id)
+        ->where('kodcaw','=',$user->kodcaw)
         ->first();        
 
         $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
         ->where('user_id',$user_id)
         ->where('lelongbidder.status_bidder', 1)
         ->where('lelongbid.lelong_id', $lelong_id)
+        ->where('lelongbid.kodcaw','=',$user->kodcaw)
         ->get();
 
         $senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
         // ->where('lelongbid.kodcaw',$caw['caw_code']) buang jap nti check balik
+        ->where('lelongbid.kodcaw','=',$user->kodcaw)
         ->where('user_id',$user_id)
         ->where('lelongbidder.status_bidder', 1)
         ->where('lelongbid.lelong_id', $lelong_id)
@@ -167,6 +170,7 @@ class SerahanController extends Controller
 
         $invois = Payment::join('resit','payment.resit_id','=','resit.id')
         ->where('resit.id',$lelong_id)
+        ->where ('kodcaw',$user->kodcaw)
         ->get();      
         // dd($invois);  
         
@@ -175,10 +179,12 @@ class SerahanController extends Controller
         ->where('user_id',$user_id)
         ->where('lelongbidder.status_bidder', 1)
         ->where('lelongbid.lelong_id', $lelong_id)
+        ->where('lelongbid.kodcaw',$user->kodcaw)
         ->get();
 
         $senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
         // ->where('lelongbid.kodcaw',$caw['caw_code']) buang jap nti check balik
+        ->where('lelongbid.kodcaw',$user->kodcaw)
         ->where('user_id',$user_id)
         ->where('lelongbidder.status_bidder', 1)
         ->where('lelongbid.lelong_id', $lelong_id)
diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php
index 1a6eecf8..bab8f0f2 100644
--- a/resources/views/pembayaran/kaunterpembayaran.blade.php
+++ b/resources/views/pembayaran/kaunterpembayaran.blade.php
@@ -39,7 +39,7 @@
                             <td>{{ number_format($winner['totalPay'], 2, '.', ',')}}</td>
                             <td>
                                 @if($winner['totalPay'] < $winner['totalBid'])
-                                    <button class="btn btn-warning btn-sm" disabled>BELUM SELESAI</button>
+                                    <button class="btn btn-danger btn-sm" disabled>BELUM SELESAI</button>
                                 @elseif($winner['totalPay'] == $winner['totalBid'])
                                     <button class="btn btn-success btn-sm" disabled>SELESAI</button>
                                 @endif
@@ -47,8 +47,18 @@
                             <td>
                                 <a href="{{ route('serahan.penyatabayaran',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Penyata Bayaran" ><i class="fas fa-download"></i></a>
                             </td>
-                            <td>
+                            <td>   
+                                
+                                @if($winner['totalPay'] < $winner['totalBid'])
+                                <a href="#" target = "blank" data-toggle="tooltip" data-placement="top" title="" ><i class="fas fa-download" style="color:#DCDCDC"></i></a>
+                                @elseif($winner['totalPay'] == $winner['totalBid'])
                                 <a href="{{ route('serahan.resitpembayaran',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Resit Bayaran" ><i class="fas fa-download"></i></a>
+                                @endif
+
+
+
+
+
                             </td>
                             <td>
                                 {{-- @if( ($winner['totalPay'] < $winner['totalBid']) || ($winner['sts_payment'] == 2) )     --}}
diff --git a/resources/views/tangguhlelong/senarailelongtangguh.blade.php b/resources/views/tangguhlelong/senarailelongtangguh.blade.php
index 784bc7a2..d1d71e34 100644
--- a/resources/views/tangguhlelong/senarailelongtangguh.blade.php
+++ b/resources/views/tangguhlelong/senarailelongtangguh.blade.php
@@ -59,10 +59,10 @@
                             </td>
                             <td> 
                                 @if($lel['info']['sts_lelong'] == 0)
-                                @foreach($lel['detailsinfo'] as $details)
+                                {{-- @foreach($lel['detailsinfo'] as $details) --}}
                                 <a  href="{{ route('tangguhlelong.carian', $lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Carian" style="margin-right:40px"><i class="fas fa-search"></i></a>
                                 <a  href="{{ route('tangguhlelong.listtangguh', [$lel['info']['lelong_id'], $details['caw_code']]) }}" data-toggle="tooltip" data-placement="top" title="Senarai Tangguh" style="margin-right:40px"><i class="fas fa-list"></i></a>
-                                @endforeach
+                                {{-- @endforeach --}}
                                 @endif
                             </td>
                         </tr>