From d3bcc6449b26af79df962f8d3658d38f9d3f6867 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Sun, 6 Mar 2022 14:24:07 +0800 Subject: [PATCH] kemaskini simulasi --- app/Http/Controllers/PaymentController.php | 1 + app/Http/Controllers/SimulasiController.php | 63 +++- .../views/lelong/senarailelong.blade.php | 4 +- resources/views/lelong/showlelong.blade.php | 5 + .../views/simulasi/showsimulasi.blade.php | 278 ++++++++++++------ routes/web.php | 1 + 6 files changed, 263 insertions(+), 89 deletions(-) diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 9e9c856a..151d0fcf 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -117,6 +117,7 @@ class PaymentController extends Controller $resit = Resit::where('lelong_id', $request->lelong_id) ->where('user_id',$request->user_id) + ->where('resit_type', 2) ->first(); $total_hargabida = 0; diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index b814a808..db6c4e1b 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -284,6 +284,7 @@ class SimulasiController extends Controller $simulasi = Simulasi::where('id','=',$id)->first(); $cawangansim = CawanganSimulasi::where('simulasi_id','=',$id)->get(); $simkarat = SimKarat::where('simulasi_id','=',$id)->get(); + $jeniskarat = JenisKarat::all(); $arraydata = []; $arraycaw = []; @@ -444,7 +445,8 @@ class SimulasiController extends Controller 'total14K', 'total9K', 'simkarat', - 'simulasi_id')); + 'simulasi_id', + 'jeniskarat')); } public function delete($id) @@ -461,6 +463,65 @@ class SimulasiController extends Controller } + public function kemaskini(Request $request) + { + $simkarat = SimKarat::where('simulasi_id','=',$request->idsimulasi)->get(); + + foreach($simkarat as $karat) //save old harga asas + { + $simkarat_temp = new SimKarat_temp; + $simkarat_temp->simulasi_id = $request->idsimulasi; + $simkarat_temp->karat = $karat->karat; + $simkarat_temp->keterangan = $karat->keterangan; + $simkarat_temp->harga = $karat->harga; + $simkarat_temp->harga2 = $karat->harga2; + $simkarat_temp->save(); + } + foreach($simkarat as $index=>$karat) //update harga asas + { + $karat->karat = $karat->karat; + $karat->keterangan = $karat->keterangan; + $karat->harga = $request->harga[$index]; + $karat->harga2 = $request->harga2[$index]; + $karat->save(); + } + + //update marhun + $simulasibid = SimulasiBid::where('simulasi_id','=',$request->idsimulasi)->get(); + + foreach($simulasibid as $bid) + { + $sumhargaasas = 0; + $simulasibidmarhun = SimulasiBidMarhun::where('simulasibid_id','=',$bid->id)->get(); + foreach($simulasibidmarhun as $marhun) + { + $simkarat = SimKarat::where('simulasi_id','=',$bid->simulasi_id)->get(); + // dd($simkarat); + foreach($simkarat as $karat) + { + + if($karat->karat == $marhun->karat) + { + $val = round($marhun->berat * $karat->harga); + $sumhargaasas = $sumhargaasas + $val; + + $marhun->harga = $karat->harga; + $marhun->n_marhun = $marhun->berat * $karat->harga; + $marhun->hargaasas = floatval(number_format($val,2)); + $marhun->save(); + } + } + } + $bid->hargaasas = $sumhargaasas; + $bid->baki = $sumhargaasas-$bid->pinjaman - $bid->bakiupah - $bid->cajlelong; + $bid->save(); + + } + + return redirect()->route('analisa.senaraisimulasi',$request->idsimulasi) + ->with('success','Kemaskini Berjaya'); + } + // PDF SIMULASI KESELURUHAN SEMUA CAWANGAN public function export(Request $request) diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index cbcb97f4..29272392 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -40,8 +40,8 @@ @if($lel->sts_lelong == 0) - - + + @elseif ($lel->sts_lelong == 2) @elseif ($lel->sts_lelong == 3) diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php index dfcfd4a8..68175bd9 100644 --- a/resources/views/lelong/showlelong.blade.php +++ b/resources/views/lelong/showlelong.blade.php @@ -195,6 +195,11 @@ + @if ($message = Session::get('success')) +
{{ $message }}
+{{ $message }}
@@ -179,36 +195,126 @@