From 380d1fcd3f6ddcf21d08899bc00723d8b5b804a6 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Thu, 2 Jun 2022 13:04:08 +0800 Subject: [PATCH] update kemaskini hargaasas lelong --- app/Http/Controllers/LelongController.php | 183 +++++++++++------- app/Http/Controllers/SimulasiController.php | 180 ++++++++--------- app/Models/LelongBid.php | 5 +- .../views/lelong/senarailelong.blade.php | 8 +- .../views/lelong/senaraimarhun.blade.php | 6 +- 5 files changed, 211 insertions(+), 171 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index e70aa5b4..2282c9a2 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -281,6 +281,7 @@ class LelongController extends Controller $lelong->harga_emas_asas = $simulasi->harga_emas_asas; $lelong->jbg = $simulasi->jbg; $lelong->cajlelong = $simulasi->cajlelong; + $lelong->fasa = $simulasi->fasa; $lelong->save(); @@ -315,65 +316,102 @@ class LelongController extends Controller $caw_lelong->save(); $datasimbid = SimulasiBid::where('caw_id','=',$caw->caw_id)->where('simulasi_id',$id)->get(); - - foreach ($datasimbid as $simulasibid ) { - $lelongbid = new LelongBid; - $lelongbid->lelong_id = $lelong->id; - $lelongbid->caw_id = $simulasibid->caw_id; - $lelongbid->kodcaw =$simulasibid->kodcaw; - $lelongbid->norujukan =$simulasibid->norujukan; - $lelongbid->t_lelong =$simulasibid->t_lelong; - $lelongbid->hargaasas =$simulasibid->hargaasas; - $lelongbid->hargajual =$simulasibid->hargajual; - $lelongbid->t_jual =$simulasibid->t_jual; - $lelongbid->nopembeli =$simulasibid->nopembeli; - $lelongbid->jbg =$simulasibid->jbg; - $lelongbid->kadarupah =$simulasibid->kadarupah; - $lelongbid->upahsimpan =$simulasibid->upahsimpan; - $lelongbid->ansuran =$simulasibid->ansuran; - $lelongbid->nilaimarhun =$simulasibid->nilaimarhun; - $lelongbid->pinjaman =$simulasibid->pinjaman; - $lelongbid->bakiupah =$simulasibid->bakiupah; - $lelongbid->cajlain =$simulasibid->cajlain; - $lelongbid->cajlelong =$simulasibid->cajlelong; - $lelongbid->baki =$simulasibid->baki; - $lelongbid->berat =$simulasibid->berat; - $lelongbid->marhun =$simulasibid->marhun; - $lelongbid->percent =$simulasibid->percent; - $lelongbid->status_jual =$simulasibid->status_jual; - $lelongbid->status_payment =$simulasibid->status_payment; - $lelongbid->mora_upah =$simulasibid->mora_upah; - $lelongbid->save(); - if($lelongbid->save()) + $suratcaw = $datasimbid->all(); + // foreach ($datasimbid as $simulasibid ) { + // $lelongbid = new LelongBid; + // $lelongbid->lelong_id = $lelong->id; + // $lelongbid->caw_id = $simulasibid->caw_id; + // $lelongbid->kodcaw =$simulasibid->kodcaw; + // $lelongbid->norujukan =$simulasibid->norujukan; + // $lelongbid->t_lelong =$simulasibid->t_lelong; + // $lelongbid->hargaasas =$simulasibid->hargaasas; + // $lelongbid->hargajual =$simulasibid->hargajual; + // $lelongbid->t_jual =$simulasibid->t_jual; + // $lelongbid->nopembeli =$simulasibid->nopembeli; + // $lelongbid->jbg =$simulasibid->jbg; + // $lelongbid->kadarupah =$simulasibid->kadarupah; + // $lelongbid->upahsimpan =$simulasibid->upahsimpan; + // $lelongbid->ansuran =$simulasibid->ansuran; + // $lelongbid->nilaimarhun =$simulasibid->nilaimarhun; + // $lelongbid->pinjaman =$simulasibid->pinjaman; + // $lelongbid->bakiupah =$simulasibid->bakiupah; + // $lelongbid->cajlain =$simulasibid->cajlain; + // $lelongbid->cajlelong =$simulasibid->cajlelong; + // $lelongbid->baki =$simulasibid->baki; + // $lelongbid->berat =$simulasibid->berat; + // $lelongbid->marhun =$simulasibid->marhun; + // $lelongbid->percent =$simulasibid->percent; + // $lelongbid->status_jual =$simulasibid->status_jual; + // $lelongbid->status_payment =$simulasibid->status_payment; + // $lelongbid->mora_upah =$simulasibid->mora_upah; + // $lelongbid->fasa =$simulasibid->fasa; + // $lelongbid->save(); + //dd($suratcaw); + foreach(array_chunk($suratcaw,100) as $data_chunk) { - $updategadai = Gadai::where('norujukan','=',$simulasibid->norujukan)->first(); - $updategadai->taglel = 1; - $updategadai->save(); - } + //dd($data); + foreach($data_chunk as $data) + { + //dd($simulasi->id); + $lelongbid = LelongBid::create([ + "lelong_id" => $lelong->id, + "caw_id" => $data->caw_id, + "kodcaw" => $data->kodcaw, + "norujukan" => $data->norujukan, + "t_lelong" => $data->t_lelong, + "hargaasas" => $data->hargaasas, + "hargajual" => 0.00, + "jbg" => $data->jbg, + "kadarupah" => $data->kadarupah, + "ansuran" => $data->ansuran, + "nilaimarhun" => $data->nilaimarhun, + "pinjaman" => $data->pinjaman, + "bakiupah" => $data->bakiupah, + "upahsimpan" => $data->bakiupah, + "cajlain" => $data->cajlain, + "cajlelong" => 0.00, + "baki" => 0.00, + "berat" => $data->berat, + "marhun" => $data->marhun, + "percent" => $data->percent, + "status_jual" => 0, + "status_payment" => 0, + "mora_upah" => 0, + "fasa" => $data->fasa + ]); - $simulasibidmarhun = SimulasiBidMarhun::where('simulasibid_id','=',$simulasibid->id)->get(); - foreach($simulasibidmarhun as $simbidmarhun) - { - $lelongbidmarhun = new LelongBidMarhun; - $lelongbidmarhun->lelongbid_id = $lelongbid->id; - $lelongbidmarhun->bil = $simbidmarhun->bil; - $lelongbidmarhun->marhun = $simbidmarhun->marhun; - $lelongbidmarhun->nota = $simbidmarhun->nota; - $lelongbidmarhun->old_karat = $simbidmarhun->karat; - $lelongbidmarhun->old_berat = $simbidmarhun->berat; - $lelongbidmarhun->old_harga = $simbidmarhun->harga; - $lelongbidmarhun->old_nmarhun = $simbidmarhun->n_marhun; - $lelongbidmarhun->old_hargaasas = $simbidmarhun->hargaasas; - $lelongbidmarhun->karat = $simbidmarhun->karat; - $lelongbidmarhun->berat = $simbidmarhun->berat; - $lelongbidmarhun->harga = $simbidmarhun->harga; - $lelongbidmarhun->n_marhun = $simbidmarhun->n_marhun; - $lelongbidmarhun->hargaasas = $simbidmarhun->hargaasas; - $lelongbidmarhun->save(); + if($lelongbid->save()) + { + $updategadai = Gadai::where('norujukan','=', $data->norujukan)->first(); + $updategadai->taglel = 1; + $updategadai->save(); + } + + $simulasibidmarhun = SimulasiBidMarhun::where('simulasibid_id','=',$data->id)->get(); + foreach($simulasibidmarhun as $simbidmarhun) + { + $lelongbidmarhun = new LelongBidMarhun; + $lelongbidmarhun->lelongbid_id = $lelongbid->id; + $lelongbidmarhun->bil = $simbidmarhun->bil; + $lelongbidmarhun->marhun = $simbidmarhun->marhun; + $lelongbidmarhun->nota = $simbidmarhun->nota; + $lelongbidmarhun->old_karat = $simbidmarhun->karat; + $lelongbidmarhun->old_berat = $simbidmarhun->berat; + $lelongbidmarhun->old_harga = $simbidmarhun->harga; + $lelongbidmarhun->old_nmarhun = $simbidmarhun->n_marhun; + $lelongbidmarhun->old_hargaasas = $simbidmarhun->hargaasas; + $lelongbidmarhun->karat = $simbidmarhun->karat; + $lelongbidmarhun->berat = $simbidmarhun->berat; + $lelongbidmarhun->harga = $simbidmarhun->harga; + $lelongbidmarhun->n_marhun = $simbidmarhun->n_marhun; + $lelongbidmarhun->hargaasas = $simbidmarhun->hargaasas; + $lelongbidmarhun->save(); + + } + } } - } - } + } return redirect()->route('analisa.senaraisimulasi') ->with('success','Create Lelong Berjaya'); @@ -465,10 +503,14 @@ class LelongController extends Controller } //update marhun - $lelongbid = LelongBid::where('lelong_id','=',$request->idlelong)->get(); + $lelongbid = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') + ->select('lelongbid.id','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.ansakhir','gadai.tempoh','gadai.tempohbayar','gadai.kadarupah','gadai.norujukan','lelongbid.lelong_id') + ->where('lelong_id','=',$request->idlelong) + ->get(); - foreach($lelongbid as $bid) + foreach($lelongbid as $index1=>$bid) { + $keuntungan = $bid['bakipjm'] - ($bid['bakihargajualan'] - ($bid['upah12'] - $bid['ansakhir'])-(($bid['tempoh']-$bid['tempohbayar'])*$bid['kadarupah']/100*$bid['bakipjm']) ); $sumhargaasas = 0; $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id','=',$bid->id)->get(); foreach($lelongbidmarhun as $marhun) @@ -491,15 +533,25 @@ class LelongController extends Controller $marhun->save(); } } + $karat916 = LelKarat::where('karat','=',"22.0K")->get(); + //dd($karat916); + foreach($karat916 as $k916) + { + + $updatelelong = Lelong::where('id',$request->idlelong) + ->update([ + 'harga_emas_asas'=> $k916->harga2, + ]); + } } - $lelong = Lelong::where('id',$request->idlelong)->get(); - $bid->hargaasas = $sumhargaasas; $sumcajlelong = $sumhargaasas * ($lelong[0]['cajlelong']/100); - $bid->cajlelong = bcdiv($sumcajlelong,1,1); - $bid->baki = $sumhargaasas-$bid->pinjaman - $bid->bakiupah - $sumcajlelong; - $bid->save(); - + $totalbaki = $sumhargaasas -$bid->bakipjm - bcdiv($keuntungan,1,1) - bcdiv($sumcajlelong,1,1); + $kirakeuntungan = LelongBid::where('norujukan',$bid['norujukan']) + ->update([ + 'bakiupah'=> bcdiv($keuntungan,1,1), + 'hargaasas'=> $sumhargaasas + ]); } return redirect()->route('lelong.show',$request->idlelong) @@ -835,6 +887,7 @@ class LelongController extends Controller 'lelongbid.upahsimpan', 'lelongbid.cajlelong', 'lelongbid.baki', + 'lelongbid.bakiupah', 'lelongbid.status_jual', 'lelongbid.jbg', 'gadai.bakipjm', @@ -866,13 +919,11 @@ class LelongController extends Controller { $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->where('lelong_id',$laporan['lelong_id']) + ->where('caw_id',$cawid) ->get() ->toArray(); array_push($arrayinfo,['laporan' => $laporan,'details' => $details]); } - - - return view('lelong.senaraimarhun',compact('marhuns','lelongid','cawid','arrayinfo')); } diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 23ab0e4e..a1b63a2e 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -143,111 +143,84 @@ class SimulasiController extends Controller foreach(array_chunk($suratcaw,100) as $data_chunk) { //dd($data); - foreach($data_chunk as $data){ - // dd($data->tempoh); - // $simulasibid = new SimulasiBid; - // $simulasibid->simulasi_id = $simulasi->id; - // $simulasibid->caw_id = $cawsimulasi->id; - // $simulasibid->kodcaw = $data->kodcaw; - // $simulasibid->norujukan = $data->norujukan; - // $simulasibid->t_lelong = $request->tarikh_lelong; - // $simulasibid->hargaasas = 0.00; - // $simulasibid->hargajual = 0.00; - // $simulasibid->jbg = $data->tempoh; - // $simulasibid->kadarupah = $data->kadarupah; - // $simulasibid->upahsimpan = $data->upahSim; - // $simulasibid->ansuran = $data->ansuran; - // $simulasibid->nilaimarhun = $data->nilaimarhun; - // $simulasibid->pinjaman = $data->pinjaman; - // $simulasibid->bakiupah = $data->bakiupah; - // $simulasibid->cajlain = $data->cajlain; - // $simulasibid->cajlelong = 0.00; - // $simulasibid->baki = 0.00; - // $simulasibid->berat = $data->berat; - // $simulasibid->marhun = $data->marhun; - // $simulasibid->percent = $data->percentpinj; - // $simulasibid->status_jual = 0; - // $simulasibid->status_payment = 0; - // $simulasibid->mora_upah = 0; - // $simulasibid->fasa = $request->fasa; - // $simulasibid->save(); - //dd($simulasi->id); - $simulasibid = SimulasiBid::create([ - "simulasi_id" => $simulasi->id, - "caw_id" => $cawsimulasi->id, - "kodcaw" => $data->kodcaw, - "norujukan" => $data->norujukan, - "t_lelong" => $request->tarikh_lelong, - "hargaasas" => 0.00, - "hargajual" => 0.00, - "jbg" => $data->tempoh, - "kadarupah" => $data->kadarupah, - "upahsimpan" => $data->upahSim, - "ansuran" => $data->ansuran, - "nilaimarhun" => $data->nilaimarhun, - "pinjaman" => $data->pinjaman, - "bakiupah" => $data->bakiupah, - "cajlain" => $data->cajlain, - "cajlelong" => 0.00, - "baki" => 0.00, - "berat" => $data->berat, - "marhun" => $data->marhun, - "percent" => $data->percentpinj, - "status_jual" => 0, - "status_payment" => 0, - "mora_upah" => 0, - "fasa" => $request->fasa - ]); - - $sumhargaasas = 0; - $berat = 0; - $gadaimarhun = GadaiMarhun::where('norujukan','=',$data->norujukan)->get(); - foreach($gadaimarhun as $marhun) + foreach($data_chunk as $data) { - $simkarat = SimKarat::where('simulasi_id','=',$simulasi->id)->get(); - // dd($simkarat); - foreach($simkarat as $karat) - { - - if($karat->karat == $marhun->karat) - { - $val = round($marhun->berat * $karat->harga); - $sumhargaasas = $sumhargaasas + $val; - $berat = $berat + $marhun->berat; + $simulasibid = SimulasiBid::create([ + "simulasi_id" => $simulasi->id, + "caw_id" => $cawsimulasi->id, + "kodcaw" => $data->kodcaw, + "norujukan" => $data->norujukan, + "t_lelong" => $request->tarikh_lelong, + "hargaasas" => 0.00, + "hargajual" => 0.00, + "jbg" => $data->tempoh, + "kadarupah" => $data->kadarupah, + "upahsimpan" => $data->upahSim, + "ansuran" => $data->ansuran, + "nilaimarhun" => $data->nilaimarhun, + "pinjaman" => $data->pinjaman, + "bakiupah" => $data->bakiupah, + "cajlain" => $data->cajlain, + "cajlelong" => 0.00, + "baki" => 0.00, + "berat" => $data->berat, + "marhun" => $data->marhun, + "percent" => $data->percentpinj, + "status_jual" => 0, + "status_payment" => 0, + "mora_upah" => 0, + "fasa" => $request->fasa + ]); - $simmarhun = new SimulasiBidMarhun; - $simmarhun->simulasibid_id = $simulasibid->id; - $simmarhun->bil = $marhun->bil; - $simmarhun->marhun = $marhun->marhun; - $simmarhun->nota = $marhun->nota; - $simmarhun->karat = $marhun->karat; - $simmarhun->berat = $marhun->berat; - $simmarhun->harga = $karat->harga; - $simmarhun->n_marhun = $marhun->n_marhun; - $simmarhun->hargaasas = $val; - $simmarhun->save(); + $sumhargaasas = 0; + $berat = 0; + $gadaimarhun = GadaiMarhun::where('norujukan','=',$data->norujukan)->get(); + foreach($gadaimarhun as $marhun) + { + $simkarat = SimKarat::where('simulasi_id','=',$simulasi->id)->get(); + // dd($simkarat); + foreach($simkarat as $karat) + { + + if($karat->karat == $marhun->karat) + { + $val = round($marhun->berat * $karat->harga); + $sumhargaasas = $sumhargaasas + $val; + $berat = $berat + $marhun->berat; + + $simmarhun = new SimulasiBidMarhun; + $simmarhun->simulasibid_id = $simulasibid->id; + $simmarhun->bil = $marhun->bil; + $simmarhun->marhun = $marhun->marhun; + $simmarhun->nota = $marhun->nota; + $simmarhun->karat = $marhun->karat; + $simmarhun->berat = $marhun->berat; + $simmarhun->harga = $karat->harga; + $simmarhun->n_marhun = $marhun->n_marhun; + $simmarhun->hargaasas = $val; + $simmarhun->save(); + } } - } - } + } - // $calcaj = ($request->cajlelong/100)*$sumhargaasas; - // $updatesimbid = SimulasiBid::where('id','=',$simulasibid->id)->first(); - // $updatesimbid->hargaasas = $sumhargaasas; - // $updatesimbid->cajlelong = $calcaj; - // $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj; - // $updatesimbid->berat = $berat; - // $updatesimbid->save(); + // $calcaj = ($request->cajlelong/100)*$sumhargaasas; + // $updatesimbid = SimulasiBid::where('id','=',$simulasibid->id)->first(); + // $updatesimbid->hargaasas = $sumhargaasas; + // $updatesimbid->cajlelong = $calcaj; + // $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj; + // $updatesimbid->berat = $berat; + // $updatesimbid->save(); - $updategadai = Gadai::where('norujukan','=',$data->norujukan)->first(); - $updategadai->taglel = 1; - $updategadai->update(); - // $updatesimbid->cajlelong = $calcaj; - // $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj; - // $updatesimbid->berat = $berat; - // $updatesimbid->save(); + $updategadai = Gadai::where('norujukan','=',$data->norujukan)->first(); + $updategadai->taglel = 1; + $updategadai->update(); + // $updatesimbid->cajlelong = $calcaj; + // $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj; + // $updatesimbid->berat = $berat; + // $updatesimbid->save(); } } } @@ -569,9 +542,18 @@ class SimulasiController extends Controller $marhun->save(); } } + $karat916 = SimKarat::where('karat','=',"22.0K")->get(); + //dd($karat916); + foreach($karat916 as $k916) + { + + $updatesimulasi = Simulasi::where('id',$request->idsimulasi) + ->update([ + 'harga_emas_asas'=> $k916->harga2, + ]); + } // dd($sumhargaasas); } - $simulasi = Simulasi::where('id',$request->idsimulasi)->get(); $sumcajlelong = $sumhargaasas * ($simulasi[0]['cajlelong']/100); $totalbaki = $sumhargaasas -$bid->bakipjm - bcdiv($keuntungan,1,1) - bcdiv($sumcajlelong,1,1); @@ -582,7 +564,7 @@ class SimulasiController extends Controller 'cajlelong'=> bcdiv($sumcajlelong,1,1), 'baki'=> $totalbaki, ]); - //dd($sumcajlelong); + //dd($sumcajlelong); } diff --git a/app/Models/LelongBid.php b/app/Models/LelongBid.php index 304d1bbc..f167a401 100644 --- a/app/Models/LelongBid.php +++ b/app/Models/LelongBid.php @@ -12,7 +12,9 @@ class LelongBid extends Model protected $table = 'lelongbid'; protected $fillable = [ + 'lelong_id', 'caw_id', + 'kodcaw', 'norujukan', 't_lelong', 'hargaasas', @@ -20,7 +22,7 @@ class LelongBid extends Model 't_jual', 'nopembeli', 'jbg', - 'kadarupdah', + 'kadarupah', 'upahsimpan', 'ansuran', 'nilaimarhun', @@ -35,5 +37,6 @@ class LelongBid extends Model 'status_jual', 'status_payment', 'mora_upah', + 'fasa' ]; } diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index 6cf26509..3fd66722 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -32,8 +32,12 @@ {{$loop->iteration}} {{ $lel['info']['lelong_id'] }} - {{ $lel['info']['tarikh_lelong']}} - + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp + @foreach($lel['detailsinfo'] as $details) {{$details['caw_name']}}
@endforeach diff --git a/resources/views/lelong/senaraimarhun.blade.php b/resources/views/lelong/senaraimarhun.blade.php index de84ef1a..0953e904 100644 --- a/resources/views/lelong/senaraimarhun.blade.php +++ b/resources/views/lelong/senaraimarhun.blade.php @@ -35,11 +35,11 @@ No. Norujukan - Pinjaman (RM) Tempoh Berat (gm) Nilai Marhun (RM) Harga Asas (RM) + Pembiayaan (RM) Keuntungan (RM) Caj Lelong (%) Rugi Lelong (RM) @@ -52,12 +52,12 @@ {{$loop->iteration}} {{ $marhun['norujukan']}} - {{ $marhun['pinjaman'] }} {{ $marhun['jbg']}} {{ $marhun['berat'] }} {{ $marhun['nilaimarhun'] }} {{ $marhun['hargaasas'] }} - {{ number_format($marhun['keuntungan'], 2, '.', ',') }} + {{ $marhun['pinjaman'] }} + {{ number_format($marhun['bakiupah'], 2, '.', ',') }} {{-- {{ $marhun['keuntungan'] }} --}} {{ $marhun['cajlelong'] }}