diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 703e20bc..7cd354a6 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -674,7 +674,7 @@ class LelongController extends Controller } public function deletemarhun(Request $request){ - dd($request->checkboxdata); + // dd($request->checkboxdata); $data = $request->checkboxdata; foreach($data as $index=>$norujukan) { diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index a835a75f..384f362f 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -706,6 +706,43 @@ class SimulasiController extends Controller } + + public function senaraimarhunlel($lelongid, $cawid) + { + $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id') + ->where('lelong_id','=',$lelongid) + ->where('caw_id','=',$cawid) + ->select( + 'lelongbid.t_lelong', + 'lelongbid.kodcaw', + 'cawangan.caw_name', + 'lelongbid.norujukan', + 'lelongbid.pinjaman', + 'lelongbid.berat', + 'lelongbid.nilaimarhun', + 'lelongbid.hargaasas', + 'lelongbid.upahsimpan', + 'lelongbid.cajlelong', + 'lelongbid.baki', + 'lelongbid.status_jual', + ) + ->get(); + + return view('lelong.senaraimarhunsim',compact('marhuns','lelongid','cawid')); + } + public function deletemarhunlel(Request $request){ + dd($request->checkboxdata); + + $data = $request->checkboxdata; + foreach($data as $index=>$norujukan) + { + $marhun = LelongBid::where('norujukan','=',$norujukan)->first(); + $marhun->delete(); + } + + return redirect()->route('lelong.senaraimarhunlel',['lelongid'=>$request->lelongid,'cawid'=>$request->cawid]) + ->with('success','Delete Berjaya'); + } } \ No newline at end of file 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 3b375d54..09b63431 100644 --- a/database/migrations/2021_12_14_041557_create_lelongs_table.php +++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php @@ -76,6 +76,7 @@ class CreateLelongsTable extends Migration $table->string('status_jual'); $table->string('status_payment'); $table->integer('status_semak')->default(0); + $table->datetime('diserahkan_pada')->nullable(); $table->string('mora_upah'); $table->timestamps(); diff --git a/resources/views/simulasi/senaraimarhunsim.blade.php b/resources/views/simulasi/senaraimarhunsim.blade.php new file mode 100644 index 00000000..d1461cd1 --- /dev/null +++ b/resources/views/simulasi/senaraimarhunsim.blade.php @@ -0,0 +1,169 @@ +@extends('layouts.app') + +@section('content') + +
{{ $message }}
+