Merge branch 'amirah' into 'main'

tarikh lelong page simulasi

See merge request online-sistem1/lelong!25
This commit is contained in:
Nur Izzati Zulkifli
2022-04-27 06:03:00 +00:00
2 changed files with 7 additions and 6 deletions
+1 -3
View File
@@ -467,9 +467,7 @@ class SimulasiController extends Controller
$data = Simulasi::where('simulasi.id','=',$simulasi_id)
->get();
// $simulasi = new Simulasi;
// $simulasi->harga_emas_asas = $request->hargaasas;
// $simulasi->save();
}
@@ -32,6 +32,11 @@
<tr>
<td>Keuntungan Keseluruhan : RM{{ number_format($total_upah, 2, '.', ',') }}</td>
</tr>
<tr>
@foreach ($data as $data1)
<td>Tarikh Lelong: {{ $data1['tarikh_lelong']}}</td>
@endforeach
</tr>
</table>
</div>
<div class="col-md-2"></div>
@@ -61,7 +66,6 @@
<tr class="text-center">
<th>No</th>
<th>Cawangan</th>
<th>Tarikh Lelong</th>
<th>Bil Marhun (Paket)</th>
<th>Berat (gm)</th>
<th>Nilai Marhun (RM)</th>
@@ -79,7 +83,6 @@
<tr>
<td>{{$index+1}}</td>
<td><a href=" {{ route('analisa.senaraimarhunlel',['simulasi_id'=>$simulasi_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>
<td>{{ $caw['t_lelong'] }}</td>
<td>{{ $caw['bil_marhun'] }}</td>
<td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
<td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
@@ -94,7 +97,7 @@
</tbody>
<tfoot>
<tr>
<td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
<td colspan="2"><b>JUMLAH KESELURUHAN</b></td>
<td>{{ $total_marhun }}</td>
<td>{{ number_format($total_berat, 2, '.', ',') }}</td>
<td>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>