diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index a1b8c90e..b7d741ac 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -198,7 +198,7 @@ class ApiController extends Controller return response()->json([ 'success' => true, 'message' => $billcode['url'], - ], 401); + ], 201); // return view('pembayaran.result.berjaya',compact('arraybayaran')); } @@ -371,7 +371,7 @@ class ApiController extends Controller $resit->lelong_id = $request->lelong_id; $resit->reference_no = $reference_no; $resit->billplz_id = $billcode['id']; - $resit->resit_type = 3; //billplz resit for bid payment + $resit->resit_type = 2; //billplz resit for bid payment $resit->total_payment = $request->total; $resit->save(); @@ -380,7 +380,7 @@ class ApiController extends Controller return response()->json([ 'success' => true, 'message' => $billcode['url'], - ], 401); + ], 201); // return view('pembayaran.result.berjaya',compact('arraybayaran')); } 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..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 { /** @@ -55,7 +57,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(); @@ -235,13 +237,15 @@ 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) ->get(); } - + return view('lelong.showlelong',compact( 'arraycaw', @@ -393,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(); @@ -416,13 +423,24 @@ 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(); + } + } } } return redirect()->route('analisa.senaraisimulasi') - ->with('success','Create Lelong Berjaya'); - + ->with('success','Create Lelong Berjaya'); + } public function exportnotis($id) { @@ -448,13 +466,13 @@ class LelongController extends Controller $gadai->taglel = 0; $gadai->update(); } - + $lelong = Lelong::where('id','=',$id)->first(); // dd($role); $lelong->delete(); return redirect()->route('lelong.senarailelong') - ->with('success','Padam Lelong Berjaya'); + ->with('success','Padam Lelong Berjaya'); } public function start($id) @@ -463,21 +481,29 @@ class LelongController extends Controller $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)->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'); + ->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') @@ -487,9 +513,9 @@ class LelongController extends Controller public function kemaskini(Request $request) { // dd($request->all()); - + $lelkarat = lelKarat::where('lelong_id','=',$request->idlelong)->get(); - + foreach($lelkarat as $karat) //save old harga asas { $lelkarat_temp = new LelKarat_temp; @@ -498,6 +524,7 @@ class LelongController extends Controller $lelkarat_temp->keterangan = $karat->keterangan; $lelkarat_temp->harga = $karat->harga; $lelkarat_temp->harga2 = $karat->harga2; + $lelkarat_temp->save(); } foreach($lelkarat as $index=>$karat) //update harga asas @@ -530,13 +557,13 @@ class LelongController extends Controller if($karat->karat == $marhun->karat) { $val = round($marhun->berat * $karat->harga2); - $sumhargaasas = $sumhargaasas + $val; + $sumhargaasas = intval($sumhargaasas + $val); $marhun->harga = $karat->harga2; $marhun->n_marhun = $marhun->berat * $karat->harga2; - $marhun->hargaasas = floatval($val); + $marhun->hargaasas = $val; // $marhun->hargaasas = floatval(number_format($val,2)); - + $marhun->save(); } } @@ -560,9 +587,9 @@ class LelongController extends Controller 'hargaasas'=> $sumhargaasas ]); } - + return redirect()->route('lelong.show',$request->idlelong) - ->with('success','Kemaskini Berjaya'); + ->with('success','Kemaskini Berjaya'); } public function janapemenang($id){ @@ -692,6 +719,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'); @@ -856,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')); @@ -891,6 +920,8 @@ class LelongController extends Controller 'lelongbid.berat', 'lelongbid.nilaimarhun', 'lelongbid.hargaasas', + 'lelongbid.hargajual', + 'lelongbid.t_jual', 'lelongbid.upahsimpan', 'lelongbid.cajlelong', 'lelongbid.baki', @@ -947,398 +978,6 @@ class LelongController extends Controller ->with('success','Delete Berjaya'); } - - public function lapbrglelongindex (Request $request){ - - $arraydetails = []; - - $laporanpembida= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') - ->select('lelong_id','tarikh_lelong') - ->groupBy('lelong_id') - ->get() - ->toArray(); - - foreach($laporanpembida as $laporan) - { - $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id',$laporan['lelong_id']) - ->get() - ->toArray(); - array_push($arraydetails,['laporan' => $laporan,'details' => $details]); - } - - return view('lelong.laporanlelong', compact('arraydetails')); - } - - public function senaraibrglelong($lelong_id){ - - - - $arraydetails = []; - $arrayinfo = []; - - - $lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') - ->where('cawangan_lelong.lelong_id','=',$lelong_id) - ->select('lelong_id','tarikh_lelong') - ->groupBy('lelong_id') - ->get()->toArray(); - - foreach($lelongid as $laporan) - { - $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id',$laporan['lelong_id']) - ->get() - ->toArray(); - array_push($arrayinfo,['laporan' => $laporan,'details' => $details]); - } - - - $brglelong = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') - ->where('lelongbid.lelong_id', $lelong_id) - ->get()->toArray(); - - $keuntungan=0; - $total_hargaasas = 0; - $total_berat = 0; - - foreach($brglelong as $index1=>$upah) - { - - $total_hargaasas = $total_hargaasas + $upah['hargaasas']; - $total_berat = $total_berat + $upah['berat']; - - } - - - $pdf = PDF::loadView('pdf.listlelong',compact('arrayinfo','lelongid','brglelong','lelong_id','keuntungan','total_hargaasas','total_berat')) - ->setPaper('a4', 'potrait'); - - return $pdf->download('Senarai Barang Lelong.pdf'); - } - - - - public function lapbrglelongdetailsindex (Request $request){ - - $arraydetails = []; - - $brgdetails= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') - ->select('lelong_id','tarikh_lelong') - ->groupBy('lelong_id') - ->get() - ->toArray(); - - // dd($brgdetails); - - foreach($brgdetails as $brg) - { - $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id', $brg['lelong_id']) - ->get() - ->toArray(); - array_push($arraydetails,['brg' => $brg, 'detailsbrg' => $details ]); - } - - return view('lelong.brgleldetails', compact('arraydetails')); - } - - public function lapbidaanpembidaindex (Request $request){ - - $arraydetails = []; - - $lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') - ->select('lelong_id','tarikh_lelong') - ->groupBy('lelong_id') - ->get() - ->toArray(); - - foreach($lelongid as $laporan){ - - $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id',$laporan['lelong_id']) - ->get() - ->toArray(); - array_push($arraydetails,['laporan' => $laporan,'details' => $details]); - - } - - - return view('lelong.laporanbidaanindex',compact('lelongid','arraydetails')); - } - - - public function senarailapbidaan ($lelong_id){ - - - $arraydetails = []; - - $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('cawangan_lelong.lelong_id','=',$lelong_id) - ->get(); - - - $laporanpembida= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') - ->select('lelongbid_id','norujukan','hargaasas') - ->where('lelongbid.lelong_id','=',$lelong_id) - ->groupBy('lelongbid_id') - ->get() - ->toArray(); - - foreach($laporanpembida as $laporan) - { - $details = LelongBidder::where('lelongbid_id',$laporan['lelongbid_id']) - ->orderBy('hargabida','desc') - ->orderBy('masa_bidaan','asc') - ->get() - ->toArray(); - array_push($arraydetails,['laporan' => $laporan,'details' => $details]); - } - - return view('lelong.senarailapbidaan', compact('lelongid','arraydetails','lelong_id')); - - - - } - - Public function pdfsenarailapbidaan (Request $request){ - - $lelong_id = $request->lelongid; - - $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('cawangan_lelong.lelong_id','=',$lelong_id) - ->get(); - - - $arraydetails = []; - - $laporanpembida= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') - ->select('lelongbid_id','norujukan','hargaasas') - ->where('lelongbid.lelong_id','=',$lelong_id) - ->groupBy('lelongbid_id') - ->get() - ->toArray(); - - foreach($laporanpembida as $laporan) - { - $details = LelongBidder::where('lelongbid_id',$laporan['lelongbid_id']) - ->orderBy('hargabida','desc') - ->orderBy('masa_bidaan','asc') - ->get() - ->toArray(); - array_push($arraydetails,['laporan' => $laporan,'details' => $details]); - } - - - - $pdf = PDF::loadView('pdf.pdfsenarailapbidaan',compact('arraydetails','lelong_id','lelongid')) - ->setPaper('a4', 'potrait'); - - return $pdf->download('Senarai Nama Bidaan Pembida.pdf'); - - } - - Public function laplelongindex (Request $request){ - - $arraydetails =[]; - - $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->select('lelong_id','tarikh_lelong') - ->groupBy('lelong_id') - ->get() - ->toArray(); - - foreach($lelongid as $laporan){ - - $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id',$laporan['lelong_id']) - ->get() - ->toArray(); - array_push($arraydetails,['laporan' => $laporan,'details' => $details]); - } - - return view('lelong.laplelongindex',compact('lelongid','arraydetails')); - - - } - - Public function laplelong ($lelong_id){ - - $total_nmarhun = 0; - $total_pembiayaan = 0; - $total_upahsimpan = 0; - $total_cajlelong = 0; - $total_hargalelong = 0; - $total_bakirugi = 0; - $total_hargaasas = 0; - - $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('cawangan_lelong.lelong_id','=',$lelong_id) - ->get(); - - $laporanlelong= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') - ->where('lelongbid.lelong_id','=',$lelong_id) - ->where('lelongbidder.status_bidder','=','1') - ->select('lelongbid.norujukan','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.upahsimpan', - 'lelongbid.cajlelong','lelongbidder.hargabida','lelongbid.baki','lelongbid.hargaasas','lelongbidder.nama_bidder') - ->get()->toArray(); - - foreach($laporanlelong as $index1=>$laplelong) - { - - $total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun']; - $total_pembiayaan = $total_pembiayaan + $laplelong['pinjaman']; - $total_upahsimpan = $total_upahsimpan + $laplelong['upahsimpan']; - $total_cajlelong = $total_cajlelong + $laplelong['cajlelong']; - $total_hargalelong = $total_hargalelong + $laplelong['hargabida']; - $total_bakirugi = $total_bakirugi + $laplelong['baki']; - $total_hargaasas = $total_hargaasas + $laplelong['hargaasas']; - - } - - - return view('lelong.laplelong', compact('lelongid','laporanlelong','lelong_id','total_nmarhun','total_pembiayaan', - 'total_upahsimpan','total_cajlelong','total_hargalelong','total_bakirugi','total_hargaasas')); - - - } - - Public function pdflaplelong (Request $request){ - - $lelong_id = $request->lelongid; - - $total_nmarhun = 0; - $total_pembiayaan = 0; - $total_upahsimpan = 0; - $total_cajlelong = 0; - $total_hargalelong = 0; - $total_bakirugi = 0; - $total_hargaasas = 0; - - $info = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('cawangan_lelong.lelong_id','=',$lelong_id) - ->get(); - - $laporanlelong= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') - ->where('lelongbid.lelong_id','=',$lelong_id) - ->where('lelongbidder.status_bidder','=','1') - ->select('lelongbid.norujukan','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.upahsimpan', - 'lelongbid.cajlelong','lelongbidder.hargabida','lelongbid.baki','lelongbid.hargaasas','lelongbidder.nama_bidder') - ->get()->toArray(); - - foreach($laporanlelong as $index1=>$laplelong) - { - - $total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun']; - $total_pembiayaan = $total_pembiayaan + $laplelong['pinjaman']; - $total_upahsimpan = $total_upahsimpan + $laplelong['upahsimpan']; - $total_cajlelong = $total_cajlelong + $laplelong['cajlelong']; - $total_hargalelong = $total_hargalelong + $laplelong['hargabida']; - $total_bakirugi = $total_bakirugi + $laplelong['baki']; - $total_hargaasas = $total_hargaasas + $laplelong['hargaasas']; - - } - - $pdf = PDF::loadView('pdf.pdflaplelong',compact('info','lelong_id','laporanlelong','lelong_id','total_nmarhun','total_pembiayaan', - 'total_upahsimpan','total_cajlelong','total_hargalelong','total_bakirugi','total_hargaasas')) - ->setPaper('a4', 'potrait'); - - return $pdf->download('Laporan Lelong Keseluruhan.pdf'); - - - } - - Public function lapbrglelpembidaindex (Request $request){ - - $arraydetails = []; - - $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->select('lelong_id','tarikh_lelong') - ->groupBy('lelong_id') - ->get() - ->toArray(); - - foreach($lelongid as $laporan){ - - $details = CawanganLelong ::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('lelong_id',$laporan['lelong_id']) - ->get() - ->toArray(); - array_push($arraydetails, ['laporan' =>$laporan,'details' =>$details]); - } - - return view ('lelong.lapbrglelpembidaindex',compact('lelongid','arraydetails')); - - } - - Public function lapbrglelpembida ($lelong_id){ - - $total_berat = 0; - $total_hargaasas = 0; - $total_hargalelong = 0; - - $info = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('cawangan_lelong.lelong_id','=',$lelong_id) - ->get(); - - $brglelpembida = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') - ->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') - ->where('lelongbid.lelong_id','=',$lelong_id) - ->where('lelongbidder.status_bidder','=','1') - ->get()->toArray(); - - foreach( $brglelpembida as $index1=>$totalbrglelpembida){ - - $total_berat = $total_berat + $totalbrglelpembida['berat']; - $total_hargaasas = $total_hargaasas + $totalbrglelpembida['hargaasas']; - $total_hargalelong = $total_hargalelong + $totalbrglelpembida['hargabida']; - - } - - return view('lelong.lapbrglelpembida',compact('lelong_id','info','brglelpembida','total_berat','total_hargaasas','total_hargalelong')); - } - - - Public function pdflapbrglelpembida (Request $request){ - - $lelong_id = $request->lelongid; - - $total_berat = 0; - $total_hargaasas = 0; - $total_hargalelong = 0; - - $info = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') - ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - ->where('cawangan_lelong.lelong_id','=',$lelong_id) - ->get(); - - $brglelpembida = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') - ->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') - ->where('lelongbid.lelong_id','=',$lelong_id) - ->where('lelongbidder.status_bidder','=','1') - ->get()->toArray(); - - foreach( $brglelpembida as $index1=>$totalbrglelpembida){ - - $total_berat = $total_berat + $totalbrglelpembida['berat']; - $total_hargaasas = $total_hargaasas + $totalbrglelpembida['hargaasas']; - $total_hargalelong = $total_hargalelong + $totalbrglelpembida['hargabida']; - - - } - - $pdf = PDF::loadView('pdf.pdflapbrglelpembida',compact('lelong_id','info','brglelpembida','total_berat','total_hargaasas','total_hargalelong')) - ->setPaper('a4','potrait'); - - return $pdf->download('Laporan Barang Lelong Pembida.pdf'); - - } - public function showsimulasi($id) { $lelong_id = $id; @@ -1422,7 +1061,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 +1134,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,7 +1146,6 @@ 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) @@ -1616,6 +1254,439 @@ 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->masamula_lelong = $currenttime; + $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 = 2; //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(); + } + + $hapuscart = Cart::truncate(); + + + return redirect()->route('home') + ->with('success','Lelongan berhenti'); + + } + + public function listcawangan() + { + $arrayinfo = []; + + $lelong = Lelong::where('sts_lelong', 2) + ->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')); + } + + 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'); + + } + + + } \ No newline at end of file diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index fa036bf9..67293827 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(); @@ -299,15 +301,13 @@ class MarhunController extends Controller public function senarailelongmarhun(Request $request){ $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') + ->select('lelong_id','tarikh_lelong','cawangan_lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->get() ->toArray(); @@ -408,8 +408,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= []; @@ -466,7 +473,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(); @@ -520,19 +527,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','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(); @@ -550,7 +558,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) { @@ -822,15 +831,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]); } @@ -838,10 +872,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', @@ -858,19 +893,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) @@ -907,26 +944,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/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index b3fdc1b8..c8f255e8 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -128,7 +128,7 @@ class LelongMobileController extends Controller } else if($feepayment == null){ - $errors = [ + $response = [ 'success' => "error", 'message' => "Something wrong with the server" ]; @@ -154,12 +154,12 @@ class LelongMobileController extends Controller // please do not delete this changes // backup web pembida - public function listBidItemWeb(Request $request){ + public function listBidItemWeb($user_id, 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') + ->select('lelongbid.lelong_id', 'lelongbid.t_lelong') + ->groupBy('lelongbid.lelong_id', 'lelongbid.t_lelong') ->get()->toArray(); foreach($lelongbidder as $index1=>$lelbid) @@ -169,10 +169,46 @@ class LelongMobileController extends Controller ->where('lelongbidder.user_id', $request->user_id) ->get()->toArray(); - $lelongbidder[$index1]['lelongbid'] = $lelongbid; - } + $lelongbidder[$index1]['lelongbid']=$lelongbid; - return response()->json($lelongbidder); + } + return response()->json($lelongbidder); + } + + public function historyFeePay (Request $request) + { + $checkpay = Payment::join('resit', 'payment.resit_id', '=', 'resit.id') + ->where('resit.user_id', $request->user_id) + ->where('payment.lelong_id', $request->lelong_id) + ->where('payment.status', 1) + ->where('resit.resit_type', 1) + ->select('resit.id as resit id', + 'resit.resit_type', + 'resit.status as resit_status', + 'resit.paid_at', + 'payment.id as payment_id', + 'payment.lelong_id', + 'payment.status as payment_status' + ) + ->first(); + + if($checkpay) + { + $response = + [ + "message" => "Success", + "status" => 1 + ]; + } + else + { + $response = + [ + "message" => "Sila buat pembayaran yuran terlebih dahulu", + "status" => 2 + ]; + } + return response()->json($response, 201) ; } public function searchLelByCaw(Request $request){ @@ -339,38 +375,66 @@ class LelongMobileController extends Controller return response()->json($lelongs, 201); } - public function hisfeepay(Request $request) + public function listCawLelongToday() { - $checkpay = Payment::join('resit', 'payment.resit_id', '=', 'resit.id') - ->where('resit.user_id', $request->user_id) - ->where('payment.lelong_id', $request->lelong_id) - ->where('payment.status', 1) - ->where('resit.resit_type', 1) - ->select('resit.id as resit_id', - 'resit.resit_type', - 'resit.status as resit_status', - 'resit.paid_at', - 'payment.id as payment_id', - 'payment.lelong_id', - 'payment.status as payment_status', - ) - ->first(); - if($checkpay) - { - $response = - [ - 'success' => "success" - ]; - } - else - { - $response = - [ - 'failed' => "Sila buat pembayaran yuran terlebih dahulu" - ]; - } + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateString(); - return response()->json($response, 201); + $lelong = Lelong::join('cawangan_lelong', 'lelong.id', '=', 'cawangan_lelong.lelong_id') + ->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('tarikh_lelong', '=', $currentdate) + ->select( + 'lelong.id as lelong_id', + 'lelong.tarikh_lelong', + 'cawangan.caw_name', + 'cawangan_lelong.caw_id', + 'lelong.masamula_lelong', + 'lelong.masatamat_lelong', + ) + ->get()->toArray(); + + if ($lelong) { + return response()->json([ + 'success' => true, + 'lelong' => $lelong + ]); + } else { + return response()->json([ + 'success' => false, + ]); + } + } + + public function listCawLelongNext() + { + + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateString(); + + $lelong = Lelong::join('cawangan_lelong', 'lelong.id', '=', 'cawangan_lelong.lelong_id') + ->join('cawangan', 'cawangan_lelong.caw_id', '=', 'cawangan.id') + ->where('tarikh_lelong', '>', $currentdate) + ->select( + 'lelong.id as lelong_id', + 'lelong.tarikh_lelong', + 'cawangan.caw_name', + 'cawangan_lelong.caw_id', + 'lelong.masamula_lelong', + 'lelong.masatamat_lelong', + ) + ->orderBy('lelong.tarikh_lelong', 'ASC') + ->get()->toArray(); + + if ($lelong) { + return response()->json([ + 'success' => true, + 'lelong' => $lelong + ]); + } else { + return response()->json([ + 'success' => false, + ]); + } } } diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php index ec60ff87..429764c0 100644 --- a/app/Http/Controllers/NotisController.php +++ b/app/Http/Controllers/NotisController.php @@ -55,9 +55,15 @@ class NotisController extends Controller public function senarainotis($lelong_id){ + $user = Auth::user(); + + $caw = Cawangan::where('caw_code','=',$user->kodcaw) + ->first(); + $lelong_id = $lelong_id; $senarai = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') + ->where('gadai.kodcaw','=',$user->kodcaw) ->where('lelongbid.lelong_id', $lelong_id) ->get()->toArray(); @@ -121,6 +127,7 @@ class NotisController extends Controller $payment = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') ->join('customer','gadai.nokp','=','customer.kpbaru') + ->where('gadai.kodcaw','=',$user->kodcaw) ->where('lelongbid.lelong_id', $lelong_id) ->get()->toArray(); diff --git a/app/Http/Controllers/ReportCawanganController.php b/app/Http/Controllers/ReportCawanganController.php new file mode 100644 index 00000000..a9686653 --- /dev/null +++ b/app/Http/Controllers/ReportCawanganController.php @@ -0,0 +1,117 @@ +middleware('auth'); + } + + /** + * Show the application dashboard. + * + * @return \Illuminate\Contracts\Support\Renderable + */ + + + + // Laporan by cawangan + public function laporancawindex(request $request) + { + $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(); + + return view('lelong.laporancawindex',compact('lelongid')); + } + + public function laporanbrglelcaw($lelong_id){ + + $user = Auth::user(); + $caw = Cawangan::where('caw_code','=',$user->kodcaw) + ->first(); + + $brglelongcaw = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') + ->where('lelongbid.lelong_id', $lelong_id) + ->where('gadai.kodcaw','=',$user['kodcaw']) + ->get()->toArray(); + + $keuntungan=0; + $total_hargaasas = 0; + $total_berat = 0; + + foreach($brglelongcaw as $index1=>$upah) + { + + $total_hargaasas = $total_hargaasas + $upah['hargaasas']; + $total_berat = $total_berat + $upah['berat']; + + } + + $info = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('cawangan_lelong.lelong_id','=',$lelong_id) + ->where('cawangan.caw_code','=',$user['kodcaw']) + ->select('lelong_id','tarikh_lelong','caw_name') + ->groupBy('lelong_id','caw_name') + ->get()->toArray(); + + + $pdf = PDF::loadView('pdf.brglelcaw',compact('brglelongcaw','lelong_id','keuntungan','total_hargaasas','total_berat','info')) + ->setPaper('a4', 'potrait'); + + return $pdf->download('Senarai Barang Lelong.pdf'); + + + } + + + + + + + + + +} + \ No newline at end of file diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php new file mode 100644 index 00000000..6b007d12 --- /dev/null +++ b/app/Http/Controllers/ReportController.php @@ -0,0 +1,434 @@ +middleware('auth'); + } + + /** + * Show the application dashboard. + * + * @return \Illuminate\Contracts\Support\Renderable + */ + + + + public function lapbrglelongindex (){ + + $arraydetails = []; + + $laporanpembida= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->select('lelong_id','tarikh_lelong') + ->groupBy('lelong_id') + ->get() + ->toArray(); + + foreach($laporanpembida as $laporan) + { + $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan['lelong_id']) + ->get() + ->toArray(); + array_push($arraydetails,['laporan' => $laporan,'details' => $details]); + } + + return view('lelong.laporanlelong', compact('arraydetails')); + } + + public function senaraibrglelong($lelong_id){ + + + $arraydetails = []; + $arrayinfo = []; + + + $lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->where('cawangan_lelong.lelong_id','=',$lelong_id) + ->select('lelong_id','tarikh_lelong') + ->groupBy('lelong_id') + ->get()->toArray(); + + foreach($lelongid as $laporan) + { + $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan['lelong_id']) + ->get() + ->toArray(); + array_push($arrayinfo,['laporan' => $laporan,'details' => $details]); + } + + + $brglelong = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') + ->where('lelongbid.lelong_id', $lelong_id) + ->get()->toArray(); + + $keuntungan=0; + $total_hargaasas = 0; + $total_berat = 0; + + foreach($brglelong as $index1=>$upah) + { + + $total_hargaasas = $total_hargaasas + $upah['hargaasas']; + $total_berat = $total_berat + $upah['berat']; + + } + + + $pdf = PDF::loadView('pdf.listlelong',compact('arrayinfo','lelongid','brglelong','lelong_id','keuntungan','total_hargaasas','total_berat')) + ->setPaper('a4', 'potrait'); + + return $pdf->download('Senarai Barang Lelong.pdf'); + } + + public function lapbrglelongdetailsindex (){ + + $arraydetails = []; + + $brgdetails= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->select('lelong_id','tarikh_lelong') + ->groupBy('lelong_id') + ->get() + ->toArray(); + + // dd($brgdetails); + + foreach($brgdetails as $brg) + { + $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id', $brg['lelong_id']) + ->get() + ->toArray(); + array_push($arraydetails,['brg' => $brg, 'detailsbrg' => $details ]); + } + + return view('lelong.brgleldetails', compact('arraydetails')); + } + + public function senaraibrglelongdetails ($lelong_id){ + + $lelongs= LelongBid::where('lelong_id','=',$lelong_id) + ->get()->toArray(); + + $arraycaw= []; + + $total_berat = 0; + $berat = 0; + + $total_harga = 0; + $harga = 0; + + $total_nmarhun = 0; + $nilai_marhun = 0; + + $total_hargaasas = 0; + $hargaasas = 0; + + foreach($lelongs as $index1=>$lelong){ + + $marhun= LelongBidMarhun::where('lelongbid_id','=',$lelong['id'])->get(); + $total_berat = $total_berat + ($marhun->sum('berat')); + $total_harga = $total_harga + ($marhun->sum('harga')); + $total_nmarhun = $total_nmarhun + ($marhun->sum('n_marhun')); + $total_hargaasas = $total_hargaasas + ($marhun->sum('hargaasas')); + + $lelongs[$index1]['detailmarhun']=$marhun; + + } + + array_push($arraycaw,[ + 'berat'=>$berat, + 'harga'=>$harga, + 'n_marhun'=>$nilai_marhun, + 'hargaasas'=>$hargaasas + + ]); + + + + + $pdf = PDF::loadView('pdf.listlelongdetails',compact('lelongs','arraycaw','total_nmarhun','total_berat','total_harga','total_hargaasas' + ))->setPaper('a4', 'potrait'); + + return $pdf->download('Senarai Lelong Details.pdf'); + + } + + public function lapbidaanpembidaindex (){ + + $arraydetails = []; + + $lelongid = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->select('lelong_id','tarikh_lelong') + ->groupBy('lelong_id') + ->get() + ->toArray(); + + foreach($lelongid as $laporan){ + + $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan['lelong_id']) + ->get() + ->toArray(); + array_push($arraydetails,['laporan' => $laporan,'details' => $details]); + + } + + + return view('lelong.laporanbidaanindex',compact('lelongid','arraydetails')); + } + + + public function senarailapbidaan ($lelong_id){ + + + $arraydetails = []; + $arrayinfocaw = []; + + $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('cawangan_lelong.lelong_id','=',$lelong_id) + ->select('lelong_id','tarikh_lelong') + ->groupBy('lelong_id') + ->get(); + + foreach($lelongid as $laporancaw) + { + $cawangan = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporancaw['lelong_id']) + ->get() + ->toArray(); + array_push($arrayinfocaw,['laporancaw' => $laporancaw,'cawangan' => $cawangan]); + } + + + $laporanpembida= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') + ->select('lelongbid_id','norujukan','hargaasas') + ->where('lelongbid.lelong_id','=',$lelong_id) + ->groupBy('lelongbid_id') + ->get() + ->toArray(); + + + + foreach($laporanpembida as $laporan) + { + $details = LelongBidder::where('lelongbid_id',$laporan['lelongbid_id']) + ->orderBy('hargabida','desc') + ->orderBy('masa_bidaan','asc') + ->get() + ->toArray(); + array_push($arraydetails,['laporan' => $laporan,'details' => $details]); + } + + $pdf = PDF::loadView('pdf.pdfsenarailapbidaan', compact('lelongid','arraydetails','lelong_id','lelongid','cawangan','arrayinfocaw')) + ->setPaper('a4', 'potrait'); + + return $pdf->download('Senarai Nama Bidaan Pembida.pdf'); + + + + } + + + Public function laplelongindex (){ + + $arraydetails =[]; + + $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->select('lelong_id','tarikh_lelong') + ->groupBy('lelong_id') + ->get() + ->toArray(); + + foreach($lelongid as $laporan){ + + $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan['lelong_id']) + ->get() + ->toArray(); + array_push($arraydetails,['laporan' => $laporan,'details' => $details]); + } + + return view('lelong.laplelongindex',compact('lelongid','arraydetails')); + + + } + + Public function laplelong ($lelong_id){ + + $total_nmarhun = 0; + $total_pembiayaan = 0; + $total_upahsimpan = 0; + $total_cajlelong = 0; + $total_hargalelong = 0; + $total_bakirugi = 0; + $total_hargaasas = 0; + $arrayinfocaw = []; + + $info = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('cawangan_lelong.lelong_id','=',$lelong_id) + ->select('lelong_id','tarikh_lelong') + ->groupBy('lelong_id') + ->get(); + + foreach($info as $laporancaw) + { + $cawangan = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporancaw['lelong_id']) + ->get() + ->toArray(); + array_push($arrayinfocaw,['laporancaw' => $laporancaw,'cawangan' => $cawangan]); + } + + $laporanlelong= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') + ->where('lelongbid.lelong_id','=',$lelong_id) + ->where('lelongbidder.status_bidder','=','1') + ->select('lelongbid.norujukan','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.upahsimpan', + 'lelongbid.cajlelong','lelongbidder.hargabida','lelongbid.baki','lelongbid.hargaasas','lelongbidder.nama_bidder') + ->get()->toArray(); + + foreach($laporanlelong as $index1=>$laplelong) + { + + $total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun']; + $total_pembiayaan = $total_pembiayaan + $laplelong['pinjaman']; + $total_upahsimpan = $total_upahsimpan + $laplelong['upahsimpan']; + $total_cajlelong = $total_cajlelong + $laplelong['cajlelong']; + $total_hargalelong = $total_hargalelong + $laplelong['hargabida']; + $total_bakirugi = $total_bakirugi + $laplelong['baki']; + $total_hargaasas = $total_hargaasas + $laplelong['hargaasas']; + + } + + + $pdf = PDF::loadView('pdf.pdflaplelong',compact('info','lelong_id','laporanlelong','lelong_id','total_nmarhun','total_pembiayaan', + 'total_upahsimpan','total_cajlelong','total_hargalelong','total_bakirugi','total_hargaasas','arrayinfocaw')) + + ->setPaper('a4', 'potrait'); + return $pdf->download('Laporan Lelong Keseluruhan.pdf'); + + + } + + + + + Public function lapbrglelpembidaindex (){ + + $arraydetails = []; + + $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->select('lelong_id','tarikh_lelong') + ->groupBy('lelong_id') + ->get() + ->toArray(); + + foreach($lelongid as $laporan){ + + $details = CawanganLelong ::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan['lelong_id']) + ->get() + ->toArray(); + array_push($arraydetails, ['laporan' =>$laporan,'details' =>$details]); + } + + return view ('lelong.lapbrglelpembidaindex',compact('lelongid','arraydetails')); + + } + + Public function lapbrglelpembida ($lelong_id){ + + $total_berat = 0; + $total_hargaasas = 0; + $total_hargalelong = 0; + $arrayinfocaw = []; + + + $info = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') + ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('cawangan_lelong.lelong_id','=',$lelong_id) + ->select('lelong_id','tarikh_lelong') + ->groupBy('lelong_id') + ->get(); + + foreach($info as $laporancaw) + { + $cawangan = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporancaw['lelong_id']) + ->get() + ->toArray(); + array_push($arrayinfocaw,['laporancaw' => $laporancaw,'cawangan' => $cawangan]); + } + + $brglelpembida = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') + ->join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id') + ->where('lelongbid.lelong_id','=',$lelong_id) + ->where('lelongbidder.status_bidder','=','1') + ->get()->toArray(); + + foreach( $brglelpembida as $index1=>$totalbrglelpembida){ + + $total_berat = $total_berat + $totalbrglelpembida['berat']; + $total_hargaasas = $total_hargaasas + $totalbrglelpembida['hargaasas']; + $total_hargalelong = $total_hargalelong + $totalbrglelpembida['hargabida']; + + + } + + + $pdf = PDF::loadView('pdf.pdflapbrglelpembida',compact('lelong_id','info','brglelpembida','total_berat','total_hargaasas','total_hargalelong','arrayinfocaw')) + ->setPaper('a4','potrait'); + + return $pdf->download('Laporan Barang Lelong Pembida.pdf'); + } + + + + + + + + +} + \ No newline at end of file diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index ea6d18e1..ab37ffe9 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -238,7 +238,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(); 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/public/img/icon_pkb.png b/public/img/icon_pkb.png index 7ff253ff..28a7cd57 100644 Binary files a/public/img/icon_pkb.png and b/public/img/icon_pkb.png differ 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..dcfaf735 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..879ae400 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -98,6 +98,18 @@
  • Pembayaran Pemenang
    • + + {{-- laporan --}} +
  • + + + +
    • + {{-- end laporan --}} @endhasrole @hasrole('jurulelong')
  • @@ -106,16 +118,27 @@
  • Senarai Lelong
    • - + + +
  • + +
    • @endhasrole @hasrole('operasi')
  • Import Data
    • -
  • +
    • @@ -170,42 +193,39 @@
    • -
  • - -
      -
    • - Barang Lelong + + {{-- laporan --}} +
    • + + + -
        -
      • - Barang Lelong Details + -
          -
        • - Nama Pembida + -
          • + {{-- end laporan --}} + + @endhasrole @hasrole('account') {{--
        • diff --git a/resources/views/jurulelong/listcawangan.blade.php b/resources/views/jurulelong/listcawangan.blade.php new file mode 100644 index 00000000..912caf10 --- /dev/null +++ b/resources/views/jurulelong/listcawangan.blade.php @@ -0,0 +1,117 @@ +@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) + + {{$details['caw_name']}}
          + @endforeach +           		{{$lel['detail']['harga_emas_asas']}}{{$lel['detail']['jbg']}}{{$lel['detail']['cajlelong']}} + +
          +
          +
          + +
          +
          + + +@endsection 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/brgleldetails.blade.php b/resources/views/lelong/brgleldetails.blade.php index f117513b..c8e4ce4d 100644 --- a/resources/views/lelong/brgleldetails.blade.php +++ b/resources/views/lelong/brgleldetails.blade.php @@ -37,7 +37,7 @@ - + diff --git a/resources/views/lelong/lapbrglelpembidaindex.blade.php b/resources/views/lelong/lapbrglelpembidaindex.blade.php index 8e2d64e4..51ef909e 100644 --- a/resources/views/lelong/lapbrglelpembidaindex.blade.php +++ b/resources/views/lelong/lapbrglelpembidaindex.blade.php @@ -19,7 +19,7 @@ Lelong ID Cawangan Tarikh Lelong - Action + Muat Turun @@ -37,7 +37,7 @@ {{ $info['laporan']['tarikh_lelong'] }} - + @endforeach diff --git a/resources/views/lelong/laplelongindex.blade.php b/resources/views/lelong/laplelongindex.blade.php index 5ec3a2fa..7691b0ad 100644 --- a/resources/views/lelong/laplelongindex.blade.php +++ b/resources/views/lelong/laplelongindex.blade.php @@ -19,7 +19,7 @@ Lelong ID Cawangan Tarikh Lelong - Action + Muat Turun @@ -36,7 +36,7 @@ {{ $bid['laporan']['tarikh_lelong'] }} - + diff --git a/resources/views/lelong/laporanbidaanindex.blade.php b/resources/views/lelong/laporanbidaanindex.blade.php index 9742f2bd..88b5e3d1 100644 --- a/resources/views/lelong/laporanbidaanindex.blade.php +++ b/resources/views/lelong/laporanbidaanindex.blade.php @@ -39,7 +39,7 @@ {{ $bid['laporan']['tarikh_lelong'] }} - + @endforeach diff --git a/resources/views/lelong/laporancawindex.blade.php b/resources/views/lelong/laporancawindex.blade.php new file mode 100644 index 00000000..25807814 --- /dev/null +++ b/resources/views/lelong/laporancawindex.blade.php @@ -0,0 +1,72 @@ +@extends('layouts.app') + +@section('content') +
          +
          +
          + @foreach ($lelongid as $bid) +

          Laporan Barang Lelong: {{$bid->caw_name}}

          + + @if ($message = Session::get('success')) +
          +

          {{ $message }}

          +
          + @endif +
          + + + + + + + + + + + + + + + + + + @endforeach + + +
          BilLelong IDTarikh LelongMuat Turun
          {{$loop->iteration}} + {{ $bid->lelong_id}}{{ $bid->tarikh_lelong }} + +
          +
          +
          + +
          +
          + + +@endsection diff --git a/resources/views/lelong/laporanlelong.blade.php b/resources/views/lelong/laporanlelong.blade.php index 3543e7d1..293df9e3 100644 --- a/resources/views/lelong/laporanlelong.blade.php +++ b/resources/views/lelong/laporanlelong.blade.php @@ -37,7 +37,7 @@ - + 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/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) diff --git a/resources/views/pdf/brglelcaw.blade.php b/resources/views/pdf/brglelcaw.blade.php new file mode 100644 index 00000000..bc055942 --- /dev/null +++ b/resources/views/pdf/brglelcaw.blade.php @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + +

    PERMODALAN KELANTAN BERHAD

    LAPORAN BARANG LELONG
    + + + +
    + + @foreach ($info as $info) + + + +
    Lelong ID : {{$info['lelong_id']}}Tarikh Lelong : {{$info['tarikh_lelong']}} + Nama Cawangan : {{$info['caw_name']}} + @endforeach +
    + +
    + + + + + + + + + + + + + + @foreach($brglelongcaw as $brg) + + + + + + + + + @endforeach + + + + + + + + +
    NoNo RujukanMarhunBerat (gm)Harga Asas
    {{ $loop->iteration }} {{ $brg['norujukan']}}{{ $brg['marhun']}}{{ number_format($brg['berat'], 2, '.', ',') }}{{ number_format($brg['hargaasas'], 2, '.', ',') }}
    JUMLAH KESELURUHAN{{ number_format($total_berat, 2, '.', ',') }}{{ number_format($total_hargaasas, 2, '.', ',') }}
    + + + + + + + + + diff --git a/resources/views/pdf/listlelongdetails.blade.php b/resources/views/pdf/listlelongdetails.blade.php new file mode 100644 index 00000000..45f7d9a0 --- /dev/null +++ b/resources/views/pdf/listlelongdetails.blade.php @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + +

    PERMODALAN KELANTAN BERHAD

    LAPORAN SIMULASI SEMUA CAWANGAN
    + +

    + + + + + + + + + + + + + + + + + + + @foreach ($lelongs as $marhun) + + + + + + + + + + + + + + + + + + + + + + + @endforeach + @foreach ($arraycaw as $index=>$caw) + + + + + + + + + + @endforeach +
    NoNo Rujukan Jenis MarhunKaratBerat(gm)Harga(RM)Nilai Marhun(RM)Harga Asas(RM)Nota
    {{ $loop->iteration }} {{ $marhun['norujukan'] }}@foreach ($marhun['detailmarhun'] as $item) + {{ $item['marhun'] }}
    + @endforeach    		@foreach ($marhun['detailmarhun'] as $item) + {{ $item['karat'] }}
    + @endforeach    		@foreach ($marhun['detailmarhun'] as $item) + {{ $item['berat'] }}
    + @endforeach    		@foreach ($marhun['detailmarhun'] as $item) + {{ $item['harga'] }}
    + @endforeach    		@foreach ($marhun['detailmarhun'] as $item) + {{ $item['n_marhun'] }}
    + @endforeach    		@foreach ($marhun['detailmarhun'] as $item) + {{ $item['hargaasas'] }}
    + @endforeach    		@foreach ($marhun['detailmarhun'] as $item) + {{ $item['nota'] }}
    + @endforeach
    {{ number_format($marhun['berat'], 2, '.', ',') }}{{ number_format($marhun['nilaimarhun'], 2, '.', ',') }}{{ number_format($marhun['hargaasas'], 2, '.', ',') }}
    Jumlah Keseluruhan{{ number_format($total_berat, 2, '.', ',') }}{{ number_format($total_harga, 2, '.', ',') }}{{ number_format($total_nmarhun, 2, '.', ',') }}{{ number_format($total_hargaasas, 2, '.', ',') }}
    + + + + diff --git a/resources/views/pdf/pdflapbrglelpembida.blade.php b/resources/views/pdf/pdflapbrglelpembida.blade.php index f648bb92..9eff44a0 100644 --- a/resources/views/pdf/pdflapbrglelpembida.blade.php +++ b/resources/views/pdf/pdflapbrglelpembida.blade.php @@ -90,12 +90,17 @@ tr:nth-child(even) {
    - Lelong ID: {{$lelong_id}} - @foreach ($info as $info) - Cawangan:{{ $info->caw_name}} - Tarikh Lelong:{{ $info->tarikh_lelong}} - - @endforeach + Lelong ID: {{$lelong_id}} + @foreach ($info as $info) + + Tarikh Lelong:{{ $info->tarikh_lelong}} + + @endforeach + @foreach ($arrayinfocaw as $laporancaw) + @foreach ($laporancaw['cawangan'] as $details) + Cawangan : {{$details['caw_name']}} + @endforeach + @endforeach diff --git a/resources/views/pdf/pdflaplelong.blade.php b/resources/views/pdf/pdflaplelong.blade.php index 15b34902..d32c4337 100644 --- a/resources/views/pdf/pdflaplelong.blade.php +++ b/resources/views/pdf/pdflaplelong.blade.php @@ -91,11 +91,16 @@ tr:nth-child(even) {
    Lelong ID: {{$lelong_id}} - @foreach ($info as $info) - Cawangan:{{ $info->caw_name}} + @foreach ($info as $info) + Tarikh Lelong:{{ $info->tarikh_lelong}} @endforeach + @foreach ($arrayinfocaw as $laporancaw) + @foreach ($laporancaw['cawangan'] as $details) + Cawangan : {{$details['caw_name']}} + @endforeach + @endforeach diff --git a/resources/views/pdf/pdfsenarailapbidaan.blade.php b/resources/views/pdf/pdfsenarailapbidaan.blade.php index b9ca7764..f6b401bc 100644 --- a/resources/views/pdf/pdfsenarailapbidaan.blade.php +++ b/resources/views/pdf/pdfsenarailapbidaan.blade.php @@ -90,12 +90,16 @@ tr:nth-child(even) {
    - Lelong ID: {{$lelong_id}} - @foreach ($lelongid as $info) - Cawangan:{{ $info->caw_name}} - Tarikh Lelong:{{ $info->tarikh_lelong}} - - @endforeach + Lelong ID: {{$lelong_id}} + @foreach ($lelongid as $info) + Tarikh Lelong:{{ $info->tarikh_lelong}} + @endforeach + @foreach ($arrayinfocaw as $laporancaw) + @foreach ($laporancaw['cawangan'] as $details) + Cawangan : {{$details['caw_name']}} + @endforeach + @endforeach + 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 f503011a..5fcbb033 100644 --- a/resources/views/pengesahan/perubahanmutumarhun.blade.php +++ b/resources/views/pengesahan/perubahanmutumarhun.blade.php @@ -25,7 +25,7 @@ @foreach($mutumarhun as $marhun) {{ $loop->iteration }} - {{ $marhun['cawangan_name'] }} + {{ $marhun['cawangan_name'] }} {{ $marhun['norujukan'] }} @if($marhun['total'] === intval($marhun['tstat'])) @@ -69,7 +69,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/api.php b/routes/api.php index 1a309e96..f0b43b81 100644 --- a/routes/api.php +++ b/routes/api.php @@ -60,12 +60,14 @@ Route::group(['middleware' => ['auth:sanctum']], function () { Route::get('/karat', [LelongMobileController::class, 'getListKarat']); Route::get('/result/{user_id}', [LelongMobileController::class, 'bidresult']); Route::get('/history/{user_id}', [LelongMobileController::class, 'history']); + Route::get('/listcawlelongtoday', [LelongMobileController::class, 'listCawLelongToday']); + Route::get('/listcawlelongnext', [LelongMobileController::class, 'listCawLelongNext']); // Lelong => Bidder Route::post('/bidder/biditem', [LelongMobileController::class, 'bidderSelectBidItem']); Route::get('/bidder/listbiditem', [LelongMobileController::class, 'listBidItem']); - Route::get('/bidder/listBidItemWeb', [LelongMobileController::class, 'listBidItemWeb']); - Route::get('/bidder/hisfeepay', [LelongMobileController::class, 'hisfeepay']); + Route::get('/bidder/listBidItemWeb/{user_id}', [LelongMobileController::class, 'listBidItemWeb']); + Route::get('/bidder/historyFeePay', [LelongMobileController::class, 'historyFeePay']); Route::post('/bidder/updatebiditem', [LelongMobileController::class, 'updatebiditem']); }); diff --git a/routes/web.php b/routes/web.php index 0f189f01..2bec4b50 100644 --- a/routes/web.php +++ b/routes/web.php @@ -104,18 +104,20 @@ 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 +131,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 +139,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 +149,27 @@ 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',['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/{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::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']); }); }); @@ -193,6 +208,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 () { @@ -202,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 () { @@ -243,13 +261,14 @@ Route::group(['middleware' => ['permission:pengesahanbayarancash'],'prefix'=>'pe Route::post('/banktransfer', ['as'=>'pembayaran.banktransfer','uses'=>'PaymentController@banktransfer']); }); + Route::group(['middleware' => ['permission:tangguhlelong'],'prefix'=>'tangguhlelong'], function () { Route::get('/senleluntuktangguh', ['as'=>'tangguhlelong.senleluntuktangguh','uses'=>'TangguhLelongController@senleluntuktangguh']); Route::get('/carian/{lelong_id}', ['as'=>'tangguhlelong.carian','uses'=>'TangguhLelongController@carian']); Route::post('/searchbyic', ['as'=>'tangguhlelong.searchbyic','uses'=>'TangguhLelongController@searchbyic']); Route::post('/tangguhlelong', ['as'=>'tangguhlelong.tangguhlelong','uses'=>'TangguhLelongController@tangguhlelong']); }); -// Pengurus Cawangan + // Account Route::group(['middleware' => ['permission:pengesahanbayaran'],'prefix'=>'account'], function () { @@ -259,7 +278,8 @@ Route::group(['middleware' => ['permission:pengesahanbayaran'],'prefix'=>'accoun Route::post('/sahbayaronline', ['as'=>'account.sahbayaronline','uses'=>'AccountController@sahbayaronline']); }); -// Account + +// Pengurus Cawangan Route::group(['middleware' => ['permission:jananotis'],'prefix'=>'jananotis'], function () { Route::get('/notislelong',['as'=>'jananotis.notislelong','uses'=>'NotisController@notislelong']); @@ -273,5 +293,38 @@ Route::group(['middleware' => ['permission:jananotis'],'prefix'=>'jananotis'], f }); +//Report +Route::group(['middleware' => ['permission:report'],'prefix'=>'report'], function () { + +Route::get('/lapbrglelongindex',['as'=>'report.lapbrglelongindex','uses'=>'ReportController@lapbrglelongindex']); +Route::get('/senaraibrglelong/{lelong_id}',['as'=>'report.senaraibrglelong','uses'=>'ReportController@senaraibrglelong']); + +Route::get('/lapbrglelongdetailsindex',['as'=>'report.lapbrglelongdetailsindex','uses'=>'ReportController@lapbrglelongdetailsindex']); +Route::get('/senaraibrglelongdetails/{lelong_id}',['as'=>'report.senaraibrglelongdetails','uses'=>'ReportController@senaraibrglelongdetails']); + +Route::get('/lapbrglelongdetailsindex',['as'=>'report.lapbrglelongdetailsindex','uses'=>'ReportController@lapbrglelongdetailsindex']); +Route::get('/senaraibrglelongdetails/{lelong_id}',['as'=>'report.senaraibrglelongdetails','uses'=>'ReportController@senaraibrglelongdetails']); + +Route::get('/lapbidaanpembidaindex', ['as'=>'report.lapbidaanpembidaindex','uses'=>'ReportController@lapbidaanpembidaindex']); +Route::get('/senarailapbidaan/{lelong_id}',['as' =>'report.senarailapbidaan','uses'=>'ReportController@senarailapbidaan']); + +Route::get('/laplelongindex',['as' =>'report.laplelongindex','uses'=>'ReportController@laplelongindex']); +Route::get('/laplelong/{lelong_id}',['as' =>'report.laplelong','uses'=>'ReportController@laplelong']); + +Route::get('/lapbrglelpembidaindex',['as'=>'report.lapbrglelpembidaindex','uses'=>'ReportController@lapbrglelpembidaindex']); +Route::get('/lapbrglelpembida/{lelong_id}',['as'=>'report.lapbrglelpembida','uses'=>'ReportController@lapbrglelpembida']); + + + +}); + +//Report +Route::group(['middleware' => ['permission:report'],'prefix'=>'reportcaw'], function () { +Route::get('laporancawindex',['as'=>'reportcaw.laporancawindex','uses'=>'ReportCawanganController@laporancawindex']); +Route::get('laporanbrglelcaw/{lelong_id}',['as'=>'reportcaw.laporanbrglelcaw','uses'=>'ReportCawanganController@laporanbrglelcaw']); + +}); + +