diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 8ec49793..7f712dc9 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -299,7 +299,6 @@ class MarhunController extends Controller public function senarailelongmarhun(Request $request){ $user = Auth::user(); - $arrayinfo = []; $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') @@ -307,7 +306,6 @@ class MarhunController extends Controller ->where('cawangan.caw_code', $user->kodcaw) ->where('sts_lelong', 0) ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') - ->groupBy('lelong_id') ->get() ->toArray(); @@ -403,8 +401,15 @@ class MarhunController extends Controller public function exportmarhundetails($lelong_id) { + $user = Auth::user(); + //dd($user); $lelongs= LelongBid::where('lelong_id','=',$lelong_id) - ->get()->toArray(); + ->where('kodcaw','=',$user['kodcaw']) + ->get() + ->toArray(); + //dd($lelongs); + + $arraycaw= []; diff --git a/resources/views/marhun/senarailelongmarhun.blade.php b/resources/views/marhun/senarailelongmarhun.blade.php index 2b128be3..6b8f2539 100644 --- a/resources/views/marhun/senarailelongmarhun.blade.php +++ b/resources/views/marhun/senarailelongmarhun.blade.php @@ -15,6 +15,7 @@ No Cawangan + Batch Lelong Tarikh Lelong Status Lelong Action @@ -24,12 +25,19 @@ @foreach($arrayinfo as $lel) {{$loop->iteration}} + @foreach($lel['detailsinfo'] as $details) {{$details['caw_name']}}
@endforeach + - {{ $lel['info']['tarikh_lelong']}} + {{ $lel['info']['lelong_id']}} + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp @if($lel['info']['sts_lelong'] == 0)