From e93fd9a704cab5c12ce91c1eeac6444696329d40 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Sun, 5 Jun 2022 16:56:47 +0800 Subject: [PATCH 01/14] update senarai marhun page khazanah pdf --- app/Http/Controllers/MarhunController.php | 11 ++++++++--- resources/views/marhun/senarailelongmarhun.blade.php | 10 +++++++++- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 8ec49793..7f712dc9 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -299,7 +299,6 @@ class MarhunController extends Controller public function senarailelongmarhun(Request $request){ $user = Auth::user(); - $arrayinfo = []; $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') @@ -307,7 +306,6 @@ class MarhunController extends Controller ->where('cawangan.caw_code', $user->kodcaw) ->where('sts_lelong', 0) ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') - ->groupBy('lelong_id') ->get() ->toArray(); @@ -403,8 +401,15 @@ class MarhunController extends Controller public function exportmarhundetails($lelong_id) { + $user = Auth::user(); + //dd($user); $lelongs= LelongBid::where('lelong_id','=',$lelong_id) - ->get()->toArray(); + ->where('kodcaw','=',$user['kodcaw']) + ->get() + ->toArray(); + //dd($lelongs); + + $arraycaw= []; diff --git a/resources/views/marhun/senarailelongmarhun.blade.php b/resources/views/marhun/senarailelongmarhun.blade.php index 2b128be3..6b8f2539 100644 --- a/resources/views/marhun/senarailelongmarhun.blade.php +++ b/resources/views/marhun/senarailelongmarhun.blade.php @@ -15,6 +15,7 @@ No Cawangan + Batch Lelong Tarikh Lelong Status Lelong Action @@ -24,12 +25,19 @@ @foreach($arrayinfo as $lel) {{$loop->iteration}} + @foreach($lel['detailsinfo'] as $details) {{$details['caw_name']}}
@endforeach + - {{ $lel['info']['tarikh_lelong']}} + {{ $lel['info']['lelong_id']}} + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp @if($lel['info']['sts_lelong'] == 0) From 59d98a89a9aef78cbff157c7bcdad02bc8f65bf0 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Wed, 8 Jun 2022 15:37:33 +0800 Subject: [PATCH 02/14] update laporan 1 --- app/Http/Controllers/LelongController.php | 120 +++++++++++--- .../views/lelong/brgleldetails.blade.php | 2 +- .../views/pdf/listlelongdetails.blade.php | 154 ++++++++++++++++++ routes/web.php | 2 + 4 files changed, 250 insertions(+), 28 deletions(-) create mode 100644 resources/views/pdf/listlelongdetails.blade.php diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index e70aa5b4..1e86214a 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -230,12 +230,12 @@ class LelongController extends Controller $total_rugilelong = $total_rugilelong + $rugilelong; $total_bakilelong = $total_bakilelong + $bakilelong; $total_nilaimarhun = $total_nilaimarhun + $nilai_marhun; - - + + $data = Lelong::where('lelong.id','=',$lelong_id) ->get(); } - + return view('lelong.showlelong',compact( 'arraycaw', @@ -370,14 +370,14 @@ class LelongController extends Controller $lelongbidmarhun->n_marhun = $simbidmarhun->n_marhun; $lelongbidmarhun->hargaasas = $simbidmarhun->hargaasas; $lelongbidmarhun->save(); - + } } - } - + } + return redirect()->route('analisa.senaraisimulasi') - ->with('success','Create Lelong Berjaya'); - + ->with('success','Create Lelong Berjaya'); + } public function exportnotis($id) { @@ -403,13 +403,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) @@ -418,17 +418,17 @@ 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(); - + return redirect()->route('lelong.senarailelong') - ->with('success','Lelongan bermula'); + ->with('success','Lelongan bermula'); } - + public function refresh($id) { $lelong = Lelong::where('id','=',$id)->first(); @@ -442,9 +442,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; @@ -453,6 +453,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 @@ -466,6 +467,8 @@ class LelongController extends Controller //update marhun $lelongbid = LelongBid::where('lelong_id','=',$request->idlelong)->get(); + // $lelongbid = LelongBid:: + // ->where('lelong_id','=',$request->idlelong)->get(); foreach($lelongbid as $bid) { @@ -481,29 +484,43 @@ 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(); } } + + $keuntungan = 0; + $keuntungan = $bid->bakipjm- ($bid->bakihargajualan - ($bid->upah12 - $bid->ansakhir)-(($bid->tempoh-$bid->tempohbayar) + *$bid->kadarupah/100*$bid->bakipjm) ); + + dd($keuntungan); + $lelong = Lelong::where('id',$request->idlelong)->get(); + $bid->hargaasas = $sumhargaasas; + $sumcajlelong = $sumhargaasas * ($lelong[0]['cajlelong']/100); + $bid->cajlelong = bcdiv($sumcajlelong,1,1); + $bid->baki = $sumhargaasas-$bid->pinjaman - $keuntungan - $sumcajlelong; + $bid->save(); } - $lelong = Lelong::where('id',$request->idlelong)->get(); - $bid->hargaasas = $sumhargaasas; - $sumcajlelong = $sumhargaasas * ($lelong[0]['cajlelong']/100); - $bid->cajlelong = bcdiv($sumcajlelong,1,1); - $bid->baki = $sumhargaasas-$bid->pinjaman - $bid->bakiupah - $sumcajlelong; - $bid->save(); + + + // $lelong = Lelong::where('id',$request->idlelong)->get(); + // $bid->hargaasas = $sumhargaasas; + // $sumcajlelong = $sumhargaasas * ($lelong[0]['cajlelong']/100); + // $bid->cajlelong = bcdiv($sumcajlelong,1,1); + // $bid->baki = $sumhargaasas-$bid->pinjaman - $keuntungan - $sumcajlelong; + // $bid->save(); } - + return redirect()->route('lelong.show',$request->idlelong) - ->with('success','Kemaskini Berjaya'); + ->with('success','Kemaskini Berjaya'); } public function janapemenang($id){ @@ -985,6 +1002,55 @@ class LelongController extends Controller 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 (Request $request){ $arraydetails = []; diff --git a/resources/views/lelong/brgleldetails.blade.php b/resources/views/lelong/brgleldetails.blade.php index f117513b..351d858a 100644 --- a/resources/views/lelong/brgleldetails.blade.php +++ b/resources/views/lelong/brgleldetails.blade.php @@ -37,7 +37,7 @@ - + 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/routes/web.php b/routes/web.php index 02616d80..06427375 100644 --- a/routes/web.php +++ b/routes/web.php @@ -113,6 +113,8 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/senaraibrglelong/{lelong_id}',['as'=>'lelong.senaraibrglelong','uses'=>'LelongController@senaraibrglelong']); Route::get('/lapbrglelongdetailsindex',['as'=>'lelong.lapbrglelongdetailsindex','uses'=>'LelongController@lapbrglelongdetailsindex']); + Route::get('/senaraibrglelongdetails/{lelong_id}',['as'=>'lelong.senaraibrglelongdetails','uses'=>'LelongController@senaraibrglelongdetails']); + Route::get('/lapbidaanpembidaindex', ['as'=>'lelong.lapbidaanpembidaindex','uses'=>'LelongController@lapbidaanpembidaindex']); From e2b8c1aa90deaa26fb4aa1e66f37659dedb53274 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Thu, 9 Jun 2022 10:42:04 +0800 Subject: [PATCH 03/14] update dashboard jurulelong --- app/Http/Controllers/HomeController.php | 28 +++- app/Http/Controllers/LelongController.php | 139 +++++++++++++++++- app/Models/CawanganLelong.php | 3 + ...2021_12_14_041557_create_lelongs_table.php | 3 + resources/views/home.blade copy.php | 134 +++++++++++++++++ resources/views/home.blade.php | 101 ++++++++++++- resources/views/includes/sidebar.blade.php | 17 ++- .../views/jurulelong/listcawangan.blade.php | 110 ++++++++++++++ routes/web.php | 33 +++-- 9 files changed, 545 insertions(+), 23 deletions(-) create mode 100644 resources/views/home.blade copy.php create mode 100644 resources/views/jurulelong/listcawangan.blade.php diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index c2d1fce4..2ce9c71e 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -7,6 +7,10 @@ use Spatie\Permission\Models\Role; use Spatie\Permission\Models\Permission; use Illuminate\Support\Facades\Auth; +use App\Models\Lelong; +use App\Models\CawanganLelong; +use Carbon\Carbon; + class HomeController extends Controller { /** @@ -28,7 +32,29 @@ class HomeController extends Controller { // $user = Auth::user(); // $user->assignRole('admin'); - return view('home'); + $dateTime = date('Y-m-d'); + $arrayinfo = []; + + $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + ->select('fasa','lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->where('tarikh_lelong', $dateTime) + ->groupBy('lelong_id') + ->get() + ->toArray(); + + foreach($lelong as $info) + { + + $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->select('batchlel','lelong_id','cawangan_lelong.caw_id','cawangan.caw_name','cawangan.caw_code','status_online','cawangan_lelong.masamula_lelong','cawangan_lelong.masatamat_lelong') + ->where('lelong_id',$info['lelong_id']) + ->get() + ->toArray(); + array_push($arrayinfo,['info'=>$info, 'detailsinfo'=>$detailsinfo]); + + + }//dd($detailsinfo); + return view('home',compact('lelong', 'arrayinfo')); } public function about() diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index dd95e54e..16ce91c6 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -55,7 +55,7 @@ class LelongController extends Controller $arrayinfo = []; $lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') - ->select('fasa','lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->select('fasa','lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->groupBy('lelong_id') ->get() ->toArray(); @@ -470,14 +470,21 @@ class LelongController extends Controller $lelong->sts_lelong = 1; //start lelong $lelong->save(); + $cawlelong = CawanganLelong::where('lelong_id','=',$id)->first(); + $cawlelong->masamula_lelong = $currenttime; + $cawlelong->masatamat_lelong = $endtime->toTimeString(); + $cawlelong->status_online = 1; //start lelong + $cawlelong->save(); + return redirect()->route('lelong.senarailelong') ->with('success','Lelongan bermula'); } public function refresh($id) { + $date = Carbon::now()->toDateTimeString(); $lelong = Lelong::where('id','=',$id)->first(); - $lelong->masakemaskini_data = '2021-12-20 04:51:50'; + $lelong->masakemaskini_data = $date; $lelong->save(); return redirect()->route('lelong.senarailelong') @@ -692,6 +699,7 @@ class LelongController extends Controller $lelong->masatamat_lelong = $currenttime; $lelong->sts_lelong = 2; //stop lelong $lelong->save(); + return redirect()->route('lelong.senarailelong') ->with('success','Lelongan berhenti'); @@ -1616,6 +1624,133 @@ class LelongController extends Controller return view('lelong.senaraimarhunsimulasi',compact('marhuns','lelongid','cawid','arrayinfo')); } + public function refreshhome($id) + { + $date = Carbon::now()->toDateTimeString(); + $lelong = Lelong::where('id','=',$id)->first(); + $lelong->masakemaskini_data = $date; + $lelong->save(); + + return redirect()->route('home') + ->with('success','Kemaskini Berjaya'); + } + + public function startcawangan($id,$cawid) + { + event(new LelongNotify('start')); + $currentdate = Carbon::now(); + $currenttime = $currentdate->toTimeString(); + $endtime = $currentdate->addHours(2); + + // $lelong = Lelong::where('id','=',$id)->first(); + // $lelong->masamula_lelong = $currenttime; + // $lelong->masatamat_lelong = $endtime->toTimeString(); + // $lelong->sts_lelong = 1; //start lelong + // $lelong->save(); + $lelong = CawanganLelong::where('lelong_id','=',$id)->where('caw_id','=',$cawid)->first(); + $lelong->masamula_lelong = $currenttime; + $lelong->masatamat_lelong = $endtime->toTimeString(); + $lelong->status_online = 1; //start lelong + $lelong->save(); + + return redirect()->route('home') + ->with('success','Lelongan bermula'); + } + + public function stopcawangan($id,$cawid) + { + event(new LelongNotify('start')); + $currentdate = Carbon::now(); + $currenttime = $currentdate->toTimeString(); + $endtime = $currentdate->addHours(2); + + // $lelong = Lelong::where('id','=',$id)->first(); + // $lelong->masamula_lelong = $currenttime; + // $lelong->masatamat_lelong = $endtime->toTimeString(); + // $lelong->sts_lelong = 1; //start lelong + // $lelong->save(); + $lelong = CawanganLelong::where('lelong_id','=',$id)->where('caw_id','=',$cawid)->first(); + // $lelong->masamula_lelong = $currenttime; + $lelong->masatamat_lelong = $currenttime; + $lelong->status_online = 0; //start lelong + $lelong->save(); + + return redirect()->route('home') + ->with('success','Lelongan bermula'); + } + + public function startall($id) + { + event(new LelongNotify('start')); + $currentdate = Carbon::now(); + $currenttime = $currentdate->toTimeString(); + $endtime = $currentdate->addHours(2); + + $lelong = Lelong::where('id','=',$id)->first(); + $lelong->masamula_lelong = $currenttime; + $lelong->masatamat_lelong = $endtime->toTimeString(); + $lelong->sts_lelong = 1; //start lelong + $lelong->save(); + + $cawlelong = CawanganLelong::where('lelong_id','=',$id)->get(); + foreach($cawlelong as $cawlel) //save old harga asas + { + $cawlel->masatamat_lelong = $endtime->toTimeString(); + $cawlel->status_online = 1; //start lelong + $cawlel->save(); + } + + return redirect()->route('home'); + } + + + public function stopall($id) + { + event(new LelongNotify('stop')); + $currentdate = Carbon::now(); + $currenttime = $currentdate->toTimeString(); + $endtime = $currentdate->addHours(2); + + $lelong = Lelong::where('id','=',$id)->first(); + $lelong->masatamat_lelong = $currenttime; + $lelong->sts_lelong = 0; //stop lelong + $lelong->save(); + + $cawlelong = CawanganLelong::where('lelong_id','=',$id)->get(); + foreach($cawlelong as $cawlel) //save old harga asas + { + $cawlel->masatamat_lelong = $currenttime; + $cawlel->status_online = 0; //start lelong + $cawlel->save(); + } + + + return redirect()->route('home') + ->with('success','Lelongan berhenti'); + + } + + public function listcawangan() + { + $arrayinfo = []; + + $lelong = Lelong::where('sts_lelong', 0) + ->get()->toArray(); + + foreach($lelong as $details) + { + $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id', $details['id']) + ->get() + ->toArray(); + + array_push($arrayinfo,['detail'=>$details, 'detailsinfo'=>$detailsinfo]); + } + + return view('jurulelong.listcawangan',compact('lelong', 'arrayinfo')); + } + + } \ No newline at end of file diff --git a/app/Models/CawanganLelong.php b/app/Models/CawanganLelong.php index 2c86b25f..bef247b3 100644 --- a/app/Models/CawanganLelong.php +++ b/app/Models/CawanganLelong.php @@ -15,6 +15,9 @@ class CawanganLelong extends Model 'batchlel', 'lelong_id', 'caw_id', + 'status_online', + 'masamula_lelong', + 'masatamat_lelong', 'online', 'export_data_sts', 'import_data_sts', diff --git a/database/migrations/2021_12_14_041557_create_lelongs_table.php b/database/migrations/2021_12_14_041557_create_lelongs_table.php index ce60c677..2e4bb3ae 100644 --- a/database/migrations/2021_12_14_041557_create_lelongs_table.php +++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php @@ -33,6 +33,9 @@ class CreateLelongsTable extends Migration $table->integer('batchlel')->nullable(); $table->unsignedBigInteger('lelong_id')->unsigned(); $table->unsignedBigInteger('caw_id')->unsigned(); + $table->integer('status_online')->default(0)->nullable(); + $table->time('masamula_lelong')->nullable(); + $table->time('masatamat_lelong')->nullable(); $table->string('online'); $table->string('export_data_sts')->nullable(); $table->string('import_data_sts')->nullable(); diff --git a/resources/views/home.blade copy.php b/resources/views/home.blade copy.php new file mode 100644 index 00000000..d73f6b0f --- /dev/null +++ b/resources/views/home.blade copy.php @@ -0,0 +1,134 @@ +@extends('layouts.app') + +@section('content') +
+
+
+
+
{{ __('Dashboard') }}
+
+ @if (session('status')) + + @endif + + {{ __('You are logged in!') }} + @hasrole('admin') + I am a admin! + @endhasrole + @hasrole('khazanah') + I am a khazanah! + @endhasrole + @hasrole('teller') + I am a teller! + @endhasrole + @hasrole('pengurus-cawangan') + I am a pengurus-cawangan! + @endhasrole + @hasrole('jurulelong') + I am a jurulelong! + + + + + + + + + + + + + + + + + + + @foreach ($arrayinfo as $lel) +
LELONGAN HARI INI + + + + + + + + + + + + + + + @endforeach + + + + +
NoLelong IDT.LelongFasaCawanganStatusMasa TamatHarga EmasJBGAction
{{$loop->iteration}}{{ $lel['info']['lelong_id'] }}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $lel['info']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp{{$lel['info']['fasa']}} + @foreach($lel['detailsinfo'] as $details) + {{$details['caw_name']}}
+ @endforeach +
+ @foreach($lel['detailsinfo'] as $details) + @if($details['status_online'] == '0') +
+ + @elseif($details['status_online'] == '1') +
+ @endif + @endforeach +
@foreach($lel['detailsinfo'] as $details) + {{$details['masatamat_lelong']}}
+ @endforeach
{{$lel['info']['harga_emas_asas']}}{{$lel['info']['jbg']}} + @hasrole('jurulelong') + + + + + + + + + + + + + + @endhasrole + +
+ @endhasrole + @hasrole('operasi') + I am a operasi! + @endhasrole + @hasrole('account') + I am a account! + @endhasrole + @hasrole('pembida') + I am a pembida! + @endhasrole +
+
+
+
+ + + +
+@endsection diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 4991a5c8..bef751b2 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -1,12 +1,11 @@ @extends('layouts.app') @section('content') -
-
-
+
+
+
{{ __('Dashboard') }}
-
@if (session('status')) -
+
+ + +
@endsection diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index d0162a6d..81ab0685 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -106,16 +106,27 @@
  • Senarai Lelong
  • - + + +
  • + +
  • @endhasrole @hasrole('operasi')
  • Import Data
  • -
  • +
    • diff --git a/resources/views/jurulelong/listcawangan.blade.php b/resources/views/jurulelong/listcawangan.blade.php new file mode 100644 index 00000000..634fab2d --- /dev/null +++ b/resources/views/jurulelong/listcawangan.blade.php @@ -0,0 +1,110 @@ +@extends('layouts.app') + +@section('content') +
      +
      +
      + + @if ($message = Session::get('success')) +
      +

      {{ $message }}

      +
      + @endif +
      + + + + + + + + + + + + + + + @foreach ($arrayinfo as $lel) + + + + + + + + + + @endforeach + +
      NoTarikh LelongNama CawanganHarga Emas AsasJBGCaj LelongAction
      {{$loop->iteration}}{{ $lel['detail']['tarikh_lelong']}} + @foreach($lel['detailsinfo'] as $details) + {{$details['caw_name']}}
      + @endforeach +
      {{$lel['detail']['harga_emas_asas']}}{{$lel['detail']['jbg']}}{{$lel['detail']['cajlelong']}} + +
      +
      +
      + +
      +
      + + +@endsection diff --git a/routes/web.php b/routes/web.php index 0f189f01..b5879ce4 100644 --- a/routes/web.php +++ b/routes/web.php @@ -104,18 +104,17 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/showlelong/{id}',['as'=>'lelong.show','uses'=>'LelongController@show']); Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']); Route::get('/export/{id}',['as'=>'lelong.exportnotis','uses'=>'LelongController@exportnotis']); - Route::get('/janapemenang/{id}', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); + // Route::get('/janapemenang/{id}', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); Route::get('/senaraimarhun/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhun','uses'=>'LelongController@senaraimarhun']); Route::post('/deletemarhun', ['as'=>'lelong.deletemarhun','uses'=>'LelongController@deletemarhun']); Route::get('/showsimulasi/{id}',['as'=>'lelong.showsimulasi','uses'=>'LelongController@showsimulasi']); Route::get('/senaraimarhunsimulasi/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhunsimulasi','uses'=>'LelongController@senaraimarhunsimulasi']); - Route::get('/lapbrglelongindex',['as'=>'lelong.lapbrglelongindex','uses'=>'LelongController@lapbrglelongindex']); Route::get('/senaraibrglelong/{lelong_id}',['as'=>'lelong.senaraibrglelong','uses'=>'LelongController@senaraibrglelong']); Route::get('/lapbrglelongdetailsindex',['as'=>'lelong.lapbrglelongdetailsindex','uses'=>'LelongController@lapbrglelongdetailsindex']); - + Route::get('/lapbidaanpembidaindex', ['as'=>'lelong.lapbidaanpembidaindex','uses'=>'LelongController@lapbidaanpembidaindex']); Route::get('/senarailapbidaan/{lelong_id}',['as' =>'lelong.senarailapbidaan','uses'=>'LelongController@senarailapbidaan']); @@ -129,12 +128,7 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/lapbrglelpembida/{lelong_id}',['as'=>'lelong.lapbrglelpembida','uses'=>'LelongController@lapbrglelpembida']); Route::post('/pdflapbrglelpembida',['as'=>'lelong.pdflapbrglelpembida','uses'=>'LelongController@pdflapbrglelpembida']); - - - - - - }); + }); Route::group(['middleware' => ['permission:pengesahanpembayaranpc']], function () { Route::get('/pengesahanPembayaran', ['as'=>'payment.pengesahanPembayaran','uses'=>'PaymentController@pengesahanPembayaran']); @@ -142,6 +136,7 @@ Route::group(['prefix'=>'lelong'], function () { Route::group(['middleware' => ['permission:import']], function () { Route::get('/refresh/{id}',['as'=>'lelong.refresh','uses'=>'LelongController@refresh']); + Route::get('/refreshhome/{id}',['as'=>'lelong.refreshhome','uses'=>'LelongController@refreshhome']); }); Route::group(['middleware' => ['permission:kemaskinihargaasas']], function () { @@ -151,10 +146,23 @@ Route::group(['prefix'=>'lelong'], function () { Route::group(['middleware' => ['permission:lelongan']], function () { Route::get('/lelongstart/{id}',['as'=>'lelong.start','uses'=>'LelongController@start']); Route::get('/lelongstop/{id}',['as'=>'lelong.stop','uses'=>'LelongController@stop']); - }); + Route::get('/lelongstartcawangan/{id}/{cawid}',['as'=>'lelong.startcawangan','uses'=>'LelongController@startcawangan']); + Route::get('/lelongstopcawangan/{id}/{cawid}',['as'=>'lelong.stopcawangan','uses'=>'LelongController@stopcawangan']); + Route::get('/lelongstartall/{id}',['as'=>'lelong.startall','uses'=>'LelongController@startall']); + Route::get('/lelongstopall/{id}',['as'=>'lelong.stopall','uses'=>'LelongController@stopall']); + }); +//jurulelong Route::group(['middleware' => ['permission:janapemenang']], function () { - Route::get('/janapemenang/{id}',['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); + Route::get('/janapemenang',['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); + Route::get('/listcawangan',['as'=>'lelong.listcawangan','uses'=>'LelongController@listcawangan']); + }); +}); + + Route::group(['prefix'=>'pemenang'], function () { + Route::group(['middleware' => ['permission:janapemenang']], function () { + Route::get('/janapemenang',['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); + Route::get('/listcawangan',['as'=>'lelong.listcawangan','uses'=>'LelongController@listcawangan']); }); }); @@ -193,6 +201,7 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid Route::get('/senlelpembayaranbidaan',['as'=>'pembida.senlelpembayaranbidaan','uses'=>'PembidaController@senlelpembayaranbidaan']); Route::get('/pembayaranbidaan',['as'=>'pembida.pembayaranbidaan','uses'=>'PembidaController@pembayaranbidaan']); Route::get('/detailsbidaan/{user_id}/{payment_id}/{kodcaw}',['as'=>'pembida.detailsbidaan','uses'=>'PembidaController@detailsbidaan']); + }); Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], function () { @@ -275,3 +284,5 @@ Route::group(['middleware' => ['permission:jananotis'],'prefix'=>'jananotis'], f + + From 2d52d307cc39a04abc457a5897ec1b226e150c45 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Thu, 9 Jun 2022 10:58:29 +0800 Subject: [PATCH 04/14] Update MarhunController.php --- app/Http/Controllers/MarhunController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 7f712dc9..54769bf1 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -305,7 +305,7 @@ class MarhunController extends Controller ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') ->where('cawangan.caw_code', $user->kodcaw) ->where('sts_lelong', 0) - ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->select('lelong_id','tarikh_lelong','cawangan_lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->get() ->toArray(); From 07b0752e7b20497ab05ec9d249e490db62c68135 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Thu, 9 Jun 2022 11:02:55 +0800 Subject: [PATCH 05/14] Update MarhunController.php --- app/Http/Controllers/MarhunController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 54769bf1..ef09509c 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -466,7 +466,7 @@ class MarhunController extends Controller ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') ->where('cawangan.caw_code', $user->kodcaw) ->where('sts_lelong', 0) - ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->select('lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->groupBy('lelong_id') ->get() ->toArray(); From 05e30c34fa0afe1e467ad96359ebe95b50eb4d94 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Thu, 9 Jun 2022 11:09:39 +0800 Subject: [PATCH 06/14] update marhun dan tangguh lelong controller(isu contstrains) --- app/Http/Controllers/MarhunController.php | 2 +- app/Http/Controllers/TangguhLelongController.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index ef09509c..1bf4ba43 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -518,7 +518,7 @@ class MarhunController extends Controller $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') ->where('sts_lelong', 0) - ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->select('lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->groupBy('lelong_id') ->get() ->toArray(); diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index c5742460..f47b76ce 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -211,7 +211,7 @@ class TangguhLelongController extends Controller $lelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') ->where('sts_lelong', 0) - ->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') + ->select('lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong') ->groupBy('lelong_id') ->get() ->toArray(); From e8011a301eacfa61884645feb42ce81fa32b7a2b Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Thu, 9 Jun 2022 16:42:05 +0800 Subject: [PATCH 07/14] full report --- app/Http/Controllers/LelongController.php | 439 ------------------ app/Http/Controllers/ReportController.php | 430 +++++++++++++++++ resources/views/includes/sidebar.blade.php | 52 +-- .../views/lelong/brgleldetails.blade.php | 2 +- .../lelong/lapbrglelpembidaindex.blade.php | 2 +- .../views/lelong/laplelongindex.blade.php | 2 +- .../views/lelong/laporanbidaanindex.blade.php | 2 +- .../views/lelong/laporanlelong.blade.php | 2 +- .../views/pdf/pdflapbrglelpembida.blade.php | 17 +- resources/views/pdf/pdflaplelong.blade.php | 9 +- .../views/pdf/pdfsenarailapbidaan.blade.php | 16 +- routes/web.php | 55 +-- 12 files changed, 515 insertions(+), 513 deletions(-) create mode 100644 app/Http/Controllers/ReportController.php diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 1e86214a..ec8aaa14 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -907,445 +907,6 @@ class LelongController extends Controller } - 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 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 (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'); - - } } \ 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..04217d3c --- /dev/null +++ b/app/Http/Controllers/ReportController.php @@ -0,0 +1,430 @@ +middleware('auth'); + } + + /** + * Show the application dashboard. + * + * @return \Illuminate\Contracts\Support\Renderable + */ + + + + 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 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 (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 = []; + $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 (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; + $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 (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; + $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/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 057d5460..392f6c82 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -161,42 +161,38 @@
  • -
  • - -
  • 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'] }}
    + +
    +
    +
    + + +@endsection diff --git a/resources/views/pengesahan/perubahanmutumarhun.blade.php b/resources/views/pengesahan/perubahanmutumarhun.blade.php index 88feaacf..c0156551 100644 --- a/resources/views/pengesahan/perubahanmutumarhun.blade.php +++ b/resources/views/pengesahan/perubahanmutumarhun.blade.php @@ -24,7 +24,7 @@ @foreach($mutumarhun as $marhun) {{ $loop->iteration }} - {{ $marhun['cawangan_name'] }} + {{ $marhun['cawangan_name'] }} {{ $marhun['norujukan'] }} @if($marhun['total'] === intval($marhun['tstat'])) @@ -68,7 +68,7 @@ "orderable": false } ], - order: [[1, 'desc']], + order: [[0, 'asc']], // "ordering": false, "info": false, "lengthChange": false, diff --git a/resources/views/pengesahan/senarailelong.blade.php b/resources/views/pengesahan/senarailelong.blade.php index ed711bc5..68e2ffa3 100644 --- a/resources/views/pengesahan/senarailelong.blade.php +++ b/resources/views/pengesahan/senarailelong.blade.php @@ -16,30 +16,33 @@ No + Lelong ID Tarikh Lelong Nama Cawangan Harga Emas Asas JBG Caj Lelong - Action + @foreach ($arrayinfo as $lel) {{$loop->iteration}} + {{ $lel['detail']['id']}} {{ $lel['detail']['tarikh_lelong']}} - + + @foreach($lel['detailsinfo'] as $details) + {{$details['caw_name']}}
    + @endforeach {{$lel['detail']['harga_emas_asas']}} {{$lel['detail']['jbg']}} {{$lel['detail']['cajlelong']}} - - - + @endforeach @@ -66,7 +69,7 @@ "orderable": false } ], - order: [[1, 'asc']], + order: [[0, 'asc']], // "ordering": false, "info": false, "lengthChange": false, diff --git a/resources/views/pengesahan/senarailelongubahmutu.blade.php b/resources/views/pengesahan/senarailelongubahmutu.blade.php index 7d0efdbc..fa86bfd4 100644 --- a/resources/views/pengesahan/senarailelongubahmutu.blade.php +++ b/resources/views/pengesahan/senarailelongubahmutu.blade.php @@ -16,19 +16,22 @@ No + Lelong ID Cawangan Tarikh Lelong Harga Emas Asas JBG Caj Lelong Status Lelong - Action + Pengesahan + Telah Sah @foreach($arrayinfo as $lel) {{$loop->iteration}} + {{ $lel['info']['lelong_id'] }} @foreach($lel['detailsinfo'] as $details) {{$details['caw_name']}}
    @@ -51,6 +54,9 @@ + + + @endforeach diff --git a/resources/views/pengesahan/senaraitangguhlelong.blade.php b/resources/views/pengesahan/senaraitangguhlelong.blade.php index 9e8d3f0c..bda0d881 100644 --- a/resources/views/pengesahan/senaraitangguhlelong.blade.php +++ b/resources/views/pengesahan/senaraitangguhlelong.blade.php @@ -15,7 +15,7 @@

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

    -

    Nama Cawangan : {{ $caw_name }}

    +

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

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

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