diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 2430fb6b..acf5c6cd 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -744,7 +744,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();
@@ -871,7 +871,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/excel/laporanakaundetail_excel.blade.php b/resources/views/excel/laporanakaundetail_excel.blade.php
index a6d5d23a..8d50e683 100644
--- a/resources/views/excel/laporanakaundetail_excel.blade.php
+++ b/resources/views/excel/laporanakaundetail_excel.blade.php
@@ -76,20 +76,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)
@@ -97,9 +97,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/excel/laporanakaundetailall_excel.blade.php b/resources/views/excel/laporanakaundetailall_excel.blade.php
index e7957dc8..38f654ee 100644
--- a/resources/views/excel/laporanakaundetailall_excel.blade.php
+++ b/resources/views/excel/laporanakaundetailall_excel.blade.php
@@ -77,13 +77,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
@@ -91,7 +91,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)
@@ -99,9 +99,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/pdf/laporanakaundetailallpdf.blade.php b/resources/views/pdf/laporanakaundetailallpdf.blade.php
index 8c6e282e..675c8a37 100644
--- a/resources/views/pdf/laporanakaundetailallpdf.blade.php
+++ b/resources/views/pdf/laporanakaundetailallpdf.blade.php
@@ -184,13 +184,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
@@ -198,7 +198,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)
@@ -206,9 +206,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/pdf/laporanakaundetailpdf.blade.php b/resources/views/pdf/laporanakaundetailpdf.blade.php
index c9e9af89..f401b64c 100644
--- a/resources/views/pdf/laporanakaundetailpdf.blade.php
+++ b/resources/views/pdf/laporanakaundetailpdf.blade.php
@@ -183,20 +183,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)
@@ -204,9 +204,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)
|