Merge branch 'atie' into 'main'

update senarai marhun page khazanah pdf

See merge request online-sistem1/lelong!50

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= [];
 

resources/views/marhun/senarailelongmarhun.blade.php

@@ -15,6 +15,7 @@
                     <tr>
                         <th>No</th>
                         <th>Cawangan</th>
+                        <th>Batch Lelong</th>
                         <th>Tarikh Lelong</th>
                         <th>Status Lelong</th>
                         <th class="text-center">Action</th>
@@ -24,12 +25,19 @@
                 @foreach($arrayinfo as $lel)
                 <tr>
                     <td>{{$loop->iteration}}</td>
+                   
                     <td>
                         @foreach($lel['detailsinfo'] as $details)
                         <span class="m-2">{{$details['caw_name']}}</span><br>
                         @endforeach
+
                     </td>
-                    <td>{{ $lel['info']['tarikh_lelong']}}</td>
+                    <td>{{ $lel['info']['lelong_id']}}</td>
+                    <td>@php
+                                $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] );
+                                $t_lelong =  $myDateTime->format('d-m-Y');
+                                echo($t_lelong);
+                            @endphp</td>
                     <td>
                         @if($lel['info']['sts_lelong'] == 0)
                             <button class="btn btn-warning btn-sm" disabled>LELONG BELUM BERMULA</button>