wip

config/services/payum/action.php

@@ -4,8 +4,10 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
-use CommerceWeavers\SyliusTpayPlugin\Payum\Action\Api\CreateTransactionAction;
+use CommerceWeavers\SyliusTpayPlugin\Payum\Action\Api\CreateCardTransactionAction;
+use CommerceWeavers\SyliusTpayPlugin\Payum\Action\Api\CreateRedirectBasedTransactionAction;
 use CommerceWeavers\SyliusTpayPlugin\Payum\Action\Api\NotifyAction;
+use CommerceWeavers\SyliusTpayPlugin\Payum\Action\Api\PayWithCardAction;
 use CommerceWeavers\SyliusTpayPlugin\Payum\Action\CaptureAction;
 use CommerceWeavers\SyliusTpayPlugin\Payum\Action\GetStatusAction;
 use CommerceWeavers\SyliusTpayPlugin\Payum\Action\RefundAction;
@@ -24,20 +26,34 @@
         ->tag('payum.action', ['factory' => TpayGatewayFactory::NAME, 'alias' => 'cw.tpay.capture'])
     ;
 
-    $services->set(CreateTransactionAction::class)
+    $services->set(CreateCardTransactionAction::class)
         ->args([
             service('router'),
             param('commerce_weavers_tpay.payum.create_transaction.success_route'),
             param('commerce_weavers_tpay.payum.create_transaction.error_route'),
             param('commerce_weavers_tpay.payum.create_transaction.notify_route'),
         ])
-        ->tag('payum.action', ['factory' => TpayGatewayFactory::NAME, 'alias' => 'cw.tpay.create_transaction'])
+        ->tag('payum.action', ['factory' => TpayGatewayFactory::NAME, 'alias' => 'cw.tpay.create_card_transaction'])
+    ;
+
+    $services->set(CreateRedirectBasedTransactionAction::class)
+        ->args([
+            service('router'),
+            param('commerce_weavers_tpay.payum.create_transaction.success_route'),
+            param('commerce_weavers_tpay.payum.create_transaction.error_route'),
+            param('commerce_weavers_tpay.payum.create_transaction.notify_route'),
+        ])
+        ->tag('payum.action', ['factory' => TpayGatewayFactory::NAME, 'alias' => 'cw.tpay.create_redirect_based_transaction'])
     ;
 
     $services->set(NotifyAction::class)
         ->tag('payum.action', ['factory' => TpayGatewayFactory::NAME, 'alias' => 'cw.tpay.notify'])
     ;
 
+    $services->set(PayWithCardAction::class)
+        ->tag('payum.action', ['factory' => TpayGatewayFactory::NAME, 'alias' => 'cw.tpay.pay_with_card'])
+    ;
+
     $services->set(GetStatusAction::class)
         ->tag('payum.action', ['factory' => TpayGatewayFactory::NAME, 'alias' => 'cw.tpay.get_status'])
     ;

src/Payum/Action/Api/AbstractCreateTransactionAction.php

@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CommerceWeavers\SyliusTpayPlugin\Payum\Action\Api;
+
+use Payum\Core\GatewayAwareTrait;
+use Payum\Core\Security\GenericTokenFactoryAwareInterface;
+use Payum\Core\Security\GenericTokenFactoryAwareTrait;
+use Payum\Core\Security\TokenInterface;
+use Sylius\Component\Core\Model\PaymentInterface;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\Routing\RouterInterface;
+use Webmozart\Assert\Assert;
+
+abstract class AbstractCreateTransactionAction extends BaseApiAwareAction implements GenericTokenFactoryAwareInterface
+{
+    use GenericTokenFactoryAwareTrait;
+    use GatewayAwareTrait;
+
+    public function __construct(
+        private RouterInterface $router,
+        private string $notifyRoute,
+    ) {
+        parent::__construct();
+    }
+
+    protected function createTransaction(PaymentInterface $payment, array $payload): void
+    {
+        $details = $payment->getDetails();
+
+        $order = $payment->getOrder();
+        Assert::notNull($order);
+        $localeCode = $order->getLocaleCode();
+        Assert::notNull($localeCode);
+
+        $response = $this->api->transactions()->createTransaction($payload);
+
+        $details['tpay']['transaction_id'] = $response['transactionId'];
+        $details['tpay']['transaction_payment_url'] = $response['transactionPaymentUrl'];
+
+        $payment->setDetails($details);
+    }
+
+    protected function getLocaleCodeFrom(PaymentInterface $payment): string
+    {
+        return $payment->getOrder()->getLocaleCode() ?? throw new \InvalidArgumentException('Cannot determine locale code for a given payment');
+    }
+
+    protected function createNotifyToken(PaymentInterface $payment, TokenInterface $token, string $localeCode): TokenInterface
+    {
+        return $this->tokenFactory->createToken(
+            $token->getGatewayName(),
+            $payment,
+            $this->router->generate($this->notifyRoute, ['_locale' => $localeCode], UrlGeneratorInterface::ABSOLUTE_URL),
+        );
+    }
+}

src/Payum/Action/Api/CreateCardTransactionAction.php

