From 153a6c69d413ce00124ba818cc5bb85fc20c5265 Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Wed, 27 Apr 2022 13:59:48 +0800
Subject: [PATCH] tarikh lelong page simulasi

---
 app/Http/Controllers/SimulasiController.php     | 9 ++++-----
 resources/views/simulasi/showsimulasi.blade.php | 9 ++++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index 1b35711f..c9805997 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -301,7 +301,7 @@ class SimulasiController extends Controller
         return view('simulasi.senaraisimulasi',compact('simulasi','arrayinfo'));
     }
 
-    public function show($id)
+    public function show(Request $request, $id)
     {
         $simulasi_id = $id;
         $simulasi = Simulasi::where('id','=',$id)->first();
@@ -461,9 +461,7 @@ class SimulasiController extends Controller
             $data = Simulasi::where('simulasi.id','=',$simulasi_id)
             ->get();
 
-            $simulasi = new Simulasi;
-            $simulasi->harga_emas_asas = $request->hargaasas;           
-            $simulasi->save();
+            
         }
 
 
@@ -494,7 +492,8 @@ class SimulasiController extends Controller
                                                 'jeniskarat',
                                                 'data',
                                                 'total_upahkeuntungan',
-                                                'total_nilaimarhun'));
+                                                'total_nilaimarhun'
+                                            ));
     }
 
     public function delete($id)
diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php
index dd60f631..a63aa75f 100644
--- a/resources/views/simulasi/showsimulasi.blade.php
+++ b/resources/views/simulasi/showsimulasi.blade.php
@@ -32,6 +32,11 @@
                                     <tr>
                                         <td>Keuntungan Keseluruhan : RM{{ number_format($total_upah, 2, '.', ',') }}</td>
                                     </tr>
+                                    <tr>
+                                        @foreach ($data as $data1)
+                                        <td>Tarikh Lelong: {{ $data1['tarikh_lelong']}}</td>
+                                        @endforeach
+                                    </tr>
                                 </table>
                             </div>
                             <div class="col-md-2"></div>
@@ -61,7 +66,6 @@
                                 <tr class="text-center">
                                     <th>No</th>
                                     <th>Cawangan</th>
-                                    <th>Tarikh Lelong</th>
                                     <th>Bil Marhun (Paket)</th>
                                     <th>Berat (gm)</th>
                                     <th>Nilai Marhun (RM)</th>
@@ -79,7 +83,6 @@
                                 <tr>
                                     <td>{{$index+1}}</td>
                                     <td><a href=" {{ route('analisa.senaraimarhunlel',['simulasi_id'=>$simulasi_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></td>                                    
-                                    <td>{{ $caw['t_lelong'] }}</td>
                                     <td>{{ $caw['bil_marhun'] }}</td>
                                     <td>{{ number_format($caw['berat'], 2, '.', ',') }}</td>
                                     <td>{{ number_format($caw['n_marhun'], 2, '.', ',') }}</td>
@@ -94,7 +97,7 @@
                             </tbody>
                             <tfoot>
                                 <tr>
-                                    <td colspan="3"><b>JUMLAH KESELURUHAN</b></td>
+                                    <td colspan="2"><b>JUMLAH KESELURUHAN</b></td>
                                     <td>{{ $total_marhun }}</td>
                                     <td>{{ number_format($total_berat, 2, '.', ',') }}</td>
                                     <td>{{ number_format($total_nilaimarhun, 2, '.', ',') }}</td>