From 8f1577cca17dcd1b13c041bf68139c563207c9fc Mon Sep 17 00:00:00 2001
From: Amir <amirhassan.hamzan@gmail.com>
Date: Sun, 19 Feb 2023 12:14:52 +0800
Subject: [PATCH] Fix senarai sag menang group by cawangan, operasi

---
 app/Http/Controllers/PembidaController.php         | 3 ++-
 resources/views/pembida/pembayaranbidaan.blade.php | 2 +-
 routes/web.php                                     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php
index bc175336..4665ef71 100644
--- a/app/Http/Controllers/PembidaController.php
+++ b/app/Http/Controllers/PembidaController.php
@@ -324,7 +324,7 @@ class PembidaController extends Controller
 
     
 
-    public function detailsbidaan($user_id, $kodcaw)
+    public function detailsbidaan($lelong_id, $user_id, $kodcaw)
     {
 
         $userdetail = User::where('id', $user_id)->first();
@@ -336,6 +336,7 @@ class PembidaController extends Controller
         ->where('cawangan.caw_code', $kodcaw)
         ->where('lelongbid.kodcaw', $kodcaw)
         ->where('lelongbidder.status_payment', 1)
+        ->where('lelongbid.lelong_id', $lelong_id)
         ->select('lelongbid.id as lelongbid_id',
                  'lelongbidder.id as lelongbidder_id',
                  'lelongbid.lelong_id',
diff --git a/resources/views/pembida/pembayaranbidaan.blade.php b/resources/views/pembida/pembayaranbidaan.blade.php
index 8096386a..b8de45a8 100644
--- a/resources/views/pembida/pembayaranbidaan.blade.php
+++ b/resources/views/pembida/pembayaranbidaan.blade.php
@@ -72,7 +72,7 @@
                             @endif
                         </td>
                         <td>
-                            <a class="btn m-1 btn-info" href="{{ route('pembida.detailsbidaan', [ 'user_id'=>$winner['details']['id'], $kodcaw ]) }}"  data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-list-alt"></i></a>
+                            <a class="btn m-1 btn-info" href="{{ route('pembida.detailsbidaan', [ $lelong_id, 'user_id'=>$winner['details']['id'], $kodcaw ]) }}"  data-toggle="tooltip" data-placement="top" title="Butiran Bidaan"><i class="far fa-list-alt"></i></a>
                         </td>
                         </tr>
                     @php 
diff --git a/routes/web.php b/routes/web.php
index 82235a80..b9cd941b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -323,7 +323,7 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid
     Route::post('/update',['as'=>'pembida.update','uses'=>'PembidaController@update']);
     Route::get('/senlelpembayaranbidaan',['as'=>'pembida.senlelpembayaranbidaan','uses'=>'PembidaController@senlelpembayaranbidaan']);
     Route::get('/pembayaranbidaan',['as'=>'pembida.pembayaranbidaan','uses'=>'PembidaController@pembayaranbidaan']);
-    Route::get('/detailsbidaan/{user_id}/{kodcaw}',['as'=>'pembida.detailsbidaan','uses'=>'PembidaController@detailsbidaan']);
+    Route::get('/detailsbidaan/{lelong_id}/{user_id}/{kodcaw}',['as'=>'pembida.detailsbidaan','uses'=>'PembidaController@detailsbidaan']);
     Route::get('/senlelbelumbayarbidaan',['as'=>'pembida.senlelbelumbayarbidaan','uses'=>'PembidaController@senlelbelumbayarbidaan']);
     Route::get('/belumbayarbidaan',['as'=>'pembida.belumbayarbidaan','uses'=>'PembidaController@belumbayarbidaan']);
     Route::post('/declaretidaklaku',['as'=>'pembida.declaretidaklaku','uses'=>'PembidaController@declaretidaklaku']);