From e38aae6640c5c14c84e0b95f0ccad37b3b41fb2f Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Mon, 13 Jun 2022 17:12:42 +0800 Subject: [PATCH] update 13062022 --- app/Http/Controllers/LelongController.php | 606 +++++++++++++++++- app/Http/Controllers/MarhunController.php | 118 ++-- resources/views/home.blade.php | 4 +- .../views/jurulelong/listcawangan.blade.php | 13 +- .../views/jurulelong/listpemenang.blade.php | 119 ++++ .../jurulelong/senaraipemenangbycaw.blade.php | 111 ++++ .../views/lelong/senarailelong.blade.php | 32 +- .../views/lelong/senaraimarhun.blade.php | 10 +- .../views/lelong/senaraipemenang.blade.php | 4 +- .../views/lelong/senaraisagpemenang.blade.php | 2 +- .../listperubahanmutumarhun.blade.php | 107 ++++ .../pengesahan/perubahanmutumarhun.blade.php | 4 +- .../views/pengesahan/senarailelong.blade.php | 15 +- .../senarailelongubahmutu.blade.php | 8 +- .../pengesahan/senaraitangguhlelong.blade.php | 2 +- .../senarailelongtangguh.blade.php | 5 +- .../tangguhlelong/senleltangguh.blade.php | 11 +- routes/web.php | 16 +- 18 files changed, 1104 insertions(+), 83 deletions(-) create mode 100644 resources/views/jurulelong/listpemenang.blade.php create mode 100644 resources/views/jurulelong/senaraipemenangbycaw.blade.php create mode 100644 resources/views/pengesahan/listperubahanmutumarhun.blade.php diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index aa062cfb..fd8d862f 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -7,6 +7,7 @@ use Illuminate\Http\Request; use Spatie\Permission\Models\Role; use Spatie\Permission\Models\Permission; use Illuminate\Support\Facades\Auth; + use PDF; use App\Models\User; use App\Models\Cawangan; @@ -20,7 +21,7 @@ use App\Models\SimulasiBidMarhun; use App\Models\SimKarat; use App\Models\SimKarat_temp; use App\Models\CawanganSimulasi; - +use App\Models\Cart; use App\Models\Lelong; use App\Models\CawanganLelong; @@ -32,6 +33,7 @@ use App\Models\LelKarat_temp; use App\Models\Resit; use Carbon\Carbon; + class LelongController extends Controller { /** @@ -395,6 +397,9 @@ class LelongController extends Controller $updategadai = Gadai::where('norujukan','=', $data->norujukan)->first(); $updategadai->taglel = 1; $updategadai->save(); + + // $hapussimulasi = SimulasiBid::where('norujukan','=',$data->norujukan)->first(); + // $hapussimulasi->delete(); } $simulasibidmarhun = SimulasiBidMarhun::where('simulasibid_id','=',$data->id)->get(); @@ -418,6 +423,17 @@ class LelongController extends Controller $lelongbidmarhun->save(); } + + if($lelongbidmarhun->save()) + { + // $updategadai = Gadai::where('norujukan','=', $data->norujukan)->first(); + // $updategadai->taglel = 1; + // $updategadai->save(); + + $hapussimulasi = SimulasiBid::where('norujukan','=',$data->norujukan)->first(); + $hapussimulasi->delete(); + } + } } } @@ -868,6 +884,7 @@ class LelongController extends Controller $listwinner[$index1]['details'] = $userdetails; $listwinner[$index1]['total_surat'] = sizeof($SAGWin); $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida'); + $listwinner[$index1]['lelong_id'] = $lelong_id; } return view('lelong.senaraipemenang',compact('listwinner','lelong_id')); @@ -903,6 +920,8 @@ class LelongController extends Controller 'lelongbid.berat', 'lelongbid.nilaimarhun', 'lelongbid.hargaasas', + 'lelongbid.hargajual', + 'lelongbid.t_jual', 'lelongbid.upahsimpan', 'lelongbid.cajlelong', 'lelongbid.baki', @@ -959,6 +978,283 @@ class LelongController extends Controller ->with('success','Delete Berjaya'); } + 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')); + } + + 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')); + } + + public function refreshhome($id) { $date = Carbon::now()->toDateTimeString(); @@ -1030,6 +1326,7 @@ class LelongController extends Controller $cawlelong = CawanganLelong::where('lelong_id','=',$id)->get(); foreach($cawlelong as $cawlel) //save old harga asas { + $cawlel->masamula_lelong = $currenttime; $cawlel->masatamat_lelong = $endtime->toTimeString(); $cawlel->status_online = 1; //start lelong $cawlel->save(); @@ -1048,7 +1345,7 @@ class LelongController extends Controller $lelong = Lelong::where('id','=',$id)->first(); $lelong->masatamat_lelong = $currenttime; - $lelong->sts_lelong = 0; //stop lelong + $lelong->sts_lelong = 2; //stop lelong $lelong->save(); $cawlelong = CawanganLelong::where('lelong_id','=',$id)->get(); @@ -1058,6 +1355,8 @@ class LelongController extends Controller $cawlel->status_online = 0; //start lelong $cawlel->save(); } + + $hapuscart = Cart::truncate(); return redirect()->route('home') @@ -1069,7 +1368,7 @@ class LelongController extends Controller { $arrayinfo = []; - $lelong = Lelong::where('sts_lelong', 0) + $lelong = Lelong::where('sts_lelong', 2) ->get()->toArray(); foreach($lelong as $details) @@ -1085,6 +1384,307 @@ class LelongController extends Controller return view('jurulelong.listcawangan',compact('lelong', 'arrayinfo')); } + public function janapemenangbycaw($lelong_id,$cawid){ + + $current = Carbon::now(); + $current = new Carbon(); + $currentdate = $current->toDateString(); + + $day = $current->day; + $month = $current->month; + $year = $current->format('y'); + + $lelong = Lelong::where('id','=',$lelong_id)->first(); + $lelongbid = LelongBid::join('cawangan','cawangan.caw_code','=','lelongbid.kodcaw') + ->where('lelong_id','=',$lelong_id) + ->where('cawangan.id','=',$cawid) + ->select('lelongbid.id') + ->get(); + //dd($lelongbid); + foreach($lelongbid as $bid) + { + + $highestprice = LelongBidder::join('lelongbid','lelongbid.id','=','lelongbidder.lelongbid_id') + ->join('cawangan','cawangan.caw_code','=','lelongbid.kodcaw') + ->where('lelongbid_id','=',$bid->id) + ->orderBy('lelongbidder.hargabida','DESC' ) + ->first(); + // dd($bid->id); + if($highestprice) + { + // foreach($highestprice as $price){ + $bidders = LelongBidder::join('lelongbid','lelongbid.id','=','lelongbidder.lelongbid_id') + ->where('lelongbid_id','=',$bid->id) + ->where('hargabida','=',$highestprice->hargabida)->orderBy('masa_bidaan','ASC' ) + ->select('lelongbidder.user_id','lelongbidder.id','lelongbidder.hargabida','lelongbid.pinjaman','lelongbid.bakiupah') + ->get(); + + // dd($lelong[0]['cajlelong']); + $count = 0; + foreach($bidders as $bidder) + { + // dd($bidder->bakiupah); + $count = $count + 1; + if($count == 1) + { + + $sumhargabida = LelongBidder::join('lelongbid','lelongbid.id','=','lelongbidder.lelongbid_id') + ->where('lelongbidder.user_id','=',$bidder->user_id) + ->where('lelongbid.lelong_id','=',$lelong_id) + ->where('lelongbid.caw_id','=',$cawid) + ->where('lelongbidder.hargabida','=',$highestprice->hargabida)->orderBy('masa_bidaan','ASC' ) + ->raw("SUM(hargabida) as hargabida") + ->get(); + // dd($bidder->user_id); + // dd($bidder->id); + $pemenang = LelongBidder::where('id','=',$bidder->id)->first(); + $pemenang->status_bidder = 1; + $pemenang->save(); + + $datalelong = Lelong::where('id',$lelong_id)->get(); + $sumcajlelong = $bidder->hargabida * ($datalelong[0]['cajlelong']/100); + $totalbaki = $bidder->hargabida - $bidder->pinjaman - bcdiv($bidder->bakiupah,1,1) - bcdiv($sumcajlelong,1,1); + $updatebid = LelongBid::where('id','=',$bid->id)->first(); + // dd($totalbaki); + $updatebid->hargajual = $bidder->hargabida; + $updatebid->t_jual = $currentdate; + $updatebid->cajlelong = bcdiv($sumcajlelong,1,1); + $updatebid->baki = $totalbaki; + $updatebid->nopembeli = $bidder->user_id; + $updatebid->status_jual = 1; + $updatebid->save(); + + + $previous_siri = Resit::orderBy('id','desc')->first(); + $checkdata = Resit::where('user_id', $bidder->user_id) + ->where('lelong_id', $lelong_id) + ->where('resit_type', 2) + ->first(); + + if(!$checkdata){ + if($previous_siri){ + $nosiri = $previous_siri->id + 1; + }else{ + $nosiri = 1; + } + + $reference_no = 'LPKB' . $day . $month . $year . sprintf("%08d", $nosiri); + + + + $resit = new Resit; + $resit->user_id = $bidder->user_id; + $resit->lelong_id = $lelong_id; + $resit->reference_no = $reference_no; + $resit->billplz_id = ''; + $resit->total_payment = $sumhargabida->sum('hargabida'); + dd($sumhargabida->sum('hargabida')); + $resit->resit_type = 2; // 1 = fee , 2 = bid + $resit->save(); + } + } + else + { + $kalah = LelongBidder::where('id','=',$bidder->id) + ->first(); + $kalah->status_bidder = 2; + $kalah->save(); + } + } + // } + + } + else + { //xlaku + + } + } + $lelong->sts_lelong = 3; //siap jana pemenang + $lelong->save(); + + return redirect()->route('lelong.senarailelong') + ->with('success','Selesai menjana pemenang'); + + } + + public function listpemenang() + { + $arrayinfo = []; + + $lelong = Lelong::where('sts_lelong', 3) + ->get()->toArray(); + + foreach($lelong as $details) + { + $detailsinfo = CawanganLelong::select('cawangan_lelong.caw_id','caw_name','lelongbid.status_jual') + ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->join('lelongbid','lelongbid.kodcaw','=','cawangan.caw_code') + ->where('lelongbid.status_jual', '1') + ->where('cawangan_lelong.lelong_id', $details['id']) + ->distinct() + ->get() + ->toArray(); + // dd($detailsinfo); + + array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]); + + //dd($detailsinfo); + } + + return view('jurulelong.listpemenang',compact('lelong', 'arrayinfo')); + } + + public function listpemenangbycaw($lelong_id,$caw_id) + { + + $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code') + ->where('lelongbidder.status_bidder', 1) + ->where('cawangan.id', $caw_id) + ->where('lelongbid.lelong_id', $lelong_id) + ->select('lelongbidder.user_id' + ) + ->groupBy('lelongbidder.user_id') + ->get()->toArray(); + // dd($listwinner); + + foreach($listwinner as $index1=>$winner){ + + $userdetails = User::where('id', $winner['user_id'])->first(); + $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code') + ->where('user_id', $winner['user_id']) + ->where('cawangan.id', $caw_id) + ->where('lelongbidder.status_bidder', 1) + ->where('lelongbid.lelong_id', $lelong_id) + ->get(); + + $listwinner[$index1]['details'] = $userdetails; + $listwinner[$index1]['total_surat'] = sizeof($SAGWin); + $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida'); + $listwinner[$index1]['lelong_id'] = $lelong_id; + + $getnamacaw = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code') + ->where('lelong_id', $lelong_id) + ->where('cawangan.id', $caw_id) + ->select('cawangan.caw_name') + ->first(); + + $tangguhlelong[$index1]['nama_caw'] = $getnamacaw; + } + + return view('jurulelong.senaraipemenangbycaw',compact('listwinner','lelong_id','getnamacaw')); + + } + + public function janapemenangallcaw($lelong_id){ + + $current = Carbon::now(); + $current = new Carbon(); + $currentdate = $current->toDateString(); + + $day = $current->day; + $month = $current->month; + $year = $current->format('y'); + + $lelong = Lelong::where('id','=',$lelong_id)->first(); + $lelongbid = LelongBid::where('lelong_id','=',$lelong_id)->get(); + foreach($lelongbid as $bid) + { + $highestprice = LelongBidder::where('lelongbid_id','=',$bid->id)->orderBy('lelongbidder.hargabida','DESC' )->first(); + + // dd($highestprice->hargabida); + if($highestprice) + { + // foreach($highestprice as $price){ + // $bidders = LelongBidder::where('lelongbid_id','=',$bid->id)->where('hargabida','=',$highestprice->hargabida)->orderBy('masa_bidaan','ASC' )->get(); + $bidders = LelongBidder::join('lelongbid','lelongbid.id','=','lelongbidder.lelongbid_id') + ->where('lelongbid_id','=',$bid->id) + ->where('hargabida','=',$highestprice->hargabida)->orderBy('masa_bidaan','ASC' ) + ->select('lelongbidder.user_id','lelongbidder.id','lelongbidder.hargabida','lelongbid.pinjaman','lelongbid.bakiupah') + ->get(); + // dd($bidders); + $count = 0; + foreach($bidders as $bidder) + { + $count = $count + 1; + if($count == 1) + { + $pemenang = LelongBidder::where('id','=',$bidder->id) + ->first(); + $pemenang->status_bidder = 1; + $pemenang->save(); + + // $updatebid = LelongBid::where('id','=',$bid->id)->first(); + // // dd($updatebid); + // $updatebid->hargajual = $bidder->hargabida; + // $updatebid->nopembeli = $bidder->user_id; + // $updatebid->status_jual = 1; + // $updatebid->save(); + + $datalelong = Lelong::where('id',$lelong_id)->get(); + $sumcajlelong = $bidder->hargabida * ($datalelong[0]['cajlelong']/100); + // dd($bidder->pinjaman); + $totalbaki = $bidder->hargabida - $bidder->pinjaman - bcdiv($bidder->bakiupah,1,1) - bcdiv($sumcajlelong,1,1); + $updatebid = LelongBid::where('id','=',$bid->id)->first(); + // dd($totalbaki); + $updatebid->hargajual = $bidder->hargabida; + $updatebid->t_jual = $currentdate; + $updatebid->cajlelong = bcdiv($sumcajlelong,1,1); + $updatebid->baki = $totalbaki; + $updatebid->nopembeli = $bidder->user_id; + $updatebid->status_jual = 1; + $updatebid->save(); + + + $previous_siri = Resit::orderBy('id','desc')->first(); + $checkdata = Resit::where('user_id', $bidder->user_id) + ->where('lelong_id', $lelong_id) + ->where('resit_type', 2) + ->first(); + if(!$checkdata){ + if($previous_siri){ + $nosiri = $previous_siri->id + 1; + }else{ + $nosiri = 1; + } + + $reference_no = 'LPKB' . $day . $month . $year . sprintf("%08d", $nosiri);; + + $resit = new Resit; + $resit->user_id = $bidder->user_id; + $resit->lelong_id = $lelong_id; + $resit->reference_no = $reference_no; + $resit->billplz_id = ''; + $resit->total_payment = '0.00'; + $resit->resit_type = 2; // 1 = fee , 2 = bid + $resit->save(); + } + } + else + { + $kalah = LelongBidder::where('id','=',$bidder->id) + ->first(); + $kalah->status_bidder = 0; + $kalah->save(); + } + } + // } + + } + else + { //xlaku + + } + } + $lelong->sts_lelong = 3; //siap jana pemenang + $lelong->save(); + + return redirect()->route('lelong.senarailelong') + ->with('success','Selesai menjana pemenang'); + + } + diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 1bf4ba43..1cea0e9d 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -64,7 +64,9 @@ class MarhunController extends Controller ->where('status_semak', 1) ->get(); - $dalamproses = Pengesahan::where('pengesahan.lelong_id', $lelong_id) + $dalamproses = Pengesahan::join('lelongbid', 'pengesahan.lelongbid_id', '=', 'lelongbid.id') + ->where('pengesahan.lelong_id', $lelong_id) + ->where('caw_id','=', $caw->id) ->whereNull('pengesahan.disahkan_oleh') ->get(); @@ -515,19 +517,20 @@ class MarhunController extends Controller { $arrayinfo = []; - $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','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') - ->groupBy('lelong_id') + $lelong = pengesahan::join('lelong','lelong.id','=','pengesahan.lelong_id') + // ->where('sts_lelong', 0) + ->whereIn('pengesahan.status_ubah', [1,2,3,4,5]) + ->select('pengesahan.lelong_id','lelong.id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','sts_lelong') + // ->groupBy('pengesahan.lelong_id') + + ->distinct() ->get() ->toArray(); - + // dd($lelong); + foreach($lelong as $info) { - $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id',$info['lelong_id']) ->get() ->toArray(); @@ -545,7 +548,8 @@ class MarhunController extends Controller ->whereIn('status_ubah', [1,2,3,4,5]) ->selectRaw('count(*) as total, sum(status) as tstat,norujukan') ->groupBy('norujukan') - ->get()->toArray(); + ->get() + ->toArray(); foreach($mutumarhun as $index1=>$mutu) { @@ -793,15 +797,40 @@ class MarhunController extends Controller { $arrayinfo = []; - $lelong = Lelong::where('sts_lelong', 0) - ->get()->toArray(); + // $lelong = Lelong::join('tangguhlelong','lelong.id','=','tangguhlelong.lelong_id') + // ->select('tangguhlelong.norujukan','tangguhlelong.lelong_id','lelong.id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','sts_lelong') + // ->distinct() + // ->get() + // ->toArray(); + + $lelong = TangguhLelong::join('lelong','lelong.id','=','tangguhlelong.lelong_id') + ->select('tangguhlelong.lelong_id','lelong.id','lelong.tarikh_lelong','lelong.masatamat_lelong','lelong.harga_emas_asas','lelong.jbg','lelong.cajlelong','sts_lelong') + ->distinct() + ->orderBy('lelong_id') + ->get() + ->toArray(); + // dd($lelong); foreach($lelong as $details) { - $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id', $details['id']) + + // $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + + // ->where('cawangan_lelong.lelong_id', $details['id']) + // ->distinct() + // ->get() + // ->toArray(); + + $detailsinfo = CawanganLelong::select('tangguhlelong.lelong_id','cawangan_lelong.caw_id','caw_name','caw_code') + ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->join('tangguhlelong','tangguhlelong.lelong_id','=','cawangan_lelong.lelong_id') + ->where('tangguhlelong.lelong_id', $details['id']) + // ->where('tangguhlelong.norujukan', $details['norujukan']) + ->distinct() + ->orderBy('lelong_id') ->get() ->toArray(); + // dd($detailsinfo); array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]); } @@ -809,10 +838,11 @@ class MarhunController extends Controller return view('pengesahan.senarailelong',compact('lelong', 'arrayinfo')); } - public function senaraitangguhlelong($id, $caw_name) + public function senaraitangguhlelong($id, $caw_code) { + // dd($id); $tangguhlelong = TangguhLelong::join('lelong', 'tangguhlelong.lelong_id', '=', 'lelong.id') - ->where('tangguhlelong.lelong_id', $id) + ->where('tangguhlelong.norujukan', 'like', "%$caw_code%") ->whereNotNull('tangguhlelong.tarikhtangguh') ->select('tangguhlelong.id as tangguhlelong_id', 'tangguhlelong.lelongbid_id', @@ -829,19 +859,21 @@ class MarhunController extends Controller 'lelong.sts_lelong' ) ->get(); - // dd($tangguhlelong); + //dd($tangguhlelong); foreach($tangguhlelong as $index1=>$tanguhlel) { $getkodcaw = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code') ->where('lelong_id', $id) + ->where('kodcaw', $caw_code) + ->select('cawangan.caw_name') ->first(); $tangguhlelong[$index1]['details'] = $tanguhlel; $tangguhlelong[$index1]['nama_caw'] = $getkodcaw; } - return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id', 'caw_name')); + return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id', 'caw_code', 'getkodcaw')); } public function lelbidmarhun($id, $norujukan, $tangguhlelong_id) @@ -878,26 +910,36 @@ class MarhunController extends Controller } - //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(); + public function listsahubahmutu($id){ - // $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(); + $user = Auth::user(); + + $cawangan = Pengesahan::join('users', 'pengesahan.diminta_oleh', 'users.id') + ->where('pengesahan.lelong_id', $id) + ->whereNotNull('pengesahan.disahkan_oleh') + ->select('pengesahan.diminta_oleh','pengesahan.disahkan_oleh', 'pengesahan.disahkan_pada', 'pengesahan.norujukan', 'pengesahan.lelong_id', 'users.id as user_id', 'users.name', 'users.username', 'users.kodcaw') + ->distinct() + ->get(); + // dd($cawangan); + + foreach($cawangan as $index1=>$caw) + { + // dd($caw); + $getpengesahan = Cawangan::where('caw_code', $caw['kodcaw'])->first(); + // dd($getpengesahan); + + $getdisahkanoleh = User::where('id', $caw['disahkan_oleh'])->first(); + $getdimintaoleh = User::where('id', $caw['diminta_oleh'])->first(); + // dd($getdisahkanoleh); + + $cawangan[$index1]['namacaw'] = $getpengesahan['caw_name']; + $cawangan[$index1]['disahkan_oleh'] = $getdisahkanoleh['name']; + $cawangan[$index1]['diminta_oleh'] = $getdimintaoleh['name']; + } + + return view('pengesahan.listperubahanmutumarhun', compact('cawangan', 'id')); + + } + - // } } diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index bef751b2..dcfaf735 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -83,10 +83,10 @@ @hasrole('jurulelong') - + - + diff --git a/resources/views/jurulelong/listcawangan.blade.php b/resources/views/jurulelong/listcawangan.blade.php index 634fab2d..912caf10 100644 --- a/resources/views/jurulelong/listcawangan.blade.php +++ b/resources/views/jurulelong/listcawangan.blade.php @@ -16,6 +16,7 @@ No + Lelong ID Tarikh Lelong Nama Cawangan Harga Emas Asas @@ -28,9 +29,15 @@ @foreach ($arrayinfo as $lel) {{$loop->iteration}} - {{ $lel['detail']['tarikh_lelong']}} - + {{ $lel['detail']['id']}} + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['detail']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp + @foreach($lel['detailsinfo'] as $details) + {{$details['caw_name']}}
@endforeach @@ -38,7 +45,7 @@ {{$lel['detail']['jbg']}} {{$lel['detail']['cajlelong']}} - + @endforeach diff --git a/resources/views/jurulelong/listpemenang.blade.php b/resources/views/jurulelong/listpemenang.blade.php new file mode 100644 index 00000000..efd73a03 --- /dev/null +++ b/resources/views/jurulelong/listpemenang.blade.php @@ -0,0 +1,119 @@ +@extends('layouts.app') + +@section('content') +
+
+
+ + @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @endif +
+ + + + + + + + + + + + + + + + @foreach ($arrayinfo as $lel) + + + + + + + + + + + @endforeach + +
NoLelong IDTarikh LelongNama CawanganHarga Emas AsasJBGCaj LelongAction
{{$loop->iteration}}{{ $lel['detail']['id']}}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['detail']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp + @foreach($lel['detailsinfo'] as $details) + @if($details['status_jual'] == 1) + + @endif + {{$details['caw_name']}}
+ @endforeach + 		{{$lel['detail']['harga_emas_asas']}}{{$lel['detail']['jbg']}}{{$lel['detail']['cajlelong']}} + +
+
+
+ +
+
+ + +@endsection diff --git a/resources/views/jurulelong/senaraipemenangbycaw.blade.php b/resources/views/jurulelong/senaraipemenangbycaw.blade.php new file mode 100644 index 00000000..8de1478d --- /dev/null +++ b/resources/views/jurulelong/senaraipemenangbycaw.blade.php @@ -0,0 +1,111 @@ +@extends('layouts.app') + +@section('content') + +
+
+
+ @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @endif +
+
+

Nama Cawangan : {{ $getnamacaw->caw_name }}

+ + + + + + + + + + + + + + + @foreach($listwinner as $winner) + + + + + + + + + + + @endforeach + +
NoLelong IDNamaNo Kad PengenalanNo TelefonBilangan SuratJumlah Bidaan(RM)Action
{{ $loop->iteration }} {{ $lelong_id}}{{ $winner['details']['name']}}{{ $winner['details']['nokp']}}{{ $winner['details']['notelbimbit']}}{{ $winner['total_surat']}}{{ $winner['totalBid']}} + +
+
+ Kembali +
+
+
+
+
+
+ + + +@endsection + diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index d5a81fb5..ede55d84 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -51,19 +51,19 @@ @hasrole('jurulelong') - - @if($lel['info']['sts_lelong'] == 0) - - - - - @elseif ($lel['info']['sts_lelong'] == 2) - - @elseif ($lel['info']['sts_lelong'] == 3) - - @else - - @endif + + + + + + + + + + + + + @endhasrole @hasrole('operasi') @@ -71,7 +71,11 @@ - @else + @elseif($lel['info']['sts_lelong'] == 1) + + @elseif($lel['info']['sts_lelong'] == 2) + + @elseif($lel['info']['sts_lelong'] == 3) @endif @endhasrole diff --git a/resources/views/lelong/senaraimarhun.blade.php b/resources/views/lelong/senaraimarhun.blade.php index 0953e904..6f36a7c2 100644 --- a/resources/views/lelong/senaraimarhun.blade.php +++ b/resources/views/lelong/senaraimarhun.blade.php @@ -38,7 +38,9 @@ Tempoh Berat (gm) Nilai Marhun (RM) + Tarikh Jual (RM) Harga Asas (RM) + Harga Jual (RM) Pembiayaan (RM) Keuntungan (RM) Caj Lelong (%) @@ -54,9 +56,11 @@ {{ $marhun['norujukan']}} {{ $marhun['jbg']}} {{ $marhun['berat'] }} - {{ $marhun['nilaimarhun'] }} - {{ $marhun['hargaasas'] }} - {{ $marhun['pinjaman'] }} + {{ number_format($marhun['nilaimarhun'], 2, '.', ',') }} + {{ $marhun['t_jual'] }} + {{ number_format($marhun['hargaasas'], 2, '.', ',') }} + {{ number_format($marhun['hargajual'], 2, '.', ',') }} + {{ number_format($marhun['pinjaman'], 2, '.', ',') }} {{ number_format($marhun['bakiupah'], 2, '.', ',') }} {{-- {{ $marhun['keuntungan'] }} --}} diff --git a/resources/views/lelong/senaraipemenang.blade.php b/resources/views/lelong/senaraipemenang.blade.php index 0c6ac193..e520d6c8 100644 --- a/resources/views/lelong/senaraipemenang.blade.php +++ b/resources/views/lelong/senaraipemenang.blade.php @@ -14,6 +14,7 @@ No + Lelong ID Nama No Kad Pengenalan No Telefon @@ -26,13 +27,14 @@ @foreach($listwinner as $winner) {{ $loop->iteration }} + {{ $lelong_id}} {{ $winner['details']['name']}} {{ $winner['details']['nokp']}} {{ $winner['details']['notelbimbit']}} {{ $winner['total_surat']}} {{ $winner['totalBid']}} - + @endforeach diff --git a/resources/views/lelong/senaraisagpemenang.blade.php b/resources/views/lelong/senaraisagpemenang.blade.php index 065b6ac2..dee51125 100644 --- a/resources/views/lelong/senaraisagpemenang.blade.php +++ b/resources/views/lelong/senaraisagpemenang.blade.php @@ -35,7 +35,7 @@
- Kembali + Kembali
diff --git a/resources/views/pengesahan/listperubahanmutumarhun.blade.php b/resources/views/pengesahan/listperubahanmutumarhun.blade.php new file mode 100644 index 00000000..232341bc --- /dev/null +++ b/resources/views/pengesahan/listperubahanmutumarhun.blade.php @@ -0,0 +1,107 @@ +@extends('layouts.app') + +@section('content') +
+
+
+ + @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @endif + + + + + + + + + + + + + + @foreach($cawangan as $marhun) + + + + + + + + + @endforeach + + +
BilCawanganNo RujukanStatusDiminta OlehDisahkan Oleh
{{ $loop->iteration }}{{ $marhun['namacaw'] }}{{ $marhun['norujukan'] }} + + {{ $marhun['diminta_oleh'] }}{{ $marhun['disahkan_oleh'] }}
+
+ Kembali +
+
+
+
+ + +@endsection diff --git a/resources/views/pengesahan/perubahanmutumarhun.blade.php b/resources/views/pengesahan/perubahanmutumarhun.blade.php index 88feaacf..c0156551 100644 --- a/resources/views/pengesahan/perubahanmutumarhun.blade.php +++ b/resources/views/pengesahan/perubahanmutumarhun.blade.php @@ -24,7 +24,7 @@ @foreach($mutumarhun as $marhun) {{ $loop->iteration }} - {{ $marhun['cawangan_name'] }} + {{ $marhun['cawangan_name'] }} {{ $marhun['norujukan'] }} @if($marhun['total'] === intval($marhun['tstat'])) @@ -68,7 +68,7 @@ "orderable": false } ], - order: [[1, 'desc']], + order: [[0, 'asc']], // "ordering": false, "info": false, "lengthChange": false, diff --git a/resources/views/pengesahan/senarailelong.blade.php b/resources/views/pengesahan/senarailelong.blade.php index ed711bc5..68e2ffa3 100644 --- a/resources/views/pengesahan/senarailelong.blade.php +++ b/resources/views/pengesahan/senarailelong.blade.php @@ -16,30 +16,33 @@ No + Lelong ID Tarikh Lelong Nama Cawangan Harga Emas Asas JBG Caj Lelong - Action + @foreach ($arrayinfo as $lel) {{$loop->iteration}} + {{ $lel['detail']['id']}} {{ $lel['detail']['tarikh_lelong']}} - + + @foreach($lel['detailsinfo'] as $details) + {{$details['caw_name']}}
+ @endforeach {{$lel['detail']['harga_emas_asas']}} {{$lel['detail']['jbg']}} {{$lel['detail']['cajlelong']}} - - - + @endforeach @@ -66,7 +69,7 @@ "orderable": false } ], - order: [[1, 'asc']], + order: [[0, 'asc']], // "ordering": false, "info": false, "lengthChange": false, diff --git a/resources/views/pengesahan/senarailelongubahmutu.blade.php b/resources/views/pengesahan/senarailelongubahmutu.blade.php index 7d0efdbc..fa86bfd4 100644 --- a/resources/views/pengesahan/senarailelongubahmutu.blade.php +++ b/resources/views/pengesahan/senarailelongubahmutu.blade.php @@ -16,19 +16,22 @@ No + Lelong ID Cawangan Tarikh Lelong Harga Emas Asas JBG Caj Lelong Status Lelong - Action + Pengesahan + Telah Sah @foreach($arrayinfo as $lel) {{$loop->iteration}} + {{ $lel['info']['lelong_id'] }} @foreach($lel['detailsinfo'] as $details) {{$details['caw_name']}}
@@ -51,6 +54,9 @@ + + + @endforeach diff --git a/resources/views/pengesahan/senaraitangguhlelong.blade.php b/resources/views/pengesahan/senaraitangguhlelong.blade.php index 9e8d3f0c..bda0d881 100644 --- a/resources/views/pengesahan/senaraitangguhlelong.blade.php +++ b/resources/views/pengesahan/senaraitangguhlelong.blade.php @@ -15,7 +15,7 @@

Tarikh Lelong : {{ $tangguhlelong[0]['tarikh_lelong'] }}

-

Nama Cawangan : {{ $caw_name }}

+

Nama Cawangan : {{ $getkodcaw->caw_name }}

JBG : {{ $tangguhlelong[0]['jbg'] }}

diff --git a/resources/views/tangguhlelong/senarailelongtangguh.blade.php b/resources/views/tangguhlelong/senarailelongtangguh.blade.php index 75f06669..47cf4921 100644 --- a/resources/views/tangguhlelong/senarailelongtangguh.blade.php +++ b/resources/views/tangguhlelong/senarailelongtangguh.blade.php @@ -16,7 +16,9 @@ No + Lelong ID Tarikh Lelong + Cawangan Harga Emas Asas JBG @@ -29,8 +31,9 @@ @foreach ($arrayinfo as $lel) {{$loop->iteration}} + {{ $lel['info']['lelong_id']}} {{ $lel['info']['tarikh_lelong']}} - + @foreach($lel['detailsinfo'] as $details) {{$details['caw_name']}}
@endforeach diff --git a/resources/views/tangguhlelong/senleltangguh.blade.php b/resources/views/tangguhlelong/senleltangguh.blade.php index 57deba77..4b768ecb 100644 --- a/resources/views/tangguhlelong/senleltangguh.blade.php +++ b/resources/views/tangguhlelong/senleltangguh.blade.php @@ -16,6 +16,7 @@ No + Lelong ID Tarikh Lelong Cawangan Harga Emas Asas @@ -29,8 +30,14 @@ @foreach ($arrayinfo as $lel) {{$loop->iteration}} - {{ $lel['info']['tarikh_lelong']}} - + {{ $lel['info']['lelong_id']}} + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong']); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + + @endphp + @foreach($lel['detailsinfo'] as $details) {{$details['caw_name']}}
@endforeach diff --git a/routes/web.php b/routes/web.php index 5cf0fa78..2bec4b50 100644 --- a/routes/web.php +++ b/routes/web.php @@ -156,16 +156,20 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/lelongstopall/{id}',['as'=>'lelong.stopall','uses'=>'LelongController@stopall']); }); //jurulelong - Route::group(['middleware' => ['permission:janapemenang']], function () { - Route::get('/janapemenang',['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); - Route::get('/listcawangan',['as'=>'lelong.listcawangan','uses'=>'LelongController@listcawangan']); - }); + // Route::group(['middleware' => ['permission:janapemenang']], function () { + // 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']); + Route::get('/janapemenangbycaw/{lelong_id}/{cawid}',['as'=>'lelong.janapemenangbycaw','uses'=>'LelongController@janapemenangbycaw']); + Route::get('/janapemenangallcaw/{lelong_id}',['as'=>'lelong.janapemenangallcaw','uses'=>'LelongController@janapemenangallcaw']); + Route::get('/listpemenang',['as'=>'lelong.listpemenang','uses'=>'LelongController@listpemenang']); + Route::get('/listpemenangbycaw/{lelong_id}/{caw_id}',['as'=>'lelong.listpemenangbycaw','uses'=>'LelongController@listpemenangbycaw']); }); }); @@ -214,11 +218,13 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], Route::post('/terimaperubahan',['as'=>'pengesahan.terimaperubahan','uses'=>'MarhunController@terimaperubahan']); Route::post('/pcdelete',['as'=>'pengesahan.pcdelete','uses'=>'MarhunController@pcdelete']); Route::get('/senarailelong',['as'=>'pengesahan.senarailelong','uses'=>'MarhunController@senarailelong']); - Route::get('/senaraitangguhlelong/{id}/{caw_name}',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']); + Route::get('/senaraitangguhlelong/{id}/{caw_code}',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']); Route::get('/lelbidmarhun/{id}/{norujukan}/{tangguhlelong_id}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']); Route::get('/senarailelongtangguh',['as'=>'pengesahan.senarailelongtangguh','uses'=>'TangguhLelongController@senarailelongtangguh']); Route::get('/senaraisahtangguh/{lelong_id}/{caw_code}',['as'=>'pengesahan.senaraisahtangguh','uses'=>'TangguhLelongController@senaraisahtangguh']); Route::post('/sahkantangguhlel',['as'=>'pengesahan.sahkantangguhlel','uses'=>'TangguhLelongController@sahkantangguhlel']); + Route::get('/listperubahanmutumarhun/{id}',['as'=>'pengesahan.listperubahanmutumarhun','uses'=>'MarhunController@listsahubahmutu']); + Route::get('/detailmutumarhun/{norujukan}/{id}',['as'=>'pengesahan.detailmutumarhun','uses'=>'MarhunController@detailmutumarhun']); }); Route::group(['middleware' => ['permission:notistamatkontrak'],'prefix'=>'notistamatkontrak'], function () {