diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index fbb7ad82..79cf3dcb 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -2001,8 +2001,7 @@ class LelongController extends Controller foreach($cawanganlel as $cawlel) { $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first(); - $databid = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') - ->select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.ansakhir','gadai.tempoh','gadai.kadarupah','gadai.tempohbayar') + $databid = LelongBid::select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong') ->where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$id)->get(); // dd($databid->toArray()); @@ -2162,8 +2161,7 @@ class LelongController extends Controller foreach($cawanganlel as $cawlel) { $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first(); - $databid = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') - ->select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.ansakhir','gadai.tempoh','gadai.kadarupah','gadai.tempohbayar') + $databid = LelongBid::select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong') ->where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$id)->get(); // dd($databid->toArray()); diff --git a/resources/views/simulasi/senaraisimulasiall.blade.php b/resources/views/simulasi/senaraisimulasiall.blade.php index 70632b29..3a775b3b 100644 --- a/resources/views/simulasi/senaraisimulasiall.blade.php +++ b/resources/views/simulasi/senaraisimulasiall.blade.php @@ -18,8 +18,8 @@