update 2106

app/Http/Controllers/AccountController.php

@@ -33,12 +33,12 @@ class AccountController extends Controller
 
     public function listbayaranonline($lelong_id, $caw_code)
     {
-        $getkodcaw = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
-        ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
-        ->where('lelong.id', $lelong_id)
-        ->where('caw_code')
-        ->select('cawangan.caw_name')
-        ->get();
+        // $getkodcaw = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
+        // ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
+        // ->where('lelong.id', $lelong_id)
+        // ->where('caw_code')
+        // ->select('cawangan.caw_name')
+        // ->get();
 
         $getkodcaw = Cawangan::where('caw_code', $caw_code)->select('caw_name')->first();
 
@@ -46,6 +46,7 @@ class AccountController extends Controller
         ->join('payment', 'lelongbidder.payment_id', 'payment.id')
         ->where('lelongbidder.status_bidder', 1)
         ->where('lelongbid.lelong_id', $lelong_id)
+        ->where('lelongbid.kodcaw', $caw_code)
         ->where('payment.status_payment_opt', 3)
         ->orWhere('payment.status_payment_opt', 2)
         ->where('lelongbidder.status_payment', 2)
@@ -54,14 +55,18 @@ class AccountController extends Controller
         )
         ->groupBy('lelongbidder.user_id')
         ->get();
+        
 
         foreach($listwinner as $index1=>$winner){
 
             $userdetails = User::where('id', $winner['user_id'])->first();
 
-            $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
+            $SAGWin = LelongBidder::join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
+            ->join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
             ->where('lelongbidder.user_id', $winner['user_id'])
             ->where('lelongbidder.status_bidder', 1)
+            ->where('payment.status_payment_opt', 3)
+            ->orWhere('payment.status_payment_opt', 2)
             ->where('lelongbid.lelong_id', $lelong_id)
             ->get();
             // dd($SAGWin->sum('hargabida'));
@@ -108,6 +113,7 @@ class AccountController extends Controller
         ->orWhere('payment.status_payment_opt', 2)
         ->where('lelongbidder.status_payment', 2)
         ->get()->toArray();
+        // dd($senaraisag);
 
         foreach($senaraisag as $index1=>$sag)
         {
@@ -117,6 +123,7 @@ class AccountController extends Controller
             ->whereNotNull('payment.disahkan_pada')
             ->whereNotNull('payment.disahkan_pada')
             ->first();
+            // dd($checking);
         }
 
         $saggroupbyid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')

app/Http/Controllers/PaymentController.php

@@ -27,21 +27,23 @@ class PaymentController extends Controller
 
         $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
         ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
-        ->select('lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->select('fasa','lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
         ->where('lelong.sts_lelong', 3)
         ->where('cawangan.caw_code', $user->kodcaw)
         ->groupBy('lelong_id')
         ->get()
         ->toArray();
+       
 
         foreach($lelong as $info)
         {
             $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
             ->where('lelong_id',$info['lelong_id'])
+            ->where('cawangan.caw_code',$user->kodcaw)
             ->get()
             ->toArray();
             array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]);
-
+            //  dd($detailsinfo);
         }
 
         return view('pembayaran.senarailelongbayaran',compact('lelong', 'arrayinfo'));
@@ -50,11 +52,13 @@ class PaymentController extends Controller
 
     public function SenaraiPemenang($lelong_id){
 
+        $user = Auth::user();
+
         $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
         ->where('lelongbidder.status_bidder', 1)
+        ->where('lelongbid.kodcaw',$user->kodcaw)
         ->where('lelongbid.lelong_id', $lelong_id)
-        ->select('lelongbidder.user_id'
-        )
+        ->select('lelongbidder.user_id')
         ->groupBy('lelongbidder.user_id')
         ->get()->toArray();
 
@@ -66,6 +70,7 @@ class PaymentController extends Controller
             ->where('lelongbidder.status_bidder', 1)
             ->where('lelongbid.lelong_id', $lelong_id)
             ->get();
+            // dd($userdetails);
 
             $sts_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
             ->where('user_id', $winner['user_id'])
@@ -272,7 +277,7 @@ class PaymentController extends Controller
         // dd($request->all());
         //eachbid = lelongbid_id
         $bid_id = implode(",", $request->eachbid);
-        dd($bid_id);
+        // dd($bid_id);
 
         $paymentexist = Payment::join('fileresit', 'payment.id', '=', 'fileresit.payment_id')
         ->where('payment.lelong_id', $request->lelong_id)

app/Http/Controllers/SerahanController.php

@@ -108,11 +108,12 @@ class SerahanController extends Controller
         ->get();
 
         $senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
-        ->where('lelongbid.kodcaw',$caw['caw_code'])
+        // ->where('lelongbid.kodcaw',$caw['caw_code']) buang jap nti check balik
         ->where('user_id',$user_id)
         ->where('lelongbidder.status_bidder', 1)
         ->where('lelongbid.lelong_id', $lelong_id)
         ->get();
+        // dd($senaraisag);
 
         $caw['total_berat'] = $senaraisag->sum('berat');
         $caw['total_bidaan'] = $senaraisag->sum('hargabida');
@@ -150,7 +151,7 @@ class SerahanController extends Controller
         ->get();
 
         $senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
-        ->where('lelongbid.kodcaw',$caw['caw_code'])
+        // ->where('lelongbid.kodcaw',$caw['caw_code']) buang jap nti check balik
         ->where('user_id',$user_id)
         ->where('lelongbidder.status_bidder', 1)
         ->where('lelongbid.lelong_id', $lelong_id)

app/Http/Controllers/TangguhLelongController.php

@@ -30,7 +30,7 @@ class TangguhLelongController extends Controller
         ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
         ->where('cawangan.caw_code', $user->kodcaw)
         ->where('sts_lelong', 0)
-        ->select('lelong_id','cawangan.caw_code','tarikh_lelong','cawangan_lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
+        ->select('fasa','lelong_id','cawangan.caw_code','tarikh_lelong','cawangan_lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
         ->distinct()
         ->get()
         ->toArray();