diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 810ec05a..d8c16467 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -141,9 +141,38 @@ class HomeController extends Controller
         ->get();
         
         }
+
+        //paparan pemenang lelongan harini
+        $arrayinfomenang = [];
+
+        $lelongmenang = 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) 
+        ->where('tarikh_lelong', '=', $dateTime)
+        ->get()
+        ->toArray();
+        // dd($lelongmenang);
+
+        foreach($lelongmenang as $details)
+        {
+
+            $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')
+            ->where('lelong_id',$details['lelong_id'])    
+            ->distinct()
+            ->orderBy('lelong_id')
+            ->get()
+            ->toArray();
+            // dd($detailsinfo);
+            
+            array_push($arrayinfomenang,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
+        }
+        //end paparan pemenang lelongan harini
         
         
-        return view('home',compact('lelongmutu', 'arrayinfomutu','arrayinfo','sag','semakCountArray'));
+        return view('home',compact('lelongmutu', 'arrayinfomutu','arrayinfo','sag','semakCountArray','arrayinfomenang'));
 
     }
 
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index fe5d2511..d52710bb 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -17,6 +17,7 @@ use App\Models\FileResit;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Auth;
 use App\Models\Invoice;
+use App\Models\PayDenoKaunter;
 
 class PaymentController extends Controller
 {
@@ -255,6 +256,33 @@ class PaymentController extends Controller
             $resit->total_payment =  $request->amaunkiraan;
             $resit->resit_type = 2; // 1 = fee , 2 = bid
             $resit->save();
+        
+        //adddenokaunter
+        $paymentdeno = PayDenoKaunter::create([
+            'user_id' => $request->user_id,
+            'lelong_id' => $request->lelong_id,
+            'kodcaw' => $user->kodcaw,
+            // 'norujukan' => $norujukan_id[$index1],
+            'status_payment_opt' => 1,
+            'status' => 2,
+            'remark' => 'TUNAI',
+            'resit_id' => $resit->id,
+            'total_payment' => $request->amaunkiraan,
+            '1sen' => $request->ambilansen1,
+            '5sen' => $request->ambilansen5,
+            '10sen' => $request->ambilansen10,
+            '20sen' => $request->ambilansen20,
+            '50sen' => $request->ambilansen50,
+            'rm1' => $request->ambilanring1,
+            'rm5' => $request->ambilanring5,
+            'rm10' => $request->ambilanring10,
+            'rm20' => $request->ambilanring20,
+            'rm50' => $request->ambilanring50,
+            'rm100' => $request->ambilanring100,
+            'disahkan_oleh' => $user->id,
+            'disahkan_pada' => $currentdate
+        ]);
+
             
        
    
@@ -286,20 +314,11 @@ class PaymentController extends Controller
                 'remark' => 'TUNAI',
                 'resit_id' => $resit->id,
                 'total_payment' => $eachbid->hargabida,
-                '1sen' => $request->ambilansen1,
-                '5sen' => $request->ambilansen5,
-                '10sen' => $request->ambilansen10,
-                '20sen' => $request->ambilansen20,
-                '50sen' => $request->ambilansen50,
-                'rm1' => $request->ambilanring1,
-                'rm5' => $request->ambilanring5,
-                'rm10' => $request->ambilanring10,
-                'rm20' => $request->ambilanring20,
-                'rm50' => $request->ambilanring50,
-                'rm100' => $request->ambilanring100,
                 'disahkan_oleh' => $user->id,
                 'disahkan_pada' => $currentdate
             ]);
+
+           
     
             
             $updatelelbidbidder = LelongBidder::where('lelongbid_id', $eachbid->lelongbid_id)
