Merge branch 'faiqahzaman'

app/Http/Controllers/AccountController.php

@@ -72,8 +72,8 @@ class AccountController extends Controller
         return view('account.listbayaranonline',compact('listwinner','lelong_id'));
     }
 
-    public function sahsagonline($lelong_id, $user_id){
-
+    public function sahsagonline($lelong_id, $user_id)
+    {
         $senaraisag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
         ->join('payment', 'lelongbid.id', '=', 'payment.lelongbid_id')
         ->where('lelongbid.lelong_id', $lelong_id)
@@ -82,8 +82,6 @@ class AccountController extends Controller
         ->where('payment.status_payment_opt', 2)
         ->get()->toArray();
 
-    //    dd($senaraisag);
-
         $total_payment = 0;
         foreach($senaraisag as $index1=>$sagbid){
 
@@ -97,7 +95,8 @@ class AccountController extends Controller
         return view('account.sahsagonline', compact('senaraisag', 'user_id', 'lelong_id','total_payment'));
     }
 
-    public function sahbayaronline($lelong_id, $user_id){
+    public function sahbayaronline($lelong_id, $user_id)
+    {
         
         $currentdate = Carbon::now();
         $currentdate = $currentdate->toDateTimeString();

app/Http/Controllers/LelongController.php

@@ -568,6 +568,7 @@ class LelongController extends Controller
         
         $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
         ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
+        ->where('lelong.sts_lelong', 3)
         ->get();
 
         return view('lelong.senarailelongtaklaku',compact('senarai'));

app/Http/Controllers/MarhunController.php

@@ -46,8 +46,6 @@ class MarhunController extends Controller
         $lelongid = LelongBid::select('lelong_id')->where('caw_id','=',$caw->id)->groupBy('lelong_id')->get();
         $lelong = Lelong::whereIn('id', $lelongid)->get();
 
-
-
         return view('marhun.senaraimarhun',compact('lelongbid','lelong'));
     }
 
@@ -130,6 +128,7 @@ class MarhunController extends Controller
 
         $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
         ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
+        ->where('lelong.sts_lelong', 0)
         ->get();
 
         return view('marhun.senarailelongmarhun',compact('senarai'));