diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index 8e450a24..bcd8630a 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -215,15 +215,16 @@ class PembidaController extends Controller public function senlelbelumbayarbidaan(Request $request) { - $kodcaw = $request->kodcaw; + //$kodcaw = $request->kodcaw; - $arrayinfo = []; + //$arrayinfo = []; $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') + ->join('cawangan','cawangan.id','=','lelongbid.caw_id') + ->select('lelongbid.lelong_id','lelongbid.caw_id','lelongbid.kodcaw','lelongbid.t_lelong','lelong.sts_lelong','cawangan.caw_name') ->distinct() ->orderBy('lelongbid.lelong_id') ->where('lelongbid.status_jual', 1) @@ -233,27 +234,12 @@ class PembidaController extends Controller ->orWhere('lelongbidder.status_payment',2) ->where('lelongbidder.status_bidder', 1); }) - ->get() - ->toArray(); + ->get(); + //->toArray(); //dd($lelong); - foreach($lelong as $details) - { - - $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->select('cawangan_lelong.lelong_id','cawangan_lelong.caw_id','caw_name','caw_code','cawangan_lelong.export_data_sts') - ->where('lelong_id',$details['lelong_id']) - ->distinct() - ->orderBy('lelong_id') - ->get() - ->toArray(); - // dd($detailsinfo); - - array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]); - } - // dd($request->kodcaw); - return view('pembida.senlelbelumbayarbidaan',compact('lelong','arrayinfo')); + return view('pembida.senlelbelumbayarbidaan', compact('lelong')); } public function pembayaranbidaan(Request $request) diff --git a/database/migrations/2021_12_14_041557_create_lelongs_table.php b/database/migrations/2021_12_14_041557_create_lelongs_table.php index d7125b7b..82d021db 100644 --- a/database/migrations/2021_12_14_041557_create_lelongs_table.php +++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php @@ -19,17 +19,18 @@ class CreateLelongsTable extends Migration $table->string('kodcaw'); $table->string('norujukan'); $table->date('t_lelong'); - $table->intger('status'); + $table->integer('status'); $table->integer('fasa')->default(0); $table->timestamps(); - $table->foreign('caw_id') - ->references('id')->on('cawangan') - ->onDelete('cascade'); + // $table->foreign('caw_id') + // ->references('id')->on('cawangan') + // ->onDelete('cascade'); - $table->foreign('lelong_id') - ->references('id')->on('lelong') - ->onDelete('cascade'); + // $table->foreign('lelong_id') + // ->references('id')->on('lelong') + // ->onDelete('cascade'); + }); Schema::create('lelong', function (Blueprint $table) { $table->bigIncrements('id'); diff --git a/resources/views/pembida/senlelbelumbayarbidaan.blade.php b/resources/views/pembida/senlelbelumbayarbidaan.blade.php index 864da246..7ac1a38a 100644 --- a/resources/views/pembida/senlelbelumbayarbidaan.blade.php +++ b/resources/views/pembida/senlelbelumbayarbidaan.blade.php @@ -22,24 +22,24 @@
- @foreach($arrayinfo as $lel) + @foreach($lelong as $index=> $lel)