Add alert, fix template layout in simulasi

app/Http/Controllers/SimulasiController.php

@@ -707,29 +707,9 @@ class SimulasiController extends Controller
 
     public function senaraisimulasi()
     {
-        // $simulasi = Simulasi::all();
+        $simulasiAll = Simulasi::with('cawangan')->orderBy('id', 'desc')->get();
 
-        $arrayinfo = [];
-
-        $simulasi = Simulasi::join('cawangan_simulasi','simulasi.id','=','cawangan_simulasi.simulasi_id')
-        ->select('simulasi_id','tarikh_lelong', 'simulasi.fasa','simulasi.harga_emas_asas')
-        ->groupBy('simulasi_id')
-        ->orderBy('simulasi.id', 'desc')
-        ->get()
-        ->toArray();
-
-        foreach($simulasi as $info)
-        {
-            $detailsinfo = CawanganSimulasi::join('cawangan','cawangan_simulasi.caw_id','=','cawangan.id')
-            ->where('simulasi_id',$info['simulasi_id'])
-            ->get()
-            ->toArray();
-
-            array_push($arrayinfo, ['info'=> $info, 'detailsinfo'=>$detailsinfo]);
-
-        }
-
-        return view('simulasi.senaraisimulasi',compact('simulasi','arrayinfo'));
+        return view('simulasi.senaraisimulasi',compact('simulasiAll'));
     }
 
     public function show2(Request $request, $id)
@@ -1203,8 +1183,8 @@ class SimulasiController extends Controller
 
         }
 
-        return redirect()->route('analisa.senaraisimulasi',$request->idsimulasi)
-                        ->with('success','Kemaskini Berjaya');
+        return redirect()->route('analisa.show',$request->idsimulasi)
+                        ->with('success','Kemaskini Harga Emas Berjaya');
     }
 
 
@@ -1516,6 +1496,7 @@ class SimulasiController extends Controller
         'total_pinjaman',
         'total_bakiupah',
         'total_hargaasas',
+        'simulasilel',
         'total_cazlelong'));
     }