This commit is contained in:
Azfar Arsyad
2022-03-10 16:49:06 +08:00
parent 150da4081d
commit b4925b080b
8 changed files with 52 additions and 17 deletions
+30
View File
@@ -0,0 +1,30 @@
<?php
namespace App\Events;
use Illuminate\Queue\SerializesModels;
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Broadcasting\InteractsWithSockets;
use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
class LelongNotify implements ShouldBroadcast
{
use Dispatchable, InteractsWithSockets, SerializesModels;
public $status;
public function __construct($status)
{
$this->status = $status;
}
public function broadcastOn()
{
return ['lelong-notify'];
}
public function broadcastAs()
{
return 'trigger-lelong';
}
}
+3 -1
View File
@@ -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()
+3 -2
View File
@@ -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();
+8 -8
View File
@@ -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
@@ -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)){
@@ -1,6 +1,7 @@
<?php
namespace App\Http\Controllers;
use App\Events\LelongNotify;
use Illuminate\Http\Request;
use Spatie\Permission\Models\Role;
@@ -349,6 +350,7 @@ class LelongController extends Controller
public function start($id)
{
event(new LelongNotify('start'));
$currentdate = Carbon::now();
$currenttime = $currentdate->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();
@@ -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();
+2 -2
View File
@@ -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();