Merge branch 'atie' into 'main'
update excel dan pdf dalam accout page See merge request online-sistem1/lelong!380
This commit is contained in:
Nur Izzati Zulkifli
@@ -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();
|
||||
|
||||
@@ -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
|
||||
<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)
|
||||
@@ -97,9 +97,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)
|
||||
|
||||
@@ -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 @@
|
||||
<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)
|
||||
@@ -99,9 +99,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)
|
||||
|
||||
@@ -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 @@
|
||||
<td>{{ $loop->iteration }}</td>
|
||||
<td>{{ $winner['kodcaw'] }}</td>
|
||||
<td align = 'left' style='white-space:nowrap;text-transform: uppercase'>{{ $winner['details']['name'] }}</td>
|
||||
<td align = 'right'>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td>
|
||||
<td align = 'right'>{{ number_format($winner['paid'], 2, '.', ',') }}</td>
|
||||
<td align="right">@if($winner['jenisbayaran']['status_payment_opt'] == 2)
|
||||
{{ number_format(1, 2, '.', ',') }}
|
||||
@elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
|
||||
@@ -206,9 +206,9 @@
|
||||
@endif
|
||||
</td>
|
||||
<td align="right"> @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 align = 'center'> @if($winner['jenisbayaran'] != NULL)
|
||||
|
||||
@@ -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
|
||||
<tr>
|
||||
<td>{{ $loop->iteration }}</td>
|
||||
<td align = 'left' style='white-space:nowrap;text-transform: uppercase'>{{ $winner['details']['name'] }}</td>
|
||||
<td align = 'right'>{{ number_format($winner['totalPay'], 2, '.', ',') }}</td>
|
||||
<td align = 'right'>{{ number_format($winner['paid'], 2, '.', ',') }}</td>
|
||||
<td align="right">@if($winner['jenisbayaran']['status_payment_opt'] == 2)
|
||||
{{ number_format(1, 2, '.', ',') }}
|
||||
@elseif($winner['jenisbayaran']['status_payment_opt'] == 3)
|
||||
@@ -204,9 +204,9 @@
|
||||
@endif
|
||||
</td>
|
||||
<td align="right"> @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 align = 'center'> @if($winner['jenisbayaran'] != NULL)
|
||||
|
||||
Reference in New Issue
Block a user