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 @@ +
Nama : {{ $BidItem->nama_bidder }}
+Nama : {{ $BidItem->name }}
No Kad Pengenalan : {{ $BidItem->nokp }}
Alamat : {{ $BidItem->alamat }}
@endforeach @@ -17,7 +17,7 @@| No | @@ -28,18 +28,19 @@||||||||
|---|---|---|---|---|---|---|---|---|
| 1 | -{{ $BidItem->norujukan}} | -{{ $BidItem->hargaasas}} | -{{ $BidItem->hargajual}} | +{{ $loop->iteration }} | +{{ $biditem->norujukan}} | +{{ $biditem->hargaasas}} | +{{ $biditem->hargajual}} | |
| Jumlah Bayaran | RM 2000 | +|||||||
| No | @@ -22,15 +22,23 @@|||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|
| 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 + | ++ + |
| No | +Nama | +No Kad Pengenalan | +No Telefon | +Bilangan Surat | +Jumlah Bayaran(RM) | +Remark | +Status Bayaran | +Action | +
|---|---|---|---|---|---|---|---|---|
| {{ $loop->iteration }} | +{{ $sahbayar->nama_bidder}} | +{{ $sahbayar->nokp}} | +{{ $sahbayar->notelbimbit}} | ++ | {{ $sahbayar->hargabida}} | ++ | + @if ($sahbayar->status_payment == 0) + + @elseif ($sahbayar->status_payment == 1) + + @endif + | ++ + | +