KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'amirah' of https://gitlab.com/azfararsyad/lelong into amirah

Browse Source
This commit is contained in:
Amirah22
2022-02-27 11:55:26 +08:00
parent 2a5335340f 6f38796d12
commit 6539a1592c
16 changed files with 569 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ApiController.php
+23 -31
View File
@@ -182,37 +182,13 @@ class ApiController extends Controller
// dd($response2->toArray());
$resit = new Resit;
$resit->user_id = $request->user_id;
$resit->lelongbid_id = null;
$resit->lelong_id = $request->lelong_id;
$resit->reference_no = $reference_no;
$resit->billplz_id = $billcode['id'];
$resit->resit_type = 1;
$resit->total_payment = 10;
$resit->save();
// foreach($array_payment as $index1=>$arraypay)
// {
// $previous_siri = Http::get(config('api.url') . '/api/online/transaction')->json();
// if($previous_siri){
// $nosiri = $previous_siri['nosiri'] + 1;
// }else{
// $nosiri = 1;
// }
// $reference_no = 'LPKB' . $day . $month . $year . sprintf("%08d", $nosiri);
// $new_transaction = Http::post(config('api.url') . '/api/online/transaction',[
// 'nokp'=> Auth::user()->icno,
// 'reference_no'=> $reference_no,
// 'nosiri'=> $nosiri,
// 'billplz_id' => $billcode['id'],
// 'norujukan' => $arraypay['norujukan'],
// 'kodcaw' => $arraypay['kodcaw'],
// 'total_payment'=> $arraypay['bayaran'],
// 'customer_name' => Auth::user()->name,
// ])->json();
// }
return redirect($billcode['url'] . '?auto_submit=true');
@@ -242,10 +218,18 @@ class ApiController extends Controller
$resit->paid_at = $data['billplz']['paid_at'];
$resit->save();
$payment = new Payment;
$payment->user_id = $resit->user_id;
$payment->lelong_id = $resit->lelong_id;
$payment->total_payment = $resit->total_payment;
$payment->resit_id = $resit->id;
$payment->status_payment_opt = 2; //bayar secara online 2
$payment->status = 1; //fee rm10 - 1
$payment->remark = 'Bayaran Online';
$payment->save();
event(new PaymentNotify('PAID',$resit->user_id));
// $transactionOnline = Http::get(config('api.url') . '/api/transaction/online/express',[
// 'billplz_id' => $data['billplz']['id']
// ])->json();
return response()->json([
'success' => true,
'resit' => $resit
@@ -289,10 +273,18 @@ class ApiController extends Controller
$resit->paid_at = $data['paid_at'];
$resit->save();
// $transactionOnline = Http::get(config('api.url') . '/api/transaction/online/express',[
// 'billplz_id' => $data['billplz']['id']
// ])->json();
$payment = new Payment;
$payment->user_id = $resit->user_id;
$payment->lelong_id = $resit->lelong_id;
$payment->total_payment = $resit->total_payment;
$payment->resit_id = $resit->id;
$payment->status_payment_opt = 2; //bayar secara online 2
$payment->status = 1; //fee rm10 - 1
$payment->remark = 'Bayaran Online';
$payment->save();
event(new PaymentNotify('PAID',$resit->user_id));
return response()->json([
'success' => true,
'resit' => $resit
app/Http/Controllers/AuthMobile/AuthController.php
+1
View File
@@ -50,6 +50,7 @@ class AuthController extends Controller
$user->notelbimbit = $fields['notelbimbit'];
$user->register_agree = $fields['register_agree'];
$user->t_daftar = $currentdate;
$user->status = 'inprogress';
$user->user_type = 2; //type 2 = pembida
app/Http/Controllers/LelongController.php
+69
View File
@@ -27,6 +27,7 @@ use App\Models\LelongBidder;
use App\Models\LelongBidMarhun;
use App\Models\LelKarat;
use App\Models\LelKarat_temp;
use App\Models\Resit;
use Carbon\Carbon;
@@ -436,6 +437,13 @@ class LelongController extends Controller
public function janapemenang($id){
$current = Carbon::now();
$current = new Carbon();
$day = $current->day;
$month = $current->month;
$year = $current->format('y');
$lelong = Lelong::where('id','=',$id)->first();
$lelongbid = LelongBid::where('lelong_id','=',$id)->get();
foreach($lelongbid as $bid)
@@ -461,6 +469,29 @@ class LelongController extends Controller
$updatebid->nopembeli = $bidder->user_id;
$updatebid->status_jual = 1;
$updatebid->save();
$previous_siri = Resit::orderBy('id','desc')->first();
$checkdata = Resit::where('user_id', $bidder->user_id)
->where('lelong_id', $id)
->first();
if(!$checkdata){
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 = $bidder->user_id;
$resit->lelong_id = $id;
$resit->reference_no = $reference_no;
$resit->billplz_id = '';
$resit->total_payment = '';
$resit->resit_type = 2; // 1 = fee , 2 = bid
$resit->save();
}
}
else
{
@@ -578,6 +609,44 @@ class LelongController extends Controller
return view('lelong.lelongtaklaku',compact('lelongtaklaku'));
}
public function senaraipemenang($lelong_id){
$listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->select('lelongbidder.user_id'
)
->groupBy('lelongbidder.user_id')
->get()->toArray();
// 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();
$listwinner[$index1]['details'] = $userdetails;
$listwinner[$index1]['total_surat'] = sizeof($SAGWin);
$listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
}
return view('lelong.senaraipemenang',compact('listwinner','lelong_id'));
}
public function senaraisagpemenang($user_id, $lelong_id){
$senaraisag = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbidder.user_id', $user_id)
->get();
return view('lelong.senaraisagpemenang', compact('senaraisag', 'user_id', 'lelong_id'));
}
public function senaraimarhun($lelongid, $cawid){
// $marhun = LelongBid::->get();
app/Http/Controllers/Mobile/LelongMobileController.php
+19 -13
View File
@@ -64,15 +64,17 @@ class LelongMobileController extends Controller
public function bidderSelectBidItem(Request $request){
$feepayment = Payment::where('status', '=', 1)->first();
$feepayment = Payment::where('lelong_id', '=', $request->lelong_id)->first();
if($feepayment != null){
$user = User::where('id', '=', $request->user_id)
->first();
$selectBid = Cart::join('lelongbid', 'carts.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid.norujukan', $request->norujukan)
$carts = Cart::join('lelongbid', 'carts.lelongbid_id', '=', 'lelongbid.id')
->join('lelong', 'lelongbid.lelong_id', '=', 'lelong.id')
->where('lelong.sts_lelong','=',1)
->where('carts.user_id', $user->id)
->select('lelongbid.id as lelongbid_id',
'lelongbid.t_lelong',
'lelongbid.nilaimarhun',
@@ -84,16 +86,20 @@ class LelongMobileController extends Controller
$currentdate = Carbon::now()->toDateTimeString();
$lelongBidder = new LelongBidder();
$lelongBidder->nama_bidder = $request->name;
$lelongBidder->user_id = $user->id;
$lelongBidder->notelbimbit = $user->notelbimbit;
$lelongBidder->hargabida = $selectBid[0]->hargabida;
$lelongBidder->lelongbid_id = $selectBid[0]->lelongbid_id;
$lelongBidder->nilaimarhun = $selectBid[0]->nilaimarhun;
$lelongBidder->cajlelong = $selectBid[0]->cajlelong;
$lelongBidder->masa_bidaan = $currentdate;
$lelongBidder->save();
foreach($carts as $cart)
{
$lelongBidder = new LelongBidder();
$lelongBidder->nama_bidder = $request->name;
$lelongBidder->user_id = $user->id;
$lelongBidder->notelbimbit = $user->notelbimbit;
$lelongBidder->hargabida = $cart->hargabida;
$lelongBidder->lelongbid_id = $cart->lelongbid_id;
$lelongBidder->nilaimarhun = $cart->nilaimarhun;
$lelongBidder->cajlelong = $cart->cajlelong;
$lelongBidder->masa_bidaan = $currentdate;
$lelongBidder->save();
}
return response()->json("success", 201);
}
app/Http/Controllers/PaymentController.php
+41 -39
View File
@@ -41,6 +41,7 @@ class PaymentController extends Controller
)
->groupBy('lelongbidder.user_id')
->get()->toArray();
// dd($listwinner);
foreach($listwinner as $index1=>$winner){
@@ -50,9 +51,21 @@ class PaymentController extends Controller
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->get();
$total_payment = 0;
foreach($SAGWin as $SAG){
$payment = Payment::where('lelongbid_id', $SAG->lelongbid_id)
->first();
if($payment){
$total_payment = $total_payment + $payment->total_payment;
}
}
$listwinner[$index1]['details'] = $userdetails;
$listwinner[$index1]['total_surat'] = sizeof($SAGWin);
$listwinner[$index1]['totalBid'] = $SAGWin->sum('hargabida');
$listwinner[$index1]['totalPay'] = $total_payment;
}
@@ -75,7 +88,7 @@ class PaymentController extends Controller
)
->first();
foreach($SAGBidItem as $eachbid){
// foreach($SAGBidItem as $eachbid){
$eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('users', 'lelongbidder.user_id', '=', 'users.id')
@@ -85,32 +98,30 @@ class PaymentController extends Controller
->select('lelongbidder.hargabida',
'lelongbid.hargaasas',
'lelongbid.norujukan',
'lelongbidder.lelongbid_id'
'lelongbidder.lelongbid_id',
'lelongbidder.status_payment'
)
->get();
}
// }
return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid'));
return view('pembayaran.SAGBidItem',compact('SAGBidItem', 'eachbid', 'lelong_id'));
}
public function paymentdenokaunter(Request $request){
// dd($request->all());
$currentdate = Carbon::now();
$currentdate = $currentdate->toDateString();
$current = Carbon::now();
$current = new Carbon();
$day = $current->day;
$month = $current->month;
$year = $current->format('y');
$currentdate = $currentdate->toDateTimeString();
$user = Auth::user();
$bid_id = explode(",", $request->eachbid);
$resit = Resit::where('lelong_id', $request->lelong_id)
->first();
$total_hargabida = 0;
foreach($bid_id as $bid){
$eachbid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
@@ -120,34 +131,17 @@ class PaymentController extends Controller
'lelongbid.hargaasas',
'lelongbid.norujukan',
'lelongbidder.lelongbid_id',
'lelongbidder.id as lelongbidder_id'
'lelongbidder.id as lelongbidder_id',
'lelongbid.lelong_id as lelong_id'
)
->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();
$total_hargabida = $total_hargabida + $eachbid->hargabida;
$payment = Payment::create([
'user_id' => $request->user_id,
'lelongbidder_id' => $eachbid->lelongbidder_id,
'lelongbid_id' => $bid,
'lelong_id' => $eachbid->lelong_id,
'kodcaw' => $user->kodcaw,
'status_payment_opt' => 1,
'status' => 2,
@@ -169,14 +163,22 @@ class PaymentController extends Controller
'disahkan_pada' => $currentdate
]);
$updatelelbidbidder = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->update(array(
'lelongbid.status_jual' => 1,
'lelongbid.t_jual' => $currentdate
));
$updatelelbidbidder = LelongBidder::where('lelongbid_id', $eachbid->lelongbid_id)
->first();
$updatelelbidbidder->status_payment = 1;
$updatelelbidbidder->update();
$eachbid->status_jual = 1;
$eachbid->t_jual = $currentdate;
$eachbid->update();
}
if($request->amaunkiraan == $total_hargabida){
$resit->total_payment = $total_hargabida;
$resit->status = 'PAID';
$resit->paid_at = $currentdate;
$resit->update();
}
return redirect()->route('pembayaran.SenaraiLelongBayar')->with('success','Pembayaran Berjaya');
}
app/Http/Controllers/PembidaController.php
+1 -1
View File
@@ -34,7 +34,7 @@ class PembidaController extends Controller
// $alluser = User::all();
$alluser = User::doesntHave('roles')
->where('user_type','=',2)
->where('status', '!=', 'rejected')
->where('status', '=', 'inprogress')
->get();
// dd($alluser);