Added the return_url configuration

- Passing it in the `$options` array is no longer needed

Changelog.md

@@ -2,6 +2,11 @@
 
 ## 2.x
 
+### Unreleased
+#### 2024-XX-YY
+
+- Added the `return_url` configuration (passing it in the `$options` array is no longer needed)
+
 ### 2.0.0
 #### 2024-07-26
 

src/Concerns/HasStripeConfiguration.php

@@ -7,10 +7,6 @@
 trait HasStripeConfiguration
 {
     use HasStripeCredentials;
-    //
-    //private string $returnUrl;
-    //
-    //private string $cancelUrl;
-    //
-    //private bool $isSandbox;
+
+    private ?string $returnUrl = null;
 }

src/Concerns/HasStripeInteraction.php

@@ -8,9 +8,13 @@ trait HasStripeInteraction
 {
     use HasStripeConfiguration;
 
-    public function __construct(string $secretKey, string $publicKey)
-    {
+    public function __construct(
+        string $secretKey,
+        string $publicKey,
+        ?string $returnUrl = null,
+    ) {
         $this->secretKey = $secretKey;
         $this->publicKey = $publicKey;
+        $this->returnUrl = $returnUrl;
     }
 }

src/Factories/RequestFactory.php

@@ -21,11 +21,8 @@ public function create(Payment $payment, array $options = []): StripePaymentRequ
             ->setPublicKey($this->publicKey)
             ->setPaymentId($payment->getPaymentId())
             ->setCurrency($payment->getCurrency())
-            ->setAmount($payment->getAmount());
-
-        if (isset($options['return_url'])) {
-            $result->setReturnUrl($options['return_url']);
-        }
+            ->setAmount($payment->getAmount())
+            ->setReturnUrl($this->returnUrl);
 
         if (isset($options['view'])) {
             $result->setView($options['view']);

src/Messages/StripePaymentRequest.php

@@ -20,8 +20,6 @@ class StripePaymentRequest implements PaymentRequest
 
     private float $amount;
 
-    private ?string $returnUrl = null;
-
     private string $view = 'stripe::_request';
 
     public function getHtmlSnippet(array $options = []): ?string
@@ -101,7 +99,7 @@ public function setView(string $view): self
         return $this;
     }
 
-    public function setReturnUrl(string $returnUrl): self
+    public function setReturnUrl(?string $returnUrl): self
     {
         $this->returnUrl = $returnUrl;
 

src/Providers/ModuleServiceProvider.php

@@ -35,7 +35,8 @@ public function boot()
             $this->app->bind(StripePaymentGateway::class, function ($app) {
                 return new StripePaymentGateway(
                     $this->config('secret_key'),
-                    $this->config('public_key')
+                    $this->config('public_key'),
+                    $this->config('return_url'),
                 );
             });
         }

src/StripePaymentGateway.php

@@ -47,7 +47,8 @@ public function createPaymentRequest(Payment $payment, Address $shippingAddress
         if (null === $this->requestFactory) {
             $this->requestFactory = new RequestFactory(
                 $this->secretKey,
-                $this->publicKey
+                $this->publicKey,
+                $this->returnUrl,
             );
         }
 

src/resources/config/module.php

@@ -11,5 +11,6 @@
     ],
     'bind' => true,
     'secret_key' => env('STRIPE_SECRET_KEY', ''),
-    'public_key' => env('STRIPE_PUBLICK_KEY', ''),
+    'public_key' => env('STRIPE_PUBLIC_KEY', ''),
+    'return_url' => env('STRIPE_RETURN_URL', ''),
 ];

tests/Factory/RequestFactoryTest.php

@@ -17,7 +17,7 @@ class RequestFactoryTest extends TestCase
     /** @test */
     public function it_creates_a_request_object()
     {
-        $factory = new RequestFactory('secret', 'pkey');
+        $factory = new RequestFactory('secret', 'pkey', url('/'));
         $method = PaymentMethod::create([
             'gateway' => StripePaymentGateway::getName(),
             'name' => 'Stripe',