From 6930d72c0b8a7fe1afaf5aa8309f71d0272ed1f9 Mon Sep 17 00:00:00 2001
From: faiqahzaman <zmnfqh@gmail.com>
Date: Mon, 18 Apr 2022 15:41:44 +0800
Subject: [PATCH] senarai tangguh lelong & details

---
 app/Http/Controllers/MarhunController.php     | 18 ++++++++++++---
 .../views/pengesahan/senarailelong.blade.php  | 22 ++++++++++++-------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php
index e022108e..aeab4529 100644
--- a/app/Http/Controllers/MarhunController.php
+++ b/app/Http/Controllers/MarhunController.php
@@ -643,10 +643,22 @@ class MarhunController extends Controller
 
     public function senarailelong()
     {
-        $lelong = Lelong::where('sts_lelong', 0)
-        ->get();
+        $arrayinfo = [];
 
-        return view('pengesahan.senarailelong',compact('lelong'));
+        $lelong = Lelong::where('sts_lelong', 0)
+        ->get()->toArray();
+
+        foreach($lelong as $details)
+        {
+            $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
+            ->where('lelong_id', $details['id'])
+            ->get()
+            ->toArray();
+
+            array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]);
+        }
+
+        return view('pengesahan.senarailelong',compact('lelong', 'arrayinfo'));
     }
 
     public function senaraitangguhlelong($id)
diff --git a/resources/views/pengesahan/senarailelong.blade.php b/resources/views/pengesahan/senarailelong.blade.php
index d89ffb2e..6a438109 100644
--- a/resources/views/pengesahan/senarailelong.blade.php
+++ b/resources/views/pengesahan/senarailelong.blade.php
@@ -15,8 +15,9 @@
                 <table class="table table-striped  table-xl text-center" id="tablelelong" style="width:100%">
                     <thead class="bg-primary text-white">
                         <tr>
-                            <th><input type="checkbox" aria-label="Checkbox for following text input" onclick="selectall(this)"></th>
+                            <th>No</th>
                             <th>Tarikh Lelong</th>
+                            <th>Nama Cawangan</th>
                             <th>Harga Emas Asas</th>
                             <th>JBG</th>
                             <th>Caj Lelong</th>
@@ -24,15 +25,20 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach ($lelong as $lel)
+                        @foreach ($arrayinfo as $lel)
                         <tr>
-                            <td><input type="checkbox" aria-label="Checkbox for following text input" name="checkboxdata[]" value="{{ $lel->id }}"></td>
-                            <td>{{ $lel->tarikh_lelong }}</td>
-                            <td>{{ $lel->harga_emas_asas }}</td>
-                            <td>{{ $lel->jbg }}</td>
-                            <td>{{ $lel->cajlelong }}</td>
+                            <td>{{$loop->iteration}}</td>
+                            <td>{{ $lel['detail']['tarikh_lelong']}}</td>
                             <td>
-                                    <a  href="{{ route('pengesahan.senaraitangguhlelong',$lel->id) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
+                                @foreach($lel['detailsinfo'] as $details)
+                                    <span class="m-2">{{$details['caw_name']}}</span><br>
+                                @endforeach
+                            </td>
+                            <td>{{$lel['detail']['harga_emas_asas']}}</td>
+                            <td>{{$lel['detail']['jbg']}}</td>
+                            <td>{{$lel['detail']['cajlelong']}}</td>                     
+                            <td>
+                                    <a  href="{{ route('pengesahan.senaraitangguhlelong',$lel['detail']['id']) }}" data-toggle="tooltip" data-placement="top" title="Butiran" class="text-center" ><i class="far fa-edit"></i></a>
                             </td>
                         </tr>
                         @endforeach