update thousand seperator semakan marhun dan update taglel selepas tangguh lelong

This commit is contained in:
Nur Izzati Zulkifli
2022-06-05 12:12:01 +08:00
parent f262ef055b
commit adf31efdee
6 changed files with 39 additions and 17 deletions
+4 -4
View File
@@ -68,16 +68,16 @@
</td>
<td>
@if($item->n_marhun != null)
{{ $item->n_marhun }}
{{ number_format($item->n_marhun, 2, '.', ',') }}
@else
{{ $item->old_nmarhun }}
{{ number_format($item->old_nmarhun, 2, '.', ',') }}
@endif
</td>
<td>
@if($item->hargaasas != null)
{{ $item->hargaasas }}
{{ number_format($item->hargaasas, 2, '.', ',') }}
@else
{{ $item->old_hargaasas }}
{{ number_format($item->old_hargaasas, 2, '.', ',') }}
@endif
</td>
<td>{{ $item->nota }}</td>
@@ -22,10 +22,10 @@
<div class="col-md-12 mx-auto card p-4" style="margin-top:2%; margin-bottom:2%;">
<p> <b>Norujukan : </b> {{ $lelongbid->norujukan }}</p>
<p> <b>Tempoh / JBG : </b> {{ $lelongbid->jbg }}</p>
<p> <b>Pembiayaan : </b> {{ $marhuns[0]['pembiayaan'] }}</p>
<p> <b>Keuntungan : </b></p>
<p> <b>Baki Lelong : </b>{{ $marhuns[0]['baki_lelong'] }}</p>
<p> <b>Rugi Lelong : </b>{{ $marhuns[0]['rugi_lelong'] }}</p>
<p> <b>Pembiayaan(RM) : </b> {{ number_format($marhuns[0]['pembiayaan'], 2, '.', ',') }}</p>
<p> <b>Keuntungan(RM) : </b> {{ number_format($marhuns[0]['bakiupah'], 2, '.', ',') }}</p>
<p> <b>Baki Lelong(RM) : </b>{{ number_format($marhuns[0]['baki_lelong'], 2, '.', ',') }}</p>
<p> <b>Rugi Lelong(RM) : </b>{{ number_format($marhuns[0]['rugi_lelong'], 2, '.', ',') }}</p>
</div>
</div>
</div>
@@ -29,12 +29,17 @@
@foreach($arrayinfo as $lel)
<tr>
<td>{{$loop->iteration}}</td>
<td>
<td align = 'left'>
@foreach($lel['detailsinfo'] as $details)
<span class="m-2">{{$details['caw_name']}}</span><br>
@endforeach
</td>
<td>{{ $lel['info']['tarikh_lelong']}}</td>
<td> @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong']);
$datez = $myDateTime->format('d-m-Y');
echo($datez);
@endphp</td>
<td>{{ $lel['info']['harga_emas_asas'] }}</td>
<td>{{ $lel['info']['jbg'] }}</td>
<td>{{ $lel['info']['cajlelong'] }}</td>
@@ -19,7 +19,8 @@
<th>Lelong ID</th>
<th>Tarikh Lelong</th>
<th>Fasa</th>
<th>Cawangan</th>
<th>Cawangan</th>
<th>Harga Asas (RM)</th>
<th class="text-center">Action</th>
</tr>
</thead>
@@ -40,6 +41,7 @@
{{$info2['caw_name']}}<br>
@endforeach
</td>
<td>{{ $info['info']['harga_emas_asas'] }}</td>
<td class="text-center">
<a href="{{ route('analisa.show',$info['info']['simulasi_id']) }}" data-toggle="tooltip" data-placement="top" title="Butiran Simulasi" style="margin-right:30px"><i class="far fa-edit"></i></a>
<a class="confirmdel" href="{{ route('analisa.delete',$info['info']['simulasi_id']) }}" data-toggle="tooltip" data-placement="top" title="Padam"><i class="far fa-trash-alt"></i></a>