diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 3df7cc24..e77aa326 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -5,27 +5,94 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; use App\Models\LelongBid; use App\Models\LelongBidder; -use App\Models\Users; +use App\Models\LelongBidMarhun; +use App\Models\User; class PaymentController extends Controller { public function SenaraiPemenang(Request $request){ - $listwinner = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') + $lelong_id = 1; + $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.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' + ) + ->first(); + + foreach($SAGBidItem as $eachbid){ + + $eachbid = 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('lelongbidder.hargabida', + 'lelongbid.hargaasas', + 'lelongbid.norujukan') + ->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(); - return view('pembayaran.SAGBidItem',compact('SAGBidItem')); + return view('pembayaran.pengesahanPembayaran',compact('pengesahanPembayaran')); } } diff --git a/database/seeders/RolesSeeder.php b/database/seeders/RolesSeeder.php index 9df1079c..87354b7c 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([ @@ -95,6 +99,10 @@ class RolesSeeder extends Seeder 'name' => 'tangguhan', 'description' => 'Tangguh lelong' ]); + Permission::create([ + 'name' => 'pengesahanpembida', + 'description' => 'Pengesahan Pembida Baru' + ]); //account Permission::create([ @@ -129,6 +137,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'); @@ -142,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 794080be..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,16 +65,17 @@ - {{--
  • +
  • -
  • --}} - - + +
  • + Pengesahan Pembayaran +
  • @endhasrole @hasrole('jurulelong')
  • @@ -82,14 +86,6 @@
  • -
  • - - -
  • @endhasrole @hasrole('operasi')
  • diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php index ce950875..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->nama_bidder }}

    -

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

    -

    Alamat : {{ $BidItem->alamat }}

    - @endforeach +

    Nama : {{ $SAGBidItem->name }}

    +

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

    +

    Alamat : {{ $SAGBidItem->alamat }}

    @@ -17,7 +15,7 @@
    - +
    @@ -28,18 +26,23 @@ - @foreach($SAGBidItem as $BidItem) - - - - - - - + + + + @foreach($eachbid as $biditem) + + + + + + + @endforeach - + +
    No
    1{{ $BidItem->norujukan}}{{ $BidItem->hargaasas}}{{ $BidItem->hargajual}}
    {{ $loop->iteration }}{{ $biditem->norujukan}}{{ $biditem->hargaasas}}{{ $biditem->hargabida}}
    Jumlah Bayaran RM 2000 RM
    @@ -47,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 1b223a69..ec1f9e6e 100644 --- a/resources/views/pembayaran/kaunterpembayaran.blade.php +++ b/resources/views/pembayaran/kaunterpembayaran.blade.php @@ -5,7 +5,7 @@
    - +
    @@ -14,23 +14,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') + +
    +
    +
    +
    NoNo Telefon Bilangan Surat Jumlah Bidaan(RM)RemarkStatus Bayaran Resit BayaranAction
    1{{ $winner->nama_bidder}}{{ $winner->nokp}}{{ $winner->notelbimbit}}{{ $winner->hargabida}}{{ $winner->status_payment}} {{ $loop->iteration }} {{ $winner['details']['name']}}{{ $winner['details']['nokp']}}{{ $winner['details']['notelbimbit']}}{{ $winner['total_surat']}}{{ $winner['totalBid']}} + +
    + + + + + + + + + + + + + + + @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 3e87cb59..7acc6b4a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -80,7 +80,6 @@ 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/{id}', ['as'=>'lelong.janapemenang','uses'=>'LelongController@janapemenang']); Route::get('/kaunterpembayaran', ['as'=>'lelong.kaunterpembayaran','uses'=>'PaymentController@SenaraiPemenang']); @@ -91,6 +90,10 @@ Route::group(['prefix'=>'lelong'], function () { }); + + 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']); @@ -138,9 +141,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