diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 765ceebe..13c59764 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -46,12 +46,12 @@ class MarhunController extends Controller $user = Auth::user(); $caw = Cawangan::where('caw_code','=',$user->kodcaw)->first(); - $lelongbid = LelongBid::where('caw_id','=',$caw->id)->get(); - $lelongid = LelongBid::select('lelong_id')->where('caw_id','=',$caw->id)->groupBy('lelong_id')->get(); - $lelong = Lelong::whereIn('id', $lelongid)->get(); + $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id) + ->where('caw_id','=', $caw->id) + ->get(); - return view('marhun.senaraimarhun',compact('lelongbid','lelong')); + return view('marhun.senaraimarhun',compact('lelongbid','lelong_id')); } public function kemaskini(Request $request) @@ -414,6 +414,34 @@ class MarhunController extends Controller return redirect()->route('pengesahan.perubahanmutumarhun') ->with('success','Pengesahan Padam Marhun Telah Berjaya'); } + + public function senarailelong() + { + $lelong = Lelong::where('sts_lelong', 0) + ->get(); + + return view('pengesahan.senarailelong',compact('lelong')); + } + + public function senaraitangguhlelong($id) + { + $tangguhlelong = TangguhLelong::join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id') + ->where('tangguhlelong.lelong_id', $id) + ->get(); + + return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id')); + + } + + public function lelbidmarhun($id) + { + $marhuns = LelongBidMarhun::join('tangguhlelong', 'lelongbidmarhun.lelongbid_id', '=', 'tangguhlelong.lelongbid_id') + ->where('tangguhlelong.lelong_id', $id) + ->get(); + + return view('pengesahan.lelbidmarhun',compact('marhuns')); + + } } \ No newline at end of file diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index d0cf44b5..b357e879 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -120,8 +120,8 @@
diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php index fd8c65aa..4c0dea37 100644 --- a/resources/views/marhun/marhun.blade.php +++ b/resources/views/marhun/marhun.blade.php @@ -53,7 +53,7 @@ diff --git a/resources/views/pengesahan/lelbidmarhun.blade.php b/resources/views/pengesahan/lelbidmarhun.blade.php new file mode 100644 index 00000000..810fd0bc --- /dev/null +++ b/resources/views/pengesahan/lelbidmarhun.blade.php @@ -0,0 +1,118 @@ +@extends('layouts.app') + +@section('content') +{{ $message }}
+{{ $message }}
+{{ $message }}
+