Single page payment

composer.json

@@ -7,7 +7,7 @@
     "require": {
         "php": "^7.3",
 
-        "sylius/sylius": "^1.7",
+        "sylius/sylius": "1.7.*",
         "nyholm/append-query-string": "^0.1.1",
         "phpseclib/phpseclib": "^2.0"
     },

src/Controller/CompletePayPalOrderAction.php

@@ -4,9 +4,13 @@
 
 namespace Sylius\PayPalPlugin\Controller;
 
-use Sylius\Component\Core\Model\PaymentInterface;
+use Doctrine\Persistence\ObjectManager;
+use SM\Factory\FactoryInterface;
+use Sylius\Component\Core\Model\OrderInterface;
+use Sylius\Component\Core\OrderCheckoutTransitions;
 use Sylius\PayPalPlugin\Manager\PaymentStateManagerInterface;
 use Sylius\PayPalPlugin\Provider\OrderProviderInterface;
+use Sylius\PayPalPlugin\Provider\PaymentProviderInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -20,28 +24,50 @@ final class CompletePayPalOrderAction
     /** @var UrlGeneratorInterface */
     private $router;
 
+    /** @var PaymentProviderInterface */
+    private $paymentProvider;
+
     /** @var OrderProviderInterface */
     private $orderProvider;
 
