Merge branch 'nisha' into 'main'

block tangguhlelong if tarikh_lelong = currentdate

See merge request online-sistem1/lelong!248
This commit is contained in:
Nur Izzati Zulkifli
2022-10-26 03:45:34 +00:00
2 changed files with 4 additions and 3 deletions
@@ -27,7 +27,8 @@ class TangguhLelongController extends Controller
public function senleluntuktangguh()
{
$user = Auth::user();
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateTimeString();
$arrayinfo = [];
$lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
@@ -58,7 +59,7 @@ class TangguhLelongController extends Controller
}
return view('tangguhlelong.senarailelongtangguh',compact('lelong', 'arrayinfo'));
return view('tangguhlelong.senarailelongtangguh',compact('lelong', 'arrayinfo', 'currentdate'));
}
public function carian($lelong_id)
@@ -58,7 +58,7 @@
@endif
</td>
<td>
@if($lel['info']['sts_lelong'] == 0)
@if($lel['info']['sts_lelong'] == 0 && $lel['info']['tarikh_lelong'] == $currentdate)
{{-- @foreach($lel['detailsinfo'] as $details) --}}
<a href="{{ route('tangguhlelong.carian', $lel['info']['lelong_id']) }}" data-toggle="tooltip" data-placement="top" title="Carian" style="margin-right:40px"><i class="fas fa-search"></i></a>
<!-- <a href="{{ route('tangguhlelong.listtangguh', [$lel['info']['lelong_id'], $details['caw_code']]) }}" data-toggle="tooltip" data-placement="top" title="Senarai Tangguh" style="margin-right:40px"><i class="fas fa-list"></i></a> -->