From 9679edb778f376f29abe96172d1bf6507cddb107 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Tue, 1 Mar 2022 14:31:02 +0800 Subject: [PATCH 1/2] update jana pemenang --- app/Http/Controllers/LelongController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 8e174bad..53ad1b72 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -446,12 +446,12 @@ class LelongController extends Controller $lelongbid = LelongBid::where('lelong_id','=',$id)->get(); foreach($lelongbid as $bid) { - $highestprice = LelongBidder::where('lelongbid_id','=',139)->orderBy('lelongbidder.hargabida','DESC' )->first(); + $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','=',139)->where('hargabida','=',$highestprice->hargabida)->orderBy('masa_bidaan','ASC' )->get(); + $bidders = LelongBidder::where('lelongbid_id','=',$bid->id)->where('hargabida','=',$highestprice->hargabida)->orderBy('masa_bidaan','ASC' )->get(); // dd($bidders); $count = 0; foreach($bidders as $bidder) From 00335a471cf65a3b3f0e38a46054da1d0c03decc Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Tue, 1 Mar 2022 14:48:17 +0800 Subject: [PATCH 2/2] add senarai lelong marhun --- app/Http/Controllers/MarhunController.php | 9 +- resources/views/includes/sidebar.blade.php | 4 +- .../views/lelong/senaraipemenang.blade.php | 3 + .../marhun/senarailelongmarhun.blade.php | 88 +++++++++++++++++++ .../views/marhun/senaraimarhun.blade.php | 3 + routes/web.php | 7 +- 6 files changed, 108 insertions(+), 6 deletions(-) create mode 100644 resources/views/marhun/senarailelongmarhun.blade.php diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index c1148ad5..c8f5f298 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -126,7 +126,14 @@ class MarhunController extends Controller } - + public function senarailelongmarhun(Request $request){ + + $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') + ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') + ->get(); + + return view('marhun.senarailelongmarhun',compact('senarai')); + } } \ No newline at end of file diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index ce029f8f..2e02e300 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -42,8 +42,8 @@ @endhasrole @hasrole('khazanah') -
  • - Marhun +
  • + Marhun
    • @endhasrole @hasrole('teller') diff --git a/resources/views/lelong/senaraipemenang.blade.php b/resources/views/lelong/senaraipemenang.blade.php index 59092f71..e838464a 100644 --- a/resources/views/lelong/senaraipemenang.blade.php +++ b/resources/views/lelong/senaraipemenang.blade.php @@ -38,6 +38,9 @@ @endforeach +
    + Kembali +
    diff --git a/resources/views/marhun/senarailelongmarhun.blade.php b/resources/views/marhun/senarailelongmarhun.blade.php new file mode 100644 index 00000000..ac151710 --- /dev/null +++ b/resources/views/marhun/senarailelongmarhun.blade.php @@ -0,0 +1,88 @@ +@extends('layouts.app') + +@section('content') + +
    +
    +
    + @if ($message = Session::get('success')) +
    +

    {{ $message }}

    +
    + @endif + + + + + + + + + + + @foreach($senarai as $data) + + + + + + + @endforeach + +
    NoTarikh LelongStatus LelongAction
    {{$loop->iteration}}{{ $data->tarikh_lelong }}{{ $data->sts_lelong }}
    +
    +
    +
    + + + +@endsection \ No newline at end of file diff --git a/resources/views/marhun/senaraimarhun.blade.php b/resources/views/marhun/senaraimarhun.blade.php index cce798af..d0880847 100644 --- a/resources/views/marhun/senaraimarhun.blade.php +++ b/resources/views/marhun/senaraimarhun.blade.php @@ -38,6 +38,9 @@ +
    + Kembali +
    diff --git a/routes/web.php b/routes/web.php index f2696643..1e5c568a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -89,7 +89,6 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/senaraimarhun/{lelongid}/{cawid}', ['as'=>'lelong.senaraimarhun','uses'=>'LelongController@senaraimarhun']); Route::post('/deletemarhun', ['as'=>'lelong.deletemarhun','uses'=>'LelongController@deletemarhun']); - }); Route::group(['middleware' => ['permission:pengesahanpembayaranpc']], function () { @@ -116,9 +115,10 @@ Route::group(['prefix'=>'lelong'], function () { - +//Khazanah Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinimarhun'],'prefix'=>'marhun'], function () { - Route::get('/senaraimarhun',['as'=>'marhun.senaraimarhun','uses'=>'MarhunController@index']); + Route::get('/senarailelongmarhun',['as'=>'marhun.senarailelongmarhun','uses'=>'MarhunController@senarailelongmarhun']); + Route::get('/senaraimarhun/{lelong_id}',['as'=>'marhun.senaraimarhun','uses'=>'MarhunController@index']); Route::get('/marhun/{id}',['as'=>'marhun.show','uses'=>'MarhunController@show']); Route::get('/deletemarhun/{id}',['as'=>'marhun.delete','uses'=>'MarhunController@delete']); @@ -128,6 +128,7 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim }); +//Khazanah Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembida'], function () { Route::get('/senaraipembida',['as'=>'pembida.senaraipembida','uses'=>'PembidaController@index']);