From d6d61ab8a4cdd0b831c03f0bf372910e483ed09a Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Tue, 22 Feb 2022 12:49:31 +0800 Subject: [PATCH] update kaunter pembayaran add deno --- app/Http/Controllers/PaymentController.php | 85 +++-- ...2022_01_25_010223_create_payment_table.php | 13 +- resources/views/includes/sidebar.blade.php | 7 +- .../views/pembayaran/SAGBidItem.blade.php | 304 +++++++++++++++++- .../pembayaran/senarailelongbayaran.blade.php | 32 ++ routes/web.php | 4 +- 6 files changed, 418 insertions(+), 27 deletions(-) create mode 100644 resources/views/pembayaran/senarailelongbayaran.blade.php diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index e77aa326..87f2ed38 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use Illuminate\Http\Request; +use App\Models\Lelong; use App\Models\LelongBid; use App\Models\LelongBidder; use App\Models\LelongBidMarhun; @@ -10,9 +11,18 @@ use App\Models\User; class PaymentController extends Controller { - public function SenaraiPemenang(Request $request){ + public function SenaraiLelongBayar(Request $request){ + + $senarai = Lelong::all(); + + // dd($senarai); + + return view('pembayaran.senarailelongbayaran',compact('senarai')); + + } + + public function SenaraiPemenang($lelong_id){ - $lelong_id = 1; $listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->where('lelongbidder.status_bidder', 1) ->where('lelongbid.lelong_id', $lelong_id) @@ -21,7 +31,6 @@ class PaymentController extends Controller ->groupBy('lelongbidder.user_id') ->get()->toArray(); - // dd($listwinner); foreach($listwinner as $index1=>$winner){ @@ -31,24 +40,10 @@ class PaymentController extends Controller ->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')); @@ -63,6 +58,7 @@ class PaymentController extends Controller ->where('users.id', $user_id) ->where('lelongbid.lelong_id', $lelong_id) ->select( + 'users.id', 'users.name', 'users.nokp', 'users.alamat' @@ -78,7 +74,9 @@ class PaymentController extends Controller ->where('lelongbid.lelong_id', $lelong_id) ->select('lelongbidder.hargabida', 'lelongbid.hargaasas', - 'lelongbid.norujukan') + 'lelongbid.norujukan', + 'lelongbidder.lelongbid_id' + ) ->get(); } @@ -86,6 +84,57 @@ class PaymentController extends Controller return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid')); } + public function paymentdenokaunter(Request $request){ + //status_payment = 1 ->update deno into payment + dd($request->all()); + + $user = Auth::user(); + + $bid_id = explode(",", $request->eachbid); + // dd($bid_id); + foreach($bid_id as $bid){ + + $eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + ->join('users', 'lelongbidder.user_id', '=', 'users.id') + ->where('lelongbidder.lelongbid_id', $bid) + ->select('lelongbidder.hargabida', + 'lelongbid.hargaasas', + 'lelongbid.norujukan', + 'lelongbidder.lelongbid_id', + 'lelongbidder.id as lelongbidder_id' + ) + ->first(); + // dd($eachbid); + $payment = Payment::create([ + 'user_id' => $request->user_id, + 'lelongbidder_id' => $eachbid->lelongbidder_id, + 'lelongbid_id' => $bid, + 'kodcaw' => $user->kodcaw, + 'status_payment_opt' => 1, + 'status' => 'PAID', + 'remark' => 'BAYARAN DI KAUNTER', + 'total_payment' => $request->amaunkiraan, + '1sen' => $request->ambilansen1, + '5sen' => $request->ambilansen5, + '10sen' => $request->ambilansen10, + '20sen' => $request->ambilansen20, + '50sen' => $request->ambilansen50, + 'rm1' => $request->ambilanring1, + 'rm5' => $request->ambilanring5, + 'rm10' => $request->ambilanring10, + 'rm20' => $request->ambilanring20, + 'rm50' => $request->ambilanring50, + 'rm100' => $request->ambilanring100, + ]); + + + } + // $payment = new Payment; + // $payment->ambilan + // + + } + public function pengesahanPembayaran(Request $request){ $pengesahanPembayaran = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') diff --git a/database/migrations/2022_01_25_010223_create_payment_table.php b/database/migrations/2022_01_25_010223_create_payment_table.php index 775bf72e..8497ce96 100644 --- a/database/migrations/2022_01_25_010223_create_payment_table.php +++ b/database/migrations/2022_01_25_010223_create_payment_table.php @@ -19,7 +19,6 @@ class CreatePaymentTable extends Migration $table->unsignedBigInteger('lelongbidder_id')->unsigned()->nullable(); $table->unsignedBigInteger('lelongbid_id')->unsigned(); $table->string('kodcaw')->nullable(); - $table->decimal('total_payment')->nullable(); $table->string('back_acc_pembeli')->nullable(); $table->string('bank_acc_no_pembeli')->nullable(); $table->string('nama_bank_acc_caw')->nullable(); @@ -28,6 +27,18 @@ class CreatePaymentTable extends Migration $table->integer('resit_id'); $table->integer('status'); //1 = fee RM10 , 2 = paybidifwin $table->string('remark'); + $table->integer('1sen'); + $table->integer('5sen'); + $table->integer('10sen'); + $table->integer('20sen'); + $table->integer('50sen'); + $table->integer('rm1'); + $table->integer('rm5'); + $table->integer('rm10'); + $table->integer('rm20'); + $table->integer('rm50'); + $table->integer('rm100'); + $table->decimal('total_payment', $precision = 11, $scale = 2); $table->timestamps(); $table->foreign('user_id') diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index a5a565c7..ba2aacf8 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -50,9 +50,6 @@ -
  • - Pembayaran Pemenang -
    • @endhasrole @hasrole('pengurus-cawangan') @@ -73,8 +70,8 @@ -
  • - Pengesahan Pembayaran +
  • + Pembayaran Pemenang
    • @endhasrole @hasrole('jurulelong') diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php index 1c93ec26..f0fe981b 100644 --- a/resources/views/pembayaran/SAGBidItem.blade.php +++ b/resources/views/pembayaran/SAGBidItem.blade.php @@ -36,7 +36,7 @@ {{ $biditem->norujukan}} {{ $biditem->hargaasas}} {{ $biditem->hargabida}} - + @endforeach @@ -46,24 +46,324 @@ +
    + +
    + + diff --git a/resources/views/pembayaran/senarailelongbayaran.blade.php b/resources/views/pembayaran/senarailelongbayaran.blade.php new file mode 100644 index 00000000..9bd40667 --- /dev/null +++ b/resources/views/pembayaran/senarailelongbayaran.blade.php @@ -0,0 +1,32 @@ +@extends('layouts.app') + +@section('content') + +
    +
    +
    + + + + + + + + + + + @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/routes/web.php b/routes/web.php index 189e8707..41a562f1 100644 --- a/routes/web.php +++ b/routes/web.php @@ -144,7 +144,9 @@ Route::group(['middleware' => ['permission:serahan'],'prefix'=>'serahan'], funct }); Route::group(['middleware' => ['permission:pengesahanbayarancash'],'prefix'=>'pembayaran'], function () { - Route::get('/kaunterpembayaran', ['as'=>'pembayaran.kaunterpembayaran','uses'=>'PaymentController@SenaraiPemenang']); + Route::get('/kaunterpembayaran/{lelong_id}', ['as'=>'pembayaran.kaunterpembayaran','uses'=>'PaymentController@SenaraiPemenang']); Route::get('/SAGBidItem/{user_id}/{lelong_id}', ['as'=>'pembayaran.SAGBidItem','uses'=>'PaymentController@SAGBidItem']); + Route::get('/SenaraiLelongBayar', ['as'=>'pembayaran.SenaraiLelongBayar','uses'=>'PaymentController@SenaraiLelongBayar']); + Route::post('/paymentdenokaunter', ['as'=>'pembayaran.paymentdenokaunter','uses'=>'PaymentController@paymentdenokaunter']); }); \ No newline at end of file