From 03fae749fcc274711c418f7f66587fd73e801010 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Sun, 20 Feb 2022 12:15:08 +0800 Subject: [PATCH 1/2] pengesahan pembayaran by PC --- app/Http/Controllers/PaymentController.php | 32 +++++++++++- database/seeders/RolesSeeder.php | 7 ++- resources/views/includes/sidebar.blade.php | 3 ++ .../views/pembayaran/SAGBidItem.blade.php | 15 +++--- .../pembayaran/kaunterpembayaran.blade.php | 16 ++++-- .../pembayaran/pengesahanPembayaran.blade.php | 50 +++++++++++++++++++ .../views/pengurusanpengguna/taraf.blade.php | 3 -- routes/web.php | 5 +- 8 files changed, 113 insertions(+), 18 deletions(-) create mode 100644 resources/views/pembayaran/pengesahanPembayaran.blade.php diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 3df7cc24..393749e3 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -5,13 +5,15 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use App\Models\LelongBid; use App\Models\LelongBidder; +use App\Models\LelongBidMarhun; use App\Models\Users; class PaymentController extends Controller { public function SenaraiPemenang(Request $request){ - $listwinner = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') + $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->join('users', 'lelongbidder.user_id', '=', 'users.id') ->where('lelongbidder.status_bidder', 1) ->get(); @@ -24,8 +26,34 @@ class PaymentController extends Controller $SAGBidItem = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->join('users', 'lelongbidder.user_id', '=', 'users.id') ->where('lelongbidder.status_bidder', 1) + ->select( + 'users.name', + 'users.nokp', + 'users.alamat' + ) ->get(); - return view('pembayaran.SAGBidItem',compact('SAGBidItem')); + foreach($SAGBidItem as $eachbid){ + + $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->join('lelongbidmarhun', 'lelongbidder.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id') + ->where('lelongbidder.status_bidder', 1) + ->get(); + + } + + return view('pembayaran.SAGBidItem',compact('SAGBidItem','eachbid')); + } + + public function pengesahanPembayaran(Request $request){ + + $pengesahanPembayaran = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + // ->join('users', 'lelongbidder.user_id', '=', 'users.id') + ->where('lelongbidder.status_bidder', 1) + ->get(); + + // dd($pengesahanPembayaran); + + return view('pembayaran.pengesahanPembayaran',compact('pengesahanPembayaran')); } } diff --git a/database/seeders/RolesSeeder.php b/database/seeders/RolesSeeder.php index 9df1079c..01262ef4 100644 --- a/database/seeders/RolesSeeder.php +++ b/database/seeders/RolesSeeder.php @@ -57,12 +57,16 @@ class RolesSeeder extends Seeder //pengurus cawangan Permission::create([ 'name' => 'pendaftaranpembida', - 'description' => 'Pemdaftaran pembida di cawangan' + 'description' => 'Pendaftaran pembida di cawangan' ]); Permission::create([ 'name' => 'jananotis', 'description' => 'Jana Notis Lelong' ]); + Permission::create([ + 'name' => 'pengesahanpembayaranpc', + 'description' => 'Pengesahan Pembayaran Bagi PC' + ]); //jurulelong Permission::create([ @@ -129,6 +133,7 @@ class RolesSeeder extends Seeder $role4 = Role::create(['name' => 'pengurus-cawangan']); $role4->givePermissionTo('pendaftaranpembida'); $role4->givePermissionTo('jananotis'); + $role4->givePermissionTo('pengesahanpembayaranpc'); $role5 = Role::create(['name' => 'jurulelong']); $role5->givePermissionTo('pendaftaranbatch'); diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index f728d3d0..8d1b7e7a 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -60,6 +60,9 @@ +
  • + Pengesahan Pembayaran +
    • @endhasrole @hasrole('jurulelong')
  • diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php index ce950875..6b078253 100644 --- a/resources/views/pembayaran/SAGBidItem.blade.php +++ b/resources/views/pembayaran/SAGBidItem.blade.php @@ -6,7 +6,7 @@
    @foreach($SAGBidItem as $BidItem) -

    Nama : {{ $BidItem->nama_bidder }}

    +

    Nama : {{ $BidItem->name }}

    No Kad Pengenalan : {{ $BidItem->nokp }}

    Alamat : {{ $BidItem->alamat }}

    @endforeach @@ -17,7 +17,7 @@
    - +
    @@ -28,18 +28,19 @@ - @foreach($SAGBidItem as $BidItem) + @foreach($eachbid as $biditem) - - - - + + + + @endforeach +
    No
    1{{ $BidItem->norujukan}}{{ $BidItem->hargaasas}}{{ $BidItem->hargajual}}{{ $loop->iteration }}{{ $biditem->norujukan}}{{ $biditem->hargaasas}}{{ $biditem->hargajual}}
    Jumlah Bayaran RM 2000
    diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php index 1b223a69..5a69dc0b 100644 --- a/resources/views/pembayaran/kaunterpembayaran.blade.php +++ b/resources/views/pembayaran/kaunterpembayaran.blade.php @@ -5,7 +5,7 @@
    - +
    @@ -22,15 +22,23 @@ @foreach($listwinner as $winner) - + - - + + @endforeach diff --git a/resources/views/pembayaran/pengesahanPembayaran.blade.php b/resources/views/pembayaran/pengesahanPembayaran.blade.php new file mode 100644 index 00000000..47f7af6b --- /dev/null +++ b/resources/views/pembayaran/pengesahanPembayaran.blade.php @@ -0,0 +1,50 @@ +@extends('layouts.app') + +@section('content') + +
    +
    +
    +
    No
    1 {{ $loop->iteration }} {{ $winner->nama_bidder}} {{ $winner->nokp}} {{ $winner->notelbimbit}} {{ $winner->hargabida}} {{ $winner->status_payment}} + @if ($winner->status_payment == 0) + + @elseif ($winner->status_payment == 1) + + @endif + + +
    + + + + + + + + + + + + + + + @foreach($pengesahanPembayaran as $sahbayar) + + + + + + + + + + + + @endforeach + +
    NoNamaNo Kad PengenalanNo TelefonBilangan SuratJumlah Bayaran(RM)RemarkStatus BayaranAction
    {{ $loop->iteration }} {{ $sahbayar->nama_bidder}}{{ $sahbayar->nokp}}{{ $sahbayar->notelbimbit}}{{ $sahbayar->hargabida}} + @if ($sahbayar->status_payment == 0) + + @elseif ($sahbayar->status_payment == 1) + + @endif + + +
    +
    +
    +
    + +@endsection \ No newline at end of file diff --git a/resources/views/pengurusanpengguna/taraf.blade.php b/resources/views/pengurusanpengguna/taraf.blade.php index 7f5b1961..821c0f4e 100644 --- a/resources/views/pengurusanpengguna/taraf.blade.php +++ b/resources/views/pengurusanpengguna/taraf.blade.php @@ -111,9 +111,6 @@ $( '.adduser').removeClass('dt-button'); $( '.export').removeClass('dt-button'); - //var simple = ''; - // console.log(simple); - function selectall(cb) { tabletaraf.rows().nodes().to$().find('input[type="checkbox"]').each(function(){ diff --git a/routes/web.php b/routes/web.php index 28fbc8e1..b1d2de41 100644 --- a/routes/web.php +++ b/routes/web.php @@ -80,13 +80,16 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/lelongtaklaku',['as'=>'lelong.lelongtaklaku','uses'=>'LelongController@lelongtaklaku']); 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', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); Route::get('/kaunterpembayaran', ['as'=>'lelong.kaunterpembayaran','uses'=>'PaymentController@SenaraiPemenang']); Route::get('/SAGBidItem', ['as'=>'lelong.SAGBidItem','uses'=>'PaymentController@SAGBidItem']); }); + + Route::group(['middleware' => ['permission:pengesahanpembayaranpc']], function () { + Route::get('/pengesahanPembayaran', ['as'=>'payment.pengesahanPembayaran','uses'=>'PaymentController@pengesahanPembayaran']); + }); Route::group(['middleware' => ['permission:import']], function () { Route::get('/refresh/{id}',['as'=>'lelong.refresh','uses'=>'LelongController@refresh']); From b04281918f96e318ed412154c25511bfe59b1b48 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Mon, 21 Feb 2022 14:26:21 +0800 Subject: [PATCH 2/2] update kaunter pembayaran --- app/Http/Controllers/LelongController.php | 3 + app/Http/Controllers/PaymentController.php | 63 +++++++++++++++---- database/seeders/RolesSeeder.php | 5 ++ resources/views/includes/sidebar.blade.php | 17 ++--- .../views/pembayaran/SAGBidItem.blade.php | 46 ++++++++++---- .../pembayaran/kaunterpembayaran.blade.php | 22 +++---- routes/web.php | 9 ++- 7 files changed, 109 insertions(+), 56 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index f65ef22b..626042c7 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -438,6 +438,9 @@ class LelongController extends Controller $currentdate = Carbon::now(); $currentdate = $currentdate->toDateString(); + //loop by lelong_id + + //loop by lelongbid_id $lelongbidder = LelongBidder::join('users', 'lelongbidder.user_id', '=', 'users.id') ->select( 'users.name', diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 393749e3..e77aa326 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -6,54 +6,93 @@ use Illuminate\Http\Request; use App\Models\LelongBid; use App\Models\LelongBidder; use App\Models\LelongBidMarhun; -use App\Models\Users; +use App\Models\User; class PaymentController extends Controller { public function SenaraiPemenang(Request $request){ + $lelong_id = 1; $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') - ->join('users', 'lelongbidder.user_id', '=', 'users.id') ->where('lelongbidder.status_bidder', 1) - ->get(); + ->where('lelongbid.lelong_id', $lelong_id) + ->select('lelongbidder.user_id' + ) + ->groupBy('lelongbidder.user_id') + ->get()->toArray(); - return view('pembayaran.kaunterpembayaran',compact('listwinner')); + // dd($listwinner); + + foreach($listwinner as $index1=>$winner){ + + $userdetails = User::where('id', $winner['user_id'])->first(); + $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->where('user_id', $winner['user_id']) + ->where('lelongbidder.status_bidder', 1) + ->where('lelongbid.lelong_id', $lelong_id) + ->get(); + // $totalBid = 0; + // foreach($SAGWin as $SAG){ + // $totalBid = $totalBid + $SAG->hargabida; + + // } + $listwinner[$index1]['details'] = $userdetails; + $listwinner[$index1]['total_surat'] = sizeof($SAGWin); + $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida'); + + + // $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + // ->join('users', 'lelongbidder.user_id', '=', 'users.id') + // ->where('lelongbidder.status_bidder', 1) + // ->where('lelongbid.lelong_id', $lelongId) + // ->get(); + + + // $totalBid = LelongBidder::where('status_bidder', 1)->sum('hargabida'); + } + + return view('pembayaran.kaunterpembayaran',compact('listwinner','lelong_id')); } - public function SAGBidItem(Request $request){ + public function SAGBidItem($user_id, $lelong_id){ $SAGBidItem = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->join('users', 'lelongbidder.user_id', '=', 'users.id') ->where('lelongbidder.status_bidder', 1) + ->where('users.id', $user_id) + ->where('lelongbid.lelong_id', $lelong_id) ->select( 'users.name', 'users.nokp', 'users.alamat' ) - ->get(); + ->first(); foreach($SAGBidItem as $eachbid){ $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') - ->join('lelongbidmarhun', 'lelongbidder.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id') + ->join('users', 'lelongbidder.user_id', '=', 'users.id') ->where('lelongbidder.status_bidder', 1) + ->where('users.id', $user_id) + ->where('lelongbid.lelong_id', $lelong_id) + ->select('lelongbidder.hargabida', + 'lelongbid.hargaasas', + 'lelongbid.norujukan') ->get(); - + } - return view('pembayaran.SAGBidItem',compact('SAGBidItem','eachbid')); + return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid')); } public function pengesahanPembayaran(Request $request){ $pengesahanPembayaran = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') - // ->join('users', 'lelongbidder.user_id', '=', 'users.id') + ->join('users', 'lelongbidder.user_id', '=', 'users.id') ->where('lelongbidder.status_bidder', 1) ->get(); - // dd($pengesahanPembayaran); - return view('pembayaran.pengesahanPembayaran',compact('pengesahanPembayaran')); } } diff --git a/database/seeders/RolesSeeder.php b/database/seeders/RolesSeeder.php index 01262ef4..87354b7c 100644 --- a/database/seeders/RolesSeeder.php +++ b/database/seeders/RolesSeeder.php @@ -99,6 +99,10 @@ class RolesSeeder extends Seeder 'name' => 'tangguhan', 'description' => 'Tangguh lelong' ]); + Permission::create([ + 'name' => 'pengesahanpembida', + 'description' => 'Pengesahan Pembida Baru' + ]); //account Permission::create([ @@ -147,6 +151,7 @@ class RolesSeeder extends Seeder $role6->givePermissionTo('report'); $role6->givePermissionTo('tangguhan'); $role6->givePermissionTo('analisa'); + $role6->givePermissionTo('pengesahanpembida'); $role7 = Role::create(['name' => 'account']); $role7->givePermissionTo('pengesahanbayaran'); diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 227207b2..a5a565c7 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -47,9 +47,12 @@
    • @endhasrole @hasrole('teller') - {{--
  • + +
  • + Pembayaran Pemenang +
    • @endhasrole @hasrole('pengurus-cawangan') @@ -62,7 +65,7 @@ - {{--
  • +
    • -
  • - - -
    • @endhasrole @hasrole('operasi')
  • diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php index 6b078253..1c93ec26 100644 --- a/resources/views/pembayaran/SAGBidItem.blade.php +++ b/resources/views/pembayaran/SAGBidItem.blade.php @@ -5,11 +5,9 @@
    - @foreach($SAGBidItem as $BidItem) -

    Nama : {{ $BidItem->name }}

    -

    No Kad Pengenalan : {{ $BidItem->nokp }}

    -

    Alamat : {{ $BidItem->alamat }}

    - @endforeach +

    Nama : {{ $SAGBidItem->name }}

    +

    No Kad Pengenalan : {{ $SAGBidItem->nokp }}

    +

    Alamat : {{ $SAGBidItem->alamat }}

    @@ -28,18 +26,22 @@ + + + @foreach($eachbid as $biditem) - - {{ $loop->iteration }} - {{ $biditem->norujukan}} - {{ $biditem->hargaasas}} - {{ $biditem->hargajual}} - - + + {{ $loop->iteration }} + {{ $biditem->norujukan}} + {{ $biditem->hargaasas}} + {{ $biditem->hargabida}} + + @endforeach Jumlah Bayaran - RM 2000 + RM @@ -48,4 +50,22 @@ + + @endsection \ No newline at end of file diff --git a/resources/views/pembayaran/kaunterpembayaran.blade.php b/resources/views/pembayaran/kaunterpembayaran.blade.php index 5a69dc0b..ec1f9e6e 100644 --- a/resources/views/pembayaran/kaunterpembayaran.blade.php +++ b/resources/views/pembayaran/kaunterpembayaran.blade.php @@ -14,31 +14,23 @@ No Telefon Bilangan Surat Jumlah Bidaan(RM) - Remark - Status Bayaran Resit Bayaran + Action @foreach($listwinner as $winner) {{ $loop->iteration }} - {{ $winner->nama_bidder}} - {{ $winner->nokp}} - {{ $winner->notelbimbit}} - - {{ $winner->hargabida}} - - - @if ($winner->status_payment == 0) - - @elseif ($winner->status_payment == 1) - - @endif - + {{ $winner['details']['name']}} + {{ $winner['details']['nokp']}} + {{ $winner['details']['notelbimbit']}} + {{ $winner['total_surat']}} + {{ $winner['totalBid']}} + @endforeach diff --git a/routes/web.php b/routes/web.php index ba596228..af5b91b4 100644 --- a/routes/web.php +++ b/routes/web.php @@ -82,8 +82,6 @@ Route::group(['prefix'=>'lelong'], function () { Route::get('/deletelelong/{id}',['as'=>'lelong.delete','uses'=>'LelongController@delete']); Route::get('/export/{id}',['as'=>'lelong.exportnotis','uses'=>'LelongController@exportnotis']); Route::get('/janapemenang', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); - Route::get('/kaunterpembayaran', ['as'=>'lelong.kaunterpembayaran','uses'=>'PaymentController@SenaraiPemenang']); - Route::get('/SAGBidItem', ['as'=>'lelong.SAGBidItem','uses'=>'PaymentController@SAGBidItem']); }); @@ -137,9 +135,10 @@ Route::group(['middleware' => ['permission:serahan'],'prefix'=>'serahan'], funct Route::get('/penyatabayaran',['as'=>'serahan.penyatabayaran','uses'=>'SerahanController@penyatabayaran']); Route::get('/senaraibid',['as'=>'serahan.senaraibid','uses'=>'SerahanController@senaraibid']); +}); - - - +Route::group(['middleware' => ['permission:pengesahanbayarancash'],'prefix'=>'pembayaran'], function () { + Route::get('/kaunterpembayaran', ['as'=>'pembayaran.kaunterpembayaran','uses'=>'PaymentController@SenaraiPemenang']); + Route::get('/SAGBidItem/{user_id}/{lelong_id}', ['as'=>'pembayaran.SAGBidItem','uses'=>'PaymentController@SAGBidItem']); }); \ No newline at end of file