@@ -326,7 +345,7 @@ class PaymentController extends Controller
 
         if(floatval($request->amaunkiraan) == $total_hargabida)
         {
-            $resit->total_payment = $resit->total_payment + $total_hargabida;
+            $resit->total_payment = $request->amaunkiraan;
             if($resit->total_payment >= $senaraisagallpayment->sum('hargabida'))
             {
                 $resit->status = 'PAID'; // $resit->status = 'PAID'; when hargabida >= total_payment di resit
diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php
index 3de8fd6b..d5812e0e 100644
--- a/app/Http/Controllers/PembidaController.php
+++ b/app/Http/Controllers/PembidaController.php
@@ -726,6 +726,69 @@ class PembidaController extends Controller
         return redirect()->route('pembida.kebenaranbayarantunai')->with('success','Kebenaran Berjaya');
 
     }
+
+    public function SenaraiPemenang($lelong_id,$kodcaw){
+
+        // $user = Auth::user();
+
+        $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+        ->where('lelongbidder.status_bidder', 1)
+        ->where('lelongbid.kodcaw',$kodcaw)
+        ->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();
+            $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+            ->where('user_id', $winner['user_id'])
+            ->where('lelongbid.kodcaw', $kodcaw)
+            ->where('lelongbidder.status_bidder', 1)
+            ->where('lelongbid.lelong_id', $lelong_id)
+            ->get();
+            // dd($userdetails);
+
+            $sts_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+            ->where('user_id', $winner['user_id'])
+            ->where('lelongbidder.status_bidder', 1)
+            ->where('lelongbid.kodcaw', $kodcaw)
+            ->where('lelongbid.lelong_id', $lelong_id)
+            ->select('lelongbidder.status_payment')
+            ->get();
+            // dd($sts_payment[0]['status_payment']);
+
+            $payment_id = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+            ->where('user_id', $winner['user_id'])
+            ->where('lelongbid.kodcaw', $kodcaw)
+            ->where('lelongbidder.status_bidder', 1)
+            ->where('lelongbid.lelong_id', $lelong_id)
+            ->select('payment_id')->groupBy('payment_id')->get();
+            
+            $total_payment = 0;
+            foreach($payment_id as $id){
+                $payment = Payment::where('id', $id->payment_id)
+                ->first();
+                // dd($payment);
+
+                if($payment){
+                    $total_payment = $total_payment + $payment->total_payment;
+                }
+            }
+            // dd($total_payment);
+
+            $listwinner[$index1]['details'] = $userdetails;
+            $listwinner[$index1]['total_surat'] = sizeof($SAGWin);
+            $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
+            $listwinner[$index1]['totalPay'] = $total_payment;
+            $listwinner[$index1]['sts_payment'] = $sts_payment[0]['status_payment'];
+
+        }
+
+        return view('home.kaunterpembayaran',compact('listwinner','lelong_id','kodcaw'));
+
+    }
     
 }
        
\ No newline at end of file
diff --git a/app/Models/PayDenoKaunter.php b/app/Models/PayDenoKaunter.php
new file mode 100644
index 00000000..73174c6f
--- /dev/null
+++ b/app/Models/PayDenoKaunter.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class PayDenoKaunter extends Model
+{
+    use HasFactory;
+
+    protected $table = 'paydenokaunter';
+
+    protected $fillable = [
+        'user_id',
+        'lelongbidder_id',
+        'lelongbid_id',
+        'lelong_id',
+        'kodcaw',
+        'status_payment_opt',
+        'resit_id',
+        'status',
+        'remark',
+        '1sen',
+        '5sen',
+        '10sen',
+        '20sen',
+        '50sen',
+        'rm1',
+        'rm5',
+        'rm10',
+        'rm20',
+        'rm50',
+        'rm100',
+        'total_payment',
+        'disahkan_pada',
+        'disahkan_oleh'
+    ];
+}
diff --git a/database/migrations/2022_01_25_010223_create_payment_table.php b/database/migrations/2022_01_25_010223_create_payment_table.php
index 55383e4c..fc3eea2e 100644
--- a/database/migrations/2022_01_25_010223_create_payment_table.php
+++ b/database/migrations/2022_01_25_010223_create_payment_table.php
@@ -54,6 +54,42 @@ class CreatePaymentTable extends Migration
                 ->onDelete('cascade');
         });
 
