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 @@

{{ $message }}

@endif -
+ @csrf - + @@ -72,10 +72,10 @@
- Kembali + Kembali
- {{-- Kembali --}} + {{-- Kembali --}}
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) {{$index+1}} - {{ $caw['cawangan'] }} + {{ $caw['cawangan'] }} {{ $caw['t_lelong'] }} {{ $caw['bil_marhun'] }} {{ number_format($caw['berat'], 2, '.', ',') }} 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']);