+    /** @var FactoryInterface */
+    private $stateMachineFactory;
+
+    /** @var ObjectManager */
+    private $orderManager;
+
     public function __construct(
         PaymentStateManagerInterface $paymentStateManager,
         UrlGeneratorInterface $router,
-        OrderProviderInterface $orderProvider
+        PaymentProviderInterface $paymentProvider,
+        OrderProviderInterface $orderProvider,
+        FactoryInterface $stateMachineFactory,
+        ObjectManager $orderManager
     ) {
         $this->paymentStateManager = $paymentStateManager;
         $this->router = $router;
+        $this->paymentProvider = $paymentProvider;
         $this->orderProvider = $orderProvider;
+        $this->stateMachineFactory = $stateMachineFactory;
+        $this->orderManager = $orderManager;
     }
 
     public function __invoke(Request $request): Response
     {
-        $token = (string) $request->attributes->get('token');
-        $order = $this->orderProvider->provideOrderByToken($token);
-        /** @var PaymentInterface $payment */
-        $payment = $order->getLastPayment(PaymentInterface::STATE_PROCESSING);
+        $id = (string) $request->query->get('id');
+        $payment = $this->paymentProvider->getByPayPalOrderId($id);
+        /** @var OrderInterface $order */
+        $order = $payment->getOrder();
 
         $this->paymentStateManager->complete($payment);
 
+        $stateMachine = $this->stateMachineFactory->get($order, OrderCheckoutTransitions::GRAPH);
+        $stateMachine->apply(OrderCheckoutTransitions::TRANSITION_COMPLETE);
+
+        $this->orderManager->flush();
+
+        $request->getSession()->set('sylius_order_id', $order->getId());
+
         return new JsonResponse([
             'orderID' => $payment->getDetails()['paypal_order_id'],
             'status' => $payment->getState(),

src/Controller/PayPalButtonsController.php

@@ -4,11 +4,16 @@
 
 namespace Sylius\PayPalPlugin\Controller;
 
+use Sylius\Bundle\PayumBundle\Model\GatewayConfigInterface;
 use Sylius\Component\Channel\Context\ChannelContextInterface;
 use Sylius\Component\Core\Model\ChannelInterface;
 use Sylius\Component\Core\Model\OrderInterface;
+use Sylius\Component\Core\Model\PaymentInterface;
+use Sylius\Component\Core\Model\PaymentMethodInterface;
 use Sylius\Component\Core\Repository\OrderRepositoryInterface;
 use Sylius\Component\Locale\Context\LocaleContextInterface;
+use Sylius\PayPalPlugin\Api\CacheAuthorizeClientApiInterface;
+use Sylius\PayPalPlugin\Api\IdentityApiInterface;
 use Sylius\PayPalPlugin\Processor\LocaleProcessorInterface;
 use Sylius\PayPalPlugin\Provider\AvailableCountriesProviderInterface;
 use Sylius\PayPalPlugin\Provider\PayPalConfigurationProviderInterface;
@@ -43,6 +48,12 @@ final class PayPalButtonsController
     /** @var LocaleProcessorInterface */
     private $localeProcessor;
 
+    /** @var CacheAuthorizeClientApiInterface */
+    private $authorizeClientApi;
+
+    /** @var IdentityApiInterface */
+    private $identityApi;
+
     public function __construct(
         Environment $twig,
         UrlGeneratorInterface $router,
@@ -51,7 +62,9 @@ public function __construct(
         PayPalConfigurationProviderInterface $payPalConfigurationProvider,
         OrderRepositoryInterface $orderRepository,
         AvailableCountriesProviderInterface $availableCountriesProvider,
-        LocaleProcessorInterface $localeProcessor
+        LocaleProcessorInterface $localeProcessor,
+        CacheAuthorizeClientApiInterface $authorizeClientApi,
+        IdentityApiInterface $identityApi
     ) {
         $this->twig = $twig;
         $this->router = $router;
@@ -61,6 +74,8 @@ public function __construct(
         $this->orderRepository = $orderRepository;
         $this->availableCountriesProvider = $availableCountriesProvider;
         $this->localeProcessor = $localeProcessor;
+        $this->authorizeClientApi = $authorizeClientApi;
+        $this->identityApi = $identityApi;
     }
 
     public function renderProductPageButtonsAction(Request $request): Response
@@ -135,4 +150,39 @@ public function renderPaymentPageButtonsAction(Request $request): Response
             return new Response('');
         }
     }
+
+    public function renderPayPalPaymentAction(Request $request): Response
+    {
+        $orderId = $request->attributes->getInt('orderId');
+        /** @var OrderInterface $order */
+        $order = $this->orderRepository->find($orderId);
+        /** @var PaymentInterface $payment */
+        $payment = $order->getLastPayment();
+        /** @var PaymentMethodInterface $paymentMethod */
+        $paymentMethod = $payment->getMethod();
+        /** @var GatewayConfigInterface $gatewayConfig */
+        $gatewayConfig = $paymentMethod->getGatewayConfig();
+        /** @var string $clientId */
+        $clientId = $gatewayConfig->getConfig()['client_id'];
+        /** @var string $partnerAttributionId */
+        $partnerAttributionId = $gatewayConfig->getConfig()['partner_attribution_id'];
+
+        /** @var OrderInterface $order */
+        $order = $payment->getOrder();
+
+        $token = $this->authorizeClientApi->authorize($paymentMethod);
+        $clientToken = $this->identityApi->generateToken($token);
+
+        return new Response($this->twig->render('@SyliusPayPalPlugin/payWithPaypal.html.twig', [
+            'available_countries' => $this->availableCountriesProvider->provide(),
+            'billing_address' => $order->getBillingAddress(),
+            'client_id' => $clientId,
+            'client_token' => $clientToken,
+            'currency' => $order->getCurrencyCode(),
+            'locale' => $this->localeProcessor->process((string) $order->getLocaleCode()),
+            'merchant_id' => $gatewayConfig->getConfig()['merchant_id'],
+            'order_id' => $order->getId(),
+            'partner_attribution_id' => $partnerAttributionId,
+        ]));
+    }
 }

src/Resources/config/services/controller.xml

@@ -25,17 +25,13 @@
             <argument type="service" id="sylius.order_processing.order_payment_processor.checkout" />
         </service>
 
-        <service id="Sylius\PayPalPlugin\Controller\CancelPayPalCheckoutPaymentAction">
-            <argument type="service" id="Sylius\PayPalPlugin\Provider\PaymentProviderInterface" />
-            <argument type="service" id="Sylius\PayPalPlugin\Manager\PaymentStateManagerInterface" />
-        </service>
-
         <service id="Sylius\PayPalPlugin\Controller\CompletePayPalOrderAction">
             <argument type="service" id="Sylius\PayPalPlugin\Manager\PaymentStateManagerInterface" />
             <argument type="service" id="router" />
+            <argument type="service" id="Sylius\PayPalPlugin\Provider\PaymentProviderInterface" />
             <argument type="service" id="Sylius\PayPalPlugin\Provider\OrderProviderInterface" />
-            <argument type="service" id="Sylius\PayPalPlugin\Api\AuthorizeClientApiInterface" />
-            <argument type="service" id="Sylius\PayPalPlugin\Api\CompleteOrderApiInterface" />
+            <argument type="service" id="sm.factory" />
+            <argument type="service" id="sylius.manager.order" />
         </service>
 
         <service id="Sylius\PayPalPlugin\Controller\CreatePayPalOrderFromPaymentPageAction" public="true">
@@ -84,12 +80,6 @@
             <argument type="service" id="sylius.repository.order" />
             <argument type="service" id="Sylius\PayPalPlugin\Provider\AvailableCountriesProviderInterface" />
             <argument type="service" id="Sylius\PayPalPlugin\Processor\LocaleProcessorInterface" />
-        </service>
-
-        <service id="Sylius\PayPalPlugin\Controller\PayWithPayPalFormAction">
-            <argument type="service" id="twig" />
-            <argument type="service" id="sylius.repository.payment" />
-            <argument type="service" id="Sylius\PayPalPlugin\Provider\AvailableCountriesProviderInterface" />
             <argument type="service" id="Sylius\PayPalPlugin\Api\CacheAuthorizeClientApiInterface" />
             <argument type="service" id="Sylius\PayPalPlugin\Api\IdentityApiInterface" />
         </service>

src/Resources/config/shop_routing.yaml

@@ -1,11 +1,5 @@
-sylius_paypal_plugin_pay_with_paypal_form:
-    path: /pay-with-paypal/{id}
-    methods: [GET]
-    defaults:
-        _controller: Sylius\PayPalPlugin\Controller\PayWithPayPalFormAction
-
 sylius_paypal_plugin_create_paypal_order:
-    path: /create-pay-pal-order/{token}
+    path: /create-pay-pal-order/{id}
     methods: [POST]
     defaults:
         _controller: Sylius\PayPalPlugin\Controller\CreatePayPalOrderAction
@@ -17,7 +11,7 @@ sylius_paypal_plugin_create_paypal_order_from_cart:
         _controller: Sylius\PayPalPlugin\Controller\CreatePayPalOrderFromCartAction
 
 sylius_paypal_plugin_complete_paypal_order:
-    path: /complete-pay-pal-order/{token}
+    path: /complete-pay-pal-order
     methods: [POST]
     defaults:
         _controller: Sylius\PayPalPlugin\Controller\CompletePayPalOrderAction
@@ -116,12 +110,6 @@ sylius_paypal_plugin_cancel_payment:
     defaults:
         _controller: Sylius\PayPalPlugin\Controller\CancelPayPalPaymentAction
 
-sylius_paypal_plugin_cancel_checkout_payment:
-    path: /cancel-pay-pal-checkout-payment
-    methods: [POST]
-    defaults:
-        _controller: Sylius\PayPalPlugin\Controller\CancelPayPalCheckoutPaymentAction
-
 sylius_paypal_plugin_payment_error:
     path: /pay-pal-payment-error
     methods: [POST]

src/Resources/views/bundles/SyliusShopBundle/Checkout/Complete/_navigation.html.twig

@@ -0,0 +1,7 @@
+{% if order.lastPayment.method.gatewayConfig.factoryName == 'sylius.pay_pal' and order.lastPayment.state == 'cart' %}
+    {{ render(controller('Sylius\\PayPalPlugin\\Controller\\PayPalButtonsController:renderPayPalPaymentAction', {'orderId': order.id})) }}
+{% else %}
+    <button type="submit" class="ui huge primary fluid icon labeled button" {{ sylius_test_html_attribute('confirmation-button') }}>
+        <i class="check icon"></i> {{ 'sylius.ui.place_order'|trans }}
+    </button>
+{% endif %}