From 0c3a625f8e9262d8e1526d937e8396667fd0f046 Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Thu, 30 Jun 2022 13:17:10 +0800
Subject: [PATCH] update bayaran atas talian, migration kod caw table payment
 by cawangan, date format, senarai pemenang , lelong tak laku by caw

---
 app/Http/Controllers/AccountController.php    |   2 +
 app/Http/Controllers/LelongController.php     | 149 ++++++++++++------
 ...01_23_042652_create_lelongbidder_table.php |   1 +
 .../views/account/listbayaranonline.blade.php |   2 +-
 .../views/jurulelong/listpemenang.blade.php   |  13 +-
 .../views/lelong/lelongtaklaku.blade.php      |  23 +--
 .../views/lelong/senarailelong.blade.php      | 136 ++++++++--------
 .../lelong/senarailelongtaklaku.blade.php     |  10 +-
 .../views/lelong/senaraipemenang.blade.php    |   6 +-
 .../views/lelong/senaraisagpemenang.blade.php |  15 +-
 routes/web.php                                |   6 +-
 11 files changed, 221 insertions(+), 142 deletions(-)

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index f48d0f32..20e719bc 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -83,6 +83,7 @@ class AccountController extends Controller
             $SAGWin = LelongBidder::join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
             ->join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
             ->where('lelongbidder.user_id', $winner['user_id'])
+            ->where('lelongbidder.kodcaw',$kodcaw)
             ->where('lelongbidder.status_bidder', 1)
             ->where('payment.status_payment_opt', 3)
             ->orWhere('payment.status_payment_opt', 2)
@@ -94,6 +95,7 @@ class AccountController extends Controller
             ->where('lelongbidder.user_id', $winner['user_id'])
             ->where('lelongbidder.status_bidder', 1)
             ->where('lelongbid.lelong_id', $lelong_id)
+            ->where('lelongbidder.kodcaw',$kodcaw)
             ->select('lelongbidder.payment_id')
             ->groupBy('lelongbidder.payment_id')
             ->get();
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index d3379ba2..656d3b13 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -32,6 +32,11 @@ use App\Models\LelKarat;
 use App\Models\LelKarat_temp;
 use App\Models\Resit;
 use App\Models\LogUser;
+
+use App\Models\Customer;
+use App\Models\Daerah;
+use App\Models\Negeri;
+
 use Carbon\Carbon;
 use App\Models\LelongTebus;
 
