diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index b5e83bf5..77e76d4b 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -93,7 +93,10 @@ class AccountController extends Controller
$SAGWin = Payment::join('lelongbidder', 'payment.id', '=', 'lelongbidder.payment_id')
->where('payment.kodcaw', $kodcaw)
+ ->where('payment.lelong_id', $lelong_id)
+ ->where('payment.user_id', $winner['user_id'])
->get();
+ // dd($SAGWin);
$id_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('payment', 'lelongbidder.user_id', '=', 'payment.user_id')
@@ -467,7 +470,6 @@ class AccountController extends Controller
if($payment){
$total_payment = $total_payment + $payment->total_payment;
}
-
$disahkanoleh = User::where('id', $payment->disahkan_oleh)->first();
// dd($disahkanoleh);
}
diff --git a/resources/views/pembida/statuspembayaran.blade.php b/resources/views/pembida/statuspembayaran.blade.php
index 1d019356..d468d914 100644
--- a/resources/views/pembida/statuspembayaran.blade.php
+++ b/resources/views/pembida/statuspembayaran.blade.php
@@ -119,12 +119,16 @@
@forelse($details['listwinner'] as $winner)
@if($winner['jenisbayaran'] != NULL)
- @if($winner['jenisbayaran']['status'] == 2)
- SELESAI
+ @if($winner['jenisbayaran']['disahkan_oleh'] != NULL)
+ SELESAI
+ @elseif($winner['jenisbayaran']['disahkan_oleh'] == NULL)
+ TUNGGU PENGESAHAN
@else
- BELUM SELESAI
- @endif
+ BELUM SELESAI
@endif
+ @else
+ BELUM SELESAI
+ @endif
@empty
-