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

Merge branch 'main' into faiqahzaman

Browse Source
This commit is contained in:
faiqahzaman
2022-04-03 13:23:32 +08:00
parent 7614969354 691a32a94d
commit e19b839ab5
14 changed files with 308 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AccountController.php
+37 -31
View File
@@ -32,17 +32,13 @@ class AccountController extends Controller
public function listbayaranonline($lelong_id){
// $listwinner = Payment::join('lelongbid', 'payment.lelongbid_id', '=', 'lelongbid.id')
// ->join('lelongbidder', 'payment.lelongbidder_id', '=', 'lelongbidder.id')
// ->where('lelongbidder.status_bidder', 1)
// ->where('lelongbid.lelong_id', $lelong_id)
// ->select('payment.user_id'
// )
// ->groupBy('payment.user_id')
// ->get();
$listwinner = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('payment', 'lelongbidder.payment_id', 'payment.id')
->where('lelongbidder.status_bidder', 1)
->where('lelongbid.lelong_id', $lelong_id)
->where('payment.status_payment_opt',2)
->whereNull('payment.disahkan_pada')
->select('.lelongbidder.user_id'
)
->groupBy('lelongbidder.user_id')
@@ -105,13 +101,20 @@ class AccountController extends Controller
->where('payment.status_payment_opt', 2)
->get()->toArray();
$total_payment = 0;
foreach($senaraisag as $index1=>$sagbid){
if($sagbid['total_payment']){
$total_payment = $total_payment +$sagbid['total_payment'];
}
}
$saggroupbyid = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->join('payment', 'lelongbidder.payment_id', '=', 'payment.id')
->where('lelongbid.lelong_id', $lelong_id)
->where('lelongbidder.user_id', $user_id)
->where('lelongbidder.status_bidder', 1)
->where('payment.status_payment_opt', 2)
->select(
'lelongbidder.payment_id as payment_id'
)
->groupBy('lelongbidder.payment_id')
->get();
// $payments = Payment::whereIn($saggroupbyid)->get()
$total_payment = Payment::whereIn('id',$saggroupbyid)->get()->sum('total_payment');
return view('account.sahsagonline', compact('senaraisag', 'lelong_id', 'user_id', 'total_payment'));
}
@@ -124,6 +127,7 @@ class AccountController extends Controller
$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)
@@ -136,35 +140,37 @@ class AccountController extends Controller
'lelongbid.lelong_id',
'lelongbidder.user_id',
)
->get();
->get();
$total_payment = 0;
foreach($senaraisag as $sag)
$paymentid = 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)
->select(
'lelongbidder.payment_id as payment_id'
)
->groupBy('lelongbidder.payment_id')
->get();
foreach($paymentid as $dataid)
{
$payment = Payment::join('lelongbidder', 'payment.id', '=', 'lelongbidder.payment_id')
->where('payment.lelong_id', $request->lelong_id)
->where('payment.user_id', $request->user_id)
// ->where('lelongbidder.lelongbid_id', $sag->lelongbid_id)
->first();
// dd($payment);
$payment = Payment::where('id', $dataid->payment_id)->first();
$payment->disahkan_oleh = $user->id;
$payment->disahkan_pada = $currentdate;
$payment->save();
$total_payment = $total_payment + $payment->total_payment;
$updatelelbidbidder = LelongBidder::where('lelongbid_id', $sag->lelongbid_id)
->first();
$updatelelbidbidder->status_payment = 1;
$updatelelbidbidder->save();
}
foreach($senaraisag as $sag)
{
$eachbid = LelongBid::where('id',$sag->lelongbid_id)->first();
$eachbid->status_payment = 1;
$eachbid->status_jual = 1;
$eachbid->t_jual = $currentdate;
$eachbid->save();
}
$senaraisagallpayment = LelongBid::join('lelongbidder', 'lelongbid.id', '=', 'lelongbidder.lelongbid_id')
app/Http/Controllers/ApiController.php
+19 -8
View File
@@ -61,9 +61,9 @@ class ApiController extends Controller
}else{
$this->api_key = 'f3e82fe1-a422-4660-97f0-65cc59ff6c47';
$this->XSignature_Key = 'S-alZUbzmD2_TF3vmrRqgehQ';
$this->collection_id = 'drxdyor4';
}
}
public function biditem()
@@ -126,6 +126,10 @@ class ApiController extends Controller
}
}
public function testbillplz()
{
return view('pembayaran.testbillplz');
}
public function feepayment(Request $request)
{
@@ -152,7 +156,7 @@ class ApiController extends Controller
$month = $current->month;
$year = $current->format('y');
$total_bayaran = 1000;
$total_bayaran = 1100;
$collection_id = $this->collection_id;
$response = $bill->create(
@@ -190,7 +194,11 @@ class ApiController extends Controller
$resit->save();
return redirect($billcode['url'] . '?auto_submit=true');
// return redirect($billcode['url'] . '?auto_submit=true');
return response()->json([
'success' => true,
'message' => $billcode['url'],
], 401);
// return view('pembayaran.result.berjaya',compact('arraybayaran'));
}
@@ -225,7 +233,7 @@ class ApiController extends Controller
$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->remark = 'BAYARAN ONLINE';
$payment->save();
event(new PaymentNotify('PAID',$resit->user_id,$payment->id));
@@ -280,7 +288,7 @@ class ApiController extends Controller
$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->remark = 'BAYARAN ONLINE';
$payment->save();
event(new PaymentNotify('PAID',$resit->user_id,$payment->id));
@@ -330,7 +338,7 @@ class ApiController extends Controller
$month = $current->month;
$year = $current->format('y');
$total_bayaran = ($request->total)*100;
$total_bayaran = ($request->total)*100+100;
$collection_id = $this->collection_id;
$response = $bill->create(
@@ -368,8 +376,11 @@ class ApiController extends Controller
$resit->save();
return redirect($billcode['url'] . '?auto_submit=true');
// return redirect($billcode['url'] . '?auto_submit=true');
return response()->json([
'success' => true,
'message' => $billcode['url'],
], 401);
// return view('pembayaran.result.berjaya',compact('arraybayaran'));
}
app/Http/Controllers/AuthMobile/AuthController.php
+2 -1
View File
@@ -14,7 +14,8 @@ use Illuminate\Support\Facades\Validator;
class AuthController extends Controller
{
public function register(Request $request) {
$validator = Validator::make($request->all(), [
// dd($request->all);
$validator = Validator::make($request->all(), [
'name' => 'required|string',
'username' => 'required|string|unique:users',
'nokp' => 'required|string|unique:users',
app/Http/Controllers/MarhunController.php
+2 -1
View File
@@ -197,13 +197,14 @@ class MarhunController extends Controller
$karat = new Pengesahan;
$karat->lelong_id = $lelong->id;
$karat->lelongbid_id = $lelongbid->id;
$karat->lelongbidmarhun_id = $lelongbidmarhun->id;
$karat->norujukan = $lelongbid->norujukan;
$karat->diminta_oleh = $user->id;
$karat->diminta_pada = $currentdate;
$karat->status_ubah = 2;
$karat->save();
return redirect()->route('marhun.show',$lelongbid->id)
return redirect()->route('marhun.show',[$lelongbid->id,$lelongbid->lelong_id])
->with('success','Marhun Berjaya Ditambah');
}
app/Http/Controllers/Mobile/LelongMobileController.php
+34 -5
View File
@@ -14,6 +14,7 @@ use App\Models\Payment;
use App\Models\Cart;
use Carbon\Carbon;
use App\Models\Cawangan;
use App\Models\Resit;
class LelongMobileController extends Controller
{
@@ -72,8 +73,12 @@ class LelongMobileController extends Controller
public function bidderSelectBidItem(Request $request){
$feepayment = Payment::where('lelong_id', '=', $request->lelong_id)->first();
$feepayment = Payment::join('resit', 'payment.resit_id','=','resit.id')
->where('payment.user_id',$request->user_id)
->where('payment.lelong_id', '=', $request->lelong_id)
->where('resit.resit_type',1)
->where('resit.status','PAID')->first();
// dd($feepayment);
if($feepayment != null){
$user = User::where('id', '=', $request->user_id)
@@ -90,7 +95,7 @@ class LelongMobileController extends Controller
'carts.hargabida',
'carts.id as cart_id')
->get();
// dd($carts);
// dd($selectBid[0]->hargabida);
$currentdate = Carbon::now()->toDateTimeString();
@@ -227,7 +232,8 @@ class LelongMobileController extends Controller
foreach($lelongbid as $bid)
{
$lelongbidder = LelongBidder::where('lelongbid_id',$bid->id)->first();
$lelongbidder = LelongBidder::where('lelongbid_id',$bid->id)
->where('user_id',$request->user_id)->first();
$lelongbidder->status_payment =1;
$lelongbidder->payment_id = $request->paymentid;
$lelongbidder->save();
@@ -237,7 +243,28 @@ class LelongMobileController extends Controller
$lelongbid->t_jual = $currentdate;
$lelongbid->hargajual = $lelongbidder->hargabida;
$lelongbid->save();
}
// $alllelongbidder = LelongBidder::join('lelongbid','lelongbidder.lelongbid_id','lelongbid.id')
// ->where('lelongbidder.user_id',$request->user_id)
// ->where('lelongbid.lelong_id',$request->lelong_id)
// ->where('lelongbidder.status_bidder',1)
// ->select('lelongbidder.hargabida')
// ->get();
// $resit = Resit::where('lelong_id',$request->lelong_id)
// ->where('user_id',$request->user_id)
// ->where('resit_type',2)
// ->first();
// if($resit->total_payment > $alllelongbidder->SUM('hargabida'))
// {
// $resit->status = 'PAID';
// $resit->paid_at = $currentdate;
// $resit->save();
// }
$response = [
'success' => "success",
'message' => "Bidaan berjaya dibayar"
@@ -264,7 +291,9 @@ class LelongMobileController extends Controller
{
// dd($lelong['id']);
$datalelongbidder = LelongBidder::join('lelongbid', 'lelongbidder.lelongbid_id', '=', 'lelongbid.id')
->where('lelongbid.lelong_id',$lelong['id'])->get();
->where('lelongbid.lelong_id',$lelong['id'])
->where('user_id',$user_id)
->where('status_bidder',1)->get();
$payment = Payment::join('resit', 'payment.resit_id', '=', 'resit.id')
->where('payment.lelong_id',$lelong['id'])
app/Http/Controllers/PaymentController.php
+1
View File
@@ -170,6 +170,7 @@ class PaymentController extends Controller
$updatelelbidbidder = LelongBidder::where('lelongbid_id', $eachbid->lelongbid_id)
->where('user_id',$request->user_id)
->first();
$updatelelbidbidder->status_payment = 1;
$updatelelbidbidder->payment_id = $payment->id;