From 0a9ce20bddd87e2c387bb20a6d1762bafb09f844 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Wed, 29 Jun 2022 17:55:45 +0800 Subject: [PATCH] update karat 22K --- app/Http/Controllers/LelongController.php | 39 ++++--------------- app/Http/Controllers/SimulasiController.php | 11 ++++-- ...2021_12_14_041557_create_lelongs_table.php | 4 +- 3 files changed, 18 insertions(+), 36 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index c07e9ee0..d3379ba2 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -59,7 +59,7 @@ class LelongController extends Controller $arrayinfo = []; $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') - ->select('fasa','lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->select('lelong.fasa','lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->groupBy('lelong_id') ->get() ->toArray(); @@ -298,6 +298,7 @@ class LelongController extends Controller $lelong->jbg = $simulasi->jbg; $lelong->cajlelong = $simulasi->cajlelong; $lelong->fasa = $simulasi->fasa; + $lelong->kali = $simulasi->kali; $lelong->save(); @@ -329,40 +330,12 @@ class LelongController extends Controller $caw_lelong->caw_id = $caw->caw_id; $caw_lelong->online = $caw->online; $caw_lelong->lokasi = $caw->lokasi; + $caw_lelong->fasa = $caw->fasa; + $caw_lelong->kali = $caw->kali; $caw_lelong->save(); $datasimbid = SimulasiBid::where('caw_id','=',$caw->caw_id)->where('simulasi_id',$id)->get(); $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) { //dd($data); @@ -599,7 +572,9 @@ class LelongController extends Controller $marhun->save(); } } - $karat916 = LelKarat::where('karat','=',"22.0K")->get(); + $karat916 = LelKarat::where('karat','=',"22.0K") + ->where('lelong_id','=',$request->idlelong) + ->get(); //dd($karat916); foreach($karat916 as $k916) { diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index b0f00a19..d0dec0a2 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -501,6 +501,7 @@ class SimulasiController extends Controller public function kemaskini(Request $request) { + // dd($request->idsimulasi); $simkarat = SimKarat::where('simulasi_id','=',$request->idsimulasi)->get(); foreach($simkarat as $karat) //save old harga asas @@ -536,7 +537,8 @@ class SimulasiController extends Controller // dd($simulasibidmarhun); foreach($simulasibidmarhun as $marhun) { - $simkarat = SimKarat::where('simulasi_id','=',$bid->simulasi_id)->get(); + // dd($request->idsimulasi); + $simkarat = SimKarat::where('simulasi_id','=',$request->idsimulasi)->get(); // dd($simkarat); foreach($simkarat as $karat) { @@ -553,8 +555,10 @@ class SimulasiController extends Controller $marhun->save(); } } - $karat916 = SimKarat::where('karat','=',"22.0K")->get(); - //dd($karat916); + $karat916 = SimKarat::where('karat','=',"22.0K") + ->where('simulasi_id','=',$request->idsimulasi) + ->get(); + // dd($karat916); foreach($karat916 as $k916) { @@ -562,6 +566,7 @@ class SimulasiController extends Controller ->update([ 'harga_emas_asas'=> $k916->harga2, ]); + // dd($updatesimulasi); } // dd($sumhargaasas); } 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 7e26f397..c59188ea 100644 --- a/database/migrations/2021_12_14_041557_create_lelongs_table.php +++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php @@ -42,6 +42,8 @@ class CreateLelongsTable extends Migration $table->date('export_data_stsdate')->nullable(); $table->date('import_data_sts_date')->nullable(); $table->string('lokasi')->nullable(); + $table->integer('fasa')->default(0); + $table->integer('kali')->nullable(); $table->timestamps(); $table->foreign('caw_id') @@ -165,7 +167,7 @@ class CreateLelongsTable extends Migration Schema::create('tetapan', function (Blueprint $table) { $table->bigIncrements('id'); - $table->datetime('tetap_tarikh_lelong')->nullable(); + $table->date('tetap_tarikh_lelong')->nullable(); $table->string('kali')->nullable(); $table->integer('cajlelong')->nullable(); $table->timestamps();