@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CommerceWeavers\SyliusTpayPlugin\Payum\Action\Api;
+
+use CommerceWeavers\SyliusTpayPlugin\Payum\Request\Api\CreateTransaction;
+use CommerceWeavers\SyliusTpayPlugin\Payum\Request\Api\PayWithCard;
+use CommerceWeavers\SyliusTpayPlugin\Tpay\Factory\CreateCardPaymentPayloadFactoryInterface;
+use Payum\Core\GatewayAwareTrait;
+use Payum\Core\Security\GenericTokenFactoryAwareTrait;
+use Sylius\Component\Core\Model\PaymentInterface;
+use Symfony\Component\Routing\RouterInterface;
+use Webmozart\Assert\Assert;
+
+final class CreateCardTransactionAction extends AbstractCreateTransactionAction
+{
+    use GenericTokenFactoryAwareTrait;
+    use GatewayAwareTrait;
+
+    public function __construct(
+        private RouterInterface $router,
+        private CreateCardPaymentPayloadFactoryInterface $createCardPaymentPayloadFactory,
+        private string $notifyRoute,
+    ) {
+        parent::__construct($router, $this->notifyRoute);
+    }
+
+    /**
+     * @param CreateTransaction $request
+     */
+    public function execute($request): void
+    {
+        /** @var PaymentInterface $model */
+        $model = $request->getModel();
+        $token = $request->getToken();
+        Assert::notNull($token);
+
+        $localeCode = $this->getLocaleCodeFrom($model);
+        $notifyToken = $this->createNotifyToken($model, $token, $localeCode);
+
+        $this->createTransaction(
+            $model,
+            $this->createCardPaymentPayloadFactory->createFrom($model, $notifyToken->getTargetUrl(), $localeCode),
+        );
+
+        $this->gateway->execute(new PayWithCard($token));
+    }
+
+    public function supports($request): bool
+    {
+        $model = $request->getModel();
+
+        if (!$request instanceof CreateTransaction) {
+            return false;
+        }
+
+        if (!$model instanceof PaymentInterface) {
+            return false;
+        }
+
+        $details = $model->getDetails();
+
+        return isset($details['tpay']['card']);
+    }
+}

src/Payum/Action/Api/CreateRedirectBasedTransactionAction.php

@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CommerceWeavers\SyliusTpayPlugin\Payum\Action\Api;
+
+use CommerceWeavers\SyliusTpayPlugin\Payum\Request\Api\CreateTransaction;
+use CommerceWeavers\SyliusTpayPlugin\Tpay\Factory\CreateRedirectBasedPaymentPayloadFactoryInterface;
+use Payum\Core\Reply\HttpRedirect;
+use Payum\Core\Security\GenericTokenFactoryAwareTrait;
+use Sylius\Component\Core\Model\PaymentInterface;
+use Symfony\Component\Routing\RouterInterface;
+use Webmozart\Assert\Assert;
+
+class CreateRedirectBasedTransactionAction extends AbstractCreateTransactionAction
+{
+    use GenericTokenFactoryAwareTrait;
+
+    public function __construct(
+        private RouterInterface $router,
+        private CreateRedirectBasedPaymentPayloadFactoryInterface $createRedirectBasedPaymentPayloadFactory,
+        private string $notifyRoute,
+    ) {
+        parent::__construct($router, $notifyRoute);
+    }
+
+    /**
+     * @param CreateTransaction $request
+     */
+    public function execute($request): void
+    {
+        /** @var PaymentInterface $model */
+        $model = $request->getModel();
+        $token = $request->getToken();
+        Assert::notNull($token);
+
+        $localeCode = $this->getLocaleCodeFrom($model);
+        $notifyToken = $this->createNotifyToken($model, $token, $localeCode);
+
+        $this->createTransaction(
+            $model,
+            $this->createRedirectBasedPaymentPayloadFactory->createFrom($model, $notifyToken->getTargetUrl(), $localeCode),
+        );
+
+        $details = $model->getDetails();
+
+        throw new HttpRedirect($details['tpay']['transaction_payment_url']);
+    }
+
+    public function supports($request): bool
+    {
+        $model = $request->getModel();
+
+        if (!$request instanceof CreateTransaction) {
+            return false;
+        }
+
+        if (!$model instanceof PaymentInterface) {
+            return false;
+        }
+
+        $details = $model->getDetails();
+
+        return !isset($details['tpay']['card']) && !isset($details['tpay']['blik']);
+    }
+}

src/Payum/Action/Api/PayWithCardAction.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CommerceWeavers\SyliusTpayPlugin\Payum\Action\Api;
+
+use CommerceWeavers\SyliusTpayPlugin\Payum\Request\Api\PayWithCard;
+use Payum\Core\Reply\HttpRedirect;
+use Sylius\Component\Core\Model\PaymentInterface;
+
+class PayWithCardAction extends BaseApiAwareAction
+{
+    /**
+     * @param PayWithCard $request
+     */
+    public function execute($request): void
+    {
+        /** @var PaymentInterface $model */
+        $model = $request->getModel();
+        $details = $model->getDetails();
+
+        $response = $this->api->transactions()->createPaymentByTransactionId([
+            'groupId' => 103,
+            'cardPaymentData' => [
+                'card' => $details['tpay']['card'],
+            ],
+        ], $details['tpay']['transaction_id']);
+
+        $details['tpay']['transaction_payment_url'] = $response['transactionPaymentUrl'];
+
+        $model->setDetails($details);
+
+        if ($response['status'] === 'pending') {
+            throw new HttpRedirect($details['tpay']['transaction_payment_url']);
+        }
+    }
+
+    public function supports($request): bool
+    {
+        return $request instanceof PayWithCard && $request->getModel() instanceof PaymentInterface;
+    }
+}

src/Payum/Action/CaptureAction.php

@@ -33,9 +33,7 @@ public function execute($request): void
             $this->createTransactionFactory->createNewWithModel($request->getToken()),
         );
 
-        $paymentDetails = $model->getDetails();
-
-        throw new HttpRedirect($paymentDetails['tpay']['transaction_payment_url']);
+        throw new HttpRedirect($request->getToken()->getAfterUrl());
     }
 
     public function supports($request): bool

src/Payum/Request/Api/PayWithCard.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CommerceWeavers\SyliusTpayPlugin\Payum\Request\Api;
+
+use Payum\Core\Request\Generic;
+
+class PayWithCard extends Generic
+{
+}