Fix senaraimarhunlel, filter n+1 queries

This commit is contained in:
Amir
2022-11-13 15:00:06 +08:00
parent 490ba2a446
commit 02584b7946
2 changed files with 34 additions and 58 deletions
@@ -11,7 +11,7 @@
<i class="fas fa-arrow-left"></i>
</a>
<div class="header-style-title">
senarai Sag : {{ $marhuns[0]['caw_name'] }}
senarai Sag : {{ $cawanganDetail->caw_name }}
</div>
</div>
<div class="card-body">
@@ -21,7 +21,7 @@
</div>
@endif
@php
$myDateTime = DateTime::createFromFormat('Y-m-d', $simulasilel[0]->tarikh_lelong );
$myDateTime = DateTime::createFromFormat('Y-m-d', $simulasilel->tarikh_lelong );
$t_lelong = $myDateTime->format('d-m-Y');
@endphp
<div class="col-6">
@@ -39,7 +39,7 @@
<label class="col-6 col-form-label text-left">JBG</label>
<div class="col-6">
<div class="input-group">
<input type="text" readonly class="form-control bg-light" value="{{$simulasilel[0]->jbg}}">
<input type="text" readonly class="form-control bg-light" value="{{$simulasilel->jbg}}">
</div>
</div>
</div>
@@ -93,8 +93,8 @@
<td>{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}</td>
<td>{{ number_format($marhun['hargaasas'], 2, '.', ',') }}</td>
<td>{{ number_format($marhun['pinjaman'] , 2, '.', ',') }}</td>
<td>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
<td>{{ number_format($marhun['cajlelong'], 2, '.', ',') }}</td>
<td>{{ number_format($marhun['bakiupah'], 2, '.', ',') }}</td>
@php
$rugi = 0;
$baki = 0;
@@ -122,14 +122,13 @@
<tfoot class="bg-light">
<tr>
<td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
<td align='right'>{{ number_format($total_berat, 2, '.', ',') }}</td>
<td align='right'>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
<td align='right'>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
<td align='right'>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
<td align='right'>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
<td align='right'>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
{{-- <td align = 'right'>({{ number_format($rugilelong, 2, '.', ',') }})</td> --}}
<td align='right'>{{ number_format($bakilelong, 2, '.', ',') }}</td>
<td>{{ number_format($total_berat, 2, '.', ',') }}</td>
<td>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>
<td>{{ number_format($total_hargaasas, 2, '.', ',') }}</td>
<td>{{ number_format($total_pinjaman, 2, '.', ',') }}</td>
<td>{{ number_format($total_cazlelong, 2, '.', ',') }}</td>
<td>{{ number_format($total_bakiupah, 2, '.', ',') }}</td>
<td>{{ number_format($bakilelong, 2, '.', ',') }}</td>
<td></td>
</tr>
</tfoot>