update list belum byr bidaan

app/Http/Controllers/PembidaController.php

@@ -223,14 +223,16 @@ class PembidaController extends Controller
         $lelong = LelongBid::join('cawangan_lelong','lelongbid.lelong_id','=','cawangan_lelong.lelong_id')
         ->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
         ->join('lelong','lelong.id','=','lelongbid.lelong_id')
-        ->select('lelongbid.lelong_id','lelongbid.caw_id','lelongbid.kodcaw','lelongbid.t_lelong','lelong.sts_lelong','lelongbidder.status_payment')
+        ->select('lelongbid.lelong_id','lelongbid.caw_id','lelongbid.kodcaw','lelongbid.t_lelong','lelong.sts_lelong')
         ->distinct()
         ->orderBy('lelongbid.lelong_id')
         ->where('lelongbid.status_jual', 1)  
-        ->whereIn('lelongbidder.status_payment', [null, 2]) 
-        ->where('lelongbidder.status_bidder', 1)  
         ->where('lelong.sts_lelong', 3) 
-        
+        ->where(function($query){
+            $query->whereNull('lelongbidder.status_payment')
+                ->orWhere('lelongbidder.status_payment',2)
+                ->where('lelongbidder.status_bidder', 1);
+        })  
         ->get()
         ->toArray();
         //dd($lelong);
@@ -388,20 +390,25 @@ class PembidaController extends Controller
         return view('pembida.detailsbidaan', compact('infos', 'userdetail', 'kodcaw'));
     }
 
-    public function belumbayarbidaan($lelong_id, $kodcaw)
+    public function belumbayarbidaan(Request $request)
     {
 
         //$userdetail = User::where('id', $user_id)->first();
 
-        $infos = LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
-        ->whereIn('lelongbidder.status_payment', [null,2])
-        ->where('lelongbid.lelong_id', $lelong_id)
-        ->where('lelongbid.kodcaw', $kodcaw)
-        ->where('lelongbidder.status_bidder', 1)
-        ->where('lelongbid.status_jual', 1)  
+        $infos = LelongBid::join('cawangan_lelong','lelongbid.lelong_id','=','cawangan_lelong.lelong_id')
+        ->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
+        ->join('lelong','lelong.id','=','lelongbid.lelong_id')
         ->select ('lelongbid.kodcaw','lelongbid.caw_id','lelongbidder.user_id','lelongbidder.nama_bidder','lelongbidder.hargabida','lelongbid.norujukan','lelongbid.hargaasas','lelongbidder.masa_bidaan','lelongbid.t_lelong','lelongbid.id','lelongbid.fasa','lelongbid.lelong_id')
+        ->where('lelongbid.lelong_id', $request->lelong_id)
+        ->where('lelongbid.kodcaw', $request->kodcaw)
+        ->where('lelongbid.status_jual', 1)
+        ->where(function($query){
+            $query->whereNull('lelongbidder.status_payment')
+                ->orWhere('lelongbidder.status_payment',2)
+                ->where('lelongbidder.status_bidder', 1);
+        })
         ->get();
-         
+        //  dd($infos);
         
         return view('pembida.detailsbidaanbelumbayar', compact('infos'));
     }

app/Models/CawanganLelong.php

@@ -25,4 +25,8 @@ class CawanganLelong extends Model
         'import_data_stsdate',
         'lokasi'
     ];
+
+    public function lelongBid(){
+        return $this->hasMany(LelongBid::class, 'caw_id', 'caw_id');
+    }
 }

app/Models/LelongBid.php

@@ -43,4 +43,8 @@ class LelongBid extends Model
     public function lelongbidder() {
         return $this->hasOne(LelongBidder::class,'lelongbid_id', 'id' );
     }
+
+    public function cawanganLelong(){
+        return $this->hasOne(CawanganLelong::class, 'caw_id','caw_id');
+    }
 }

resources/views/pembida/senlelbelumbayarbidaan.blade.php

@@ -43,13 +43,7 @@
                             <button class="btn btn-success btn-sm" disabled>LELONG SELESAI</button>
                         @endif
                     </td>
-                    <!-- <td>
-                        @if($lel['detail']['status_payment'] == NULL)
-                            <button class="btn btn-danger btn-sm" disabled>BELUM BAYAR</button>
-                        @elseif($lel['detail']['status_payment'] == 2)
-                        <button class="btn btn-warning btn-sm" disabled>PERLU PENGESAHAN</button>
-                        @endif
-                    </td> -->
+                   
                 
                 </tr>
                 @endforeach

routes/web.php

@@ -249,7 +249,7 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid
     Route::get('/pembayaranbidaan',['as'=>'pembida.pembayaranbidaan','uses'=>'PembidaController@pembayaranbidaan']);
     Route::get('/detailsbidaan/{user_id}/{kodcaw}',['as'=>'pembida.detailsbidaan','uses'=>'PembidaController@detailsbidaan']);
     Route::get('/senlelbelumbayarbidaan',['as'=>'pembida.senlelbelumbayarbidaan','uses'=>'PembidaController@senlelbelumbayarbidaan']);
-    Route::get('/belumbayarbidaan/{lelong_id}/{kodcaw}',['as'=>'pembida.belumbayarbidaan','uses'=>'PembidaController@belumbayarbidaan']);
+    Route::get('/belumbayarbidaan',['as'=>'pembida.belumbayarbidaan','uses'=>'PembidaController@belumbayarbidaan']);
     Route::post('/declaretidaklaku',['as'=>'pembida.declaretidaklaku','uses'=>'PembidaController@declaretidaklaku']);
 });