From 8582c460e17910a73b3d1628488f903a095cbf1f Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Wed, 6 Apr 2022 12:17:27 +0800 Subject: [PATCH] cdm pc & sah account --- app/Http/Controllers/AccountController.php | 33 ++--- app/Http/Controllers/PaymentController.php | 61 +++++++++- ...2021_12_14_041557_create_lelongs_table.php | 2 +- ...2022_01_25_010223_create_payment_table.php | 4 +- resources/views/includes/sidebar.blade.php | 2 +- .../views/pembayaran/SAGBidItem.blade.php | 115 +++++++++++------- .../pembayaran/kaunterpembayaran.blade.php | 2 +- .../pembayaran/senarailelongbayaran.blade.php | 6 +- routes/web.php | 1 + 9 files changed, 159 insertions(+), 67 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 3c9711d7..bfb2a048 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -37,7 +37,8 @@ class AccountController extends Controller ->join('payment', 'lelongbidder.payment_id', 'payment.id') ->where('lelongbidder.status_bidder', 1) ->where('lelongbid.lelong_id', $lelong_id) - ->where('payment.status_payment_opt',2) + ->where('payment.status_payment_opt','=', '3,2') + ->where('lelongbidder.status_payment', 2) ->whereNull('payment.disahkan_pada') ->select('.lelongbidder.user_id' ) @@ -48,12 +49,6 @@ class AccountController extends Controller foreach($listwinner as $index1=>$winner){ $userdetails = User::where('id', $winner['user_id'])->first(); - // $SAGWin = Payment::join('lelongbid', 'payment.lelongbid_id', '=', 'lelongbid.id') - // ->join('lelongbidder', 'payment.lelongbidder_id', '=', 'lelongbidder.id') - // ->where('payment.user_id', $winner['user_id']) - // ->where('lelongbidder.status_bidder', 1) - // ->where('lelongbid.lelong_id', $lelong_id) - // ->get(); $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->where('lelongbidder.user_id', $winner['user_id']) @@ -62,7 +57,6 @@ class AccountController extends Controller ->get(); // dd($SAGWin->sum('hargabida')); - $id_payment = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->where('lelongbidder.user_id', $winner['user_id']) ->where('lelongbidder.status_bidder', 1) @@ -98,7 +92,8 @@ class AccountController extends Controller ->where('lelongbid.lelong_id', $lelong_id) ->where('lelongbidder.user_id', $user_id) ->where('lelongbidder.status_bidder', 1) - ->where('payment.status_payment_opt', 2) + ->where('payment.status_payment_opt', '=', '3,2') + ->where('lelongbidder.status_payment', 2) ->get()->toArray(); $saggroupbyid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') @@ -106,7 +101,8 @@ class AccountController extends Controller ->where('lelongbid.lelong_id', $lelong_id) ->where('lelongbidder.user_id', $user_id) ->where('lelongbidder.status_bidder', 1) - ->where('payment.status_payment_opt', 2) + ->where('payment.status_payment_opt', '=', '3,2') + ->where('lelongbidder.status_payment', 2) ->select( 'lelongbidder.payment_id as payment_id' ) @@ -126,21 +122,21 @@ class AccountController extends Controller $currentdate = $currentdate->toDateTimeString(); $user = Auth::user(); - $senaraisag = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') ->join('payment', 'lelongbidder.payment_id', '=', 'payment.id') ->where('lelongbid.lelong_id', $request->lelong_id) ->where('lelongbidder.user_id', $request->user_id) ->where('lelongbidder.status_bidder', 1) - ->where('payment.status_payment_opt', 2) + ->where('payment.status_payment_opt', '3,2') + ->where('lelongbidder.status_payment', 2) ->select( 'lelongbid.id as lelongbid_id', 'payment.id as payment_id', 'lelongbid.lelong_id', 'lelongbidder.user_id', ) - ->get(); + ->get(); $total_payment = 0; $paymentid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') @@ -148,7 +144,8 @@ class AccountController extends Controller ->where('lelongbid.lelong_id', $request->lelong_id) ->where('lelongbidder.user_id', $request->user_id) ->where('lelongbidder.status_bidder', 1) - ->where('payment.status_payment_opt', 2) + ->where('payment.status_payment_opt', '3,2') + ->where('lelongbidder.status_payment', 2) ->select( 'lelongbidder.payment_id as payment_id' ) @@ -169,8 +166,16 @@ class AccountController extends Controller $eachbid = LelongBid::where('id',$sag->lelongbid_id)->first(); $eachbid->status_payment = 1; $eachbid->status_jual = 1; + $eachbid->status_semak = 1; $eachbid->t_jual = $currentdate; $eachbid->save(); + + $bidder = LelongBidder::where('lelongbid_id', $sag->lelongbid_id) + ->where('payment_id', $sag->payment_id) + ->where('user_id', $sag->user_id) + ->first(); + $bidder->status_payment = 1; + $bidder->update(); } $senaraisagallpayment = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id') diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 8ad2e6a7..c3c3ec89 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -41,7 +41,6 @@ class PaymentController extends Controller ) ->groupBy('lelongbidder.user_id') ->get()->toArray(); - // dd($listwinner); foreach($listwinner as $index1=>$winner){ @@ -52,13 +51,20 @@ class PaymentController extends Controller ->where('lelongbid.lelong_id', $lelong_id) ->get(); - - $payment_id = $SAGWin = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id') + $sts_payment = 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) + ->select('lelongbidder.status_payment') + ->get(); + // dd($sts_payment[0]['status_payment']); + + $payment_id = 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) ->select('payment_id')->groupBy('payment_id')->get(); - // dd($payment_id); + $total_payment = 0; foreach($payment_id as $id){ $payment = Payment::where('id', $id->payment_id) @@ -73,6 +79,7 @@ class PaymentController extends Controller $listwinner[$index1]['total_surat'] = sizeof($SAGWin); $listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida'); $listwinner[$index1]['totalPay'] = $total_payment; + $listwinner[$index1]['sts_payment'] = $sts_payment[0]['status_payment']; } @@ -108,7 +115,6 @@ class PaymentController extends Controller ) ->get(); - return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid', 'lelong_id','user_id')); } @@ -125,7 +131,7 @@ class PaymentController extends Controller $resit = Resit::where('lelong_id', $request->lelong_id) ->where('user_id',$request->user_id) ->where('resit_type', 2) - ->first(); + ->first(); $total_hargabida = 0; $payment = Payment::create([ @@ -212,4 +218,47 @@ class PaymentController extends Controller return view('pembayaran.pengesahanPembayaran',compact('pengesahanPembayaran')); } + + public function banktransfer(Request $request) + { + // dd($request->all()); + + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); + + $user = Auth::user(); + // dd($user); + + $totalcheck = implode(",", $request->checkboxdata); + + $resit = Resit::where('lelong_id', $request->lelong_id) + ->where('user_id',$request->user_id) + ->where('resit_type', 2) + ->first(); + + $payment = new Payment; + $payment->user_id = $request->user_id; + $payment->lelong_id = $request->lelong_id; + $payment->kodcaw = $user->kodcaw; + $payment->status_payment_opt = 3; + $payment->status = 2; + $payment->remark = 'BAYARAN CDM'; + $payment->resit_id = $resit->id; + $payment->total_payment = $totalcheck; + $payment->diminta_pada = $currentdate; + $payment->diminta_oleh = $user->id; + $payment->save(); + + $sts_payment = LelongBidder::where('user_id', $request->user_id) + ->where('lelongbid_id', $request->eachbid) + ->first(); + + $sts_payment->payment_id = $payment->id; + $sts_payment->status_payment = 2; //Menunggu pengesahan account + $sts_payment->update(); + + return redirect()->route('pembayaran.SenaraiLelongBayar') + ->with('success','Menunggu Pengesahan Account'); + + } } diff --git a/database/migrations/2021_12_14_041557_create_lelongs_table.php b/database/migrations/2021_12_14_041557_create_lelongs_table.php index 3d131171..15e1d0a8 100644 --- a/database/migrations/2021_12_14_041557_create_lelongs_table.php +++ b/database/migrations/2021_12_14_041557_create_lelongs_table.php @@ -23,7 +23,7 @@ class CreateLelongsTable extends Migration $table->string('harga_emas_asas'); $table->string('jbg'); $table->integer('cajlelong'); - $table->integer('sts_lelong')->default(0); + $table->integer('sts_lelong')->default(0); //1= start, 2 = jana pemenang, 3 = senarai pemenang $table->timestamps(); }); 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 2171df04..ca4d5bdd 100644 --- a/database/migrations/2022_01_25_010223_create_payment_table.php +++ b/database/migrations/2022_01_25_010223_create_payment_table.php @@ -22,7 +22,7 @@ class CreatePaymentTable extends Migration $table->string('bank_acc_no_pembeli')->nullable(); $table->string('nama_bank_acc_caw')->nullable(); $table->string('bank_no_acc_caw')->nullable(); - $table->integer('status_payment_opt')->nullable(); //1=kaunter,2=online + $table->integer('status_payment_opt')->nullable(); //1=kaunter,2=online,3=CDM $table->integer('resit_id'); $table->integer('status'); //1 = fee RM10 , 2 = paybidifwin $table->string('remark'); @@ -40,6 +40,8 @@ class CreatePaymentTable extends Migration $table->decimal('total_payment', $precision = 11, $scale = 2); $table->datetime('disahkan_pada')->nullable(); $table->integer('disahkan_oleh')->nullable(); + $table->datetime('diminta_pada')->nullable(); + $table->integer('diminta_oleh')->nullable(); $table->timestamps(); $table->foreign('user_id') diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index 25abc110..2d2d3455 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -159,7 +159,7 @@ Home --}}
  • - List Bayaran Online + Bayaran Online
    • @endhasrole @hasrole('pembida') diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php index 66a75d98..6c1b8cf6 100644 --- a/resources/views/pembayaran/SAGBidItem.blade.php +++ b/resources/views/pembayaran/SAGBidItem.blade.php @@ -14,49 +14,55 @@
    -
    - - - - - - - - - - - +
    +
    + @csrf + + + +
    NoNo. rujukanHarga Asas (RM)Harga Bida (RM)Action
    + + + + + + + + + + + @foreach($eachbid as $biditem) + + + + + + - - - - - - - @endforeach - - - - - - -
    NoNo. rujukanHarga Asas (RM)Harga Bida (RM)Action
    {{ $loop->iteration }}{{ $biditem->norujukan}}{{ $biditem->hargaasas}}{{ $biditem->hargabida}} + @if($biditem->status_payment == 0) + + @elseif($biditem->status_payment == 2) + MENUNGGU PENGESAHAN + @else + PAID - - - @foreach($eachbid as $biditem) -
    {{ $loop->iteration }}{{ $biditem->norujukan}}{{ $biditem->hargaasas}}{{ $biditem->hargabida}} - @if($biditem->status_payment == 0) - - @else - PAID - @endif -
    Jumlah BayaranRM
    -
    - Kembali - -
    -
    + @endif + + + @endforeach + + Jumlah Bayaran + RM + + + + + +
    + Kembali + + +
    +
    @@ -177,6 +183,7 @@