+        Schema::create('paydenokaunter', function (Blueprint $table) {
+            $table->bigIncrements('id');
+            $table->unsignedBigInteger('user_id')->unsigned();
+            $table->unsignedBigInteger('lelong_id')->unsigned();
+            $table->string('kodcaw')->nullable();
+            $table->integer('status_payment_opt')->nullable();  //1=kaunter,2=online,3=CDM
+            $table->integer('resit_id');
+            $table->integer('status'); //1 = fee RM10 , 2 = paybidifwin 
+            $table->string('remark');
+            $table->integer('1sen')->nullable();
+            $table->integer('5sen')->nullable();
+            $table->integer('10sen')->nullable();
+            $table->integer('20sen')->nullable();
+            $table->integer('50sen')->nullable();
+            $table->integer('rm1')->nullable();
+            $table->integer('rm5')->nullable();
+            $table->integer('rm10')->nullable();
+            $table->integer('rm20')->nullable();
+            $table->integer('rm50')->nullable();
+            $table->integer('rm100')->nullable();
+            $table->decimal('total_payment', $precision = 11, $scale = 2);
+            $table->datetime('disahkan_pada')->nullable();
+            $table->integer('disahkan_oleh')->nullable();
+            $table->datetime('diminta_pada')->nullable();
+            $table->integer('diminta_oleh')->nullable();
+            $table->timestamps();
+
+            $table->foreign('user_id')
+            ->references('id')->on('users')
+            ->onDelete('cascade');
+
+            $table->foreign('lelong_id')
+                ->references('id')->on('lelong')
+                ->onDelete('cascade');
+        });
+
         Schema::create('resit', function (Blueprint $table) {
             $table->bigIncrements('id');
             $table->unsignedBigInteger('user_id')->unsigned();
@@ -108,6 +144,7 @@ class CreatePaymentTable extends Migration
     public function down()
     {
         Schema::dropIfExists('payment');
+        Schema::dropIfExists('paydenokaunter');
         Schema::dropIfExists('resit');
         Schema::dropIfExists('invoice');
     }
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index cae51823..e9e8518f 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -261,7 +261,63 @@
                                 </div>
                             </div>
                         </div>
-                  
+                        @if(count($arrayinfomenang)> 0)
+                        SENARAI PEMENANG BIDAAN MENGIKUT CAWANGAN
+                        <table class="table table-striped  table-xl text-center" id="senarailelongonline" style="width:100%">
+                            <thead class="bg-primary text-white">
+                                    <tr>
+                                        <th>No</th>
+                                        <th>ID 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>Status Lelong</th>
+                                    </tr>
+                            </thead>
+                            <tbody>
+                                @foreach($arrayinfomenang 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)
+                                        <a 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>
+                                        @endforeach
+                                    </td>
+                                    <td class="text-left">
+                                        @foreach($lel['detailsinfo'] as $details)
+                                        <span class="m-2"> @if($details['export_data_sts'] == '1')
+                                        <i class="far fa-flag"></i> Selesai Export
+                                        
+                                        @endif
+                                    
+                                        </span><br>
+                                        @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>
+                                        @endif
+                                    </td>
+                                
+                                </tr>
+                                @endforeach
+                            </tbody>
+                        </table>
+                        @endif
                       
                     @endhasrole
                     @hasrole('account')
diff --git a/resources/views/home/kaunterpembayaran.blade.php b/resources/views/home/kaunterpembayaran.blade.php
new file mode 100644
index 00000000..f850a8b9
--- /dev/null
+++ b/resources/views/home/kaunterpembayaran.blade.php
@@ -0,0 +1,145 @@
+@extends('layouts.app')
+
+@section('content')
+
+<div class="container-fluid">
+    <div class="row ">
+        <div class="col-md-11 mx-auto card p-4">
+        @if ($message = Session::get('success'))
+                <div class="alert alert-success">
+                    <p>{{ $message }}</p>
+                </div>
+        @elseif ($message = Session::get('failed'))
+                <div class="alert alert-danger">
+                    <p>{{ $message }}</p>
+                </div>
+        @endif
+        <div class="nav nav-tabs" id="nav-tab" role="tablist">
+            <button  type="button" class="btn btn-light" ><a href="javascript:window.history.go(-1);"><h3><i class="fas fa-arrow-alt-circle-left"></i></h3></a></button>
+          </div>
+        <h4> Senarai Pemenang </h4>
+        <table class="table table-striped  table-xl text-center" id="tablekaunter" style="width:100%">
+            <thead class="bg-primary text-white">
+                    <tr>
+                        <th>No</th>
+                        <th>Nama</th>
+                        <th>No Kad Pengenalan</th>
+                        <th>No Telefon</th>
+                        <th>Bilangan Surat</th>
+                        <th>Jumlah Bidaan(RM)</th>
+                        <th>Amaun Telah Dibayar(RM)</th>
+                        <th>Status Bayaran</th>
+                        {{-- <th>Penyata Bayaran</th>
+                        <th>Slip Serahan</th>
+                        <th>Resit Pembayaran</th> --}}
+                        <th class="text-center">Tindakan</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['totalBid'], 2, '.', ',')}}</td>
+                            <td>{{ number_format($winner['totalPay'], 2, '.', ',')}}</td>
+                            <td>
+                                @if($winner['totalPay'] < $winner['totalBid'])
+                                    <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
+                            </td>
+                            {{-- <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>
+                                <a href="{{ route('serahan.slipserahan',['user_id'=>$winner['details']['id'],'lelong_id'=>$lelong_id]) }}" target = "blank" data-toggle="tooltip" data-placement="top" title="Muat Turun Slip Serahan" ><i class="fas fa-download"></i></a>
+                            </td>
+
+                            <td>
+                            <a href=" {{ route('serahan.resit', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id]) }} " data-toggle="tooltip" data-placement="top" title="Resit Pembayaran"><i class="far fa-edit"></i></a>
+                            </td> --}}
+
+                           
+                            <td>
+                                <a href=" {{ route('pembida.SAGBidItembycaw', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id, 'kodcaw'=>$kodcaw]) }} " data-toggle="tooltip" data-placement="top" title="Buat Pembayaran"><i class="far fa-edit"></i></a>
+                        </td>
+                        </tr>
+                @endforeach
+            </tbody>
+        </table>
+        <div class="modal-footer" style="margin-top:2%;">
+            {{-- <a  href="{{ route('pembayaran.SenaraiLelongBayar') }}" class="btn btn-primary">Kembali</a> --}}
+        </div>
+    </div>
+    </div>
+</div>
+
+<script>
+      //Enable tooltips everywhere
+      $(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',
+            // 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
+
diff --git a/resources/views/lelong/senaraimarhunsimulasi.blade.php b/resources/views/lelong/senaraimarhunsimulasi.blade.php
index 0d363d02..f212aa19 100644
--- a/resources/views/lelong/senaraimarhunsimulasi.blade.php
+++ b/resources/views/lelong/senaraimarhunsimulasi.blade.php
@@ -72,10 +72,8 @@
                                 <td align = 'right'>{{ number_format($marhun['pinjaman'] , 2, '.', ',') }}</td>
                                 <td align = 'right'>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
                                 <td align = 'right'>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
+                                {{-- {{dd($marhun['norujukan'])}} --}}
                                 @php
-                                    
-                                
-
                                      if(strpos($marhun['baki'], '-') !== false)
                                      {
                                         $rugi  = $marhun['baki'];
diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php
index 6365784c..d74a5dfd 100644
--- a/resources/views/pembayaran/SAGBidItem.blade.php
+++ b/resources/views/pembayaran/SAGBidItem.blade.php
@@ -103,7 +103,7 @@
             <input type="hidden" name="user_id" value="{{ $user_id }}" />
             <input type="hidden" name="lelong_id" value="{{ $lelong_id }}" />
             <input type="hidden" name="eachbid[]" id="eachbid" value="" />
-            <input type="text" name="norujukan[]" id="norujukan" value="" />
+            <input type="hidden" name="norujukan[]" id="norujukan" value="" />
 
             <div class="modal-content">
                 <div class="modal-header justify-content-center" style="text-align: center;">
diff --git a/resources/views/pembida/SAGBidItembycaw.blade.php b/resources/views/pembida/SAGBidItembycaw.blade.php
index 87f6339e..ce520d7f 100644
--- a/resources/views/pembida/SAGBidItembycaw.blade.php
+++ b/resources/views/pembida/SAGBidItembycaw.blade.php
@@ -82,9 +82,9 @@
                 <button type="button" class="btn btn-success" onclick="confirmsah()" >Benarkan Bayaran Tunai</button>
                 @endif
             </div>
-            <div>
+            {{-- <div>
                 <a href="{{ route('pembida.kebenaranbayarantunai' ) }}" class="btn btn-primary" style="width:15%; margin-right:53%;">Kembali</a>
-            </div>
+            </div> --}}
         </div>
     </div>
 </div>
diff --git a/routes/web.php b/routes/web.php
index 27283cc7..389d585a 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -303,6 +303,7 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid
     Route::get('/senaraisagpemenangbycaw/{user_id}/{lelong_id}/{kodcaw}',['as'=>'pembida.senaraisagpemenangbycaw','uses'=>'PembidaController@senaraisagpemenangbycaw']);
     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']);
 
 
 });