diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 7b7e6a06..2430fb6b 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -686,7 +686,7 @@ class AccountController extends Controller
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbid.kodcaw', $kodcaw)
- ->select('lelongbidder.user_id', 'lelongbid.lelong_id','lelongbid.kodcaw','resit.billplz_id','resit.paid_at','payment.norujukan')
+ ->select('lelongbidder.user_id', 'lelongbid.lelong_id','lelongbid.kodcaw','resit.billplz_id','resit.paid_at','payment.norujukan','resit.total_payment as paid')
->groupBy('lelongbidder.user_id')
->get();
@@ -811,7 +811,7 @@ class AccountController extends Controller
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
// ->where('lelongbid.kodcaw', $kodcaw)
- ->select('lelongbidder.user_id', 'lelongbid.lelong_id','lelongbid.kodcaw','resit.billplz_id','resit.paid_at','payment.norujukan')
+ ->select('lelongbidder.user_id', 'lelongbid.lelong_id','lelongbid.kodcaw','resit.billplz_id','resit.paid_at','payment.norujukan','resit.total_payment as paid')
->groupBy('resit.billplz_id')
->orderBy('lelongbid.kodcaw')
->get();
diff --git a/resources/views/account/laporanakaundetail.blade.php b/resources/views/account/laporanakaundetail.blade.php
index 4066812d..a3b90e9c 100644
--- a/resources/views/account/laporanakaundetail.blade.php
+++ b/resources/views/account/laporanakaundetail.blade.php
@@ -56,20 +56,20 @@
@forelse($listwinner as $winner)
@if($winner['jenisbayaran']['status_payment_opt'] == 2)
@php
- $totalbidaan += $winner['totalPay'];
+ $totalbidaan += $winner['paid'];
$totalcaj += 1;
$totalbayaran = $totalbidaan + $totalcaj;
@endphp
@else
@php
- $totalbidaan += $winner['totalPay'];
+ $totalbidaan += $winner['paid'];
$totalbayaran = $totalbidaan;
@endphp
@endif
| {{ $loop->iteration }} |
{{ $winner['details']['name'] }} |
- {{ number_format($winner['totalPay'], 2, '.', ',') }} |
+ {{ number_format($winner['paid'], 2, '.', ',') }} |
@if($winner['jenisbayaran']['status_payment_opt'] == 2)
{{ number_format(1, 2, '.', ',') }}
@elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
@@ -77,9 +77,9 @@
@endif
|
@if($winner['jenisbayaran']['status_payment_opt'] == 2)
- {{ number_format($winner['totalPay']+1, 2, '.', ',') }}
+ {{ number_format($winner['paid']+1, 2, '.', ',') }}
@elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
- {{ number_format($winner['totalPay'], 2, '.', ',') }}
+ {{ number_format($winner['paid'], 2, '.', ',') }}
@endif
|
@if($winner['jenisbayaran'] != NULL)
diff --git a/resources/views/account/laporanakaundetailall.blade.php b/resources/views/account/laporanakaundetailall.blade.php
index f529a864..0b4fb5a2 100644
--- a/resources/views/account/laporanakaundetailall.blade.php
+++ b/resources/views/account/laporanakaundetailall.blade.php
@@ -57,13 +57,13 @@
@forelse($listwinner as $winner)
@if($winner['jenisbayaran']['status_payment_opt'] == 2)
@php
- $totalbidaan += $winner['totalPay'];
+ $totalbidaan += $winner['paid'];
$totalcaj += 1;
$totalbayaran = $totalbidaan + $totalcaj;
@endphp
@else
@php
- $totalbidaan += $winner['totalPay'];
+ $totalbidaan += $winner['paid'];
$totalbayaran = $totalbidaan;
@endphp
@endif
@@ -71,7 +71,7 @@
| {{ $loop->iteration }} |
{{ $winner['kodcaw'] }} |
{{ $winner['details']['name'] }} |
- {{ number_format($winner['totalPay'], 2, '.', ',') }} |
+ {{ number_format($winner['paid'], 2, '.', ',') }} |
@if($winner['jenisbayaran']['status_payment_opt'] == 2)
{{ number_format(1, 2, '.', ',') }}
@elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
@@ -79,9 +79,9 @@
@endif
|
@if($winner['jenisbayaran']['status_payment_opt'] == 2)
- {{ number_format($winner['totalPay']+1, 2, '.', ',') }}
+ {{ number_format($winner['paid']+1, 2, '.', ',') }}
@elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
- {{ number_format($winner['totalPay'], 2, '.', ',') }}
+ {{ number_format($winner['paid'], 2, '.', ',') }}
@endif
|
@if($winner['jenisbayaran'] != NULL)
|