From 8eaec7a7f5cc207c804305f821e273b5e93b55a9 Mon Sep 17 00:00:00 2001 From: faiqahzaman Date: Tue, 31 May 2022 12:03:39 +0800 Subject: [PATCH 01/14] marhun, api, senarai --- app/Http/Controllers/MarhunController.php | 410 ++++++++++++------ .../Mobile/LelongMobileController.php | 23 + app/Http/Controllers/PaymentController.php | 23 +- app/Http/Controllers/PembidaController.php | 3 - .../Controllers/TangguhLelongController.php | 22 +- .../views/account/senarailelongan.blade.php | 4 +- resources/views/includes/sidebar.blade.php | 11 +- .../views/lelong/senarailelong.blade.php | 2 + .../views/lelong/senaraimarhun.blade.php | 2 +- .../views/lelong/senaraisagpemenang.blade.php | 2 +- resources/views/marhun/marhun.blade.php | 17 +- .../marhun/senarailelongmarhun.blade.php | 16 +- .../views/marhun/senaraimarhun.blade.php | 39 +- resources/views/marhun/senlelmarhun.blade.php | 105 +++++ .../marhun/sentangguhlelongsah.blade.php | 108 +++++ .../views/pembayaran/SAGBidItem.blade.php | 2 +- .../pembayaran/kaunterpembayaran.blade.php | 2 + .../pembayaran/senarailelongbayaran.blade.php | 14 +- .../views/pembida/detailsbidaan.blade.php | 4 - .../views/pembida/pembayaranbidaan.blade.php | 4 - .../views/pengesahan/mutumarhun.blade.php | 15 +- .../pengesahan/perubahanmutumarhun.blade.php | 2 +- .../senarailelongubahmutu.blade.php | 70 +-- .../simulasi/senaraitempsimulasi.blade.php | 12 +- .../simulasi/tempbycawsimulasi.blade.php | 9 +- .../senarailelongtangguh.blade.php | 40 +- routes/api.php | 1 + routes/web.php | 3 + 28 files changed, 714 insertions(+), 251 deletions(-) create mode 100644 resources/views/marhun/senlelmarhun.blade.php create mode 100644 resources/views/marhun/sentangguhlelongsah.blade.php diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index d953a7ca..d85daa48 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -41,6 +41,8 @@ class MarhunController extends Controller * * @return \Illuminate\Contracts\Support\Renderable */ + + //Khazanah public function index($lelong_id) { $user = Auth::user(); @@ -51,7 +53,56 @@ class MarhunController extends Controller ->where('caw_id','=', $caw->id) ->get(); - return view('marhun.senaraimarhun',compact('lelongbid','lelong_id')); + $sag = LelongBid::where('lelong_id', $lelong_id) + ->where('caw_id', $caw->id) + ->where('status_semak', 0) + ->get(); + // dd($sag); + + $sdhdisemak = LelongBid::where('lelong_id', $lelong_id) + ->where('caw_id', $caw->id) + ->where('status_semak', 1) + ->get(); + + $dalamproses = Pengesahan::where('pengesahan.lelong_id', $lelong_id) + ->whereNull('pengesahan.disahkan_oleh') + ->get(); + + $sdhdisahkan = Pengesahan::join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id') + ->where('pengesahan.lelong_id', $lelong_id) + ->whereNotNull('pengesahan.disahkan_oleh') + ->where('lelongbid.status_semak', 1) + ->get(); + + foreach($lelongbid as $index1=>$bid) + { + $sudahdisahkan = Pengesahan::where('lelongbid_id', $bid['id']) + ->where('lelong_id', $lelong_id) + ->get(); + + if($sudahdisahkan) + { + foreach($sudahdisahkan as $sahkan) + { + // dd($sahkan); + $lelongbidmarhun = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.id', '=', 'pengesahan.lelongbidmarhun_id') + ->where('lelongbidmarhun.id', $sahkan['lelongbidmarhun_id']) + ->select('pengesahan.disahkan_oleh', + 'pengesahan.disahkan_pada' + ) + ->first(); + + $lelongbid[$index1]['pengesahan'] = $lelongbidmarhun; + // dd($lelongbid[$index1]['pengesahan']); + } + } + else + { + // + } + } + + return view('marhun.senaraimarhun',compact('lelongbid','lelong_id', 'caw', 'sag', 'dalamproses', 'sdhdisemak', 'sdhdisahkan')); } public function kemaskini(Request $request) @@ -231,7 +282,7 @@ class MarhunController extends Controller } return redirect()->route('marhun.show', [$lelongbid->id, $lelong->id]) - ->with('success','Kemaskini Marhun Berjaya'); + ->with('success','Kemaskini Marhun Berjaya, SILA KLIK BUTANG SEMAK DIBAWAH UNTUK MEMBUAT PENGEMASKINIAN'); } public function show($id, $lelong_id) @@ -247,19 +298,32 @@ class MarhunController extends Controller public function senarailelongmarhun(Request $request){ - $user = Auth::user(); + $user = Auth::user(); - // $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - // ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - // ->where('cawangan.caw_code','=',$user->kodcaw) - // ->get(); - $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') + $arrayinfo = []; + + $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') - ->where('lelong.sts_lelong', 0) - ->where('cawangan.caw_code','=',$user->kodcaw) - ->get(); + ->where('cawangan.caw_code', $user->kodcaw) + ->where('sts_lelong', 0) + ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->groupBy('lelong_id') + ->get() + ->toArray(); - return view('marhun.senarailelongmarhun',compact('senarai')); + foreach($lelong as $info) + { + + $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$info['lelong_id']) + ->get() + ->toArray(); + array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); + + } + + return view('marhun.senarailelongmarhun',compact('lelong', 'arrayinfo')); + } public function semak($id, $lelong_id) @@ -386,12 +450,83 @@ class MarhunController extends Controller } + public function senlelmarhun() + { + $user = Auth::user(); + + $arrayinfo = []; + + $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('cawangan.caw_code', $user->kodcaw) + ->where('sts_lelong', 0) + ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->groupBy('lelong_id') + ->get() + ->toArray(); + + foreach($lelong as $info) + { + + $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$info['lelong_id']) + ->get() + ->toArray(); + array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); + + } + + return view('marhun.senlelmarhun',compact('lelong', 'arrayinfo')); + } + + public function sentangguhlelongsah($lelong_id) + { + $user = Auth::user(); + // dd($user); + + $sdhdisahkan = TangguhLelong::join('gadai', 'tangguhlelong.norujukan', '=', 'gadai.norujukan') + ->where('gadai.kodcaw', $user['kodcaw'] ) + ->where('tangguhlelong.lelong_id', $lelong_id) + // ->where('lelongbid.status_semak', 1) + ->select('tangguhlelong.id as tangguhlelong_id', + 'tangguhlelong.norujukan', + 'gadai.marhun', + 'gadai.berat', + 'tangguhlelong.ditangguh_pada', + 'tangguhlelong.pinjaman', + 'tangguhlelong.nota' + ) + ->get(); + + return view('marhun.sentangguhlelongsah', compact('sdhdisahkan')); + + } + //Khazanah + + //Operasi public function senarailelongubahmutu() { - $lelong = Lelong::where('sts_lelong', 0) - ->get(); + $arrayinfo = []; - return view('pengesahan.senarailelongubahmutu',compact('lelong')); + $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('sts_lelong', 0) + ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->groupBy('lelong_id') + ->get() + ->toArray(); + + foreach($lelong as $info) + { + + $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$info['lelong_id']) + ->get() + ->toArray(); + array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); + } + + return view('pengesahan.senarailelongubahmutu',compact('lelong', 'arrayinfo')); } public function sahubahmutu($id){ @@ -474,7 +609,6 @@ class MarhunController extends Controller ->get()->toArray(); $lelongbid = LelongBid::where('id', $lelbidmarhun->lelongbid_id)->where('lelong_id', $id)->first(); - // dd($lelongbid); $karat = Lelkarat::where('lelong_id', $id)->get(); foreach($marhuns as $index1=>$marhun) @@ -522,80 +656,80 @@ class MarhunController extends Controller $currentdate = $currentdate->toDateTimeString(); $pengesahan = Pengesahan::where('norujukan', $request->norujukan) - ->first(); + ->where('lelong_id', $request->lelong_id) + ->where('lelongbid_id', $request->lelongbid_id) + ->get(); - $pengesahan->id = $pengesahan['id'] ; - $pengesahan->disahkan_oleh = $user['id']; - $pengesahan->disahkan_pada = $currentdate; - $pengesahan->save(); - - $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->get(); - $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->get(); + foreach($pengesahan as $sah) + { + $updatepengesahan = Pengesahan::where('id', $sah['id'])->first(); + $updatepengesahan->disahkan_oleh = $user['id']; + $updatepengesahan->disahkan_pada = $currentdate; + $updatepengesahan->save(); - if($request->jenis_button == "terima") - { - $lelongbidmarhuns = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.lelongbid_id', '=', 'pengesahan.lelongbid_id') - ->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id) - ->where('pengesahan.id', $pengesahan->id) - ->get(); + $lelongbid = LelongBid::where('id', $sah['lelongbid_id'])->first(); - foreach($lelongbidmarhuns as $bidmarhuns) - { - if($bidmarhuns->status_ubah == 3) + } + + if($request->jenis_button == "terima") + { + foreach($pengesahan as $terimalel) { - $bidmarhuns->delete(); + $lelongbidmarhuns = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.lelongbid_id', '=', 'pengesahan.lelongbid_id') + ->where('pengesahan.lelongbid_id', $terimalel['lelongbid_id']) + ->where('pengesahan.id', $terimalel['id']) + ->get(); + + foreach($lelongbidmarhuns as $bidmarhuns) + { + if($bidmarhuns->status_ubah == 3) + { + $bidmarhuns->delete(); + } + else + { + // + } + $txtmarhun = ",1 " . $bidmarhuns->marhun ; + } + + $pengesahans = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id') + ->where('pengesahan.lelongbid_id', $terimalel['lelongbid_id']) + ->select('pengesahan.id as pengesahan_id') + ->first(); + + $lelongbids = LelongBid::where('id', $lelongbid['id'])->first(); + $lelongbids->marhun = str_replace( $txtmarhun,"",$lelongbids->marhun); + $lelongbids->berat = $lelongbids->berat; + $lelongbids->hargaasas = $lelongbids->hargaasas; + $lelongbids->save(); + + // $this->pcdelete($request->pengesahan_id, $pengesahan->lelongbid_id); } - else - { - // - } - $txtmarhun = ",1 " . $bidmarhuns->marhun ; } - $pengesahans = 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(); - - $lelongbids = LelongBid::where('id', $lelongbid[0]['id'])->first(); - $lelongbids->marhun = str_replace( $txtmarhun,"",$lelongbids->marhun); - $lelongbids->berat = $lelongbids->berat; - $lelongbids->hargaasas = $lelongbids->hargaasas; - $lelongbids->save(); - - // $this->pcdelete($request->pengesahan_id, $pengesahan->lelongbid_id); - } - - else if($request->jenis_button == "tangguhlelong") - { - $pengesahan = Pengesahan::where('norujukan', $request->norujukan) - ->get(); - dd($pengesahan) ; - //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(); - - } + else if($request->jenis_button == "tangguhlelong") + { + //add into table tangguhlelong + $tangguhlelong = new TangguhLelong; + $tangguhlelong->lelong_id = $request->lelong_id; + $tangguhlelong->lelongbid_id = $request->lelongbid_id; + $tangguhlelong->norujukan = $request->norujukan; + $tangguhlelong->pinjaman = $lelongbid['pinjaman']; + $tangguhlelong->tarikhtangguh = $currentdate; + $tangguhlelong->ditangguh_oleh = $user->id; + $tangguhlelong->ditangguh_pada = $currentdate; + $tangguhlelong->nota = $request->nota; + $tangguhlelong->save(); + + $marhundelete = LelongBid::where('id', $request->lelongbid_id)->delete(); + } - else - { - // - } + else + { + // + } return redirect()->route('pengesahan.senarailelongubahmutu')->with('success','Pengesahan Mutu Marhun Berjaya'); } @@ -632,41 +766,21 @@ 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(); - + 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]); } @@ -679,35 +793,35 @@ class MarhunController extends Controller ->where('tangguhlelong.lelong_id', $id) ->whereNotNull('tangguhlelong.tarikhtangguh') ->select('tangguhlelong.id as tangguhlelong_id', - 'tangguhlelong.lelongbid_id', - 'tangguhlelong.norujukan', - 'tangguhlelong.tarikhtangguh', - 'tangguhlelong.ditangguh_pada', - 'tangguhlelong.ditangguh_oleh', - 'tangguhlelong.nota', - 'lelong.id as lelong_id', - 'lelong.tarikh_lelong', - 'lelong.harga_emas_asas', - 'lelong.jbg', - 'lelong.cajlelong', - 'lelong.sts_lelong' + 'tangguhlelong.lelongbid_id', + 'tangguhlelong.norujukan', + 'tangguhlelong.tarikhtangguh', + 'tangguhlelong.ditangguh_pada', + 'tangguhlelong.ditangguh_oleh', + 'tangguhlelong.nota', + 'lelong.id as lelong_id', + 'lelong.tarikh_lelong', + 'lelong.harga_emas_asas', + 'lelong.jbg', + 'lelong.cajlelong', + 'lelong.sts_lelong' ) ->get(); // dd($tangguhlelong); - + foreach($tangguhlelong as $index1=>$tanguhlel) { $getkodcaw = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code') ->where('lelong_id', $id) ->first(); - + $tangguhlelong[$index1]['details'] = $tanguhlel; $tangguhlelong[$index1]['nama_caw'] = $getkodcaw; } - + return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id', 'caw_name')); } - + public function lelbidmarhun($id, $norujukan, $tangguhlelong_id) { $tangguhlelong = TangguhLelong::join('gadaimarhun', 'tangguhlelong.norujukan', '=', 'gadaimarhun.norujukan') @@ -715,31 +829,53 @@ class MarhunController extends Controller ->where('tangguhlelong.id', $tangguhlelong_id) ->where('tangguhlelong.lelong_id', $id) ->select('tangguhlelong.id as tangguhlelong_id', - 'tangguhlelong.lelong_id', - 'tangguhlelong.lelongbid_id', - 'tangguhlelong.norujukan', - 'tangguhlelong.pinjaman', - 'tangguhlelong.tarikhtangguh', - 'tangguhlelong.nota as tangguh_nota', - 'tangguhlelong.pinjaman', - 'gadaimarhun.bil', - 'gadaimarhun.marhun', - 'gadaimarhun.nota as gadai_nota', - 'gadaimarhun.karat', - 'gadaimarhun.berat', - 'gadaimarhun.harga', + 'tangguhlelong.lelong_id', + 'tangguhlelong.lelongbid_id', + 'tangguhlelong.norujukan', + 'tangguhlelong.pinjaman', + 'tangguhlelong.tarikhtangguh', + 'tangguhlelong.nota as tangguh_nota', + 'tangguhlelong.pinjaman', + 'gadaimarhun.bil', + 'gadaimarhun.marhun', + 'gadaimarhun.nota as gadai_nota', + 'gadaimarhun.karat', + 'gadaimarhun.berat', + 'gadaimarhun.harga', 'gadaimarhun.n_marhun' ) ->get(); - + $caw_names = GadaiMarhun::join('cawangan', 'gadaimarhun.kodcaw', '=', 'cawangan.caw_code') ->where('gadaimarhun.norujukan', $norujukan) ->select('cawangan.caw_name') ->first(); // dd($caw_names); - + return view('pengesahan.lelbidmarhun',compact('tangguhlelong', 'id', 'norujukan', 'caw_names')); - + } + + //Operasi + // 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(); + + // } } diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index 02e700da..27fffe79 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -152,6 +152,29 @@ class LelongMobileController extends Controller return response()->json($lelongbidder); } + // please do not delete this changes + // backup web pembida + public function listBidItemWeb(Request $request){ + + $lelongbidder = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->where('user_id','=', $request->user_id) + ->select('lelongbid.lelong_id') + ->groupBy('lelongbid.lelong_id') + ->get()->toArray(); + + foreach($lelongbidder as $index1=>$lelbid) + { + $lelongbid = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') + ->where('lelong_id', $lelbid['lelong_id']) + ->where('lelongbidder.user_id', $request->user_id) + ->get()->toArray(); + + $lelongbidder[$index1]['lelongbid'] = $lelongbid; + } + + return response()->json($lelongbidder); + } + public function searchLelByCaw(Request $request){ $currentdate = Carbon::now(); diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index d812c534..3b351d78 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -19,15 +19,30 @@ class PaymentController extends Controller { public function SenaraiLelongBayar(Request $request){ + $arrayinfo = []; + $user = Auth::user(); - $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') + $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') - ->where('cawangan.caw_code', $user->kodcaw) + ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->where('lelong.sts_lelong', 3) - ->get(); + ->where('cawangan.caw_code', $user->kodcaw) + ->groupBy('lelong_id') + ->get() + ->toArray(); - return view('pembayaran.senarailelongbayaran',compact('senarai')); + foreach($lelong as $info) + { + $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$info['lelong_id']) + ->get() + ->toArray(); + array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); + + } + + return view('pembayaran.senarailelongbayaran',compact('lelong', 'arrayinfo')); } diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index 9f53592c..46909cf5 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -234,7 +234,6 @@ class PembidaController extends Controller $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida'); $listwinner[$index1]['totalPay'] = $total_payment; $listwinner[$index1]['payment_id'] = $payment_id; - $listwinner[$index1]['jenisbayaran']['remarks'] = $detailspayment['remark']; $listwinner[$index1]['jenisbayaran']['status_payment'] = $sag->status_payment; $listwinner[$index1]['jenisbayaran']['status'] = $detailspayment['status']; @@ -266,8 +265,6 @@ class PembidaController extends Controller 'lelongbid.marhun', 'lelongbid.hargaasas', 'lelongbidder.hargabida', - 'lelongbid.nilaimarhun', - 'lelongbid.berat', 'lelongbidder.masa_bidaan', 'lelongbidder.notelbimbit' ) diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index 6e9cc4f1..c5742460 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -68,28 +68,35 @@ class TangguhLelongController extends Controller $lelong = Lelong::where('id', $request->lelong_id)->first(); $getic = Customer::join('gadai', 'customer.kpbaru', '=', 'gadai.nokp') - ->where('customer.kpbaru', '=', $request->nokp) - ->where('gadai.tempoh', '=', $lelong->jbg) + ->where('gadai.nokp', '=', $request->nokp) + // ->where('gadai.tempoh', '=', $lelong->jbg) ->get(); + // dd($getic); foreach($getic as $index1=>$ic) { - $getnorujukan = LelongBid::where('norujukan', $ic->norujukan) + // dd($ic); + $getnorujukan = LelongBid::join('lelongbidmarhun', 'lelongbid.id', '=', 'lelongbidmarhun.lelongbid_id') + ->where('norujukan', $ic->norujukan) ->where('jbg', $ic->tempoh) ->get(); + // dd($getnorujukan); foreach($getnorujukan as $norujukan) { + // dd($norujukan); $pengesahan = Pengesahan::where('lelongbidmarhun_id', $norujukan->id) ->where('lelongbid_id', $norujukan->lelongbid_id) ->where('norujukan', $norujukan->norujukan) ->first(); + // dd($pengesahan); $adapengesahan = Pengesahan::join('lelongbid', 'pengesahan.norujukan', '=', 'lelongbid.norujukan') ->where('pengesahan.norujukan', $norujukan->norujukan) ->where('pengesahan.status_ubah', 6) ->where('pengesahan.lelong_id', $request->lelong_id) ->get(); + // dd($adapengesahan); if($pengesahan) { @@ -99,11 +106,16 @@ class TangguhLelongController extends Controller { // } + + $getic[$index1]['user_details'] = $getnorujukan; + // dd($getic[$index1]['user_details']); + $getic[$index1]['sdhadapengesahan'] = $adapengesahan; } - $getic[$index1]['user_details'] = $getnorujukan; - $getic[$index1]['sdhadapengesahan'] = $adapengesahan; } + // dd($getic->toArray()); + $getic_array = $getic->toArray(); + dd($getic_array); $lelong_id = $request->lelong_id; return view('tangguhlelong.searchbyic', compact('getic', 'user', 'lelong_id')); diff --git a/resources/views/account/senarailelongan.blade.php b/resources/views/account/senarailelongan.blade.php index d2bc5771..646569fa 100644 --- a/resources/views/account/senarailelongan.blade.php +++ b/resources/views/account/senarailelongan.blade.php @@ -14,7 +14,7 @@ No - Kod Cawangan + Cawangan Tarikh Lelong Status Lelong Action @@ -24,7 +24,7 @@ @foreach($senarai as $data) {{$loop->iteration}} - {{ $data->caw_code }} + {{ $data->caw_name }} {{ $data->tarikh_lelong }} {{ $data->sts_lelong }} diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 057d5460..d0162a6d 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -48,6 +48,15 @@
  • Marhun
    • + +
  • + + +
    • @endhasrole @hasrole('teller') Norujukan - Pembiayaan (RM) + Tempoh Berat (gm) Nilai Marhun (RM) Harga Asas (RM) + Pembiayaan (RM) Keuntungan (RM) Caj Lelong (%) Rugi Lelong (RM) @@ -44,12 +45,12 @@ {{ $marhun['kodcaw'] }} {{ $marhun['caw_name'] }} --> {{ $marhun['norujukan']}} - {{ number_format($marhun['pinjaman'], 2, '.', ',') }} {{ number_format($marhun['tempoh'], 2, '.', ',') }} {{ number_format($marhun['berat'], 2, '.', ',') }} {{ number_format($marhun['nilaimarhun'], 2, '.', ',') }} {{ number_format($marhun['hargaasas'], 2, '.', ',') }} - {{ number_format($marhun['keuntungan'], 2, '.', ',') }} + {{ number_format($marhun['pinjaman'], 2, '.', ',') }} + {{ number_format($marhun['bakiupah'], 2, '.', ',') }} {{ number_format($marhun['cajlelong'], 2, '.', ',') }} Date: Thu, 2 Jun 2022 13:04:08 +0800 Subject: [PATCH 03/14] 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'] }} From b78bf7c56c17fcd6ec2a31a47c079db927ba6af5 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Thu, 2 Jun 2022 14:58:53 +0800 Subject: [PATCH 04/14] update show lelong --- app/Http/Controllers/LelongController.php | 11 ++++++++--- resources/views/lelong/showlelong.blade.php | 6 +++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 2282c9a2..a4a85d25 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -113,12 +113,14 @@ class LelongController extends Controller $total_upahkeuntungan2 = 0; $total_nilaimarhun = 0; $nilai_marhun = 0; + $totalkeuntungan = 0; + $totalkeuntungan2 = 0; foreach($cawanganlel as $cawlel) { $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first(); $databid = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') - ->select('lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.ansakhir','gadai.tempoh','gadai.kadarupah','gadai.tempohbayar') + ->select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.ansakhir','gadai.tempoh','gadai.kadarupah','gadai.tempohbayar') ->where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$id)->get(); // dd($databid->toArray()); @@ -146,7 +148,7 @@ class LelongController extends Controller $databid[$index1]['keuntungan'] = $keuntungan; $total_upahkeuntungan = bcdiv($total_upahkeuntungan,1,1) + bcdiv($keuntungan,1,1); - + $totalkeuntungan = $totalkeuntungan + $bid['bakiupah']; if($bid['baki'] > 0) { @@ -214,6 +216,7 @@ class LelongController extends Controller 'n_marhun'=>$nilai_marhun, 'pinjaman'=>$pinjaman, 'upahsimpan'=>bcdiv($total_upahkeuntungan,1,1), + 'bakiupah'=>$totalkeuntungan, 'hargaasas'=>$hargaasas, 'cajlelong'=>$cajlelong, 'rugilelong'=>$rugilelong, @@ -230,6 +233,7 @@ class LelongController extends Controller $total_rugilelong = $total_rugilelong + $rugilelong; $total_bakilelong = $total_bakilelong + $bakilelong; $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun; + $totalkeuntungan2 = $totalkeuntungan2 + $totalkeuntungan; $data = Lelong::where('lelong.id','=',$lelong_id) @@ -266,7 +270,8 @@ class LelongController extends Controller 'keuntungan', 'total_upahkeuntungan', 'total_nilaimarhun', - 'total_upahkeuntungan2')); + 'total_upahkeuntungan2', + 'totalkeuntungan2')); } public function create($id) diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php index 4672b458..1e90b92d 100644 --- a/resources/views/lelong/showlelong.blade.php +++ b/resources/views/lelong/showlelong.blade.php @@ -27,7 +27,7 @@ Bilangan Lelong : {{$total_marhun}} - Nilai Marhun Keseluruhan : RM{{ number_format($total_nmarhun, 2, '.', ',') }} + Nilai Marhun Keseluruhan : RM{{ number_format($total_nilaimarhun, 2, '.', ',') }} Pembiayaan Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',') }} @@ -97,7 +97,7 @@ {{ number_format($caw['berat'], 2, '.', ',') }} {{ number_format($caw['n_marhun'], 2, '.', ',') }} {{ number_format($caw['pinjaman'], 2, '.', ',') }} - {{ number_format($caw['upahsimpan'], 2, '.', ',') }} + {{ number_format($caw['bakiupah'], 2, '.', ',') }} {{ number_format($caw['hargaasas'], 2, '.', ',') }} {{ number_format($caw['cajlelong'], 2, '.', ',') }} {{ number_format($caw['bakilelong'], 2, '.', ',') }} @@ -112,7 +112,7 @@ {{ number_format($total_berat, 2, '.', ',') }} {{ number_format($total_nilaimarhun, 2, '.', ',') }} {{ number_format($total_pinjaman, 2, '.', ',') }} - {{ number_format($total_upahkeuntungan2, 2, '.', ',') }} + {{ number_format($totalkeuntungan2, 2, '.', ',') }} {{ number_format($total_hargaasas, 2, '.', ',') }} {{ number_format($total_cazlelong, 2, '.', ',') }} {{ number_format($total_bakilelong, 2, '.', ',') }} From 7d9fe323fd50b838596f050da8d7dc99eb8d03ba Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Thu, 2 Jun 2022 16:35:26 +0800 Subject: [PATCH 05/14] update lelong (simulasi masa lelong) --- app/Http/Controllers/LelongController.php | 211 +++++++++ app/Http/Controllers/SimulasiController.php | 1 + .../views/lelong/senarailelong.blade.php | 3 +- resources/views/lelong/showlelong.blade.php | 2 +- resources/views/lelong/showsimulasi.blade.php | 415 ++++++++++++++++++ .../views/simulasi/showsimulasi.blade.php | 4 +- routes/web.php | 1 + 7 files changed, 633 insertions(+), 4 deletions(-) create mode 100644 resources/views/lelong/showsimulasi.blade.php diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index a4a85d25..259f2057 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -127,11 +127,13 @@ class LelongController extends Controller $packet = 0; $berat = 0; $pinjaman =0; + $nilai_marhun = 0; $upah = 0; $hargaasas = 0; $cajlelong = 0; $rugilelong = 0; $bakilelong = 0; + $totalkeuntungan = 0; foreach($databid as $index1=>$bid) { @@ -1336,6 +1338,215 @@ class LelongController extends Controller return $pdf->download('Laporan Barang Lelong Pembida.pdf'); } + + public function showsimulasi($id) + { + $lelong_id = $id; + $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 = []; + + $total_marhun = 0; + $total_berat = 0; + $total_nmarhun = 0; + $total_pinjaman = 0; + $total_upah = 0; + $total_hargaasas = 0; + $total_cazlelong = 0; + $total_rugilelong = 0; + $total_bakilelong = 0; + + $total24Kgb = 0; + $total24K = 0; + $total23k = 0; + $total22K = 0; + $total21K = 0; + $total20K = 0; + $total18Kp = 0; + $total18K = 0; + $total14Kp = 0; + $total14K = 0; + $total9K = 0; + + $keuntungan = 0; + $total_upahkeuntungan = 0; + $total_upahkeuntungan2 = 0; + $total_nilaimarhun = 0; + $nilai_marhun = 0; + + $totalkeuntungan2 = 0; + + foreach($cawanganlel as $cawlel) + { + $cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first(); + $databid = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') + ->select('lelongbid.t_lelong','lelongbid.bakiupah','lelongbid.hargaasas','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.ansakhir','gadai.tempoh','gadai.kadarupah','gadai.tempohbayar') + ->where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$id)->get(); + + // dd($databid->toArray()); + $packet = 0; + $berat = 0; + $pinjaman =0; + $nilai_marhun = 0; + $upah = 0; + $hargaasas = 0; + $cajlelong = 0; + $rugilelong = 0; + $bakilelong = 0; + $cajlelong = 0; + $totalkeuntungan = 0; + + foreach($databid as $index1=>$bid) + { + $marhun = LelongBidMarhun::where('lelongbid_id','=',$bid['id'])->get(); + $berat = $berat + $bid['berat']; + $nilai_marhun = $nilai_marhun + $bid['nilaimarhun']; + $pinjaman =$pinjaman + $bid['pinjaman']; + // $upah = $upah + $bid['upah']; + $hargaasas = $hargaasas + $bid['hargaasas']; + $cajlelong = $cajlelong + $bid['cajlelong']; + + + $keuntungan = $bid['bakipjm'] - ($bid['bakihargajualan'] - ($bid['upah12'] - $bid['ansakhir'])-(($bid['tempoh']-$bid['tempohbayar'])*$bid['kadarupah']/100*$bid['bakipjm']) ); + $databid[$index1]['keuntungan'] = $keuntungan; + + $total_upahkeuntungan = bcdiv($total_upahkeuntungan,1,1) + bcdiv($keuntungan,1,1); + $totalkeuntungan = $totalkeuntungan + $bid['bakiupah']; + + $lelongsim = Lelong::where('id',$id)->get(); + $sumcajlelong = $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100); + $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1); + $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - bcdiv($keuntungan,1,1) - bcdiv($sumcajlelong,1,1); + + if($totalbaki > 0) + { + $bakilelong = $bakilelong + $totalbaki; + } + else + { + $rugilelong = $rugilelong - $totalbaki; + } + + + $total24Kgb += LelongBidMarhun::where('lelongbid_id','=',$bid['id']) + ->where('karat','=','24.0Kgb') + ->sum('berat'); + + $total24K += LelongBidMarhun::where('lelongbid_id','=',$bid['id']) + ->where('karat','=','24.0K') + ->sum('berat'); + + $total23k += LelongBidMarhun::where('lelongbid_id','=',$bid['id']) + ->where('karat','=','23.0K') + ->sum('berat'); + + $total22K += LelongBidMarhun::where('lelongbid_id','=',$bid['id']) + ->where('karat','=','22.0K') + ->sum('berat'); + + $total21K += LelongBidMarhun::where('lelongbid_id','=',$bid['id']) + ->where('karat','=','21.0K') + ->sum('berat'); + + $total20K += LelongBidMarhun::where('lelongbid_id','=',$bid['id']) + ->where('karat','=','20.0K') + ->sum('berat'); + + $total18Kp += LelongBidMarhun::where('lelongbid_id','=',$bid['id']) + ->where('karat','=','18.0Kp') + ->sum('berat'); + + $total18K += LelongBidMarhun::where('lelongbid_id','=',$bid['id']) + ->where('karat','=','18.0K') + ->sum('berat'); + + $total14Kp += LelongBidMarhun::where('lelongbid_id','=',$bid['id']) + ->where('karat','=','14.0Kp') + ->sum('berat'); + + $total14K += LelongBidMarhun::where('lelongbid_id','=',$bid['id']) + ->where('karat','=','14.0K') + ->sum('berat'); + + $total9K += LelongBidMarhun::where('lelongbid_id','=',$bid['id']) + ->where('karat','=','9.0K') + ->sum('berat'); + + + + } + array_push($arraycaw,[ + 'id_cawangan'=> $cawangan['id'], + 'cawangan'=>$cawangan['caw_name'], + 't_lelong'=>$lelong['tarikh_lelong'], + 'bil_marhun'=>sizeof($databid), + 'berat'=>$berat, + 'n_marhun'=>$nilai_marhun, + 'pinjaman'=>$pinjaman, + 'upahsimpan'=>bcdiv($total_upahkeuntungan,1,1), + 'bakiupah'=>$totalkeuntungan, + 'hargaasas'=>$hargaasas, + 'cajlelong'=>$cajlelong, + 'rugilelong'=>$rugilelong, + 'bakilelong'=>$bakilelong, + ]); + + $total_upahkeuntungan2 = $total_upahkeuntungan2 + $total_upahkeuntungan; + $total_marhun = $total_marhun + sizeof($databid); + $total_berat = $total_berat + $berat; + $total_pinjaman = $total_pinjaman + $pinjaman; + $total_upah = $total_upah + 0; + $total_hargaasas = $total_hargaasas + $hargaasas; + $total_cazlelong = $total_cazlelong + $cajlelong; + $total_rugilelong = $total_rugilelong + $rugilelong; + $total_bakilelong = $total_bakilelong + $bakilelong; + $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun; + $totalkeuntungan2 = $totalkeuntungan2 + $totalkeuntungan; + + + $data = Lelong::where('lelong.id','=',$lelong_id) + ->get(); + } + + + return view('lelong.showsimulasi',compact( + 'arraycaw', + 'total_marhun', + 'total_berat', + 'total_nmarhun', + 'total_pinjaman', + 'total_upah', + 'total_hargaasas', + 'total_cazlelong', + 'total_rugilelong', + 'total_bakilelong', + 'total24Kgb', + 'total24K', + 'total23k', + 'total22K', + 'total21K', + 'total20K', + 'total18Kp', + 'total18K', + 'total14Kp', + 'total14K', + 'total9K', + 'lelkarat', + 'lelong_id', + 'jeniskarat', + 'data', + 'keuntungan', + 'total_upahkeuntungan', + 'total_nilaimarhun', + 'total_upahkeuntungan2', + 'totalkeuntungan2')); + } + } \ No newline at end of file diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index a1b63a2e..08a3df96 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -317,6 +317,7 @@ class SimulasiController extends Controller $keuntungan = 0; $total_upahkeuntungan = 0; + foreach($databid as $index1=>$bid) { diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index 3fd66722..af6053fe 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -66,7 +66,8 @@ @hasrole('operasi') @if($lel['info']['sts_lelong'] == 0) - + + @else diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php index 1e90b92d..d8977268 100644 --- a/resources/views/lelong/showlelong.blade.php +++ b/resources/views/lelong/showlelong.blade.php @@ -33,7 +33,7 @@ Pembiayaan Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',') }} - Keuntungan Keseluruhan : RM{{ number_format($total_upahkeuntungan2, 2, '.', ',') }} + Keuntungan Keseluruhan : RM{{ number_format($totalkeuntungan2, 2, '.', ',') }} @foreach($data as $data1) diff --git a/resources/views/lelong/showsimulasi.blade.php b/resources/views/lelong/showsimulasi.blade.php new file mode 100644 index 00000000..dbf5e5ab --- /dev/null +++ b/resources/views/lelong/showsimulasi.blade.php @@ -0,0 +1,415 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    + +
    + + +
    + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif + {{-- {{$cawangan[0] }} --}} +
    + +
    +
    + + +@endsection diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php index da78bd15..05093856 100644 --- a/resources/views/simulasi/showsimulasi.blade.php +++ b/resources/views/simulasi/showsimulasi.blade.php @@ -24,13 +24,13 @@ Bilangan Lelong : {{$total_marhun}} - Nilai Marhun Keseluruhan : RM{{ number_format($total_nmarhun, 2, '.', ',') }} + Nilai Marhun Keseluruhan : RM{{ number_format($total_nilaimarhun, 2, '.', ',') }} Pembiayaan Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',') }} - Keuntungan Keseluruhan : RM{{ number_format($total_upahkeuntungan, 2, '.', ',') }} + Keuntungan Keseluruhan : RM{{ number_format($total_upahkeuntungan2, 2, '.', ',') }} @foreach($data as $data1) diff --git a/routes/web.php b/routes/web.php index d9d23fbe..5d13e759 100644 --- a/routes/web.php +++ b/routes/web.php @@ -107,6 +107,7 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/janapemenang/{id}', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); Route::get('/senaraimarhun/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhun','uses'=>'LelongController@senaraimarhun']); Route::post('/deletemarhun', ['as'=>'lelong.deletemarhun','uses'=>'LelongController@deletemarhun']); + Route::get('/showsimulasi/{id}',['as'=>'lelong.showsimulasi','uses'=>'LelongController@showsimulasi']); Route::get('/lapbrglelongindex',['as'=>'lelong.lapbrglelongindex','uses'=>'LelongController@lapbrglelongindex']); From f262ef055b8cdfc7217eec652c6e45697adb50d7 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Sun, 5 Jun 2022 10:05:22 +0800 Subject: [PATCH 06/14] update harga dlm semakan marhun --- app/Http/Controllers/MarhunController.php | 2 ++ resources/views/marhun/marhun.blade.php | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index d85daa48..3e862859 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -316,6 +316,7 @@ class MarhunController extends Controller $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->where('lelong_id',$info['lelong_id']) + ->where('cawangan.caw_code', $user->kodcaw) ->get() ->toArray(); array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); @@ -470,6 +471,7 @@ class MarhunController extends Controller $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->where('lelong_id',$info['lelong_id']) + ->where('cawangan.caw_code', $user->kodcaw) ->get() ->toArray(); array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php index 51478209..7f61bcbe 100644 --- a/resources/views/marhun/marhun.blade.php +++ b/resources/views/marhun/marhun.blade.php @@ -336,9 +336,9 @@ { console.log(item); var beratemas = $('#berat_emastambahan').val(); - var total_tambahan = item.harga * parseFloat(beratemas); + var total_tambahan = item.harga2 * parseFloat(beratemas); var harga_asastambahan = Math.round(total_tambahan); - $('#hargatambahan').val(parseFloat(item.harga).toFixed(2)); + $('#hargatambahan').val(parseFloat(item.harga2).toFixed(2)); $('#nilai_marhuntambahan').val(parseFloat(total_tambahan).toFixed(2)); $('#harga_asastambahan').val(parseFloat(harga_asastambahan).toFixed(2)); } @@ -388,9 +388,9 @@ karatall.forEach((item) =>{ if(item.karat == $(e).val()) { - var total = item.harga * $('#berat_emas').val(); + var total = item.harga2 * $('#berat_emas').val(); var hargaasas = Math.round(total); - $('#harga').val(parseFloat(item.harga).toFixed(2)); + $('#harga').val(parseFloat(item.harga2).toFixed(2)); $('#nilai_marhun').val(parseFloat(total).toFixed(2)); $('#harga_asas').val(parseFloat(hargaasas).toFixed(2)); } From adf31efdeea3874ddca8ea64e9fde18beb766c25 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Sun, 5 Jun 2022 12:12:01 +0800 Subject: [PATCH 07/14] update thousand seperator semakan marhun dan update taglel selepas tangguh lelong --- app/Http/Controllers/MarhunController.php | 25 +++++++++++++++---- app/Http/Controllers/SimulasiController.php | 2 +- resources/views/marhun/marhun.blade.php | 8 +++--- .../views/pengesahan/mutumarhun.blade.php | 8 +++--- .../senarailelongubahmutu.blade.php | 9 +++++-- .../views/simulasi/senaraisimulasi.blade.php | 4 ++- 6 files changed, 39 insertions(+), 17 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 3e862859..8ec49793 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -11,7 +11,7 @@ use PDF; use App\Models\Cawangan; use App\Models\JenisEmas; use App\Models\JenisKarat; - +use App\Models\Gadai; use App\Models\Lelong; use App\Models\CawanganLelong; use App\Models\LelongBid; @@ -522,6 +522,7 @@ class MarhunController extends Controller { $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$info['lelong_id']) ->get() ->toArray(); @@ -591,6 +592,7 @@ class MarhunController extends Controller 'lelongbid.jbg', 'lelongbid.kadarupah', 'lelongbid.upahsimpan', + 'lelongbid.bakiupah', 'lelongbid.ansuran', 'lelongbid.nilaimarhun', 'lelongbid.pinjaman', @@ -610,7 +612,10 @@ class MarhunController extends Controller ->where('id', $lelbidmarhun->lelongbidmarhun_id) ->get()->toArray(); - $lelongbid = LelongBid::where('id', $lelbidmarhun->lelongbid_id)->where('lelong_id', $id)->first(); + $lelongbid = LelongBid::where('lelongbid.id', $lelbidmarhun->lelongbid_id) + ->where('lelongbid.lelong_id', $id) + ->first(); + $karat = Lelkarat::where('lelong_id', $id)->get(); foreach($marhuns as $index1=>$marhun) @@ -624,13 +629,18 @@ class MarhunController extends Controller ->where('norujukan', $lelongbid->norujukan) ->first(); - if($lelongbid->baki > 0) + $lelong = Lelong::where('id',$id)->get(); + $sumcajlelong = $lelongbid->hargaasas * ($lelong[0]['cajlelong']/100); + //$cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1); + $totalbaki = $lelongbid->hargaasas - $lelongbid->pinjaman - $lelongbid->bakiupah - bcdiv($sumcajlelong,1,1); + //dd($totalbaki); + if($totalbaki > 0) { - $bakilelong = $bakilelong + $lelongbid->baki; + $bakilelong = $totalbaki; } else { - $rugilelong = $rugilelong - $lelongbid->baki; + $rugilelong = $totalbaki; } $marhuns[$index1]['harga_gadai'] = $gadaimarhun->harga; @@ -638,6 +648,7 @@ class MarhunController extends Controller $marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun; $marhuns[$index1]['status_ubah'] = $status; $marhuns[$index1]['pembiayaan'] = $lelongbid->pinjaman; + $marhuns[$index1]['bakiupah'] = $lelongbid->bakiupah; $marhuns[$index1]['baki_lelong'] = $bakilelong; $marhuns[$index1]['rugi_lelong'] = $rugilelong; } @@ -724,6 +735,10 @@ class MarhunController extends Controller $tangguhlelong->ditangguh_pada = $currentdate; $tangguhlelong->nota = $request->nota; $tangguhlelong->save(); + + $updategadai = Gadai::where('norujukan','=',$request->norujukan)->first(); + $updategadai->taglel = 0; + $updategadai->update(); $marhundelete = LelongBid::where('id', $request->lelongbid_id)->delete(); } diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 08a3df96..5643daf6 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -240,7 +240,7 @@ class SimulasiController extends Controller $arrayinfo = []; $simulasi = Simulasi::join('cawangan_simulasi','simulasi.id','=','cawangan_simulasi.simulasi_id') - ->select('simulasi_id','tarikh_lelong', 'simulasi.fasa') + ->select('simulasi_id','tarikh_lelong', 'simulasi.fasa','simulasi.harga_emas_asas') ->groupBy('simulasi_id') ->get() ->toArray(); diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php index 7f61bcbe..c0af3dd3 100644 --- a/resources/views/marhun/marhun.blade.php +++ b/resources/views/marhun/marhun.blade.php @@ -68,16 +68,16 @@ @if($item->n_marhun != null) - {{ $item->n_marhun }} + {{ number_format($item->n_marhun, 2, '.', ',') }} @else - {{ $item->old_nmarhun }} + {{ number_format($item->old_nmarhun, 2, '.', ',') }} @endif @if($item->hargaasas != null) - {{ $item->hargaasas }} + {{ number_format($item->hargaasas, 2, '.', ',') }} @else - {{ $item->old_hargaasas }} + {{ number_format($item->old_hargaasas, 2, '.', ',') }} @endif {{ $item->nota }} diff --git a/resources/views/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php index 169b4120..1d7e786c 100644 --- a/resources/views/pengesahan/mutumarhun.blade.php +++ b/resources/views/pengesahan/mutumarhun.blade.php @@ -22,10 +22,10 @@

    Norujukan : {{ $lelongbid->norujukan }}

    Tempoh / JBG : {{ $lelongbid->jbg }}

    -

    Pembiayaan : {{ $marhuns[0]['pembiayaan'] }}

    -

    Keuntungan :

    -

    Baki Lelong : {{ $marhuns[0]['baki_lelong'] }}

    -

    Rugi Lelong : {{ $marhuns[0]['rugi_lelong'] }}

    +

    Pembiayaan(RM) : {{ number_format($marhuns[0]['pembiayaan'], 2, '.', ',') }}

    +

    Keuntungan(RM) : {{ number_format($marhuns[0]['bakiupah'], 2, '.', ',') }}

    +

    Baki Lelong(RM) : {{ number_format($marhuns[0]['baki_lelong'], 2, '.', ',') }}

    +

    Rugi Lelong(RM) : {{ number_format($marhuns[0]['rugi_lelong'], 2, '.', ',') }}

    diff --git a/resources/views/pengesahan/senarailelongubahmutu.blade.php b/resources/views/pengesahan/senarailelongubahmutu.blade.php index 24c51083..7d0efdbc 100644 --- a/resources/views/pengesahan/senarailelongubahmutu.blade.php +++ b/resources/views/pengesahan/senarailelongubahmutu.blade.php @@ -29,12 +29,17 @@ @foreach($arrayinfo as $lel) {{$loop->iteration}} - + @foreach($lel['detailsinfo'] as $details) {{$details['caw_name']}}
    @endforeach - {{ $lel['info']['tarikh_lelong']}} + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong']); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + + @endphp {{ $lel['info']['harga_emas_asas'] }} {{ $lel['info']['jbg'] }} {{ $lel['info']['cajlelong'] }} diff --git a/resources/views/simulasi/senaraisimulasi.blade.php b/resources/views/simulasi/senaraisimulasi.blade.php index 70f1fe6b..871c75da 100644 --- a/resources/views/simulasi/senaraisimulasi.blade.php +++ b/resources/views/simulasi/senaraisimulasi.blade.php @@ -19,7 +19,8 @@ Lelong ID Tarikh Lelong Fasa - Cawangan + Cawangan + Harga Asas (RM) Action @@ -40,6 +41,7 @@ {{$info2['caw_name']}}
    @endforeach + {{ $info['info']['harga_emas_asas'] }} From 114171d8a0e6876190c8f4590b3032b1af4556eb Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Sun, 5 Jun 2022 12:59:19 +0800 Subject: [PATCH 08/14] update simulasi sama dengan simulasi lelong --- app/Http/Controllers/LelongController.php | 7 ++++--- app/Http/Controllers/SimulasiController.php | 6 +++--- resources/views/lelong/senarailelong.blade.php | 2 ++ resources/views/lelong/showsimulasi.blade.php | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 259f2057..d746b047 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -55,7 +55,7 @@ class LelongController extends Controller $arrayinfo = []; $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') - ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->select('fasa','lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->groupBy('lelong_id') ->get() ->toArray(); @@ -1422,7 +1422,7 @@ class LelongController extends Controller $sumcajlelong = $bid['hargaasas'] * ($lelongsim[0]['cajlelong']/100); $cajlelong = $cajlelong + bcdiv($sumcajlelong,1,1); $totalbaki = $bid['hargaasas'] - $bid['pinjaman'] - bcdiv($keuntungan,1,1) - bcdiv($sumcajlelong,1,1); - + //dd($sumcajlelong); if($totalbaki > 0) { $bakilelong = $bakilelong + $totalbaki; @@ -1495,7 +1495,7 @@ class LelongController extends Controller 'rugilelong'=>$rugilelong, 'bakilelong'=>$bakilelong, ]); - + //dd($bakilelong); $total_upahkeuntungan2 = $total_upahkeuntungan2 + $total_upahkeuntungan; $total_marhun = $total_marhun + sizeof($databid); $total_berat = $total_berat + $berat; @@ -1507,6 +1507,7 @@ class LelongController extends Controller $total_bakilelong = $total_bakilelong + $bakilelong; $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun; $totalkeuntungan2 = $totalkeuntungan2 + $totalkeuntungan; + $data = Lelong::where('lelong.id','=',$lelong_id) diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 5643daf6..c39fb06a 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -82,7 +82,7 @@ class SimulasiController extends Controller ->where('taglel','=',0) ->where('lelong_tawarruq','=',1) ->select('kodcaw','norujukan','t_lelong','tempoh','kadarupah','upahSim','ansuran','nilaimarhun','pinjaman','bakiupah','cajlain', - 'berat','marhun','percentpinj') + 'berat','marhun','percentpinj','bakipjm') ->get(); } else if($request->fasa == '2'){ @@ -92,7 +92,7 @@ class SimulasiController extends Controller ->where('tagpalsu2','=',0) ->where('taglel','=',0) ->select('kodcaw','norujukan','t_lelong','tempoh','kadarupah','upahSim','ansuran','nilaimarhun','pinjaman','bakiupah','cajlain', - 'berat','marhun','percentpinj') + 'berat','marhun','percentpinj','bakipjm') ->get(); } @@ -158,7 +158,7 @@ class SimulasiController extends Controller "upahsimpan" => $data->upahSim, "ansuran" => $data->ansuran, "nilaimarhun" => $data->nilaimarhun, - "pinjaman" => $data->pinjaman, + "pinjaman" => $data->bakipjm, "bakiupah" => $data->bakiupah, "cajlain" => $data->cajlain, "cajlelong" => 0.00, diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index af6053fe..d5a81fb5 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -18,6 +18,7 @@ No Lelong ID Tarikh Lelong + Fasa Cawangan Masa Tamat Lelong Harga Emas Asas @@ -37,6 +38,7 @@ $t_lelong = $myDateTime->format('d-m-Y'); echo($t_lelong); @endphp + {{$lel['info']['fasa']}} @foreach($lel['detailsinfo'] as $details) {{$details['caw_name']}}
    diff --git a/resources/views/lelong/showsimulasi.blade.php b/resources/views/lelong/showsimulasi.blade.php index dbf5e5ab..aabd62b3 100644 --- a/resources/views/lelong/showsimulasi.blade.php +++ b/resources/views/lelong/showsimulasi.blade.php @@ -369,7 +369,7 @@ "orderable": false } ], - order: [[1, 'asc']], + order: [[0, 'asc']], // "ordering": false, "searching":false, "info": false, From 893f01cc4962e2f18b8962910ce49c6c87778847 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Sun, 5 Jun 2022 14:05:37 +0800 Subject: [PATCH 09/14] update senarai simulasi lelong --- app/Http/Controllers/LelongController.php | 68 +++++++ .../lelong/senaraimarhunsimulasi.blade.php | 183 ++++++++++++++++++ resources/views/lelong/showsimulasi.blade.php | 2 +- routes/web.php | 1 + 4 files changed, 253 insertions(+), 1 deletion(-) create mode 100644 resources/views/lelong/senaraimarhunsimulasi.blade.php diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index d746b047..dd95e54e 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -1548,6 +1548,74 @@ class LelongController extends Controller 'totalkeuntungan2')); } + public function senaraimarhunsimulasi($lelongid, $cawid){ + // $marhun = LelongBid::->get(); + + $keuntungan = 0; + + + $marhuns = LelongBid::join('cawangan', 'lelongbid.caw_id', '=', 'cawangan.id') + ->join('gadai','lelongbid.norujukan','=','gadai.norujukan') + ->where('lelong_id','=',$lelongid)->where('caw_id','=',$cawid) + ->select( + 'lelongbid.t_lelong', + 'lelongbid.kodcaw', + 'cawangan.caw_name', + 'lelongbid.norujukan', + 'lelongbid.pinjaman', + 'lelongbid.berat', + 'lelongbid.nilaimarhun', + 'lelongbid.hargaasas', + 'lelongbid.upahsimpan', + 'lelongbid.cajlelong', + 'lelongbid.baki', + 'lelongbid.bakiupah', + 'lelongbid.status_jual', + 'lelongbid.jbg', + 'gadai.bakipjm', + 'gadai.bakihargajualan', + 'gadai.upah12', + 'gadai.ansakhir', + 'gadai.tempoh', + 'gadai.tempohbayar', + 'gadai.kadarupah' + ) + ->get()->toArray(); + + foreach ($marhuns as $index1=> $cal) { + + $keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) ); + $marhuns[$index1]['keuntungan'] = bcdiv($keuntungan,1,1); + + $simulasilel = Lelong::where('id',$lelongid)->get(); + $sumcajlelong = $cal['hargaasas'] * ($simulasilel[0]['cajlelong']/100); + $totalbaki = $cal['hargaasas'] - $cal['pinjaman'] - bcdiv($keuntungan,1,1) - bcdiv($sumcajlelong,1,1); + + $marhuns[$index1]['cajlelong'] = bcdiv($sumcajlelong,1,1); + $marhuns[$index1]['baki'] = $totalbaki; + } + + $arrayinfo = []; + + $lelong_id = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->where('cawangan_lelong.lelong_id','=',$lelongid) + ->select('lelong_id','tarikh_lelong') + ->groupBy('lelong_id') + ->get()->toArray(); + + + foreach($lelong_id as $laporan) + { + $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.senaraimarhunsimulasi',compact('marhuns','lelongid','cawid','arrayinfo')); + } + } \ No newline at end of file diff --git a/resources/views/lelong/senaraimarhunsimulasi.blade.php b/resources/views/lelong/senaraimarhunsimulasi.blade.php new file mode 100644 index 00000000..4132c732 --- /dev/null +++ b/resources/views/lelong/senaraimarhunsimulasi.blade.php @@ -0,0 +1,183 @@ +@extends('layouts.app') + +@section('content') + +
    +
    +
    + Senarai Simulasi Lelong + @foreach ($arrayinfo as $laporan) + + Lelong ID : {{ $laporan['laporan']['lelong_id']}} + Tarikh Lelong : @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + + @endphp + @foreach($laporan['details'] as $details) + Nama Cawangan : {{ $details['caw_name']}} + Kod Cawangan : {{ $details['caw_code']}} + @endforeach + + @endforeach + + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif +
    + @csrf + + + + + + + + + + + + + + + + + + + + + @foreach ($marhuns as $index=> $marhun) + + + + + + + + + + + {{-- --}} + + + + + + + + + @endforeach + + +
    No.NorujukanTempohBerat (gm)Nilai Marhun (RM)Harga Asas (RM)Pembiayaan (RM)Keuntungan (RM)Caj Lelong (%)Rugi Lelong (RM)Baki Lelong (RM)Action
    {{$loop->iteration}}{{ $marhun['norujukan']}}{{ $marhun['jbg']}}{{ $marhun['berat'] }}{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}{{ number_format($marhun['hargaasas'], 2, '.', ',') }}{{ number_format($marhun['pinjaman'] , 2, '.', ',') }}{{ number_format($marhun['bakiupah'], 2, '.', ',') }}{{ $marhun['keuntungan'] }}{{ number_format($marhun['cajlelong'], 2, '.', ',') }}{{number_format($rugi, 2, '.', ',')}}{{number_format($baki, 2, '.', ',')}} + +
    +
    + Kembali + +
    + {{-- Kembali --}} + +
    +
    + +
    +
    + +@endsection diff --git a/resources/views/lelong/showsimulasi.blade.php b/resources/views/lelong/showsimulasi.blade.php index aabd62b3..bebce235 100644 --- a/resources/views/lelong/showsimulasi.blade.php +++ b/resources/views/lelong/showsimulasi.blade.php @@ -92,7 +92,7 @@ @foreach ($arraycaw as $index=>$caw) {{$index+1}} - {{ $caw['cawangan'] }} + {{ $caw['cawangan'] }} {{ $caw['bil_marhun'] }} {{ number_format($caw['berat'], 2, '.', ',') }} {{ number_format($caw['n_marhun'], 2, '.', ',') }} diff --git a/routes/web.php b/routes/web.php index 5d13e759..0f189f01 100644 --- a/routes/web.php +++ b/routes/web.php @@ -108,6 +108,7 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/senaraimarhun/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhun','uses'=>'LelongController@senaraimarhun']); Route::post('/deletemarhun', ['as'=>'lelong.deletemarhun','uses'=>'LelongController@deletemarhun']); Route::get('/showsimulasi/{id}',['as'=>'lelong.showsimulasi','uses'=>'LelongController@showsimulasi']); + Route::get('/senaraimarhunsimulasi/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhunsimulasi','uses'=>'LelongController@senaraimarhunsimulasi']); Route::get('/lapbrglelongindex',['as'=>'lelong.lapbrglelongindex','uses'=>'LelongController@lapbrglelongindex']); From e93fd9a704cab5c12ce91c1eeac6444696329d40 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Sun, 5 Jun 2022 16:56:47 +0800 Subject: [PATCH 10/14] update senarai marhun page khazanah pdf --- app/Http/Controllers/MarhunController.php | 11 ++++++++--- resources/views/marhun/senarailelongmarhun.blade.php | 10 +++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 8ec49793..7f712dc9 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -299,7 +299,6 @@ class MarhunController extends Controller public function senarailelongmarhun(Request $request){ $user = Auth::user(); - $arrayinfo = []; $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') @@ -307,7 +306,6 @@ class MarhunController extends Controller ->where('cawangan.caw_code', $user->kodcaw) ->where('sts_lelong', 0) ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') - ->groupBy('lelong_id') ->get() ->toArray(); @@ -403,8 +401,15 @@ class MarhunController extends Controller public function exportmarhundetails($lelong_id) { + $user = Auth::user(); + //dd($user); $lelongs= LelongBid::where('lelong_id','=',$lelong_id) - ->get()->toArray(); + ->where('kodcaw','=',$user['kodcaw']) + ->get() + ->toArray(); + //dd($lelongs); + + $arraycaw= []; diff --git a/resources/views/marhun/senarailelongmarhun.blade.php b/resources/views/marhun/senarailelongmarhun.blade.php index 2b128be3..6b8f2539 100644 --- a/resources/views/marhun/senarailelongmarhun.blade.php +++ b/resources/views/marhun/senarailelongmarhun.blade.php @@ -15,6 +15,7 @@ No Cawangan + Batch Lelong Tarikh Lelong Status Lelong Action @@ -24,12 +25,19 @@ @foreach($arrayinfo as $lel) {{$loop->iteration}} + @foreach($lel['detailsinfo'] as $details) {{$details['caw_name']}}
    @endforeach + - {{ $lel['info']['tarikh_lelong']}} + {{ $lel['info']['lelong_id']}} + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp @if($lel['info']['sts_lelong'] == 0) From e2b8c1aa90deaa26fb4aa1e66f37659dedb53274 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Thu, 9 Jun 2022 10:42:04 +0800 Subject: [PATCH 11/14] update dashboard jurulelong --- app/Http/Controllers/HomeController.php | 28 +++- app/Http/Controllers/LelongController.php | 139 +++++++++++++++++- app/Models/CawanganLelong.php | 3 + ...2021_12_14_041557_create_lelongs_table.php | 3 + resources/views/home.blade copy.php | 134 +++++++++++++++++ resources/views/home.blade.php | 101 ++++++++++++- resources/views/includes/sidebar.blade.php | 17 ++- .../views/jurulelong/listcawangan.blade.php | 110 ++++++++++++++ routes/web.php | 33 +++-- 9 files changed, 545 insertions(+), 23 deletions(-) create mode 100644 resources/views/home.blade copy.php create mode 100644 resources/views/jurulelong/listcawangan.blade.php diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index c2d1fce4..2ce9c71e 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -7,6 +7,10 @@ use Spatie\Permission\Models\Role; use Spatie\Permission\Models\Permission; use Illuminate\Support\Facades\Auth; +use App\Models\Lelong; +use App\Models\CawanganLelong; +use Carbon\Carbon; + class HomeController extends Controller { /** @@ -28,7 +32,29 @@ class HomeController extends Controller { // $user = Auth::user(); // $user->assignRole('admin'); - return view('home'); + $dateTime = date('Y-m-d'); + $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') + ->where('tarikh_lelong', $dateTime) + ->groupBy('lelong_id') + ->get() + ->toArray(); + + foreach($lelong as $info) + { + + $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->select('batchlel','lelong_id','cawangan_lelong.caw_id','cawangan.caw_name','cawangan.caw_code','status_online','cawangan_lelong.masamula_lelong','cawangan_lelong.masatamat_lelong') + ->where('lelong_id',$info['lelong_id']) + ->get() + ->toArray(); + array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); + + + }//dd($detailsinfo); + return view('home',compact('lelong', 'arrayinfo')); } public function about() diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index dd95e54e..16ce91c6 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -55,7 +55,7 @@ class LelongController extends Controller $arrayinfo = []; $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') - ->select('fasa','lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->select('fasa','lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->groupBy('lelong_id') ->get() ->toArray(); @@ -470,14 +470,21 @@ class LelongController extends Controller $lelong->sts_lelong = 1; //start lelong $lelong->save(); + $cawlelong = CawanganLelong::where('lelong_id','=',$id)->first(); + $cawlelong->masamula_lelong = $currenttime; + $cawlelong->masatamat_lelong = $endtime->toTimeString(); + $cawlelong->status_online = 1; //start lelong + $cawlelong->save(); + return redirect()->route('lelong.senarailelong') ->with('success','Lelongan bermula'); } public function refresh($id) { + $date = Carbon::now()->toDateTimeString(); $lelong = Lelong::where('id','=',$id)->first(); - $lelong->masakemaskini_data = '2021-12-20 04:51:50'; + $lelong->masakemaskini_data = $date; $lelong->save(); return redirect()->route('lelong.senarailelong') @@ -692,6 +699,7 @@ class LelongController extends Controller $lelong->masatamat_lelong = $currenttime; $lelong->sts_lelong = 2; //stop lelong $lelong->save(); + return redirect()->route('lelong.senarailelong') ->with('success','Lelongan berhenti'); @@ -1616,6 +1624,133 @@ class LelongController extends Controller return view('lelong.senaraimarhunsimulasi',compact('marhuns','lelongid','cawid','arrayinfo')); } + public function refreshhome($id) + { + $date = Carbon::now()->toDateTimeString(); + $lelong = Lelong::where('id','=',$id)->first(); + $lelong->masakemaskini_data = $date; + $lelong->save(); + + return redirect()->route('home') + ->with('success','Kemaskini Berjaya'); + } + + public function startcawangan($id,$cawid) + { + event(new LelongNotify('start')); + $currentdate = Carbon::now(); + $currenttime = $currentdate->toTimeString(); + $endtime = $currentdate->addHours(2); + + // $lelong = Lelong::where('id','=',$id)->first(); + // $lelong->masamula_lelong = $currenttime; + // $lelong->masatamat_lelong = $endtime->toTimeString(); + // $lelong->sts_lelong = 1; //start lelong + // $lelong->save(); + $lelong = CawanganLelong::where('lelong_id','=',$id)->where('caw_id','=',$cawid)->first(); + $lelong->masamula_lelong = $currenttime; + $lelong->masatamat_lelong = $endtime->toTimeString(); + $lelong->status_online = 1; //start lelong + $lelong->save(); + + return redirect()->route('home') + ->with('success','Lelongan bermula'); + } + + public function stopcawangan($id,$cawid) + { + event(new LelongNotify('start')); + $currentdate = Carbon::now(); + $currenttime = $currentdate->toTimeString(); + $endtime = $currentdate->addHours(2); + + // $lelong = Lelong::where('id','=',$id)->first(); + // $lelong->masamula_lelong = $currenttime; + // $lelong->masatamat_lelong = $endtime->toTimeString(); + // $lelong->sts_lelong = 1; //start lelong + // $lelong->save(); + $lelong = CawanganLelong::where('lelong_id','=',$id)->where('caw_id','=',$cawid)->first(); + // $lelong->masamula_lelong = $currenttime; + $lelong->masatamat_lelong = $currenttime; + $lelong->status_online = 0; //start lelong + $lelong->save(); + + return redirect()->route('home') + ->with('success','Lelongan bermula'); + } + + public function startall($id) + { + event(new LelongNotify('start')); + $currentdate = Carbon::now(); + $currenttime = $currentdate->toTimeString(); + $endtime = $currentdate->addHours(2); + + $lelong = Lelong::where('id','=',$id)->first(); + $lelong->masamula_lelong = $currenttime; + $lelong->masatamat_lelong = $endtime->toTimeString(); + $lelong->sts_lelong = 1; //start lelong + $lelong->save(); + + $cawlelong = CawanganLelong::where('lelong_id','=',$id)->get(); + foreach($cawlelong as $cawlel) //save old harga asas + { + $cawlel->masatamat_lelong = $endtime->toTimeString(); + $cawlel->status_online = 1; //start lelong + $cawlel->save(); + } + + return redirect()->route('home'); + } + + + public function stopall($id) + { + event(new LelongNotify('stop')); + $currentdate = Carbon::now(); + $currenttime = $currentdate->toTimeString(); + $endtime = $currentdate->addHours(2); + + $lelong = Lelong::where('id','=',$id)->first(); + $lelong->masatamat_lelong = $currenttime; + $lelong->sts_lelong = 0; //stop lelong + $lelong->save(); + + $cawlelong = CawanganLelong::where('lelong_id','=',$id)->get(); + foreach($cawlelong as $cawlel) //save old harga asas + { + $cawlel->masatamat_lelong = $currenttime; + $cawlel->status_online = 0; //start lelong + $cawlel->save(); + } + + + return redirect()->route('home') + ->with('success','Lelongan berhenti'); + + } + + public function listcawangan() + { + $arrayinfo = []; + + $lelong = Lelong::where('sts_lelong', 0) + ->get()->toArray(); + + 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('jurulelong.listcawangan',compact('lelong', 'arrayinfo')); + } + + } \ No newline at end of file diff --git a/app/Models/CawanganLelong.php b/app/Models/CawanganLelong.php index 2c86b25f..bef247b3 100644 --- a/app/Models/CawanganLelong.php +++ b/app/Models/CawanganLelong.php @@ -15,6 +15,9 @@ class CawanganLelong extends Model 'batchlel', 'lelong_id', 'caw_id', + 'status_online', + 'masamula_lelong', + 'masatamat_lelong', 'online', 'export_data_sts', 'import_data_sts', 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 ce60c677..2e4bb3ae 100644 --- a/database/migrations/2021_12_14_041557_create_lelongs_table.php +++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php @@ -33,6 +33,9 @@ class CreateLelongsTable extends Migration $table->integer('batchlel')->nullable(); $table->unsignedBigInteger('lelong_id')->unsigned(); $table->unsignedBigInteger('caw_id')->unsigned(); + $table->integer('status_online')->default(0)->nullable(); + $table->time('masamula_lelong')->nullable(); + $table->time('masatamat_lelong')->nullable(); $table->string('online'); $table->string('export_data_sts')->nullable(); $table->string('import_data_sts')->nullable(); diff --git a/resources/views/home.blade copy.php b/resources/views/home.blade copy.php new file mode 100644 index 00000000..d73f6b0f --- /dev/null +++ b/resources/views/home.blade copy.php @@ -0,0 +1,134 @@ +@extends('layouts.app') + +@section('content') +
    +
    +
    +
    +
    {{ __('Dashboard') }}
    +
    + @if (session('status')) + + @endif + + {{ __('You are logged in!') }} + @hasrole('admin') + I am a admin! + @endhasrole + @hasrole('khazanah') + I am a khazanah! + @endhasrole + @hasrole('teller') + I am a teller! + @endhasrole + @hasrole('pengurus-cawangan') + I am a pengurus-cawangan! + @endhasrole + @hasrole('jurulelong') + I am a jurulelong! + + + + + + + + + + + + + + + + + + + @foreach ($arrayinfo as $lel) +
    LELONGAN HARI INI + + + + + + + + + + + + + + + @endforeach + + + + +
    NoLelong IDT.LelongFasaCawanganStatusMasa TamatHarga EmasJBGAction
    {{$loop->iteration}}{{ $lel['info']['lelong_id'] }}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp{{$lel['info']['fasa']}} + @foreach($lel['detailsinfo'] as $details) + {{$details['caw_name']}}
    + @endforeach +     		+ @foreach($lel['detailsinfo'] as $details) + @if($details['status_online'] == '0') +
    + + @elseif($details['status_online'] == '1') +
    + @endif + @endforeach +     		@foreach($lel['detailsinfo'] as $details) + {{$details['masatamat_lelong']}}
    + @endforeach    		{{$lel['info']['harga_emas_asas']}}{{$lel['info']['jbg']}} + @hasrole('jurulelong') + + + + + + + + + + + + + + @endhasrole + +
    + @endhasrole + @hasrole('operasi') + I am a operasi! + @endhasrole + @hasrole('account') + I am a account! + @endhasrole + @hasrole('pembida') + I am a pembida! + @endhasrole +
    +
    +
    +
    + + + +
    +@endsection diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 4991a5c8..bef751b2 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -1,12 +1,11 @@ @extends('layouts.app') @section('content') -
    -
    -
    +
    +
    +
    {{ __('Dashboard') }}
    -
    @if (session('status')) -
    +
    + + +
    @endsection diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index d0162a6d..81ab0685 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -106,16 +106,27 @@
  • Senarai Lelong
    • - + + +
  • + +
    • @endhasrole @hasrole('operasi')
  • Import Data
    • -
  • +
    • diff --git a/resources/views/jurulelong/listcawangan.blade.php b/resources/views/jurulelong/listcawangan.blade.php new file mode 100644 index 00000000..634fab2d --- /dev/null +++ b/resources/views/jurulelong/listcawangan.blade.php @@ -0,0 +1,110 @@ +@extends('layouts.app') + +@section('content') +
      +
      +
      + + @if ($message = Session::get('success')) +
      +

      {{ $message }}

      +
      + @endif +
      + + + + + + + + + + + + + + + @foreach ($arrayinfo as $lel) + + + + + + + + + + @endforeach + +
      NoTarikh LelongNama CawanganHarga Emas AsasJBGCaj LelongAction
      {{$loop->iteration}}{{ $lel['detail']['tarikh_lelong']}} + @foreach($lel['detailsinfo'] as $details) + {{$details['caw_name']}}
      + @endforeach +       		{{$lel['detail']['harga_emas_asas']}}{{$lel['detail']['jbg']}}{{$lel['detail']['cajlelong']}} + +
      +
      +
      + +
      +
      + + +@endsection diff --git a/routes/web.php b/routes/web.php index 0f189f01..b5879ce4 100644 --- a/routes/web.php +++ b/routes/web.php @@ -104,18 +104,17 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/showlelong/{id}',['as'=>'lelong.show','uses'=>'LelongController@show']); Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']); Route::get('/export/{id}',['as'=>'lelong.exportnotis','uses'=>'LelongController@exportnotis']); - Route::get('/janapemenang/{id}', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); + // Route::get('/janapemenang/{id}', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); Route::get('/senaraimarhun/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhun','uses'=>'LelongController@senaraimarhun']); Route::post('/deletemarhun', ['as'=>'lelong.deletemarhun','uses'=>'LelongController@deletemarhun']); Route::get('/showsimulasi/{id}',['as'=>'lelong.showsimulasi','uses'=>'LelongController@showsimulasi']); Route::get('/senaraimarhunsimulasi/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhunsimulasi','uses'=>'LelongController@senaraimarhunsimulasi']); - Route::get('/lapbrglelongindex',['as'=>'lelong.lapbrglelongindex','uses'=>'LelongController@lapbrglelongindex']); Route::get('/senaraibrglelong/{lelong_id}',['as'=>'lelong.senaraibrglelong','uses'=>'LelongController@senaraibrglelong']); Route::get('/lapbrglelongdetailsindex',['as'=>'lelong.lapbrglelongdetailsindex','uses'=>'LelongController@lapbrglelongdetailsindex']); - + Route::get('/lapbidaanpembidaindex', ['as'=>'lelong.lapbidaanpembidaindex','uses'=>'LelongController@lapbidaanpembidaindex']); Route::get('/senarailapbidaan/{lelong_id}',['as' =>'lelong.senarailapbidaan','uses'=>'LelongController@senarailapbidaan']); @@ -129,12 +128,7 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/lapbrglelpembida/{lelong_id}',['as'=>'lelong.lapbrglelpembida','uses'=>'LelongController@lapbrglelpembida']); Route::post('/pdflapbrglelpembida',['as'=>'lelong.pdflapbrglelpembida','uses'=>'LelongController@pdflapbrglelpembida']); - - - - - - }); + }); Route::group(['middleware' => ['permission:pengesahanpembayaranpc']], function () { Route::get('/pengesahanPembayaran', ['as'=>'payment.pengesahanPembayaran','uses'=>'PaymentController@pengesahanPembayaran']); @@ -142,6 +136,7 @@ Route::group(['prefix'=>'lelong'], function () { Route::group(['middleware' => ['permission:import']], function () { Route::get('/refresh/{id}',['as'=>'lelong.refresh','uses'=>'LelongController@refresh']); + Route::get('/refreshhome/{id}',['as'=>'lelong.refreshhome','uses'=>'LelongController@refreshhome']); }); Route::group(['middleware' => ['permission:kemaskinihargaasas']], function () { @@ -151,10 +146,23 @@ Route::group(['prefix'=>'lelong'], function () { Route::group(['middleware' => ['permission:lelongan']], function () { Route::get('/lelongstart/{id}',['as'=>'lelong.start','uses'=>'LelongController@start']); Route::get('/lelongstop/{id}',['as'=>'lelong.stop','uses'=>'LelongController@stop']); - }); + Route::get('/lelongstartcawangan/{id}/{cawid}',['as'=>'lelong.startcawangan','uses'=>'LelongController@startcawangan']); + Route::get('/lelongstopcawangan/{id}/{cawid}',['as'=>'lelong.stopcawangan','uses'=>'LelongController@stopcawangan']); + Route::get('/lelongstartall/{id}',['as'=>'lelong.startall','uses'=>'LelongController@startall']); + Route::get('/lelongstopall/{id}',['as'=>'lelong.stopall','uses'=>'LelongController@stopall']); + }); +//jurulelong Route::group(['middleware' => ['permission:janapemenang']], function () { - Route::get('/janapemenang/{id}',['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); + Route::get('/janapemenang',['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); + Route::get('/listcawangan',['as'=>'lelong.listcawangan','uses'=>'LelongController@listcawangan']); + }); +}); + + Route::group(['prefix'=>'pemenang'], function () { + Route::group(['middleware' => ['permission:janapemenang']], function () { + Route::get('/janapemenang',['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); + Route::get('/listcawangan',['as'=>'lelong.listcawangan','uses'=>'LelongController@listcawangan']); }); }); @@ -193,6 +201,7 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid Route::get('/senlelpembayaranbidaan',['as'=>'pembida.senlelpembayaranbidaan','uses'=>'PembidaController@senlelpembayaranbidaan']); Route::get('/pembayaranbidaan',['as'=>'pembida.pembayaranbidaan','uses'=>'PembidaController@pembayaranbidaan']); Route::get('/detailsbidaan/{user_id}/{payment_id}/{kodcaw}',['as'=>'pembida.detailsbidaan','uses'=>'PembidaController@detailsbidaan']); + }); Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], function () { @@ -275,3 +284,5 @@ Route::group(['middleware' => ['permission:jananotis'],'prefix'=>'jananotis'], f + + From 2d52d307cc39a04abc457a5897ec1b226e150c45 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Thu, 9 Jun 2022 10:58:29 +0800 Subject: [PATCH 12/14] Update MarhunController.php --- app/Http/Controllers/MarhunController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 7f712dc9..54769bf1 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -305,7 +305,7 @@ class MarhunController extends Controller ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') ->where('cawangan.caw_code', $user->kodcaw) ->where('sts_lelong', 0) - ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->select('lelong_id','tarikh_lelong','cawangan_lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->get() ->toArray(); From 07b0752e7b20497ab05ec9d249e490db62c68135 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Thu, 9 Jun 2022 11:02:55 +0800 Subject: [PATCH 13/14] Update MarhunController.php --- app/Http/Controllers/MarhunController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 54769bf1..ef09509c 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -466,7 +466,7 @@ class MarhunController extends Controller ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') ->where('cawangan.caw_code', $user->kodcaw) ->where('sts_lelong', 0) - ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->select('lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->groupBy('lelong_id') ->get() ->toArray(); From 05e30c34fa0afe1e467ad96359ebe95b50eb4d94 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Thu, 9 Jun 2022 11:09:39 +0800 Subject: [PATCH 14/14] update marhun dan tangguh lelong controller(isu contstrains) --- app/Http/Controllers/MarhunController.php | 2 +- app/Http/Controllers/TangguhLelongController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index ef09509c..1bf4ba43 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -518,7 +518,7 @@ class MarhunController extends Controller $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') ->where('sts_lelong', 0) - ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->select('lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->groupBy('lelong_id') ->get() ->toArray(); diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index c5742460..f47b76ce 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -211,7 +211,7 @@ class TangguhLelongController extends Controller $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') ->where('sts_lelong', 0) - ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->select('lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->groupBy('lelong_id') ->get() ->toArray();