Merge branch 'atie' into 'main'

update senarai tangguh lelong page pc

See merge request online-sistem1/lelong!433
This commit is contained in:
Nur Izzati Zulkifli
2023-04-05 01:17:52 +00:00
2 changed files with 5 additions and 6 deletions
@@ -747,9 +747,8 @@ class TangguhLelongController extends Controller
->get(); ->get();
foreach ($oprtangguh as $index1 => $o) { foreach ($oprtangguh as $index1 => $o) {
$lelong = Lelong::join('tangguhlelong','tangguhlelong.lelong_id','=','lelong.id') $lelong = TangguhLelong::where('lelong_id', $o->lelong_id)
// ->where('lelong.id', $o->lelong_id) ->where('kodcaw',$user->kodcaw)
->where('tangguhlelong.kodcaw',$user->kodcaw)
->get(); ->get();
$oprtangguh[$index1]['opr'] = $lelong; $oprtangguh[$index1]['opr'] = $lelong;
@@ -185,7 +185,7 @@
<tr> <tr>
<th>No</th> <th>No</th>
<th>Batch Lelong</th> <th>Batch Lelong</th>
<th>Tarikh Lelong</th> {{-- <th>Tarikh Lelong</th> --}}
<th>No Rujukan</th> <th>No Rujukan</th>
<th>Tarikh Mohon / Lulus</th> <th>Tarikh Mohon / Lulus</th>
<th>Status</th> <th>Status</th>
@@ -201,7 +201,7 @@
<tr> <tr>
<td>{{$loop->iteration}}</td> <td>{{$loop->iteration}}</td>
<td>{{ $lulus['lelong_id']}}</td> <td>{{ $lulus['lelong_id']}}</td>
<td> {{-- <td>
@php @php
$myDateTime = DateTime::createFromFormat('Y-m-d', $lulus['opr'][0]['tarikh_lelong']); $myDateTime = DateTime::createFromFormat('Y-m-d', $lulus['opr'][0]['tarikh_lelong']);
@@ -210,7 +210,7 @@
@endphp @endphp
</td> </td> --}}
<td align='left'><span class="m-2">{{$lulus['norujukan']}}</span></td> <td align='left'><span class="m-2">{{$lulus['norujukan']}}</span></td>
<td>{{$lulus['ditangguh_pada']}}</td> <td>{{$lulus['ditangguh_pada']}}</td>
<td> <td>