From 7a76775aa084f4be15e8e3396bc6723b92530d72 Mon Sep 17 00:00:00 2001 From: Amir Date: Wed, 22 Jun 2022 11:51:43 +0800 Subject: [PATCH] fix api feepayment & bidpayment --- app/Http/Controllers/ApiController.php | 65 +++++++--- .../views/pembida/feePaymentResult.blade.php | 114 ++++++++++++++++++ 2 files changed, 161 insertions(+), 18 deletions(-) create mode 100644 resources/views/pembida/feePaymentResult.blade.php diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php index dbeef04a..8b3ee292 100644 --- a/app/Http/Controllers/ApiController.php +++ b/app/Http/Controllers/ApiController.php @@ -167,7 +167,7 @@ class ApiController extends Controller Money::MYR($total_bayaran), route('pay.callback'), 'Bayaran Borang', - // ['redirect_url' => route('pay.paymentStatus')] + ['redirect_url' => route('pay.paymentStatus')] // ['redirect_url' => url('http://localhost:8080/test')] ); // dd($response); @@ -294,10 +294,16 @@ class ApiController extends Controller event(new PaymentNotify('PAID',$resit->user_id,$payment->id)); - return response()->json([ - 'success' => true, - 'resit' => $resit - ]); + $success = true; + + $result = $resit->toArray(); + + // return response()->json([ + // 'success' => true, + // 'resit' => $resit + // ]); + + return view('pembida.feePaymentResult',compact('data', 'result', 'success')); // return redirect()->to('http://localhost:8080/test')->with(['resit'=>$resit]); @@ -307,11 +313,16 @@ class ApiController extends Controller $resit->paid_at = null; $resit->save(); + $result = $resit->toArray(); + + $success = false; + event(new PaymentNotify('UNSUCCESSFUL',$resit->user_id,'')); - return response()->json([ - 'success' => false, - 'resit' => $resit - ]); + // return response()->json([ + // 'success' => false, + // 'resit' => $resit + // ]); + return view('pembida.feePaymentResult',compact('data', 'result', 'success')); } } @@ -352,7 +363,7 @@ class ApiController extends Controller Money::MYR($total_bayaran), route('pay.bidcallback'), 'Bayaran Bidaan', - // ['redirect_url' => route('pay.bidpaymentStatus')] + ['redirect_url' => route('pay.bidpaymentStatus')] ); // dd($response); $previous_siri = Resit::orderBy('id','desc')->first(); @@ -493,10 +504,20 @@ class ApiController extends Controller event(new PaymentNotify('PAID',$resit->user_id,$payment->id)); - return response()->json([ - 'success' => true, - 'resit' => $resit - ]); + $success = true; + + $result = $resit->toArray(); + + // dump($success); + // dump($data); + // dump($result); + + // return response()->json([ + // 'success' => true, + // 'resit' => $resit + // ]); + + return view('pembida.feePaymentResult',compact('data', 'result', 'success')); }else{ $resit = Resit::where('billplz_id','=',$data['id'])->first(); @@ -505,10 +526,18 @@ class ApiController extends Controller $resit->save(); event(new PaymentNotify('UNSUCCESSFUL',$resit->user_id,'')); - return response()->json([ - 'success' => false, - 'resit' => $resit - ]); + + $result = $resit->toArray(); + + $success = false; + + // return response()->json([ + // 'success' => false, + // 'resit' => $resit + // ]); + + return view('pembida.feePaymentResult',compact('data', 'result', 'success')); + } } } diff --git a/resources/views/pembida/feePaymentResult.blade.php b/resources/views/pembida/feePaymentResult.blade.php new file mode 100644 index 00000000..980332f2 --- /dev/null +++ b/resources/views/pembida/feePaymentResult.blade.php @@ -0,0 +1,114 @@ + + + + +
+
+
+
+ +
+ @if ($success == true) +
+

+ @if ($result['total_payment'] <= 11 ) +

Pembayaran Yuran Berjaya

+ @else +

Pembayaran Bidaan Berjaya

+ @endif +

*Sila rujuk e-mel anda untuk resit bayaran.

+
+
+
Jumlah Bayaran
+
RM{{ $result['total_payment']}}
+
+
+
Tarikh & Masa Transaksi
+
+
+
+
No Rujukan
+
{{ $result['reference_no']}}
+ +
+
+
Billplz ID
+
{{ $result['billplz_id']}}
+ +
+
+
+
+
Nama
+
{{ $data['name']}}
+
+
+
E-mel
+
{{ $data['email']}}
+ +
+
+
No Tel Bimbit
+
{{ $data['mobile']}}
+ +
+
+
+ @elseif ($success == false) +
+

+ @if ($result['total_payment'] <= 11 ) +

Pembayaran Yuran Gagal!

+ @else +

Pembayaran Bidaan Gagal!

+ @endif +

Terdapat ralat semasa transaksi dilakukan. Sila cuba lagi.

+
+
+
Jumlah
+
RM{{ $result['total_payment']}}
+
+
+
Tarikh & Masa Transaksi
+
+
+
+
No Rujukan
+
{{ $result['reference_no']}}
+ +
+
+
Billplz ID
+
{{ $result['billplz_id']}}
+ +
+
+
+
+
Nama
+
{{ $data['name']}}
+
+
+
E-mel
+
{{ $data['email']}}
+ +
+
+
No Tel Bimbit
+
{{ $data['mobile']}}
+ +
+
+
+ @endif +
+
+ + To Home +
+
+
+
+
\ No newline at end of file