From 35242fe8de154f61cab9fc1632f33065a9011841 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Wed, 16 Mar 2022 13:23:30 +0800 Subject: [PATCH] senarai tangguh lelong --- app/Http/Controllers/MarhunController.php | 36 +++++- resources/views/includes/sidebar.blade.php | 4 +- resources/views/marhun/marhun.blade.php | 2 +- .../views/pengesahan/lelbidmarhun.blade.php | 118 ++++++++++++++++++ .../views/pengesahan/senarailelong.blade.php | 104 +++++++++++++++ .../pengesahan/senaraitangguhlelong.blade.php | 106 ++++++++++++++++ routes/web.php | 4 +- 7 files changed, 366 insertions(+), 8 deletions(-) create mode 100644 resources/views/pengesahan/lelbidmarhun.blade.php create mode 100644 resources/views/pengesahan/senarailelong.blade.php create mode 100644 resources/views/pengesahan/senaraitangguhlelong.blade.php diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 765ceebe..13c59764 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -46,12 +46,12 @@ class MarhunController extends Controller $user = Auth::user(); $caw = Cawangan::where('caw_code','=',$user->kodcaw)->first(); - $lelongbid = LelongBid::where('caw_id','=',$caw->id)->get(); - $lelongid = LelongBid::select('lelong_id')->where('caw_id','=',$caw->id)->groupBy('lelong_id')->get(); - $lelong = Lelong::whereIn('id', $lelongid)->get(); + $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id) + ->where('caw_id','=', $caw->id) + ->get(); - return view('marhun.senaraimarhun',compact('lelongbid','lelong')); + return view('marhun.senaraimarhun',compact('lelongbid','lelong_id')); } public function kemaskini(Request $request) @@ -414,6 +414,34 @@ class MarhunController extends Controller return redirect()->route('pengesahan.perubahanmutumarhun') ->with('success','Pengesahan Padam Marhun Telah Berjaya'); } + + public function senarailelong() + { + $lelong = Lelong::where('sts_lelong', 0) + ->get(); + + return view('pengesahan.senarailelong',compact('lelong')); + } + + public function senaraitangguhlelong($id) + { + $tangguhlelong = TangguhLelong::join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id') + ->where('tangguhlelong.lelong_id', $id) + ->get(); + + return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id')); + + } + + public function lelbidmarhun($id) + { + $marhuns = LelongBidMarhun::join('tangguhlelong', 'lelongbidmarhun.lelongbid_id', '=', 'tangguhlelong.lelongbid_id') + ->where('tangguhlelong.lelong_id', $id) + ->get(); + + return view('pengesahan.lelbidmarhun',compact('marhuns')); + + } } \ No newline at end of file diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index d0cf44b5..b357e879 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -120,8 +120,8 @@ diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php index fd8c65aa..4c0dea37 100644 --- a/resources/views/marhun/marhun.blade.php +++ b/resources/views/marhun/marhun.blade.php @@ -53,7 +53,7 @@ diff --git a/resources/views/pengesahan/lelbidmarhun.blade.php b/resources/views/pengesahan/lelbidmarhun.blade.php new file mode 100644 index 00000000..810fd0bc --- /dev/null +++ b/resources/views/pengesahan/lelbidmarhun.blade.php @@ -0,0 +1,118 @@ +@extends('layouts.app') + +@section('content') +
+
+
+ + @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @endif +
+ + + + + + + + + + + + + + + + + + + + @foreach ($marhuns as $marhun) + + + + + + + + + + + + + + @endforeach + +
BilNo RujukanMarhunKaratBeratHarga (RM)Nilai MarhunHarga AsasNotaStatusAction
{{ $loop->iteration }}{{ $marhun->norujukan }}{{ $marhun->marhun }}{{ $marhun->karat }}{{ $marhun->berat }}{{ $marhun->harga }}{{ $marhun->n_marhun }}{{ $marhun->hargaasas }}{{ $marhun->nota }} +
+
+
+ +
+
+ + +@endsection diff --git a/resources/views/pengesahan/senarailelong.blade.php b/resources/views/pengesahan/senarailelong.blade.php new file mode 100644 index 00000000..d89ffb2e --- /dev/null +++ b/resources/views/pengesahan/senarailelong.blade.php @@ -0,0 +1,104 @@ +@extends('layouts.app') + +@section('content') +
+
+
+ + @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @endif +
+ + + + + + + + + + + + + + @foreach ($lelong as $lel) + + + + + + + + + @endforeach + +
Tarikh LelongHarga Emas AsasJBGCaj LelongAction
{{ $lel->tarikh_lelong }}{{ $lel->harga_emas_asas }}{{ $lel->jbg }}{{ $lel->cajlelong }} + +
+
+
+ +
+
+ + +@endsection diff --git a/resources/views/pengesahan/senaraitangguhlelong.blade.php b/resources/views/pengesahan/senaraitangguhlelong.blade.php new file mode 100644 index 00000000..4070526e --- /dev/null +++ b/resources/views/pengesahan/senaraitangguhlelong.blade.php @@ -0,0 +1,106 @@ +@extends('layouts.app') + +@section('content') +
+
+
+ + @if ($message = Session::get('success')) +
+

{{ $message }}

+
+ @endif +
+ + + + + + + + + + + + + + @foreach ($tangguhlelong as $tangguhlel) + + + + + + + + @endforeach + +
BilKod CawanganNo RujukanTarikh TangguhAction
{{ $loop->iteration }}{{ $tangguhlel->kodcaw }}{{ $tangguhlel->norujukan }}{{ $tangguhlel->tarikhtangguh }} + +
+
+ +
+ +
+
+ + +@endsection diff --git a/routes/web.php b/routes/web.php index fca15acc..1fe7ce5b 100644 --- a/routes/web.php +++ b/routes/web.php @@ -152,7 +152,9 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], Route::get('/mutumarhun/{pengesahan_id}/{norujukan}',['as'=>'pengesahan.mutumarhun','uses'=>'MarhunController@mutumarhun']); Route::post('/terimaperubahan',['as'=>'pengesahan.terimaperubahan','uses'=>'MarhunController@terimaperubahan']); Route::post('/pcdelete',['as'=>'pengesahan.pcdelete','uses'=>'MarhunController@pcdelete']); - Route::post('/senaraitangguhlelong',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']); + Route::get('/senarailelong',['as'=>'pengesahan.senarailelong','uses'=>'MarhunController@senarailelong']); + Route::get('/senaraitangguhlelong/{id}',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']); + Route::get('/lelbidmarhun/{id}',['as'=>'pengesahan.lelbidmarhun','uses'=>'MarhunController@lelbidmarhun']); }); //Operasi