Fix rediretions

GoteoFoundation · Jul 10, 2024 · 7cef34f · 7cef34f
1 parent d6d6cc4
commit 7cef34f
Showing 1 changed file with 25 additions and 12 deletions.
diff --git a/src/Omnipay/Stripe/Subscription/Message/SubscriptionRequest.php b/src/Omnipay/Stripe/Subscription/Message/SubscriptionRequest.php
@@ -41,12 +41,15 @@ public function sendData($data)
         $customer = $this->getStripeCustomer($user)->id;
         $metadata = $this->getMetadata($invest);
 
-        $successUrl = sprintf('%s?session_id={CHECKOUT_SESSION_ID}', $this->getRedirectUrl(
-            'invest',
-            $metadata['project'],
-            $invest->id,
-            'complete'
-        ));
+        $successUrl = $this->getRedirectUrl('pool', $invest->id, 'complete');
+        if ($invest->getProject()) {
+            $successUrl = $this->getRedirectUrl(
+                'invest',
+                $metadata['project'],
+                $invest->id,
+                'complete'
+            );
+        }
 
         $redirectUrl = $this->getRedirectUrl('dashboard', 'wallet');
         if ($invest->getProject()) {
@@ -55,7 +58,7 @@ public function sendData($data)
 
         $checkout = $this->stripe->checkout->sessions->create([
             'customer' => $customer,
-            'success_url' => $successUrl,
+            'success_url' => sprintf('%s?session_id={CHECKOUT_SESSION_ID}', $successUrl),
             'cancel_url' => $redirectUrl,
             'mode' => CheckoutSession::MODE_SUBSCRIPTION,
             'line_items' => [
@@ -99,15 +102,25 @@ public function completePurchase(array $options = [])
             return new SubscriptionResponse($this, $checkout, $subscription);
         }
 
-        $donationCheckout = $this->stripe->checkout->sessions->create([
-            'customer' => $this->getStripeCustomer(User::get($metadata['user']))->id,
-            'success_url' => sprintf('%s?session_id={CHECKOUT_SESSION_ID}', $this->getRedirectUrl(
+        $successUrl = $this->getRedirectUrl('pool', $metadata['invest']);
+        if ($metadata['project'] !== '') {
+            $successUrl = $this->getRedirectUrl(
                 'invest',
                 $metadata['project'],
                 $metadata['invest'],
                 'complete'
-            )),
-            'cancel_url' => $this->getRedirectUrl('project', $metadata['project']->id),
+            );
+        }
+
+        $cancelUrl = $this->getRedirectUrl('dashboard', 'wallet');
+        if ($metadata['project'] !== '') {
+            $cancelUrl = $this->getRedirectUrl('project', $metadata['project']);
+        }
+
+        $donationCheckout = $this->stripe->checkout->sessions->create([
+            'customer' => $this->getStripeCustomer(User::get($metadata['user']))->id,
+            'success_url' => sprintf('%s?session_id={CHECKOUT_SESSION_ID}', $successUrl),
+            'cancel_url' => $cancelUrl,
             'mode' => CheckoutSession::MODE_PAYMENT,
             'line_items' => [
                 [