From fdc7e590848a27722b9a3cc9b23ae46f99a48d11 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Tue, 26 Apr 2022 15:01:17 +0800 Subject: [PATCH] update index -> laporan --- app/Http/Controllers/AccountController.php | 2 +- app/Http/Controllers/LelongController.php | 58 +++++- app/Http/Controllers/MarhunController.php | 173 ++++++++---------- app/Http/Controllers/SimulasiController.php | 6 +- .../lelong/lapbrglelpembidaindex.blade.php | 20 +- .../views/lelong/laplelongindex.blade.php | 22 ++- .../views/lelong/laporanbidaanindex.blade.php | 22 ++- 7 files changed, 177 insertions(+), 126 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index bfb2a048..334b7f6e 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -128,7 +128,7 @@ class AccountController extends Controller ->where('lelongbid.lelong_id', $request->lelong_id) ->where('lelongbidder.user_id', $request->user_id) ->where('lelongbidder.status_bidder', 1) - ->where('payment.status_payment_opt', '3,2') + ->where('payment.status_payment_opt', '3,2') ->where('lelongbidder.status_payment', 2) ->select( 'lelongbid.id as lelongbid_id', diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 5eb15738..0241fa70 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -984,14 +984,26 @@ class LelongController extends Controller public function lapbidaanpembidaindex (Request $request){ + $arraydetails = []; + $lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->select('lelong_id','tarikh_lelong') + ->groupBy('lelong_id') + ->get() + ->toArray(); - $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->get(); + foreach($lelongid 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.laporanbidaanindex',compact('lelongid')); + return view('lelong.laporanbidaanindex',compact('lelongid','arraydetails')); } @@ -1068,12 +1080,25 @@ class LelongController extends Controller } Public function laplelongindex (Request $request){ + + $arraydetails =[]; $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->get(); + ->select('lelong_id','tarikh_lelong') + ->groupBy('lelong_id') + ->get() + ->toArray(); - return view('lelong.laplelongindex',compact('lelongid')); + foreach($lelongid 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.laplelongindex',compact('lelongid','arraydetails')); } @@ -1168,11 +1193,24 @@ class LelongController extends Controller Public function lapbrglelpembidaindex (Request $request){ + $arraydetails = []; + $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->get(); + ->select('lelong_id','tarikh_lelong') + ->groupBy('lelong_id') + ->get() + ->toArray(); - return view ('lelong.lapbrglelpembidaindex',compact('lelongid')); + foreach($lelongid 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.lapbrglelpembidaindex',compact('lelongid','arraydetails')); } diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index aeab4529..966404d7 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -521,83 +521,72 @@ class MarhunController extends Controller $currentdate = Carbon::now(); $currentdate = $currentdate->toDateTimeString(); - $pengesahan = Pengesahan::where('norujukan', $request->norujukan)->where('lelong_id', $request->lelong_id)->get(); - + $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(); + if($request->jenis_button == "terima") { - 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(); - - $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) - { - 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(); - - } + $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) + { + if($bidmarhuns->status_ubah == 3) + { + $bidmarhuns->delete(); + } + else + { + // + } } + $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") { - 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(); - } - + //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); + $marhundelete = LelongBid::where('id', $pengesahan->lelongbid_id)->delete(); } @@ -641,48 +630,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() { - $arrayinfo = []; - $lelong = Lelong::where('sts_lelong', 0) - ->get()->toArray(); + ->get(); - 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')); + return view('pengesahan.senarailelong',compact('lelong')); } public function senaraitangguhlelong($id) { - $tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', 'lelong.id') + $tangguhlelong = TangguhLelong::join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.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 = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan') - ->join('gadai', 'tangguhlelong.norujukan', '=', 'gadai.norujukan') + $marhuns = LelongBidMarhun::join('tangguhlelong', 'lelongbidmarhun.lelongbid_id', '=', 'tangguhlelong.lelongbid_id') + ->where('tangguhlelong.lelong_id', $id) ->where('tangguhlelong.norujukan', $norujukan) ->get(); diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index ac6ca11d..1b35711f 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -460,6 +460,10 @@ class SimulasiController extends Controller $data = Simulasi::where('simulasi.id','=',$simulasi_id) ->get(); + + $simulasi = new Simulasi; + $simulasi->harga_emas_asas = $request->hargaasas; + $simulasi->save(); } @@ -479,7 +483,7 @@ class SimulasiController extends Controller 'total23k', 'total22K', 'total21K', - 'total20K', + 'total20K', 'total18Kp', 'total18K', 'total14Kp', diff --git a/resources/views/lelong/lapbrglelpembidaindex.blade.php b/resources/views/lelong/lapbrglelpembidaindex.blade.php index 3ec908ab..8e2d64e4 100644 --- a/resources/views/lelong/lapbrglelpembidaindex.blade.php +++ b/resources/views/lelong/lapbrglelpembidaindex.blade.php @@ -15,7 +15,7 @@ - + @@ -24,14 +24,20 @@ - @foreach ($lelongid as $info) + @foreach ($arraydetails as $info) - - - - + + + + + + @endforeach diff --git a/resources/views/lelong/laplelongindex.blade.php b/resources/views/lelong/laplelongindex.blade.php index b08607c1..5ec3a2fa 100644 --- a/resources/views/lelong/laplelongindex.blade.php +++ b/resources/views/lelong/laplelongindex.blade.php @@ -15,7 +15,7 @@
Bil Lelong ID Cawangan Tarikh Lelong
{{ $info->lelong_id}}{{ $info->caw_name}}{{ $info->tarikh_lelong }}{{$loop->iteration}}{{ $info['laporan']['lelong_id']}} + @foreach($info['details'] as $details) + {{ $details['caw_name']}}
+ @endforeach + 		{{ $info['laporan']['tarikh_lelong'] }} - +
- + @@ -24,15 +24,21 @@ - @foreach ($lelongid as $bid) + @foreach ($arraydetails as $bid) - - - - - + + + + + @endforeach diff --git a/resources/views/lelong/laporanbidaanindex.blade.php b/resources/views/lelong/laporanbidaanindex.blade.php index 3d2a68e5..9742f2bd 100644 --- a/resources/views/lelong/laporanbidaanindex.blade.php +++ b/resources/views/lelong/laporanbidaanindex.blade.php @@ -4,6 +4,7 @@
+

Laporan Nama Pembida

@if ($message = Session::get('success'))
@@ -15,7 +16,7 @@
Bil Lelong ID Cawangan Tarikh Lelong
{{ $bid->lelong_id}}{{ $bid->caw_name}}{{ $bid->tarikh_lelong }} - + {{$loop->iteration}}{{ $bid['laporan']['lelong_id']}} + @foreach($bid['details'] as $details) + {{ $details['caw_name']}}
+ @endforeach + 		{{ $bid['laporan']['tarikh_lelong'] }} + +
- + @@ -24,14 +25,21 @@ - @foreach ($lelongid as $bid) + @foreach ($arraydetails as $bid) - - - - + + + + + + @endforeach
Bil Lelong ID Cawangan Tarikh Lelong
{{ $bid->lelong_id}}{{ $bid->caw_name}}{{ $bid->tarikh_lelong }}{{$loop->iteration}} + {{ $bid['laporan']['lelong_id']}} + @foreach($bid['details'] as $details) + {{ $details['caw_name']}}
+ @endforeach + 		{{ $bid['laporan']['tarikh_lelong'] }} - +