From c563a97df8e00b1ce478960dec2bd8a5a4947330 Mon Sep 17 00:00:00 2001
From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com>
Date: Sun, 13 Mar 2022 14:50:08 +0800
Subject: [PATCH] add senarai marhun sim

---
 app/Http/Controllers/SimulasiController.php   | 37 ++++++++++---------
 ...m.blade.php => senaraimarhunlel.blade.php} |  8 ++--
 .../views/simulasi/showsimulasi.blade.php     |  2 +-
 routes/web.php                                |  4 +-
 4 files changed, 26 insertions(+), 25 deletions(-)
 rename resources/views/simulasi/{senaraimarhunsim.blade.php => senaraimarhunlel.blade.php} (94%)

diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php
index 384f362f..ac2df2e7 100644
--- a/app/Http/Controllers/SimulasiController.php
+++ b/app/Http/Controllers/SimulasiController.php
@@ -396,6 +396,7 @@ class SimulasiController extends Controller
                 
             }
             array_push($arraycaw,[
+                'id_cawangan'=> $cawangan->id,
                 'cawangan'=>$cawangan->caw_name,
                 't_lelong'=>$simulasi->tarikh_lelong,
                 'bil_marhun'=>sizeof($databid),
@@ -707,41 +708,41 @@ class SimulasiController extends Controller
 
     }
 
-    public function senaraimarhunlel($lelongid, $cawid)
+    public function senaraimarhunlel($simulasi_id, $cawid)
     {
-        $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id')
-        ->where('lelong_id','=',$lelongid)
+        $marhuns = SimulasiBid::join('cawangan', 'simulasibid.caw_id', '=', 'cawangan.id')
+        ->where('simulasi_id','=',$simulasi_id)
         ->where('caw_id','=',$cawid)
         ->select(
-            'lelongbid.t_lelong',
-            'lelongbid.kodcaw',
+            'simulasibid.t_lelong',
+            'simulasibid.kodcaw',
             'cawangan.caw_name',
-            'lelongbid.norujukan',
-            'lelongbid.pinjaman',
-            'lelongbid.berat',
-            'lelongbid.nilaimarhun',
-            'lelongbid.hargaasas',
-            'lelongbid.upahsimpan',
-            'lelongbid.cajlelong',
-            'lelongbid.baki',
-            'lelongbid.status_jual',
+            'simulasibid.norujukan',
+            'simulasibid.pinjaman',
+            'simulasibid.berat',
+            'simulasibid.nilaimarhun',
+            'simulasibid.hargaasas',
+            'simulasibid.upahsimpan',
+            'simulasibid.cajlelong',
+            'simulasibid.baki',
+            'simulasibid.status_jual',
         )
         ->get();
         
-        return view('lelong.senaraimarhunsim',compact('marhuns','lelongid','cawid'));
+        return view('simulasi.senaraimarhunlel',compact('marhuns','simulasi_id','cawid'));
     }
     
     public function deletemarhunlel(Request $request){
-        dd($request->checkboxdata);
+        // dd($request->checkboxdata);
 
         $data = $request->checkboxdata;
         foreach($data as $index=>$norujukan)
         {
-            $marhun = LelongBid::where('norujukan','=',$norujukan)->first();
+            $marhun = SimulasiBid::where('norujukan','=',$norujukan)->first();
             $marhun->delete();
         }
 
-        return redirect()->route('lelong.senaraimarhunlel',['lelongid'=>$request->lelongid,'cawid'=>$request->cawid])
+        return redirect()->route('analisa.senaraimarhunlel',['simulasi_id'=>$request->simulasi_id,'cawid'=>$request->cawid])
                         ->with('success','Delete Berjaya');
     }
 }
diff --git a/resources/views/simulasi/senaraimarhunsim.blade.php b/resources/views/simulasi/senaraimarhunlel.blade.php
similarity index 94%
rename from resources/views/simulasi/senaraimarhunsim.blade.php
rename to resources/views/simulasi/senaraimarhunlel.blade.php
index d1461cd1..11d0c7f6 100644
--- a/resources/views/simulasi/senaraimarhunsim.blade.php
+++ b/resources/views/simulasi/senaraimarhunlel.blade.php
@@ -11,9 +11,9 @@
                     <p>{{ $message }}</p>
                 </div>
             @endif
-            <form id="deletesag" action="{{route('lelong.deletemarhunlel')}}" method="POST">
+            <form id="deletesag" action="{{route('analisa.deletemarhunlel')}}" method="POST">
                 @csrf
-                <input type="hidden" name="lelongid" value="{{$lelongid}}">
+                <input type="hidden" name="simulasi_id" value="{{$simulasi_id}}">
                 <input type="hidden" name="cawid" value="{{$cawid}}">
                 <table class="table table-striped  table-xl" id="marhun" style="width:100%">
                     <thead class="bg-primary text-white">
@@ -72,10 +72,10 @@
                     
                 </table>
                 <div class="text-right pt-4">
-                    <a  href="{{ route('lelong.show',$lelongid) }}" class="btn btn-primary">Kembali</a>
+                    <a  href="{{ route('analisa.show',$simulasi_id) }}" class="btn btn-primary">Kembali</a>
                     <button type="button" class="btn btn-danger" id="btndelete" onclick="confirm()">Delete</button>
                 </div>
-                {{-- <a href="{{url('lelong/senarailelong')}}" class="btn btn-primary">Kembali</a> --}}
+                {{-- <a href="{{url('simulasi/showsimulasi')}}" class="btn btn-primary">Kembali</a> --}}
                 
             </form>
         </div>
diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php
index 824871ab..fa480286 100644
--- a/resources/views/simulasi/showsimulasi.blade.php
+++ b/resources/views/simulasi/showsimulasi.blade.php
@@ -73,7 +73,7 @@
                                 @foreach ($arraycaw as $index=>$caw)
                                 <tr>
                                     <td>{{$index+1}}</td>
-                                    <td><a href=" {{ route('lelong.senaraimarhunlel',['lelongid'=>$lelong_id,'cawid'=>$caw['id_cawangan']]) }} " target="blank" style="color:#3490dc">{{ $caw['cawangan'] }}</a></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>
diff --git a/routes/web.php b/routes/web.php
index 85e748e3..70f5e4aa 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -59,8 +59,8 @@ Route::group(['middleware' => ['permission:analisa'],'prefix'=>'analisa'], funct
     Route::get('/senaraisimulasi',['as'=>'analisa.senaraisimulasi','uses'=>'SimulasiController@senaraisimulasi']);
     Route::get('/showsimulasi/{id}',['as'=>'analisa.show','uses'=>'SimulasiController@show']); 
     Route::get('/deletesimulasi/{id}',['as'=>'analisa.delete','uses'=>'SimulasiController@delete']);
-    Route::get('/senaraimarhunlel/{lelongid}/{cawid}',['as'=>'analisa.senaraimarhunlel','uses'=>'SimulasiController@senaraimarhunlel']);
-    Route::get('/deletemarhunlel',['as'=>'analisa.deletemarhunlel','uses'=>'SimulasiController@senaraimarhunlel']);
+    Route::get('/senaraimarhunlel/{simulasi_id}/{cawid}',['as'=>'analisa.senaraimarhunlel','uses'=>'SimulasiController@senaraimarhunlel']);
+    Route::post('/deletemarhunlel',['as'=>'analisa.deletemarhunlel','uses'=>'SimulasiController@deletemarhunlel']);
     
     Route::post('/filter',['as'=>'analisa.filter','uses'=>'SimulasiController@filter']); 
     Route::post('/export',['as'=>'analisa.export','uses'=>'SimulasiController@export']);