KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'atie' into 'main'

Browse Source 
update total payment page account

See merge request online-sistem1/lelong!379
This commit is contained in:
Nur Izzati Zulkifli
2023-02-06 04:44:12 +00:00
parent 1787c9f534 44034532ad
commit 0e32d797d9
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AccountController.php
+2 -2
View File
@@ -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();
resources/views/account/laporanakaundetail.blade.php
+5 -5
View File
@@ -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
<tr>
<td>{{ $loop->iteration }}</td>
<td align = 'left' style='text-transform: uppercase'>{{ $winner['details']['name'] }}</td>
<td>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td>
<td>{{ number_format($winner['paid'], 2, '.', ',') }}</td>
<td>@if($winner['jenisbayaran']['status_payment_opt'] == 2)
{{ number_format(1, 2, '.', ',') }}
@elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
@@ -77,9 +77,9 @@
@endif
</td>
<td> @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
</td>
<td> @if($winner['jenisbayaran'] != NULL)
resources/views/account/laporanakaundetailall.blade.php
+5 -5
View File
@@ -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 @@
<td>{{ $loop->iteration }}</td>
<td>{{ $winner['kodcaw'] }}</td>
<td align = 'left' style='text-transform: uppercase'>{{ $winner['details']['name'] }}</td>
<td>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td>
<td>{{ number_format($winner['paid'], 2, '.', ',') }}</td>
<td>@if($winner['jenisbayaran']['status_payment_opt'] == 2)
{{ number_format(1, 2, '.', ',') }}
@elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
@@ -79,9 +79,9 @@
@endif
</td>
<td> @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
</td>
<td> @if($winner['jenisbayaran'] != NULL)