Merge pull request #3 from xujiongze/master

Add support vanilo 4.X

composer.json

@@ -19,10 +19,11 @@
         "issues": "https://github.com/vanilophp/stripe"
     },
     "require": {
-        "php": "^7.4|^8.0",
-        "konekt/concord": "^1.5",
-        "vanilo/payment": "^2.1",
-        "vanilo/contracts": "^2.1",
+        "php": "^8.2",
+        "konekt/concord": "^1.13",
+        "laravel/framework": "^10.0|^11.0",
+        "vanilo/payment": "^4.0",
+        "vanilo/contracts": "^4.0",
         "stripe/stripe-php": "^7.75"
     },
     "autoload": {

src/Factories/ResponseFactory.php

@@ -6,14 +6,28 @@
 
 use Illuminate\Http\Request;
 use Stripe\Event;
+use Stripe\Stripe;
+use Stripe\PaymentIntent;
 use Vanilo\Payment\Contracts\PaymentResponse;
-use Vanilo\Stripe\Messages\StripePaymentResponse;
+use Vanilo\Stripe\Messages\StripeReturnPaymentResponse;
+use Vanilo\Stripe\Messages\StripeWebhookPaymentResponse;
+use Vanilo\Stripe\Concerns\HasStripeConfiguration;
 
 final class ResponseFactory
 {
-    public function create(Request $request, array $options): PaymentResponse
+    use HasStripeConfiguration;
+
+    public function create(Request $request, array $options,$secretKey): PaymentResponse
     {
-        return new StripePaymentResponse(
+        if($request->payment_intent){
+            $this->secretKey = $secretKey;
+            Stripe::setApiKey($this->secretKey);
+            return new StripeReturnPaymentResponse(
+                PaymentIntent::retrieve($request->payment_intent, [])
+            );
+        }
+
+        return new StripeWebhookPaymentResponse(
             Event::constructFrom($request->all())
         );
     }

src/Messages/StripePaymentRequest.php

@@ -27,13 +27,7 @@ class StripePaymentRequest implements PaymentRequest
     public function getHtmlSnippet(array $options = []): ?string
     {
         Stripe::setApiKey($this->secretKey);
-        $paymentIntent = PaymentIntent::create([
-            'amount' => $this->amount * 100,
-            'currency' => $this->currency,
-            'metadata' => [
-                'payment_id' => $this->paymentId
-            ]
-        ]);
+        $paymentIntent =$this->createIntent();
 
         return View::make(
             $this->view,
@@ -45,6 +39,22 @@ public function getHtmlSnippet(array $options = []): ?string
         )->render();
     }
 
+    public function createIntent()
+    {
+        Stripe::setApiKey($this->secretKey);
+        return PaymentIntent::create([
+            'amount' => $this->amount * 100,
+            'currency' => $this->currency,
+            'metadata' => [
+                'payment_id' => $this->paymentId
+            ]
+        ]);
+    }
+
+    public function getPublicKey ()
+    {
+        return $this->publicKey;
+    }
     public function willRedirect(): bool
     {
         return true;
@@ -85,6 +95,11 @@ public function setAmount(float $amount): self
         return $this;
     }
 
+    public function getRemoteId(): ?string
+    {
+        return null;
+    }
+
     public function setView(string $view): self
     {
         $this->view = $view;

src/Messages/StripeReturnPaymentResponse.php

@@ -0,0 +1,78 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Vanilo\Stripe\Messages;
+
+use Konekt\Enum\Enum;
+use Stripe\PaymentIntent;
+use Stripe\Event;
+use Vanilo\Payment\Contracts\PaymentResponse;
+use Vanilo\Payment\Contracts\PaymentStatus;
+use Vanilo\Payment\Models\PaymentStatusProxy;
+use Vanilo\Stripe\Models\StripeEventType;
+
+class StripeReturnPaymentResponse implements PaymentResponse
+{
+    protected PaymentIntent $intent;
+
+    protected ?PaymentStatus $status = null;
+
+    public function __construct(PaymentIntent $intent)
+    {
+        $this->intent = $intent;
+    }
+
+    public function wasSuccessful(): bool
+    {
+        return StripeEventType::INTENT_SUCCEEDED === $this->intent->status;
+    }
+
+    public function getMessage(): ?string
+    {
+        return $this->intent->description;
+    }
+
+    public function getTransactionId(): ?string
+    {
+        return $this->intent->id;
+    }
+
+    public function getTransactionAmount(): float
+    {
+        return $this->getAmountPaid() ?? 0;
+    }
+
+    public function getAmountPaid(): ?float
+    {
+        return (float) $this->intent->amount / 100;
+    }
+
+    public function getPaymentId(): string
+    {
+        return $this->intent->metadata->payment_id;
+    }
+
+    public function getStatus(): PaymentStatus
+    {
+        if (null === $this->status) {
+            switch ($this->getNativeStatus()->value()) {
+                case StripeEventType::INTENT_SUCCEEDED:
+                    $this->status = PaymentStatusProxy::PAID();
+                    break;
+                case StripeEventType::INTENT_PROCESSING:
+                    $this->status = PaymentStatusProxy::ON_HOLD();
+                    break;
+                default:
+                    $this->status = PaymentStatusProxy::DECLINED();
+            }
+        }
+
+        return $this->status;
+    }
+
+    public function getNativeStatus(): Enum
+    {
+        return StripeEventType::create($this->eventType);
+    }
+}

src/Messages/StripePaymentResponse.php → src/Messages/StripeWebhookPaymentResponse.php

@@ -12,7 +12,7 @@
 use Vanilo\Payment\Models\PaymentStatusProxy;
 use Vanilo\Stripe\Models\StripeEventType;
 
-class StripePaymentResponse implements PaymentResponse
+class StripeWebhookPaymentResponse implements PaymentResponse
 {
     protected string $eventType;
 
@@ -45,6 +45,11 @@ public function getTransactionId(): ?string
         return $this->charge->id;
     }
 
+    public function getTransactionAmount(): float
+    {
+        return $this->getAmountPaid() ?? 0;
+    }
+
     public function getAmountPaid(): ?float
     {
         if ($this->getNativeStatus()->isChargeRefunded()) {
@@ -56,7 +61,7 @@ public function getAmountPaid(): ?float
 
     public function getPaymentId(): string
     {
-        return $this->charge->metadata->payment_id;
+        return $this->charge->metadata->payment_id ?? "-1";
     }
 
     public function getStatus(): PaymentStatus

src/Models/StripeEventType.php

@@ -18,5 +18,11 @@ class StripeEventType extends Enum
     public const CHARGE_SUCCEEDED = 'charge.succeeded';
     public const CHARGE_UPDATED = 'charge.updated';
 
-    protected static $unknownValuesFallbackToDefault = true;
+    public const INTENT_REQUIRES_PAYMENT_METHOD = 'requires_payment_method';
+    public const INTENT_REQUIRES_CONFIRMATION = 'requires_confirmation';
+    public const INTENT_REQUIRES_ACTION = 'requires_action';
+    public const INTENT_PROCESSING = 'processing';
+    public const INTENT_SUCCEEDED = 'succeeded';
+    public const INTENT_CANCELED = 'canceled';
+
 }

src/StripePaymentGateway.php

@@ -23,6 +23,7 @@
 use Vanilo\Stripe\Concerns\HasStripeInteraction;
 use Vanilo\Stripe\Factories\RequestFactory;
 use Vanilo\Stripe\Factories\ResponseFactory;
+use Vanilo\Payment\Contracts\TransactionHandler;
 
 class StripePaymentGateway implements PaymentGateway
 {
@@ -57,7 +58,17 @@ public function processPaymentResponse(Request $request, array $options = []): P
             $this->responseFactory = new ResponseFactory();
         }
 
-        return $this->responseFactory->create($request, $options);
+        return $this->responseFactory->create($request, $options,$this->secretKey);
+    }
+
+    public static function svgIcon(): string
+    {
+        return self::$svg ??= file_get_contents(__DIR__ . '/resources/logo.svg');
+    }
+
+    public function transactionHandler(): ?TransactionHandler
+    {
+        return null;
     }
 
     public function isOffline(): bool