From 6b53072feec473c0c6f1d251315ca78f00a7ed77 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Tue, 28 Dec 2021 12:34:18 +0800 Subject: [PATCH] update --- app/Http/Controllers/LelongController.php | 62 ++++++- app/Models/LelKarat_temp.php | 5 +- .../views/lelong/senarailelong.blade.php | 22 ++- resources/views/lelong/showlelong.blade.php | 167 +++++++++++++----- routes/web.php | 41 +++-- 5 files changed, 223 insertions(+), 74 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 3b66c160..aa90f51e 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -56,7 +56,8 @@ class LelongController extends Controller $lelong = Lelong::where('id','=',$id)->first(); $cawanganlel = CawanganLelong::where('lelong_id','=',$id)->get(); $lelkarat = LelKarat::where('lelong_id','=',$id)->get(); - + $jeniskarat = JenisKarat::all(); + $arraydata = []; $arraycaw = []; $data = []; @@ -216,7 +217,8 @@ class LelongController extends Controller 'total14K', 'total9K', 'lelkarat', - 'lelong_id')); + 'lelong_id', + 'jeniskarat')); } public function create($id) @@ -336,7 +338,61 @@ class LelongController extends Controller public function kemaskini(Request $request) { - return redirect()->route('lelong.showlelong',$request->idlelong) + + $lelkarat = lelKarat::where('lelong_id','=',$request->idlelong)->get(); + + foreach($lelkarat as $karat) //save old harga asas + { + $lelkarat_temp = new LelKarat_temp; + $lelkarat_temp->lelong_id = $request->idlelong; + $lelkarat_temp->karat = $karat->karat; + $lelkarat_temp->keterangan = $karat->keterangan; + $lelkarat_temp->harga = $karat->harga; + $lelkarat_temp->harga2 = $karat->harga2; + $lelkarat_temp->save(); + } + foreach($lelkarat 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 + $lelongbid = LelongBid::where('lelong_id','=',$request->idlelong)->get(); + + foreach($lelongbid as $bid) + { + $sumhargaasas = 0; + $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id','=',$bid->id)->get(); + foreach($lelongbidmarhun as $marhun) + { + $lelkarat = LelKarat::where('lelong_id','=',$bid->lelong_id)->get(); + // dd($simkarat); + foreach($lelkarat 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('lelong.show',$request->idlelong) ->with('success','Kemaskini Berjaya'); } diff --git a/app/Models/LelKarat_temp.php b/app/Models/LelKarat_temp.php index ca9b627f..9cacbca5 100644 --- a/app/Models/LelKarat_temp.php +++ b/app/Models/LelKarat_temp.php @@ -12,12 +12,11 @@ class LelKarat_temp extends Model protected $table = 'lelkarat_temp'; protected $fillable = [ + 'lelong_id', 'karat', - 'karat2', 'keterangan', 'harga', - 'harga2', - 't_harga' + 'harga2' ]; } diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index 1bee7d00..8cf67dd7 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -35,14 +35,20 @@ {{ $lel->jbg }} {{ $lel->cajlelong }} - - - - @if(!$lel->masatamat_lelong) - - @else - - @endif + @hasrole('jurulelong') + + @if(!$lel->masatamat_lelong) + + @else + + @endif + + + @endhasrole + + + + diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php index 72a9d0fa..41118685 100644 --- a/resources/views/lelong/showlelong.blade.php +++ b/resources/views/lelong/showlelong.blade.php @@ -13,6 +13,11 @@ - @if ($message = Session::get('success')) -
-

{{ $message }}

-
- @endif {{-- {{$cawangan[0] }} --}}