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/NotisController.php b/app/Http/Controllers/NotisController.php
index 4e4d4d81..2fddd4f6 100644
--- a/app/Http/Controllers/NotisController.php
+++ b/app/Http/Controllers/NotisController.php
@@ -186,64 +186,63 @@ class NotisController extends Controller
     public function listnotis(Request $request){
 
       
+        $lelong_id = $request->lelong_id;
+
         $user =  Auth::user();
         $caw = Cawangan::where('caw_code','=',$user->kodcaw)
         ->first();
 
-        $lelong_id = $request->lelong_id;
-
-        $senarai = LelongBid::where('lelongbid.kodcaw','=',$user->kodcaw)
-        ->where('lelongbid.lelong_id', $lelong_id);
-
-        $arraysenarai = $senarai->pluck('norujukan')->toArray();
-        $datasenarai = $senarai->get();
-
-        $gadaicaw = Gadai::on($datasenarai[0]['kodcaw'])->whereIn('norujukan',$arraysenarai)
-        ->where('gadai.kodcaw','=',$user->kodcaw)
-        ->get()->toArray();
-
         $bayaran=0;
-        foreach($gadaicaw as $index1=>$pay)
-        {
-            $bayaran = $pay['hargajualan'] - $pay['bakihargajualan'];
+        $arraydetails = [];
+
+        $caw = Cawangan::where('caw_code','=',$user->kodcaw)
+        ->first();
+
+        $lelong_id = $lelong_id;      
+
+        $marhun = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
+        ->where('lelong_id','=',$lelong_id)
+        ->where('lelongbid.kodcaw','=',$user->kodcaw);
+
+        $arraynorujukan = $marhun->pluck('norujukan')->toArray();
+        $datalelong = $marhun->get();
+        $marhuns = Gadai::on($datalelong[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
+        ->select('nokp')
+        ->groupBy('nokp')
+        ->get();
+        // dd($marhuns); 
+        $arraysag = [];
+       
+
+        foreach($marhuns as $index1=>$cal){
+            $customer =  Customer::where('kpbaru','=',$cal['nokp'])
+            ->orWhere('kplama','=',$cal['nokp'])
+            ->get();
+
+            $listsag = Gadai::on($datalelong[0]['kodcaw'])->whereIn('norujukan', $arraynorujukan)
+            ->where('nokp','=',$cal['nokp'])
+            ->get();
+            // dd($listgadai);
+            foreach($listsag as $index=>$listing){
+
+                $bayaran = $listing['hargajualan'] - $listing['bakihargajualan'];
+
+            }
+            $marhuns[$index1]['nama'] = $customer;
+            $marhuns[$index1]['listsag'] = $listsag;
+// dd($marhuns[$index1]['nama']);
+            
         }
 
-        $gadaicaw2 = Gadai::on($datasenarai[0]['kodcaw'])->whereIn('norujukan',$arraysenarai)
-        ->where('gadai.kodcaw','=',$user->kodcaw);
-
-        
-        $arraycustomer = $gadaicaw2->pluck('nokp')->toArray();
-        $datacustomer = $gadaicaw2->get();
-        // dd($gadaicaw2);
-        $customer = Customer::query()
-        ->whereIn('kpbaru',$arraycustomer)
-        ->orWhereIn('kplama',$arraycustomer)            
-        ->get()->toArray();     
-        
-
-        
-        //  $customer[$index1]['listsag'] = $listsag;
-
-        // ->join('customer', function ($join) {
-        //     $join->on('gadai.nokp', '=', 'customer.kpbaru')->orOn('gadai.nokp', '=', 'customer.kplama');
-        //     })       
-        //     ->where('gadai.kodcaw','=',$user->kodcaw)
-        //     ->where('lelongbid.lelong_id', $lelong_id)
-        // ->get()->toArray();   
-
-
-        // $payment[$index1]['payment'] = $payment;
-        // $payment[$index1]['bayaran_keuntungan'] = $bayaran;
-
         if($request->type == 'excel')
         {
 
-            return view('excel.listnotis_excel',compact('gadaicaw','caw','lelong_id','bayaran','customer'));
+            return view('excel.listnotis_excel',compact('marhuns','lelong_id','bayaran','listsag','caw'));
 
         }
         else
         {
-            $pdf = PDF::loadView('pdf.listnotis',compact('gadaicaw','caw','lelong_id','bayaran'))
+            $pdf = PDF::loadView('pdf.listnotis',compact('marhuns','lelong_id','bayaran','listsag','caw'))
             ->setPaper('a4', 'potrait');
             
             return $pdf->download('Senarai Notis.pdf');
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/excel/listnotis_excel.blade.php b/resources/views/excel/listnotis_excel.blade.php
index 4c562f9b..13d51534 100644
--- a/resources/views/excel/listnotis_excel.blade.php
+++ b/resources/views/excel/listnotis_excel.blade.php
@@ -63,28 +63,29 @@
                 <tr>
                     <th align="left">No</th>
                     <th align="left">Nama</th>
+                    <th align="left">No KP</th>
                     <th align="left">No Rujukan</th>
                     <th align="left">No Telefon</th>
                     <th align="left">Tempoh</th>
-                    <th align="left">No KP</th>
                     <th align="left">Pembiayaan</th>
                     <th align="left">Keuntungan 6 Bulan</th>
                     <th align="left">Bayaran Telah Dibuat</th>
                 </tr>
             </thead>
-            @foreach($customer as $index1=> $pay)
-                        <tr>
-                            <td align="left">{{ $loop->iteration }} </td>
-                            <td align="left">{{ $pay['nama']}}</td>
-                            <td align="left">{{ $gadaicaw[$index1]['norujukan'] }}</td>
-                            <td align="left">6{{ $pay['telefon']}}</td>
-                            <td align="left">{{ $gadaicaw[$index1]['tempoh'] }}</td>
-                            <td align="left">{{ $gadaicaw[$index1]['nokp'] }}</td>
-                            <td align="left">{{ number_format($gadaicaw[$index1]['pinjaman'], 2, '.', ',')}}</td>
-                            <td align="left">{{ number_format($gadaicaw[$index1]['bakiupah'], 2, '.', ',')}}</td>
-                            <td align="left">{{ number_format($bayaran, 2, '.', ',')}}</td>
+            @foreach($marhuns as $index1=> $notis)
+         
+            <tr>
+                <td>{{ $loop->iteration }} </td>
+                <td>@foreach($notis['nama'] as $data){{ $data['nama']}}<br>@endforeach</td>
+                <td>{{ $notis['nokp']}}</td>
+                <td>@foreach($notis['listsag'] as $item){{ $item['norujukan']}}, <br>@endforeach</td>
+                <td>@foreach($notis['nama'] as $data)6{{ $data['telefon']}}<br>@endforeach</td>
+                <td>@foreach($notis['listsag'] as $item){{ $item['tempoh']}}, <br>@endforeach</td>
+                <td>@foreach($notis['listsag'] as $item){{ number_format($item['pinjaman'], 2, '.', ',')}}, <br>@endforeach</td>
+                <td>@foreach($notis['listsag'] as $item){{ number_format($item['bakiupah'], 2, '.', ',')}}, <br>@endforeach</td>  
+                <td>{{ number_format($bayaran, 2, '.', ',')}}<br></td>  
 
-                @endforeach
+    @endforeach
 
             </div>
 
@@ -97,7 +98,7 @@
         
         var table2excel = new Table2Excel();
         table2excel.export(document.querySelectorAll("#customers"),'senarai_notis');
-        setTimeout(function(){ window.close() }, 1000);
+        setTimeout(function(){ window.close() }, 10);
         
         
       });
diff --git a/resources/views/pdf/listnotis.blade.php b/resources/views/pdf/listnotis.blade.php
index 8fbc66ef..5d3d4cd4 100644
--- a/resources/views/pdf/listnotis.blade.php
+++ b/resources/views/pdf/listnotis.blade.php
@@ -91,26 +91,28 @@ tr:nth-child(even) {
                                 <thead>
                                 <tr> 
                                     <th>No</th>
+                                    <th>No Kp</th>
                                     <th>No Rujukan</th>
                                     <th>JGB</th>
-                                    <th>No Kp</th>
                                     <th>Pembiayaan</th>
                                     <th>Keuntungan 6 Bulan</th>
                                     <th>Bayaran Telah Dibuat</th>                                                  
         
                                 </tr>
                                 </thead>
-                            @foreach($gadaicaw as $index1=> $pay)
-                            <tr>
-                                <td align="left">{{ $loop->iteration }} </td>
-                                <td align="left">{{ $pay['norujukan']}}</td>
-                                <td align="left">{{ $pay['tempoh']}}</td>
-                                <td align="left">{{ $pay['nokp']}}</td>
-                                <td align="left">{{ number_format($pay['pinjaman'], 2, '.', ',')}}</td>
-                                <td align="left">{{ number_format($pay['bakiupah'], 2, '.', ',')}}</td>
-                                <td align="left">{{ number_format($bayaran, 2, '.', ',')}}</td> 
-                            </tr>
-                             @endforeach
+                                @foreach($marhuns as $index1=> $notis)
+                                <tr>
+                                    <td>{{ $loop->iteration }} </td>
+                                    <td>{{ $notis['nokp']}}</td>
+                                    {{-- <td style='word-wrap'>{{ $notis['nama']['nama']}}</td> --}}
+        
+                                    <td>@foreach($notis['listsag'] as $item){{ $item['norujukan']}}<br>@endforeach</td>
+                                    <td>@foreach($notis['listsag'] as $item){{ $item['tempoh']}}<br>@endforeach</td>
+                                    <td>@foreach($notis['listsag'] as $item){{ number_format($item['pinjaman'], 2, '.', ',')}}<br>@endforeach</td>
+                                    <td>@foreach($notis['listsag'] as $item){{ number_format($item['bakiupah'], 2, '.', ',')}}<br>@endforeach</td>  
+                                    <td>{{ number_format($bayaran, 2, '.', ',')}}<br></td>  
+        
+                        @endforeach
                         </table>
   
                         </div>
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>