fix api feepayment & bidpayment

2022-06-22 11:51:43 +08:00
parent c2333bdc5d
commit 7a76775aa0
2 changed files with 161 additions and 18 deletions
@@ -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'));
+
 		}
 	}
 }