From fe08284db5ee98c4657d8e5a5e71f0b1ea41d5d9 Mon Sep 17 00:00:00 2001
From: Amir <amirhassan.hamzan@gmail.com>
Date: Tue, 21 Feb 2023 06:29:52 +0800
Subject: [PATCH] Fix api payment with save response & redirect page

---
 app/Http/Controllers/ApiController.php             | 5 ++++-
 app/Models/Resit.php                               | 3 ++-
 resources/views/pembida/feePaymentResult.blade.php | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/ApiController.php b/app/Http/Controllers/ApiController.php
index ff8b680d..e0da97b0 100644
--- a/app/Http/Controllers/ApiController.php
+++ b/app/Http/Controllers/ApiController.php
@@ -555,7 +555,7 @@ class ApiController extends Controller
         $req = $request->toArray();
         $response = $bill->get($req['billplz']['id']);
         $data = $response->toArray();
-        if ($data['paid'] == 'true') {
+        if ($data['paid'] == 'true' || $data['paid_at'] != null) {
             $resit = Resit::where('billplz_id', '=', $data['id'])->first();
             $resit->status = 'PAID';
             $resit->paid_at = $data['paid_at'];
@@ -615,6 +615,8 @@ class ApiController extends Controller
 
             $result = $resit->toArray();
 
+            $resit->response = json_encode($data);
+            $resit->save();
             // return response()->json([
             //     'success' => true,
             //     'resit' => $resit
@@ -625,6 +627,7 @@ class ApiController extends Controller
             $resit = Resit::where('billplz_id', '=', $data['id'])->first();
             $resit->status = 'UNSUCCESSFUL';
             $resit->paid_at = null;
+            $resit->response = json_encode($data);
             $resit->save();
 
             event(new PaymentNotify('UNSUCCESSFUL', $resit->user_id, ''));
diff --git a/app/Models/Resit.php b/app/Models/Resit.php
index f9c708b7..120c5e8b 100644
--- a/app/Models/Resit.php
+++ b/app/Models/Resit.php
@@ -20,6 +20,7 @@ class Resit extends Model
         'total_payment',
         'resit_type', // 1 = fee , 2 = bid
         'status', //status => 1 = paid , 2 = pending
-        'paid_at'
+        'paid_at',
+        'response'
     ];
 }
diff --git a/resources/views/pembida/feePaymentResult.blade.php b/resources/views/pembida/feePaymentResult.blade.php
index 980332f2..a4260ee1 100644
--- a/resources/views/pembida/feePaymentResult.blade.php
+++ b/resources/views/pembida/feePaymentResult.blade.php
@@ -105,8 +105,8 @@
                     @endif
                 </div>
                 <div class="card-footer">
-                    <!-- <a href="https://elelong.arrahn.com.my/" class="btn btn-primary">To Home</a> -->
-                    <a href="http://localhost:8080/" class="btn btn-primary">To Home</a>
+                    <!-- <a href="https://bid.arrahn.com.my/result" class="btn btn-primary">To Home</a> -->
+                    <a href="http://localhost:8080/result" class="btn btn-primary">To Home</a>
                 </div>
             </div>
         </div>