@@ -56,26 +61,28 @@ class LelongController extends Controller
     public function index()
     {
      
-        $arrayinfo = [];
+        $arraydetails = [];           
+        
+        
+        $lelong = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
+        ->select('lelong_id','tarikh_lelong','fasa','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')   
+        ->groupBy('lelong_id')  
+        // ->where('lelong.sts_lelong', 3)  
+        ->get()->toArray();
 
-        $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
-        ->select('lelong.fasa','lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
-        ->groupBy('lelong_id')
-        ->get()
-        ->toArray();
-
-        foreach($lelong as $info)
+        foreach($lelong as $laporan)
         {
-
-            $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
-            ->where('lelong_id',$info['lelong_id'])
+            $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            ->where('lelong_id',$laporan['lelong_id'])         
             ->get()
             ->toArray();
-            array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
-
+            array_push($arraydetails,['laporan' => $laporan,'details' => $details]);
         }
 
-        return view('lelong.senarailelong',compact('lelong', 'arrayinfo'));
+
+        
+
+        return view('lelong.senarailelong',compact('lelong', 'arraydetails'));
     }
 
     public function show($id)
@@ -735,12 +742,12 @@ class LelongController extends Controller
 
     public function senarailelongtaklaku(Request $request){
         
-        $arraydetails = [];       
+        $arraydetails = [];               
         
         $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
-        ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
         ->select('lelong_id','tarikh_lelong','fasa','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong')
-        ->groupBy('lelong_id')
+        ->distinct()
+        ->orderBy('lelong_id')
         ->where('lelong.sts_lelong', 3)
         ->get()->toArray();
 
@@ -748,21 +755,18 @@ class LelongController extends Controller
         {
             $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
             ->where('lelong_id',$laporan['lelong_id'])    
+            ->distinct()
+            ->orderBy('lelong_id')
             ->get()
             ->toArray();
             array_push($arraydetails,['laporan' => $laporan,'details' => $details]);
         }
 
-        // $laporanpembida= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
-        // ->select('lelong_id','tarikh_lelong','fasa')
-        // ->groupBy('lelong_id')
-        // ->get()
-        // ->toArray();
 
         return view('lelong.senarailelongtaklaku',compact('senarai','arraydetails'));
     }
 
-    public function lelongtaklaku($lelong_id){
+    public function lelongtaklaku($lelong_id, $caw_code){
 
         $total_pinjaman = 0;
         $total_berat = 0;
@@ -772,16 +776,33 @@ class LelongController extends Controller
         $total_cajlelong = 0;
         $total_bakirugi = 0;
 
-        $tarikh_lelong = Lelong::where('id', $lelong_id)
-        ->select('tarikh_lelong')
-        ->groupBy('tarikh_lelong')
+        $arrayinfocaw = [];
+
+        $info = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
+        ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+        ->where('cawangan.caw_code',$caw_code)
+        ->where('cawangan_lelong.lelong_id','=',$lelong_id)
+        ->select('lelong_id','tarikh_lelong','fasa')
+        ->groupBy('lelong_id')
         ->get();
 
+        foreach($info as $laporancaw)
+        {
+            $cawangan = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            ->where('cawangan.caw_code',$caw_code)
+            ->where('lelong_id',$laporancaw['lelong_id'])
+            ->get()
+            ->toArray();
+            array_push($arrayinfocaw,['laporancaw' => $laporancaw,'cawangan' => $cawangan]);
+        }
+
+
 
 
         $lelongtaklaku = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
         ->where('status_jual', 0)
         ->where('lelongbid.lelong_id', $lelong_id)
+        ->where('lelongbid.kodcaw',$caw_code)
         ->whereNull('t_jual')
         ->select(
             'lelongbid.norujukan',
@@ -800,10 +821,13 @@ class LelongController extends Controller
         
         ->get();
 
+      
+
         foreach($lelongtaklaku as $index1=>$suratlelongtaklaku){
 
             $suratlelongtaklaku = LelongBid::join('lelong', 'lelongbid.lelong_id', '=', 'lelong.id')
             ->where('lelongbid.lelong_id', $lelong_id)
+            ->where('lelongbid.kodcaw',$caw_code)
             ->where('status_jual', '=', 1)
             ->whereNull('t_jual')
             ->get();
@@ -818,9 +842,11 @@ class LelongController extends Controller
         $total_upahsimpan = $total_upahsimpan + ($lelongtaklaku->sum('upahsimpan'));
         $total_cajlelong = $total_cajlelong + ($lelongtaklaku->sum('cajlelong'));
         $total_bakirugi = $total_bakirugi + ($lelongtaklaku->sum('baki'));
+     
+  
         
         return view('lelong.lelongtaklaku',compact('lelongtaklaku','lelong_id','total_pinjaman',
-        'total_berat','total_nmarhun','total_hargaasas','total_upahsimpan','total_upahsimpan','total_cajlelong','total_bakirugi','tarikh_lelong'));
+        'total_berat','total_nmarhun','total_hargaasas','total_upahsimpan','total_upahsimpan','total_cajlelong','total_bakirugi','info','arrayinfocaw'));
     }
 
     public function pdflelongtaklaku (Request $request){
@@ -894,13 +920,15 @@ class LelongController extends Controller
         return $pdf->download('Senarai Lelong Tak Laku.pdf');
     }
 
-    public function senaraipemenang($lelong_id){
+    public function senaraipemenang($lelong_id, $caw_code){
+
+             
 
         $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
         ->where('lelongbidder.status_bidder', 1)
         ->where('lelongbid.lelong_id', $lelong_id)
-        ->select('lelongbidder.user_id'
-        )
+        ->where('lelongbid.kodcaw', $caw_code)
+        ->select('lelongbidder.user_id')
         ->groupBy('lelongbidder.user_id')
         ->get()->toArray();
         // dd($listwinner);
@@ -912,27 +940,32 @@ class LelongController extends Controller
             ->where('user_id', $winner['user_id'])
             ->where('lelongbidder.status_bidder', 1)
             ->where('lelongbid.lelong_id', $lelong_id)
+            ->where('lelongbid.kodcaw', $caw_code)
             ->get();
 
             $listwinner[$index1]['details'] = $userdetails;
             $listwinner[$index1]['total_surat'] = sizeof($SAGWin);
             $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
             $listwinner[$index1]['lelong_id'] = $lelong_id;
+            // $listwinner[$index1]['kodcaw'] = $kodcaw;
         }
         
-        return view('lelong.senaraipemenang',compact('listwinner','lelong_id'));
+        return view('lelong.senaraipemenang',compact('listwinner','lelong_id','caw_code'));
     }
 
-    public function senaraisagpemenang($user_id, $lelong_id){
+    public function senaraisagpemenang($user_id, $lelong_id, $kodcaw){
+        
+        $userdetails = User::where('id', $user_id)->first(); 
         
-        // dd($user_id);
         $senaraisag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
         ->where('lelongbid.lelong_id', $lelong_id)
+        ->where('lelongbid.kodcaw', $kodcaw)
         ->where('lelongbidder.user_id', $user_id)
         ->where('lelongbidder.status_bidder', 1)
         ->get();
 
-        return view('lelong.senaraisagpemenang', compact('senaraisag', 'user_id', 'lelong_id'));
+
+        return view('lelong.senaraisagpemenang', compact('senaraisag', 'user_id', 'lelong_id','userdetails'));
     }
 
     public function senaraimarhun($lelongid, $cawid){
@@ -1561,26 +1594,48 @@ class LelongController extends Controller
     public function listpemenang()
     {
         $arrayinfo = [];
-        
-        $lelong = Lelong::where('sts_lelong', 3)
-        ->get()->toArray();
-        
+
+        $lelong = Lelong:: join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
+        ->where('sts_lelong',3)
+        ->select('cawangan_lelong.lelong_id','lelong.tarikh_lelong','lelong.fasa','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong')
+        ->distinct()
+        ->orderBy('lelong_id')
+        ->get()
+        ->toArray();
+
         foreach($lelong as $details)
         {
-            $detailsinfo = CawanganLelong::select('cawangan_lelong.caw_id','caw_name','lelongbid.status_jual')
-            ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
-            ->join('lelongbid','lelongbid.kodcaw','=','cawangan.caw_code')
-            ->where('lelongbid.status_jual', '1')
-            ->where('cawangan_lelong.lelong_id', $details['id'])
+
+            $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            ->join('lelongbid','cawangan.caw_code','=','lelongbid.kodcaw')
+            ->select('cawangan_lelong.lelong_id','cawangan_lelong.caw_id','cawangan.caw_name','cawangan.caw_code','lelongbid.status_jual')
+            ->where('lelongbid.status_jual', 1)
+            ->where('cawangan_lelong.lelong_id', $details['lelong_id'])
             ->distinct()
+            ->orderBy('lelong_id')
             ->get()
             ->toArray();
-            // dd($detailsinfo);
-            
-            array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
 
-           //dd($detailsinfo);
+            array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=> $detailsinfo]);
         }
+        
+        // $lelong = Lelong::where('sts_lelong', 3)
+        // ->get()->toArray();
+        
+        // foreach($lelong as $details)
+        // {
+        //     $detailsinfo = CawanganLelong::select('cawangan_lelong.caw_id','caw_name','lelongbid.status_jual')
+        //     ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+        //     ->join('lelongbid','lelongbid.kodcaw','=','cawangan.caw_code')
+        //     ->where('lelongbid.status_jual', '1')
+        //     ->where('cawangan_lelong.lelong_id', $details['id'])
+        //     ->distinct()
+        //     ->get()
+        //     ->toArray();
+            
+        //     array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
+
+        // }
 
         return view('jurulelong.listpemenang',compact('lelong', 'arrayinfo'));
     }
diff --git a/database/migrations/2022_01_23_042652_create_lelongbidder_table.php b/database/migrations/2022_01_23_042652_create_lelongbidder_table.php
index e82f8f53..92e473e3 100644
--- a/database/migrations/2022_01_23_042652_create_lelongbidder_table.php
+++ b/database/migrations/2022_01_23_042652_create_lelongbidder_table.php
@@ -17,6 +17,7 @@ class CreateLelongbidderTable extends Migration
             $table->bigIncrements('id');
             $table->unsignedBigInteger('user_id')->unsigned();
             $table->unsignedBigInteger('lelongbid_id')->unsigned();
+            $table->string('kodcaw')->nullable();
             $table->string('nama_bidder');
             $table->decimal('hargabida');
             $table->string('notelbimbit');
diff --git a/resources/views/account/listbayaranonline.blade.php b/resources/views/account/listbayaranonline.blade.php
index 6d2351db..067ce8a0 100644
--- a/resources/views/account/listbayaranonline.blade.php
+++ b/resources/views/account/listbayaranonline.blade.php
@@ -36,8 +36,8 @@
                             <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>{{ number_format($winner['totalBid'], 2, '.', ',')}}</td>
                             <td>
                                 <a href=" {{ route('account.sahsagonline', ['user_id'=>$winner['details']['id'], 'lelong_id'=>$lelong_id, 'caw_code'=>$kodcaw]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-edit"></i></a>
                             </td>
diff --git a/resources/views/jurulelong/listpemenang.blade.php b/resources/views/jurulelong/listpemenang.blade.php
index 511bbe92..45ddba61 100644
--- a/resources/views/jurulelong/listpemenang.blade.php
+++ b/resources/views/jurulelong/listpemenang.blade.php
@@ -19,17 +19,18 @@
                             <th>ID Lelong</th>
                             <th>Tarikh Lelong</th>
                             <th>Nama Cawangan</th>
+                            <th>Fasa</th>
                             <th>Harga Emas Asas</th>
                             <th>Tempoh</th>
                             <th>Caj Lelong</th>
-                            <th class="text-center">Tindakan</th>
+                            {{-- <th class="text-center">Tindakan</th> --}}
                         </tr>
                     </thead>
                     <tbody>
                         @foreach ($arrayinfo as $lel)
                         <tr>
                             <td>{{$loop->iteration}}</td>
-                            <td>{{ $lel['detail']['id']}}</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');
@@ -38,17 +39,19 @@
                             <td align = 'left'>
                                 @foreach($lel['detailsinfo'] as $details)
                                 @if($details['status_jual'] == 1)
-                                <a  href="{{ route('lelong.listpemenangbycaw',[$lel['detail']['id'],'caw_id'=>$details['caw_id']]) }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang"><i class="fas fa-trophy"></i></a>
+                           
+                                <a href=" {{ route('pemenang.senaraipemenang', [ '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>
                                 @endif
                                 <span class="m-2">{{$details['caw_name']}}</span><br>
                                 @endforeach
                             </td>
+                            <td>{{$lel['detail']['fasa']}}
                             <td>{{$lel['detail']['harga_emas_asas']}}</td>
                             <td>{{$lel['detail']['jbg']}}</td>
                             <td>{{$lel['detail']['cajlelong']}}</td>                     
-                            <td>
+                            {{-- <td>
                             <a  href="{{ route('lelong.senaraipemenang',$lel['detail']['id']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang"><i class="fas fa-trophy"></i></a>
-                            </td>
+                            </td> --}}
                         </tr>
                         @endforeach
                     </tbody>
diff --git a/resources/views/lelong/lelongtaklaku.blade.php b/resources/views/lelong/lelongtaklaku.blade.php
index f12f9caa..134e29e2 100644
--- a/resources/views/lelong/lelongtaklaku.blade.php
+++ b/resources/views/lelong/lelongtaklaku.blade.php
@@ -7,19 +7,24 @@
             <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>             
-              <table cellspacing="" cellpadding="4" text-align="left" border="0" height="25" align="left" id="sim" class="table table-striped  table-xl">
+              <table cellspacing="2" cellpadding="3" text-align="left" border="0" height="25" align="left" id="sim" class="table table-striped  table-xl">
                 <thead class="bg-light ">
-                    @foreach ($tarikh_lelong as $tarikh_lelong)
                     <tr> 
-                        
-                    <td><b>Tarikh Lelong : @php 
-                        $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_lelong->tarikh_lelong  );
+                        <td><b>ID Lelong:  {{$lelong_id}}</b></td>
+                        @foreach ($info as $info)
+                        <td><b>Tarikh Lelong : @php 
+                          $myDateTime = DateTime::createFromFormat('Y-m-d',$info->tarikh_lelong );
                           $datez = $myDateTime->format('d-m-Y');
                           echo($datez);                  
                         @endphp</b></td>
-                   
+                        @endforeach
+                        <td><b>Fasa: {{$info->fasa}} <b></td> 
+                        @foreach ($arrayinfocaw as $laporancaw)
+                        @foreach ($laporancaw['cawangan'] as $details)
+                        <td><b>Cawangan : {{$details['caw_name']}}
+                        @endforeach</b></td>
+                        @endforeach                   
                   </tr>
-                  @endforeach
                                 
                 </thead>
                 </table>
@@ -35,12 +40,11 @@
             <input type="hidden" name="type" value="User">
             <input type="hidden" name="lelongid" value="{{$lelong_id}}">
             
-            <table class="table table-striped  table-xl text-center" id="notis" style="width:100%">
+            <table class="table table-striped  table-xl text-center" id="notis" style="width:104%">
                 <thead class="bg-primary text-white">
                     <tr>
                         <th>No</th>
                         <th>No Rujukan</th>
-                        <th>Nama Cawangan</th>
                         <th>Bilangan</th>
                         <th>Pinjaman (RM)</th>
                         <th>Berat (gm)</th>
@@ -59,7 +63,6 @@
                 <tr>
                     <td>{{ $loop->iteration }}</td>
                     <td>{{ $leltaklaku->norujukan }}</td>
-                    <td>{{ $leltaklaku->caw_name }}</td>
                     <td>{{ $leltaklaku['suratlelongtaklaku'] }} </td>
                     <td>{{ $leltaklaku->pinjaman }}</td>
                     <td>{{ $leltaklaku->berat }}</td>
diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php
index 7776b8d8..42b295da 100644
--- a/resources/views/lelong/senarailelong.blade.php
+++ b/resources/views/lelong/senarailelong.blade.php
@@ -1,21 +1,20 @@
 @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'))
+        @if ($message = Session::get('success'))
                 <div class="alert alert-success">
                     <p>{{ $message }}</p>
                 </div>
-            @endif
-            <form id="exportform" action="" method="POST">
-                <input type="hidden" name="type" value="User">
-                <table class="table table-striped  table-xl text-center" id="tablelelong" style="width:100%">
-                    <thead class="bg-primary text-white">
-                        <tr>
-                            <th>No</th>
+        @endif
+        <table class="table table-striped  table-xl text-center" id="senarailelongtaklaku" style="width:100%">
+            <thead class="bg-primary text-white">
+                    <tr>
+                            <th>Bil</th>
                             <th>ID Lelong</th>
                             <th>Tarikh Lelong</th>
                             <th>Fasa</th>
@@ -25,80 +24,82 @@
                             <th>Tempoh</th>
                             <th>Caj Lelong</th>
                             <th class="text-center">Tindakan</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        
-                        @foreach ($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>{{$lel['info']['fasa']}}</td>
-                            <td align = 'left'>
-                                @foreach($lel['detailsinfo'] as $details)
-                                <span class="m-2">{{$details['caw_name']}}</span><br>
-                                @endforeach
-                            </td>
-                            {{-- <td>@php
-                                $myDateTime = DateTime::createFromFormat('H:i:s', $lel['info']['masatamat_lelong'] );
-                                $masa_lelong =  $myDateTime->format('h:i: a');
-                                dd($masa_lelong);
-                                echo($masa_lelong);
-                            @endphp</td> --}}
-                            <td>{{$lel['info']['masatamat_lelong']}}</td>
-                            <td>{{$lel['info']['harga_emas_asas']}}</td>
-                            <td>{{$lel['info']['jbg']}}</td>
-                            <td>{{$lel['info']['cajlelong']}}</td>                     
+                    </tr>
+            </thead>
+            <tbody>
+                @foreach($arraydetails as $data)
+                    <tr>
+                        <td>{{$loop->iteration}}</td>
+                        <td>{{ $data['laporan']['lelong_id'] }}</td>
+                        <td>@php
+                            $myDateTime = DateTime::createFromFormat('Y-m-d', $data['laporan']['tarikh_lelong'] );
+                            $t_lelong =  $myDateTime->format('d-m-Y');
+                            echo($t_lelong);
+                        @endphp</td>
+                        <td>{{$data['laporan']['fasa']}}</td>
+                        <td align = 'left'>
+                            @foreach($data['details'] as $details)
+                            <span class="m-2">{{$details['caw_name']}}</span><br>
+                            @endforeach
+                        </td>
+                        <td> @if($data['laporan']['masatamat_lelong'] == 0)
+                            {{$data['laporan']['masatamat_lelong']}}
+                         @else
+                            @php
+                            $myDateTime = DateTime::createFromFormat('H:i:s', $data['laporan']['masatamat_lelong'] );
+                            $masa_lelong =  $myDateTime->format('h:i: a');
+                            echo($masa_lelong);
                             
-                            <td class="text-center">
+                        @endphp
+                        
+                        @endif
+                        </td>
+                     
+                        <td>{{$data['laporan']['harga_emas_asas']}}</td>
+                        <td>{{$data['laporan']['jbg']}}</td>
+                        <td>{{$data['laporan']['cajlelong']}}</td>       
+                        
+                        <td class="text-center">
                             @hasrole('jurulelong')
-                            <a  href="{{ route('lelong.show',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Butiran" style="margin-right:40px" ><i class="far fa-edit"></i></a>
-                                <!-- @if($lel['info']['sts_lelong'] == 0) -->
-                                    <!-- <a  href="{{ route('lelong.refresh',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a> -->
-                                    <!-- <a class="startlelong" href="{{ route('lelong.start',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong" style="margin-right:40px"><i class="fa fa-play"></i></a> -->
-                                    <!-- <a  href="{{ route('lelong.show',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Butiran" style="margin-right:40px" ><i class="far fa-edit"></i></a> -->
-                                    <!-- <a class="confirmdel" href="{{ route('lelong.delete',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Padam" ><i class="far fa-trash-alt"></i></a> -->
-                                <!-- @elseif ($lel['info']['sts_lelong'] == 2) -->
-                                    <!-- <a  href="{{ route('lelong.janapemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang"><i class="fas fa-users-cog"></i></a> -->
-                                <!-- @elseif ($lel['info']['sts_lelong'] == 3) -->
-                                    <!-- <a  href="{{ route('lelong.senaraipemenang',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang"><i class="fas fa-trophy"></i></a> -->
+                            <a  href="{{ route('lelong.show',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Butiran" style="margin-right:40px" ><i class="far fa-edit"></i></a>
+                                <!-- @if($data['laporan']['sts_lelong'] == 0) -->
+                                    <!-- <a  href="{{ route('lelong.refresh',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a> -->
+                                    <!-- <a class="startlelong" href="{{ route('lelong.start',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Mula Lelong" style="margin-right:40px"><i class="fa fa-play"></i></a> -->
+                                    <!-- <a  href="{{ route('lelong.show',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Butiran" style="margin-right:40px" ><i class="far fa-edit"></i></a> -->
+                                    <!-- <a class="confirmdel" href="{{ route('lelong.delete',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Padam" ><i class="far fa-trash-alt"></i></a> -->
+                                <!-- @elseif ($data['laporan']['sts_lelong'] == 2) -->
+                                    <!-- <a  href="{{ route('lelong.janapemenang',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Jana Pemenang"><i class="fas fa-users-cog"></i></a> -->
+                                <!-- @elseif ($data['laporan']['sts_lelong'] == 3) -->
+                                    <!-- <a  href="{{ route('lelong.senaraipemenang',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Senarai Pemenang"><i class="fas fa-trophy"></i></a> -->
                                 <!-- @else -->
-                                    <!-- <a class="stoplelong" href="{{ route('lelong.stop',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong"><i class="fa fa-stop"></i></a> -->
+                                    <!-- <a class="stoplelong" href="{{ route('lelong.stop',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Tamat Lelong"><i class="fa fa-stop"></i></a> -->
                                 <!-- @endif -->
                             @endhasrole
                             @hasrole('operasi')
                                 
-                                @if($lel['info']['sts_lelong'] == 0)
-                                     <a  href="{{ route('lelong.kemaskinidata',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a>
-                                    <a  href="{{ route('lelong.show',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Senarai Lelong" style="margin-right:40px" ><i class="far fa-edit"></i></a>
-                                    <a  href="{{ route('lelong.showsimulasi',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Simulasi" style="margin-right:40px" ><i class="far fa-edit"></i></a>
-                                    <a class="confirmdel" href="{{ route('lelong.delete',$lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Padam" ><i class="far fa-trash-alt"></i></a>
-                                    @elseif($lel['info']['sts_lelong'] == 1)
+                                @if($data['laporan']['sts_lelong'] == 0)
+                                     <a  href="{{ route('lelong.kemaskinidata',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Kemaskini Data" style="margin-right:40px"><i class="fas fa-sync-alt"></i></a>
+                                    <a  href="{{ route('lelong.show',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Senarai Lelong" style="margin-right:40px" ><i class="far fa-edit"></i></a>
+                                    <a  href="{{ route('lelong.showsimulasi',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Lihat Simulasi" style="margin-right:40px" ><i class="far fa-edit"></i></a>
+                                    <a class="confirmdel" href="{{ route('lelong.delete',$data['laporan']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Padam" ><i class="far fa-trash-alt"></i></a>
+                                    @elseif($data['laporan']['sts_lelong'] == 1)
                                     <button class="btn btn-warning btn-sm" disabled>LELONGAN SEDANG DIJALANKAN</button>
-                                    @elseif($lel['info']['sts_lelong'] == 2)
+                                    @elseif($data['laporan']['sts_lelong'] == 2)
                                     <button class="btn btn-info btn-sm" disabled>JANA PEMENANG</button>
-                                    @elseif($lel['info']['sts_lelong'] == 3)
+                                    @elseif($data['laporan']['sts_lelong'] == 3)
                                     <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
                                 @endif
                             @endhasrole
                             </td>
-                        </tr>
-                        @endforeach
-
-
-
-                    </tbody>
-                </table>
-            </form>
+                    </tr>
+                @endforeach
+            </tbody>
+        </table>
         </div>
-        
     </div>
 </div>
+
+
 <script>
     //Enable tooltips everywhere
     $(function () {
@@ -174,5 +175,4 @@
         })
     }
 </script>
-     
-@endsection
+@endsection
\ No newline at end of file
diff --git a/resources/views/lelong/senarailelongtaklaku.blade.php b/resources/views/lelong/senarailelongtaklaku.blade.php
index fa5a1219..05463a13 100644
--- a/resources/views/lelong/senarailelongtaklaku.blade.php
+++ b/resources/views/lelong/senarailelongtaklaku.blade.php
@@ -23,7 +23,7 @@
                             <th>Harga Emas Asas</th>
                             <th>Tempoh</th>
                             <th>Caj Lelong</th>
-                            <th class="text-center">Tindakan</th>
+                            {{-- <th class="text-center">Tindakan</th> --}}
                     </tr>
             </thead>
             <tbody>
@@ -39,18 +39,20 @@
                         <td>{{ $data['laporan']['fasa'] }}</td>
                           <td  align = 'left'>
                             @foreach($data['details'] as $details)
-                                <span class="m-2">{{ $details['caw_name']}}</span><br>
+                            <a href=" {{ route('lelong.lelongtaklaku', ['lelong_id'=>$data['laporan']['lelong_id'], 'caw_code'=>$details['caw_code']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Barang Lelong"><i class="far fa-edit"></i></a>
+                            <span class="m-2"> {{ $details['caw_name']}}</span><br>
                             @endforeach
                         </td>
                         <td>@php
                             $myDateTime = DateTime::createFromFormat('H:i:s', $data['laporan']['masatamat_lelong'] );
                             $masa_lelong =  $myDateTime->format('h:i: a');
                             echo($masa_lelong);
-                        @endphp</td>
+                        @endphp
+                        </td>
                         <td>{{ $data['laporan']['harga_emas_asas'] }}</td>
                         <td>{{ $data['laporan']['jbg'] }}</td>
                         <td>{{ $data['laporan']['cajlelong'] }}</td>
-                        <td><a href=" {{ route('lelong.lelongtaklaku', ['lelong_id'=>$data['laporan']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Tak Laku" ><i class="far fa-edit"></i></a></td>
+                        {{-- <td><a href=" {{ route('lelong.lelongtaklaku', ['lelong_id'=>$data['laporan']['lelong_id']]) }} " data-toggle="tooltip" data-placement="top" title="Senarai Lelong Tak Laku" ><i class="far fa-edit"></i></a></td> --}}
                     </tr>
                 @endforeach
             </tbody>
diff --git a/resources/views/lelong/senaraipemenang.blade.php b/resources/views/lelong/senaraipemenang.blade.php
index 46e67267..99a6e1f7 100644
--- a/resources/views/lelong/senaraipemenang.blade.php
+++ b/resources/views/lelong/senaraipemenang.blade.php
@@ -37,8 +37,10 @@
                             <td>{{ $winner['total_surat']}}</td>
                             <td>{{ $winner['totalBid']}}</td>
                             <td>
-                            <a href=" {{ route('lelong.senaraisagpemenang', ['user_id'=>$winner['user_id'],'lelong_id'=>$lelong_id]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan" ><i class="far fa-edit"></i></a>
-                            </td>
+                            <a href=" {{ route('lelong.senaraisagpemenang', ['user_id'=>$winner['user_id'],'lelong_id'=>$lelong_id ,'kodcaw'=>$caw_code]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan" ><i class="far fa-edit"></i></a>
+                            {{-- <a href=" {{ route('lelong.senaraisagpemenang', ['user_id'=>$winner['user_id'],'lelong_id'=>$lelong_id,'ic'=>$winner['nokp']]) }} " data-toggle="tooltip" data-placement="top" title="Butiran Bidaan" ><i class="far fa-edit"></i></a> --}}
+    
+                        </td>
                         </tr>
                 @endforeach
             </tbody>
diff --git a/resources/views/lelong/senaraisagpemenang.blade.php b/resources/views/lelong/senaraisagpemenang.blade.php
index 14587351..dd1fac49 100644
--- a/resources/views/lelong/senaraisagpemenang.blade.php
+++ b/resources/views/lelong/senaraisagpemenang.blade.php
@@ -13,6 +13,15 @@
                     <p>{{ $message }}</p>
                 </div>
         @endif
+        <div class="container">
+            <div class="row mb-2">
+                <div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
+                    <p> <b>Nama Pembida : </b> {{ $userdetails['name'] }}</p>
+                    <p> <b>No Kad Pengenalan : </b> {{ $userdetails['nokp'] }}</p>
+                    <p> <b>No Telefon : </b> {{ $userdetails['notelbimbit'] }}</p>
+                </div>
+            </div>
+        </div>
         <table class="table table-striped  table-xl text-center" id="tablesagmenang" style="width:100%">
             <thead class="bg-primary text-white">
                     <tr>
@@ -37,11 +46,11 @@
                             <td>{{ number_format($senaraisag['hargaasas'], 2, '.', ',')}}</td>
                             <td>{{ number_format($senaraisag['hargabida'], 2, '.', ',')}}</td>
                             <td>{{ $senaraisag['masa_bidaan']}}</td>
-                            {{-- <td>@php
+                            <td>@php
                                 $myDateTime = DateTime::createFromFormat('Y-m-d', $senaraisag['t_lelong'] );
                                 $t_lelong =  $myDateTime->format('d-m-Y');
                                 echo($t_lelong);
-                            @endphp</td> --}}
+                            @endphp</td>
                         </tr>
                 @endforeach
             </tbody>
@@ -61,7 +70,7 @@
                 "orderable": false
                 }
             ],
