diff --git a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php index 59247557..35324464 100644 --- a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php +++ b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php @@ -49,14 +49,13 @@ class CallbackBillplzLogic /** * @param Request $request - * @return \Illuminate\Http\RedirectResponse + * @return bool|\Illuminate\Contracts\View\Factory|\Illuminate\View\View * @throws MalformedRequestException * @throws ResourceNotFoundException */ public function execute(Request $request) { - Log::info(json_encode($request->all())); $billplzXSignatureObject = new BillplzXSignatureObject($request); if(!$billplzXSignatureObject->isValidSignature()){ @@ -75,7 +74,8 @@ class CallbackBillplzLogic $token = Auth::fromUser(User::find(1)); $request->headers->set('Authorization', 'Bearer '.$token); - return view('pages.payments_redirect', ['marking' => $transaction->booking->marking, 'payment_reference' => $transaction->payment_reference, 'status' => $status, 'amount' => $transaction->amount]); + + return $request->method() === 'POST' ? true : view('pages.payments_redirect', ['marking' => $transaction->booking->marking, 'payment_reference' => $transaction->payment_reference, 'status' => $status, 'amount' => $transaction->amount]); } } \ No newline at end of file diff --git a/app/Http/Controllers/Billplz/CallbackBillplzController.php b/app/Http/Controllers/Billplz/CallbackBillplzController.php index dfac2c05..9ee281e6 100644 --- a/app/Http/Controllers/Billplz/CallbackBillplzController.php +++ b/app/Http/Controllers/Billplz/CallbackBillplzController.php @@ -7,10 +7,11 @@ use Illuminate\Http\Request; class CallbackBillplzController { + /** * @param Request $request * @param CallbackBillplzLogic $logic - * @return \Illuminate\Http\RedirectResponse + * @return bool|\Illuminate\Contracts\View\Factory|\Illuminate\View\View * @throws \App\Classes\Exceptions\MalformedRequestException * @throws \App\Classes\Exceptions\ResourceNotFoundException */