diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 4ddcd66e..59d46330 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -51,16 +51,34 @@ class LelongController extends Controller */ public function index() { - $lelong = Lelong::all(); + // $lelong = Lelong::all(); - foreach($lelong as $lel) + // foreach($lelong as $lel) + // { + // $caw_lelong = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') + // ->where('lelong_id', $lel['id']) + // ->get()->toArray(); + // } + $arrayinfo = []; + + $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->groupBy('lelong_id') + ->get() + ->toArray(); + + foreach($lelong as $info) { - $caw_lelong = CawanganLelong::join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') - ->where('lelong_id', $lel['id']) - ->get()->toArray(); + + $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$info['lelong_id']) + ->get() + ->toArray(); + array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); + } - return view('lelong.senarailelong',compact('lelong', 'caw_lelong')); + return view('lelong.senarailelong',compact('lelong', 'arrayinfo')); } public function show($id) @@ -810,22 +828,49 @@ class LelongController extends Controller public function lapbrglelongindex (Request $request){ - // $user = Auth::user(); - - $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - // ->where('cawangan.caw_code','=',$user->kodcaw) - ->get(); + $arraydetails = []; - return view('lelong.laporanlelong',compact('lelongid')); + $laporanpembida= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->select('lelong_id','tarikh_lelong') + ->groupBy('lelong_id') + ->get() + ->toArray(); + + foreach($laporanpembida as $laporan) + { + $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan['lelong_id']) + ->get() + ->toArray(); + array_push($arraydetails,['laporan' => $laporan,'details' => $details]); + } + + return view('lelong.laporanlelong', compact('arraydetails')); } public function senaraibrglelong($lelong_id){ - $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + + + $arraydetails = []; + $arrayinfo = []; + + + $lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') ->where('cawangan_lelong.lelong_id','=',$lelong_id) - ->get(); + ->select('lelong_id','tarikh_lelong') + ->groupBy('lelong_id') + ->get()->toArray(); + + foreach($lelongid as $laporan) + { + $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan['lelong_id']) + ->get() + ->toArray(); + array_push($arrayinfo,['laporan' => $laporan,'details' => $details]); + } + $brglelong = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') ->where('lelongbid.lelong_id', $lelong_id) @@ -853,7 +898,7 @@ class LelongController extends Controller - return view('lelong.senaraibrglelong',compact('lelongid','brglelong','lelong_id','keuntungan','total_hargaasas','total_upahkeuntungan','total_nmarhun','total_pinjaman')); + return view('lelong.senaraibrglelong',compact('arrayinfo','lelongid','brglelong','lelong_id','keuntungan','total_hargaasas','total_upahkeuntungan','total_nmarhun','total_pinjaman')); } @@ -911,6 +956,7 @@ class LelongController extends Controller $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->get(); + return view('lelong.laporanbidaanindex',compact('lelongid')); } @@ -925,6 +971,7 @@ class LelongController extends Controller ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->where('cawangan_lelong.lelong_id','=',$lelong_id) ->get(); + $laporanpembida= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') ->select('lelongbid_id','norujukan','hargaasas') diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 966404d7..aeab4529 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -521,72 +521,83 @@ class MarhunController extends Controller $currentdate = Carbon::now(); $currentdate = $currentdate->toDateTimeString(); - $pengesahan = Pengesahan::where('norujukan', $request->norujukan) - ->first(); - - $pengesahan->id = $pengesahan['id'] ; - $pengesahan->disahkan_oleh = $user['id']; - $pengesahan->disahkan_pada = $currentdate; - $pengesahan->save(); - // dd($pengesahan); - $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->get(); - $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->get(); - + $pengesahan = Pengesahan::where('norujukan', $request->norujukan)->where('lelong_id', $request->lelong_id)->get(); + if($request->jenis_button == "terima") { - $lelongbidmarhuns = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.lelongbid_id', '=', 'pengesahan.lelongbid_id') - ->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id) - ->where('pengesahan.id', $pengesahan->id) - ->get(); - dd($lelongbidmarhuns['marhun']); - - foreach($lelongbidmarhuns as $bidmarhuns) + foreach($pengesahan as $index1=>$sah) { - if($bidmarhuns->status_ubah == 3) + $savepengesahan = Pengesahan::where('id', $sah['id']) + ->first(); + $savepengesahan->disahkan_oleh = $user['id']; + $savepengesahan->disahkan_pada = $currentdate; + $savepengesahan->status = 1; + $savepengesahan->save(); + + $lelongbid = LelongBid::where('id', $sah->lelongbid_id)->get(); + $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $sah->lelongbid_id)->get(); + + $lelongbidmarhuns = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.lelongbid_id', '=', 'pengesahan.lelongbid_id') + ->where('pengesahan.lelongbid_id', $sah->lelongbid_id) + ->where('pengesahan.id', $sah->id) + ->get(); + + $total_berat = 0; + $total_hargaasas = 0; + foreach($lelongbidmarhuns as $index2=>$bidmarhuns) { - $bidmarhuns->delete(); - } - else - { - // + if($bidmarhuns->status_ubah == 3) + { + $bidmarhuns->delete(); + } + else + { + // + } + + $lelongbids = LelongBid::where('id', $sah->lelongbid_id)->first(); + $txtmarhun = ",1 " . $bidmarhuns->marhun ; + $lelongbids->marhun = str_replace( $txtmarhun,"", $lelongbid[0]['marhun']); + $lelongbids->berat = $total_berat += $bidmarhuns->berat ; + $lelongbids->hargaasas = $total_hargaasas += $bidmarhuns->hargaasas; + $lelongbids->save(); + } + } - $pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id') - ->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id) - ->select('pengesahan.id as pengesahan_id') - ->first(); - - $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id') - ->where('lelongbid_id','=',$pengesahan->lelongbid_id) - ->get(); - - $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first(); - $txtmarhun = ",1 " . $lelongbidmarhuns->marhun ; - $lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun); - $lelongbid->berat = $lelongbid->berat - $lelongbidmarhuns->berat; - $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhuns->hargaasas; - $lelongbid->save(); - // $this->pcdelete($request->pengesahan_id, $pengesahan->lelongbid_id); } else if($request->jenis_button == "tangguhlelong") { - //add into table tangguhlelong - $tangguhlelong = new TangguhLelong; - $tangguhlelong->lelong_id = $pengesahan->lelong_id; - $tangguhlelong->lelongbid_id = $pengesahan->lelongbid_id; - $tangguhlelong->norujukan = $pengesahan->norujukan; - $tangguhlelong->pinjaman = $lelongbid[0]['pinjaman']; - $tangguhlelong->tarikhtangguh = $currentdate; - $tangguhlelong->ditangguh_oleh = $user->id; - $tangguhlelong->ditangguh_pada = $currentdate; - $tangguhlelong->nota = $request->nota; - $tangguhlelong->save(); - // dd($tangguhlelong); + foreach($pengesahan as $index1=>$sah) + { + $savepengesahan = Pengesahan::where('id', $sah['id']) + ->first(); + $savepengesahan->disahkan_oleh = $user['id']; + $savepengesahan->disahkan_pada = $currentdate; + $savepengesahan->status = 1; + $savepengesahan->save(); + + $lelongbidasal = LelongBid::where('id', $sah['lelongbid_id'])->first(); + + //add into table tangguhlelong + $tangguhlelong = new TangguhLelong; + $tangguhlelong->lelong_id = $sah->lelong_id; + $tangguhlelong->lelongbid_id = $sah->lelongbid_id; + $tangguhlelong->norujukan = $sah->norujukan; + $tangguhlelong->pinjaman = $lelongbidasal['pinjaman']; + $tangguhlelong->tarikhtangguh = $currentdate; + $tangguhlelong->ditangguh_oleh = $user->id; + $tangguhlelong->ditangguh_pada = $currentdate; + $tangguhlelong->nota = $request->nota; + $tangguhlelong->save(); + + $marhundelete = LelongBid::where('id', $sah->lelongbid_id)->delete(); + } + - $marhundelete = LelongBid::where('id', $pengesahan->lelongbid_id)->delete(); } @@ -630,48 +641,48 @@ class MarhunController extends Controller } - public function pcdelete($id, $lelongbid_id) - { - $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $lelongbid_id)->first(); - $pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id') - ->where('pengesahan.lelongbid_id', $lelongbid_id) - ->select('pengesahan.id as pengesahan_id') - ->first(); - - $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id') - ->where('lelongbid_id','=',$lelongbid_id) - ->get(); - - $lelongbid = LelongBid::where('id', $lelongbid_id)->first(); - $txtmarhun = ",1 " . $lelongbidmarhun->marhun ; - $lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun); - $lelongbid->berat = $lelongbid->berat - $lelongbidmarhun->berat_emastambahan; - $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan; - $lelongbid->save(); - - } - public function senarailelong() { - $lelong = Lelong::where('sts_lelong', 0) - ->get(); + $arrayinfo = []; - return view('pengesahan.senarailelong',compact('lelong')); + $lelong = Lelong::where('sts_lelong', 0) + ->get()->toArray(); + + foreach($lelong as $details) + { + $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id', $details['id']) + ->get() + ->toArray(); + + array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]); + } + + return view('pengesahan.senarailelong',compact('lelong', 'arrayinfo')); } public function senaraitangguhlelong($id) { - $tangguhlelong = TangguhLelong::join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id') + $tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', 'lelong.id') ->where('tangguhlelong.lelong_id', $id) ->get(); + foreach($tangguhlelong as $index1=>$tanguhlel) + { + $getkodcaw = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code') + ->where('lelong_id', $id) + ->first(); + + $tangguhlelong[$index1]['nama_caw'] = $getkodcaw->caw_name; + } + return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id')); } public function lelbidmarhun($id, $norujukan) { - $marhuns = LelongBidMarhun::join('tangguhlelong', 'lelongbidmarhun.lelongbid_id', '=', 'tangguhlelong.lelongbid_id') - ->where('tangguhlelong.lelong_id', $id) + $marhuns = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan') + ->join('gadai', 'tangguhlelong.norujukan', '=', 'gadai.norujukan') ->where('tangguhlelong.norujukan', $norujukan) ->get(); diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 6aa495e6..81ad2daf 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -277,9 +277,28 @@ class SimulasiController extends Controller public function senaraisimulasi() { - $simulasi = Simulasi::all(); + // $simulasi = Simulasi::all(); - return view('simulasi.senaraisimulasi',compact('simulasi')); + $arrayinfo = []; + + $simulasi = Simulasi::join('cawangan_simulasi','simulasi.id','=','cawangan_simulasi.simulasi_id') + ->select('simulasi_id','tarikh_lelong') + ->groupBy('simulasi_id') + ->get() + ->toArray(); + + foreach($simulasi as $info) + { + $detailsinfo = CawanganSimulasi::join('cawangan','cawangan_simulasi.caw_id','=','cawangan.id') + ->where('simulasi_id',$info['simulasi_id']) + ->get() + ->toArray(); + + array_push($arrayinfo, ['info'=> $info, 'detailsinfo'=>$detailsinfo]); + + } + + return view('simulasi.senaraisimulasi',compact('simulasi','arrayinfo')); } public function show($id) diff --git a/database/migrations/2021_12_13_053311_create_cawangans_table.php b/database/migrations/2021_12_13_053311_create_cawangans_table.php index e0fb2e7f..08b9e31f 100644 --- a/database/migrations/2021_12_13_053311_create_cawangans_table.php +++ b/database/migrations/2021_12_13_053311_create_cawangans_table.php @@ -30,7 +30,7 @@ class CreateCawangansTable extends Migration $table->string('nofaks')->nullable(); $table->string('lokasi')->nullable(); $table->string('pkb_jmc')->nullable(); - $table->string('para2')->nullable(); + // $table->string('para2')->nullable(); $table->timestamps(); }); diff --git a/database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php b/database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php index d42b42af..d788ae2a 100644 --- a/database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php +++ b/database/migrations/2022_02_27_052051_add_para2_to_cawangan_table.php @@ -14,7 +14,7 @@ class AddPara2ToCawanganTable extends Migration public function up() { Schema::table('cawangan', function (Blueprint $table) { - $table->string('para2'); + $table->string('para2')->nullable(); }); } @@ -26,7 +26,7 @@ class AddPara2ToCawanganTable extends Migration public function down() { Schema::table('cawangan', function (Blueprint $table) { - $table->dropColumn('para2'); + $table->dropColumn('para2') ; }); } } diff --git a/resources/views/lelong/laporanlelong.blade.php b/resources/views/lelong/laporanlelong.blade.php index 317eca76..8b6e4705 100644 --- a/resources/views/lelong/laporanlelong.blade.php +++ b/resources/views/lelong/laporanlelong.blade.php @@ -16,25 +16,31 @@