From e707f01087c1849b783ae4879e3c983abc89c695 Mon Sep 17 00:00:00 2001 From: Azfar Arsyad <45238748+Arpax17@users.noreply.github.com> Date: Thu, 24 Feb 2022 09:30:56 +0800 Subject: [PATCH] update --- .gitignore | 1 + app/Events/PaymentNotify.php | 32 +++++++++++++++++++++ app/Http/Controllers/ApiController.php | 18 ++++++++---- app/Http/Controllers/DatabaseController.php | 3 ++ 4 files changed, 49 insertions(+), 5 deletions(-) create mode 100644 app/Events/PaymentNotify.php diff --git a/.gitignore b/.gitignore index eb003b01..f46f91d3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ npm-debug.log yarn-error.log /.idea /.vscode +composer.lock diff --git a/app/Events/PaymentNotify.php b/app/Events/PaymentNotify.php new file mode 100644 index 00000000..162b1ecd --- /dev/null +++ b/app/Events/PaymentNotify.php @@ -0,0 +1,32 @@ +response = $response; + $this->userid = $userid; + } + + public function broadcastOn() + { + return ['payment-notify']; + } + + public function broadcastAs() + { + return 'trigger-payment'; + } +} \ No newline at end of file diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index 65f70a40..e10603b4 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -2,6 +2,8 @@ namespace App\Http\Controllers; +use App\Events\PaymentNotify; + use Illuminate\Http\Request; use Spatie\Permission\Models\Role; use Spatie\Permission\Models\Permission; @@ -155,13 +157,13 @@ class ApiController extends Controller $collection_id = $this->collection_id; $response = $bill->create( $collection_id, - 'test@gmail.com', + $request->email, $request->notel, $request->name, Money::MYR($total_bayaran), route('pay.callback'), 'Bayaran Borang', - ['redirect_url' => 'http://192.168.0.85:8003/api/pembayaran/response'] + ['redirect_url' => 'http://192.168.0.88:8003/api/pembayaran/response'] ); // dd($response); $previous_siri = Resit::orderBy('id','desc')->first(); @@ -218,7 +220,7 @@ class ApiController extends Controller } public function callback(Request $request){ - // dd('hye'); + // dd('hye callback'); $http = new HttpMethodsClient( new GuzzleHttpClient(), new GuzzleMessageFactory() @@ -239,7 +241,8 @@ class ApiController extends Controller $resit->status = 'PAID'; $resit->paid_at = $data['billplz']['paid_at']; $resit->save(); - + + event(new PaymentNotify('PAID',$resit->user_id)); // $transactionOnline = Http::get(config('api.url') . '/api/transaction/online/express',[ // 'billplz_id' => $data['billplz']['id'] // ])->json(); @@ -253,6 +256,8 @@ class ApiController extends Controller $resit->status = 'UNSUCCESSFUL'; $resit->paid_at = null; $resit->save(); + + event(new PaymentNotify('UNSUCCESSFUL',$resit->user_id)); return response()->json([ 'success' => false, 'resit' => $resit @@ -261,7 +266,7 @@ class ApiController extends Controller } public function response(Request $request){ - // dd('hye'); + // dd('hye response'); $http = new HttpMethodsClient( new GuzzleHttpClient(), new GuzzleMessageFactory() @@ -287,6 +292,7 @@ class ApiController extends Controller // $transactionOnline = Http::get(config('api.url') . '/api/transaction/online/express',[ // 'billplz_id' => $data['billplz']['id'] // ])->json(); + event(new PaymentNotify('PAID',$resit->user_id)); return response()->json([ 'success' => true, 'resit' => $resit @@ -297,6 +303,8 @@ class ApiController extends Controller $resit->status = 'UNSUCCESSFUL'; $resit->paid_at = null; $resit->save(); + + event(new PaymentNotify('UNSUCCESSFUL',$resit->user_id)); return response()->json([ 'success' => false, 'resit' => $resit diff --git a/app/Http/Controllers/DatabaseController.php b/app/Http/Controllers/DatabaseController.php index b7847258..00f654c3 100644 --- a/app/Http/Controllers/DatabaseController.php +++ b/app/Http/Controllers/DatabaseController.php @@ -8,6 +8,8 @@ use Spatie\Permission\Models\Permission; use Illuminate\Support\Facades\Auth; use App\Models\Cawangan; +use App\Events\PaymentNotify; + class DatabaseController extends Controller { /** @@ -27,6 +29,7 @@ class DatabaseController extends Controller */ public function index() { + event(new PaymentNotify('lulus','8')); $caw = Cawangan::all(); // $user = Auth::user(); // $user->assignRole('admin');