WIP

happypixels#25
macmedia · Sep 10, 2019 · 55c38ab · 55c38ab
1 parent fd36f29
commit 55c38ab
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 27 deletions.
diff --git a/src/Controllers/CheckoutController.php b/src/Controllers/CheckoutController.php
@@ -52,7 +52,7 @@ public function charge(Request $request)
         $response = ['token' => $order->token];
 
         if (config('shopr.templates.order-confirmation')) {
-            $response['redirect'] = route('shopr.order-confirmation').'?token='.$order->token;
+            $response['redirect'] = route('shopr.order-confirmation', ['token' => $order->token]);
         }
 
         return response()->json($response, 201);

diff --git a/src/Controllers/Web/PaymentConfirmationController.php b/src/Controllers/Web/PaymentConfirmationController.php
@@ -10,29 +10,30 @@
 
 class PaymentConfirmationController extends Controller
 {
+    /**
+     * Attempts to confirm a payment. Returns an error view if unsuccessful and reidrects to
+     * the order confirmation view otherwise.
+     *
+     * @param Request $request
+     * @return \Illuminate\Http\Response
+     */
     public function __invoke(Request $request)
     {
         $request->validate(['gateway' => 'required']);
 
         try {
-            $response = PaymentProviderManager::make($request)->confirm($request->payment_intent);
+            $response = PaymentProviderManager::make($request)->confirmPayment();
         } catch (PaymentFailedException $e) {
             return view('shopr::payments.error')->with('message', $e->getMessage());
         }
 
-        info('Confirmation response', $response);
-
         $order = Order::where('transaction_reference', $request->payment_intent)->firstOrFail();
 
-
         $order->update([
             'payment_status' => 'paid',
             'transaction_reference' => $response['transaction_reference'],
         ]);
 
-        // Return redirectable response.
-        return redirect()->route('shopr.order-confirmation', [
-            'token' => $order->token,
-        ]);
+        return redirect()->route('shopr.order-confirmation', ['token' => $order->token]);
     }
 }
diff --git a/src/Middleware/RequireOrderToken.php b/src/Middleware/RequireOrderToken.php
@@ -17,7 +17,7 @@ class RequireOrderToken
      */
     public function handle($request, Closure $next, $guard = null)
     {
-        if ($this->hasValidOrderToken($request)) {
+        if (!$this->hasValidOrderToken($request)) {
             return redirect('/');
         }
 

diff --git a/src/PaymentProviders/PaymentProvider.php b/src/PaymentProviders/PaymentProvider.php
@@ -29,6 +29,14 @@ public function __construct()
      */
     abstract public function purchase();
 
+    /**
+     * The data used for confirming a payment, used for example when confirming a payment using SCA.
+     * The payment reference should be found in the $this->input-array.
+     *
+     * @return array
+     */
+    abstract public function getPaymentConfirmationData() : array;
+
     /**
      * Makes the purchase and returns the results if successful. Throws exception if unsuccessful.
      *
@@ -61,6 +69,27 @@ public function payForCart()
         ];
     }
 
+    /**
+     * Confirms a payment if needed.
+     *
+     * @return array
+     */
+    public function confirmPayment()
+    {
+        $response = $this->gateway->confirm($this->getPaymentConfirmationData())->send();
+
+        if (! $response->isSuccessful()) {
+            throw new PaymentFailedException($response->getMessage());
+        }
+
+        return [
+            'success' => true,
+            'transaction_reference' => $response->getTransactionReference(),
+            'transaction_id' => $response->getTransactionId(),
+            'payment_status' => 'paid',
+        ];
+    }
+
     /**
      * Initializes and authorizes the gateway with the credentials.
      *

diff --git a/src/PaymentProviders/Stripe.php b/src/PaymentProviders/Stripe.php
@@ -3,7 +3,6 @@
 namespace Happypixels\Shopr\PaymentProviders;
 
 use Omnipay\Omnipay;
-use Happypixels\Shopr\Exceptions\PaymentFailedException;
 
 class Stripe extends PaymentProvider
 {
@@ -24,27 +23,16 @@ public function purchase()
     }
 
     /**
-     * Confirms a payment if needed.
+     * The data used for confirming a payment, used for example when confirming a payment using SCA.
+     * The payment reference should be found in the $this->input-array.
      *
-     * @param string $reference
      * @return array
      */
-    public function confirm($reference)
+    public function getPaymentConfirmationData() : array
     {
-        $response = $this->gateway->confirm([
-            'paymentIntentReference' => $reference,
-            'returnUrl' => route('shopr.order-confirmation').'?gateway=Stripe',
-        ])->send();
-
-        if (! $response->isSuccessful()) {
-            throw new PaymentFailedException($response->getMessage());
-        }
-
         return [
-            'success' => true,
-            'transaction_reference' => $response->getTransactionReference(),
-            'transaction_id' => $response->getTransactionId(),
-            'payment_status' => 'paid',
+            'paymentIntentReference' => $this->input['payment_intent'],
+            'returnUrl' => route('shopr.order-confirmation', ['gateway' => 'Stripe']),
         ];
     }