diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 53ad1b72..28290951 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -566,11 +566,8 @@ class LelongController extends Controller public function senarailelongtaklaku(Request $request){ - $user = Auth::user(); - $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') - ->where('cawangan.caw_code', $user->kodcaw) ->get(); return view('lelong.senarailelongtaklaku',compact('senarai')); @@ -583,6 +580,7 @@ class LelongController extends Controller ->where('lelongbid.lelong_id', $lelong_id) ->whereNull('t_jual') ->select( + 'lelongbid.norujukan', 'lelongbid.t_lelong', 'lelongbid.kodcaw', 'cawangan.caw_name', @@ -601,6 +599,7 @@ class LelongController extends Controller $suratlelongtaklaku = LelongBid::join('lelong', 'lelongbid.lelong_id', '=', 'lelong.id') ->where('lelongbid.lelong_id', $lelong_id) + ->where('status_jual', '=', 1) ->whereNull('t_jual') ->get(); diff --git a/resources/views/jananotis/notislelong.blade.php b/resources/views/jananotis/notislelong.blade.php index 77fddc7b..192be8f6 100644 --- a/resources/views/jananotis/notislelong.blade.php +++ b/resources/views/jananotis/notislelong.blade.php @@ -29,8 +29,8 @@