diff --git a/app/Events/LelongNotify.php b/app/Events/LelongNotify.php new file mode 100644 index 00000000..98456d9c --- /dev/null +++ b/app/Events/LelongNotify.php @@ -0,0 +1,30 @@ +status = $status; + } + + public function broadcastOn() + { + return ['lelong-notify']; + } + + public function broadcastAs() + { + return 'trigger-lelong'; + } +} \ No newline at end of file diff --git a/app/Events/PaymentNotify.php b/app/Events/PaymentNotify.php index 162b1ecd..e6480e50 100644 --- a/app/Events/PaymentNotify.php +++ b/app/Events/PaymentNotify.php @@ -13,11 +13,13 @@ class PaymentNotify implements ShouldBroadcast public $response; public $userid; + public $paymentid; - public function __construct($response,$userid) + public function __construct($response,$userid,$paymentid) { $this->response = $response; $this->userid = $userid; + $this->paymentid = $paymentid; } public function broadcastOn() diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index 6e2c2ef3..92793e95 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -48,7 +48,7 @@ class AccountController extends Controller ->groupBy('lelongbidder.user_id') ->get(); - + // dd($listwinner); foreach($listwinner as $index1=>$winner){ $userdetails = User::where('id', $winner['user_id'])->first(); @@ -74,7 +74,7 @@ class AccountController extends Controller ->select('lelongbidder.payment_id') ->groupBy('lelongbidder.payment_id') ->get(); - + // dd($id_payment); $total_payment = 0; foreach($id_payment as $id){ $payment = Payment::where('id', $id->payment_id) @@ -160,6 +160,7 @@ class AccountController extends Controller $updatelelbidbidder->save(); $eachbid = LelongBid::where('id',$sag->lelongbid_id)->first(); + $eachbid->status_payment = 1; $eachbid->status_jual = 1; $eachbid->t_jual = $currentdate; $eachbid->save(); diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index 5d0c5fb6..1cf146cb 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -228,7 +228,7 @@ class ApiController extends Controller $payment->remark = 'Bayaran Online'; $payment->save(); - event(new PaymentNotify('PAID',$resit->user_id)); + event(new PaymentNotify('PAID',$resit->user_id,$payment->id)); return response()->json([ 'success' => true, @@ -241,7 +241,7 @@ class ApiController extends Controller $resit->paid_at = null; $resit->save(); - event(new PaymentNotify('UNSUCCESSFUL',$resit->user_id)); + event(new PaymentNotify('UNSUCCESSFUL',$resit->user_id,'')); return response()->json([ 'success' => false, 'resit' => $resit @@ -283,7 +283,7 @@ class ApiController extends Controller $payment->remark = 'Bayaran Online'; $payment->save(); - event(new PaymentNotify('PAID',$resit->user_id)); + event(new PaymentNotify('PAID',$resit->user_id,$payment->id)); return response()->json([ 'success' => true, @@ -296,7 +296,7 @@ class ApiController extends Controller $resit->paid_at = null; $resit->save(); - event(new PaymentNotify('UNSUCCESSFUL',$resit->user_id)); + event(new PaymentNotify('UNSUCCESSFUL',$resit->user_id,'')); return response()->json([ 'success' => false, 'resit' => $resit @@ -414,7 +414,7 @@ class ApiController extends Controller $payment->remark = 'BAYARAN ONLINE'; $payment->save(); - event(new PaymentNotify('PAID',$resitoriginal->user_id)); + event(new PaymentNotify('PAID',$resitoriginal->user_id,$payment->id)); return response()->json([ 'success' => true, @@ -427,7 +427,7 @@ class ApiController extends Controller $resit->paid_at = null; $resit->save(); - event(new PaymentNotify('UNSUCCESSFUL',$resit->user_id)); + event(new PaymentNotify('UNSUCCESSFUL',$resit->user_id,'')); return response()->json([ 'success' => false, 'resit' => $resit @@ -477,7 +477,7 @@ class ApiController extends Controller $payment->remark = 'BAYARAN ONLINE'; $payment->save(); - event(new PaymentNotify('PAID',$resit->user_id)); + event(new PaymentNotify('PAID',$resit->user_id,$payment->id)); return response()->json([ 'success' => true, @@ -490,7 +490,7 @@ class ApiController extends Controller $resit->paid_at = null; $resit->save(); - event(new PaymentNotify('UNSUCCESSFUL',$resit->user_id)); + event(new PaymentNotify('UNSUCCESSFUL',$resit->user_id,'')); return response()->json([ 'success' => false, 'resit' => $resit diff --git a/app/Http/Controllers/AuthMobile/AuthController.php b/app/Http/Controllers/AuthMobile/AuthController.php index 6d4ae5ab..158d634c 100644 --- a/app/Http/Controllers/AuthMobile/AuthController.php +++ b/app/Http/Controllers/AuthMobile/AuthController.php @@ -100,7 +100,8 @@ class AuthController extends Controller else if($user->status == 'rejected') { return response([ - 'message' => 'Permohonan Ditolak' + 'message' => 'rejected', + 'nota' => $user->note ], 401); } else @@ -109,9 +110,6 @@ class AuthController extends Controller 'message' => 'Registration in progress,status wait for approval.' ], 401); } - return response([ - 'message' => 'Bad Creds' - ], 401); } //Check Password if(!$user || !Hash::check($fields['password'], $user->password)){ diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 703e20bc..26870d13 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -1,6 +1,7 @@ toTimeString(); $endtime = $currentdate->addHours(2); @@ -552,6 +554,7 @@ class LelongController extends Controller public function stop($id) { + event(new LelongNotify('stop')); $currentdate = Carbon::now(); $currenttime = $currentdate->toTimeString(); diff --git a/app/Http/Controllers/Mobile/LelongMobileController.php b/app/Http/Controllers/Mobile/LelongMobileController.php index 6de68f5d..6b498ffb 100644 --- a/app/Http/Controllers/Mobile/LelongMobileController.php +++ b/app/Http/Controllers/Mobile/LelongMobileController.php @@ -229,6 +229,7 @@ class LelongMobileController extends Controller { $lelongbidder = LelongBidder::where('lelongbid_id',$bid->id)->first(); $lelongbidder->status_payment =1; + $lelongbidder->payment_id = $request->paymentid; $lelongbidder->save(); $lelongbid = LelongBid::where('id',$bid->id)->first(); diff --git a/app/Http/Controllers/PembidaController.php b/app/Http/Controllers/PembidaController.php index 13b73406..df679cc5 100644 --- a/app/Http/Controllers/PembidaController.php +++ b/app/Http/Controllers/PembidaController.php @@ -50,7 +50,7 @@ class PembidaController extends Controller // dd($userid); $user = User::where('id','=',$userid)->first(); $files = File::where('user_id','=',$userid)->get()->toArray(); - + // dd($files); $array_ic = []; foreach($files as $index=>$file) { @@ -100,7 +100,7 @@ class PembidaController extends Controller $user = User::where('id','=',$request->user_id)->first(); $user->disahkan_pada = $currentdate; $user->disahkan_oleh = Auth::user()->id; - $user->note = $request->note; + $user->note = $request->nota; $user->status = 'rejected'; $user->save();