diff --git a/app/Http/Controllers/ReportCawanganController.php b/app/Http/Controllers/ReportCawanganController.php index 3f36b454..722bbeb2 100644 --- a/app/Http/Controllers/ReportCawanganController.php +++ b/app/Http/Controllers/ReportCawanganController.php @@ -903,9 +903,46 @@ class ReportCawanganController extends Controller return $pdf->download('Laporan Tuntut/Belum Baki Lelong.pdf'); - } + public function indexubahmarhun (){ + + $arraydetails = []; + + $user = Auth::user(); + $caw = Cawangan::where('caw_code','=',$user->kodcaw) + ->first(); + // dd($caw); + + $laporan= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->join('pengesahan','lelong.id','=','pengesahan.lelong_id') + ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('cawangan.caw_code','=',$user['kodcaw']) + ->select('cawangan_lelong.lelong_id','tarikh_lelong','lelong.fasa') + ->distinct() + ->orderBy('cawangan_lelong.lelong_id') + ->get() + ->toArray(); + // dd($laporan); + + + foreach($laporan as $brg) + { + $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id', $brg['lelong_id']) + ->where('cawangan.caw_code','=',$user['kodcaw']) + ->distinct() + ->orderBy('lelong_id') + ->get() + ->toArray(); + array_push($arraydetails,['brg' => $brg, 'detailsbrg' => $details ]); + } + + + return view('marhun.ubahmarhuncaw', compact('arraydetails')); + +} + diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 490bc474..d2acb0b5 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -176,6 +176,11 @@ Barang Lelong Pembida + diff --git a/routes/web.php b/routes/web.php index b9cce05a..1b579295 100644 --- a/routes/web.php +++ b/routes/web.php @@ -585,6 +585,8 @@ Route::get('laporanlelfullcaw/{lelong_id}',['as'=>'reportcaw.laporanlelfullcaw', Route::get('indexbrglelpembidacaw',['as'=>'reportcaw.indexbrglelpembidacaw','uses'=>'ReportCawanganController@indexbrglelpembidacaw']); Route::get('laporanbrglelpembidacaw/{lelong_id}',['as'=>'reportcaw.laporanbrglelpembidacaw','uses'=>'ReportCawanganController@laporanbrglelpembidacaw']); +Route::get('indexubahmarhun',['as'=>'reportcaw.indexubahmarhun','uses'=>'ReportCawanganController@indexubahmarhun']); + }); //Report by cawangan KHAS