-            order: [[1, 'asc']],
+            order: [[0, 'asc']],
             "info": false,
             "lengthChange": false,
             "pageLength": 15,
diff --git a/routes/web.php b/routes/web.php
index 81d5ff2f..5901a4c6 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -99,9 +99,9 @@ Route::group(['prefix'=>'lelong'], function () {
     Route::get('/create/{id}',['as'=>'lelong.create','uses'=>'LelongController@create']); 
     Route::get('/senarailelong',['as'=>'lelong.senarailelong','uses'=>'LelongController@index']);
     Route::get('/senaraipemenang/{lelong_id}',['as'=>'lelong.senaraipemenang','uses'=>'LelongController@senaraipemenang']);
-    Route::get('/senaraisagpemenang/{user_id}/{lelong_id}',['as'=>'lelong.senaraisagpemenang','uses'=>'LelongController@senaraisagpemenang']);
+    Route::get('/senaraisagpemenang/{user_id}/{lelong_id}/{kodcaw}',['as'=>'lelong.senaraisagpemenang','uses'=>'LelongController@senaraisagpemenang']);
     Route::get('/senarailelongtaklaku',['as'=>'lelong.senarailelongtaklaku','uses'=>'LelongController@senarailelongtaklaku']);
-    Route::get('/lelongtaklaku/{lelong_id}',['as'=>'lelong.lelongtaklaku','uses'=>'LelongController@lelongtaklaku']);
+    Route::get('/lelongtaklaku/{lelong_id}/{caw_code}',['as'=>'lelong.lelongtaklaku','uses'=>'LelongController@lelongtaklaku']);
     Route::post('/pdflelongtaklaku',['as'=>'lelong.pdflelongtaklaku','uses'=>'LelongController@pdflelongtaklaku']);
     Route::get('/showlelong/{id}',['as'=>'lelong.show','uses'=>'LelongController@show']); 
     Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']); 
@@ -173,6 +173,8 @@ Route::group(['prefix'=>'lelong'], function () {
         Route::get('/janapemenangbycaw/{lelong_id}/{cawid}',['as'=>'lelong.janapemenangbycaw','uses'=>'LelongController@janapemenangbycaw']); 
         Route::get('/janapemenangallcaw/{lelong_id}',['as'=>'lelong.janapemenangallcaw','uses'=>'LelongController@janapemenangallcaw']); 
         Route::get('/listpemenang',['as'=>'lelong.listpemenang','uses'=>'LelongController@listpemenang']); 
+        Route::get('/senaraipemenang/{lelong_id}/{kodcaw}',['as'=>'pemenang.senaraipemenang','uses'=>'LelongController@senaraipemenang']);
+
         Route::get('/listpemenangbycaw/{lelong_id}/{caw_id}',['as'=>'lelong.listpemenangbycaw','uses'=>'LelongController@listpemenangbycaw']); 
     });
 });