From b3f003730203479ba4e7db7ceb7cec3bf1ff95e5 Mon Sep 17 00:00:00 2001
From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com>
Date: Wed, 23 Feb 2022 16:32:54 +0800
Subject: [PATCH] update kaunter pembayaran
---
app/Http/Controllers/LelongController.php | 60 +++++++++--------
app/Http/Controllers/PaymentController.php | 42 ++++++++++--
.../views/pembayaran/SAGBidItem.blade.php | 8 +--
.../pembayaran/kaunterpembayaran.blade.php | 64 ++++++++++++++++++-
4 files changed, 136 insertions(+), 38 deletions(-)
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 7e9158f1..1e88947a 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -440,34 +440,35 @@ class LelongController extends Controller
$lelongbid = LelongBid::where('lelong_id','=',$id)->get();
foreach($lelongbid as $bid)
{
- $bidders = LelongBidder::where('lelongbid_id','=',$bid->id)->orderByRaw('lelongbidder.masa_bidaan ASC, lelongbidder.hargabida DESC' )->get();
- if($bidders)
+ $highestprice = LelongBidder::where('lelongbid_id','=',$bid->id)->orderByRaw('lelongbidder.hargabida DESC' )->get();
+ if($highestprice)
{
- $count = 0;
- foreach($bidders as $bidder)
- {
- $count = $count + 1;
- if($count == 1)
+ foreach($highestprice as $price){
+ $bidders = LelongBidder::where('hargabida','=',$price->hargabida)->MIN('lelongbidder.masa_bidaan' )->get();
+ $count = 0;
+ foreach($bidders as $bidder)
{
- $pemenang = LelongBidder::where('lelongbid_id','=',$bidder->lelongbid_id)
- ->orderByRaw('lelongbidder.masa_bidaan ASC, lelongbidder.hargabida DESC' )
- ->first();
- $pemenang->status_bidder = 1;
- $pemenang->save();
+ $count = $count + 1;
+ if($count == 1)
+ {
+ $pemenang = LelongBidder::where('id','=',$bidder->id)
+ ->first();
+ $pemenang->status_bidder = 1;
+ $pemenang->save();
- $updatebid = LelongBid::where('id','=',$bid->id)->first();
- $updatebid->hargajual = $bidder->hargabida;
- $updatebid->nopembeli = $bidder->user_id;
- $updatebid->status_jual = 1;
- $updatebid->save();
- }
- else
- {
- $kalah = LelongBidder::where('lelongbid_id','=',$bidder->lelongbid_id)
- ->orderByRaw('lelongbidder.masa_bidaan ASC, lelongbidder.hargabida DESC' )
- ->first();
- $kalah->status_bidder = 1;
- $kalah->save();
+ $updatebid = LelongBid::where('id','=',$bid->id)->first();
+ $updatebid->hargajual = $bidder->hargabida;
+ $updatebid->nopembeli = $bidder->user_id;
+ $updatebid->status_jual = 1;
+ $updatebid->save();
+ }
+ else
+ {
+ $kalah = LelongBidder::where('id','=',$bidder->id)
+ ->first();
+ $kalah->status_bidder = 0;
+ $kalah->save();
+ }
}
}
@@ -550,6 +551,15 @@ class LelongController extends Controller
'lelongbid.status_jual',
)
->get();
+
+ foreach($lelongtaklaku as $index1=>$suratlelongtaklaku){
+
+ $suratlelongtaklaku = LelongBid::join('lelong', 'lelongbid.lelong_id', '=', 'lelong.id')
+ ->whereNull('t_jual')
+ ->get();
+
+ $lelongtaklaku[$index1]['suratlelongtaklaku'] = sizeof($suratlelongtaklaku);
+ }
return view('lelong.lelongtaklaku',compact('lelongtaklaku'));
}
diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php
index b76dfd01..bd2a93f9 100644
--- a/app/Http/Controllers/PaymentController.php
+++ b/app/Http/Controllers/PaymentController.php
@@ -4,6 +4,9 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Models\Lelong;
+use App\Models\CawanganLelong;
+use App\Models\Cawangan;
+use App\Models\Resit;
use App\Models\LelongBid;
use App\Models\LelongBidder;
use App\Models\LelongBidMarhun;
@@ -16,7 +19,12 @@ class PaymentController extends Controller
{
public function SenaraiLelongBayar(Request $request){
- $senarai = Lelong::all();
+ $user = Auth::user();
+
+ $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id')
+ ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id')
+ ->where('cawangan.caw_code', $user->kodcaw)
+ ->get();
// dd($senarai);
@@ -34,7 +42,6 @@ class PaymentController extends Controller
->groupBy('lelongbidder.user_id')
->get()->toArray();
-
foreach($listwinner as $index1=>$winner){
$userdetails = User::where('id', $winner['user_id'])->first();
@@ -93,6 +100,13 @@ class PaymentController extends Controller
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateString();
+ $current = Carbon::now();
+ $current = new Carbon();
+
+ $day = $current->day;
+ $month = $current->month;
+ $year = $current->format('y');
+
$user = Auth::user();
$bid_id = explode(",", $request->eachbid);
@@ -110,6 +124,26 @@ class PaymentController extends Controller
)
->first();
+ $previous_siri = Resit::orderBy('id','desc')->first();
+ if($previous_siri){
+ $nosiri = $previous_siri->id + 1;
+ }else{
+ $nosiri = 1;
+ }
+
+ $reference_no = 'LPKB' . $day . $month . $year . sprintf("%08d", $nosiri);
+
+ $resit = new Resit;
+ $resit->user_id = $request->user_id;
+ $resit->lelongbid_id = $bid;
+ $resit->reference_no = $reference_no;
+ $resit->billplz_id = '';
+ $resit->total_payment = $request->amaunkiraan;
+ $resit->resit_type = 2; // 1 = fee , 2 = bid
+ $resit->status = 'PAID';
+ $resit->paid_at = $currentdate;
+ $resit->save();
+
$payment = Payment::create([
'user_id' => $request->user_id,
'lelongbidder_id' => $eachbid->lelongbidder_id,
@@ -118,7 +152,7 @@ class PaymentController extends Controller
'status_payment_opt' => 1,
'status' => 2,
'remark' => 'BAYARAN DI KAUNTER',
- 'resit_id' => 1,
+ 'resit_id' => $resit->id,
'total_payment' => $request->amaunkiraan,
'1sen' => $request->ambilansen1,
'5sen' => $request->ambilansen5,
@@ -143,7 +177,7 @@ class PaymentController extends Controller
}
- return redirect()->route('pembayaran.SenaraiLelongBayar');
+ return redirect()->route('pembayaran.SenaraiLelongBayar')->with('success','Pembayaran Berjaya');
}
public function pengesahanPembayaran(Request $request){
diff --git a/resources/views/pembayaran/SAGBidItem.blade.php b/resources/views/pembayaran/SAGBidItem.blade.php
index 00956dd2..84a05a5e 100644
--- a/resources/views/pembayaran/SAGBidItem.blade.php
+++ b/resources/views/pembayaran/SAGBidItem.blade.php
@@ -164,13 +164,7 @@
-
+
+
+@endsection
+