PAYOSWXP-115: generic-express: prevent changing addresses/payment-met…

…hod and add back-link

src/Components/PaymentFilter/DefaultPaymentFilterService.php

@@ -54,7 +54,7 @@ final public function filterPaymentMethods(
 
         // Validate and remove all supported payment methods if necessary
         try {
-            if ($filterContext->getFlag(PaymentFilterContext::FLAG_SKIP_EC_REQUIRED_DATA_VALIDATION) !== true) {
+            if ($filterContext->hasFlag(PaymentFilterContext::FLAG_SKIP_EC_REQUIRED_DATA_VALIDATION) !== true) {
                 $this->validateGenericExpressCheckout($filterContext);
             }
             $this->validateCurrency($currency);

src/Components/PaymentFilter/GenericExpressCheckoutFilterOther.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PayonePayment\Components\PaymentFilter;
+
+use PayonePayment\PaymentHandler\PaymentHandlerGroups;
+use Shopware\Core\Checkout\Payment\PaymentMethodCollection;
+
+class GenericExpressCheckoutFilterOther implements PaymentFilterServiceInterface
+{
+    /**
+     * if AmazonPay/PayPal Express is selected, no other payment methods should be available.
+     */
+    public function filterPaymentMethods(PaymentMethodCollection $methodCollection, PaymentFilterContext $filterContext): PaymentMethodCollection
+    {
+        $actualPaymentMethod = $filterContext->getSalesChannelContext()->getPaymentMethod();
+
+        if ($methodCollection->has($actualPaymentMethod->getId())
+            && \in_array($actualPaymentMethod->getHandlerIdentifier(), PaymentHandlerGroups::GENERIC_EXPRESS, true)
+        ) {
+            return new PaymentMethodCollection([$actualPaymentMethod]);
+        }
+
+        return $methodCollection;
+    }
+}

src/Components/PaymentFilter/PaymentFilterContext.php

@@ -19,6 +19,9 @@ class PaymentFilterContext extends Struct
 
     private bool $_areAddressesIdentical;
 
+    /**
+     * @param string[] $flags
+     */
     public function __construct(
         private readonly SalesChannelContext $salesChannelContext,
         private readonly CustomerAddressEntity|OrderAddressEntity|null $billingAddress = null,
@@ -87,8 +90,8 @@ public function areAddressesIdentical(): bool
         return $this->_areAddressesIdentical = true;
     }
 
-    public function getFlag(string $key): bool
+    public function hasFlag(string $key): bool
     {
-        return $this->flags[$key] ?? false;
+        return \in_array($key, $this->flags, true);
     }
 }

src/DependencyInjection/controllers.xml

@@ -154,5 +154,10 @@
             <tag name="controller.service_arguments" />
         </service>
 
+        <service id="PayonePayment\Storefront\Controller\CheckoutController" autowire="true">
+            <argument key="$translator" type="service" id="translator"/>
+            <tag name="controller.service_arguments" />
+        </service>
+
     </services>
 </container>

src/DependencyInjection/listeners.xml

@@ -130,5 +130,9 @@
             <tag name="kernel.event_subscriber"/>
         </service>
 
+        <service id="PayonePayment\EventListener\CheckoutConfirmGenericExpressCheckoutEventListener">
+            <tag name="kernel.event_subscriber"/>
+        </service>
+
     </services>
 </container>

src/DependencyInjection/payment_method_filter.xml

@@ -194,6 +194,7 @@
             </argument>
             <tag name="payone.payment_method.filter"/>
         </service>
+
         <service id="payone.payment_filter_method.amazonpay.express"
                  class="PayonePayment\Components\PaymentFilter\DefaultPaymentFilterService"
                  parent="payone.payment_filter_method.amazonpay">
@@ -202,5 +203,9 @@
             <tag name="payone.payment_method.filter"/>
         </service>
 
+        <service id="PayonePayment\Components\PaymentFilter\GenericExpressCheckoutFilterOther">
+            <tag name="payone.payment_method.filter"/>
+        </service>
+
     </services>
 </container>

src/EventListener/CheckoutCartAmazonPayExpressEventListener.php

@@ -28,6 +28,7 @@
 use Shopware\Core\System\SalesChannel\Aggregate\SalesChannelPaymentMethod\SalesChannelPaymentMethodDefinition;
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
 use Shopware\Storefront\Page\Checkout\Cart\CheckoutCartPageLoadedEvent;
+use Shopware\Storefront\Page\Checkout\Confirm\CheckoutConfirmPageLoadedEvent;
 use Shopware\Storefront\Page\Checkout\Offcanvas\OffcanvasCartPageLoadedEvent;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
@@ -82,7 +83,7 @@ public function onCartLoaded(CheckoutCartPageLoadedEvent|OffcanvasCartPageLoaded
                 currency: $event->getSalesChannelContext()->getCurrency(),
                 cart: $event->getPage()->getCart(),
                 flags: [
-                    PaymentFilterContext::FLAG_SKIP_EC_REQUIRED_DATA_VALIDATION => true,
+                    PaymentFilterContext::FLAG_SKIP_EC_REQUIRED_DATA_VALIDATION,
                 ]
             )
         );

src/EventListener/CheckoutConfirmGenericExpressCheckoutEventListener.php

@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PayonePayment\EventListener;
+
+use PayonePayment\PaymentHandler\PaymentHandlerGroups;
+use PayonePayment\Storefront\Struct\CheckoutConfirmPaymentData;
+use Shopware\Storefront\Page\Checkout\Confirm\CheckoutConfirmPageLoadedEvent;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+
+class CheckoutConfirmGenericExpressCheckoutEventListener implements EventSubscriberInterface
+{
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            CheckoutConfirmPageLoadedEvent::class => 'onCheckoutConfirmLoaded',
+        ];
+    }
+
+    public function onCheckoutConfirmLoaded(CheckoutConfirmPageLoadedEvent $event): void
+    {
+        $paymentMethod = $event->getSalesChannelContext()->getPaymentMethod();
+        if (\in_array($paymentMethod->getHandlerIdentifier(), PaymentHandlerGroups::GENERIC_EXPRESS, true) === false) {
+            // payment handler is not a generic express-checkout
+            return;
+        }
+
+        $extension = $event->getPage()->getExtension(CheckoutConfirmPaymentData::EXTENSION_NAME) ?? new CheckoutConfirmPaymentData();
+        $extension->assign([
+            'showExitExpressCheckoutLink' => true,
+            'preventAddressEdit' => true,
+        ]);
+        $event->getPage()->addExtension(CheckoutConfirmPaymentData::EXTENSION_NAME, $extension);
+    }
+}

src/Resources/config/routes.xml

@@ -20,6 +20,7 @@
 
     <import resource="@PayonePayment/Storefront/Controller/Ratepay/RatepayController.php" type="annotation"/>
     <import resource="@PayonePayment/Storefront/Controller/AmazonPay/AmazonRedirectController.php" type="annotation"/>
+    <import resource="@PayonePayment/Storefront/Controller/CheckoutController.php" type="annotation"/>
 
     <!-- Store-Api routes -->
     <import resource="@PayonePayment/StoreApi/Route/CardRoute.php" type="annotation" />

src/Resources/snippet/de_DE/messages.de-DE.json

@@ -48,7 +48,9 @@
         "checkoutConfirmPage": {
             "defaultCardTitle": "Zahlungsinformationen",
             "save": "Daten für zukünftige Nutzung speichern",
-            "saveMandate": "Lastschrift-Mandat für zukünftige Nutzung speichern"
+            "saveMandate": "Lastschrift-Mandat für zukünftige Nutzung speichern",
+            "back-to-standard-checkout": "Zahlungsart ändern",
+            "express-checkout-canceled": "Der Express-Checkout wurde abgebrochen."
         },
         "checkoutFinishPage": {
             "mandateIdentification": "SEPA-Lastschriftmandat"

src/Resources/snippet/en_GB/messages.en-GB.json

@@ -48,7 +48,9 @@
         "checkoutConfirmPage": {
             "defaultCardTitle": "Payment Information",
             "save": "Save data for future use",
-            "saveMandate": "Save direct debit mandate for future use"
+            "saveMandate": "Save direct debit mandate for future use",
+            "back-to-standard-checkout": "Change payment method",
+            "express-checkout-canceled": "The express checkout has been cancelled."
         },
         "checkoutFinishPage": {
             "mandateIdentification": "Direct Debit Mandate"

src/Resources/views/storefront/page/checkout/confirm/confirm-address.html.twig

@@ -0,0 +1,13 @@
+{% sw_extends '@Storefront/storefront/page/checkout/confirm/confirm-address.html.twig' %}
+
+{% block page_checkout_confirm_address_shipping_actions %}
+    {% if not page.extensions.payone or not page.extensions.payone.preventAddressEdit %}
+        {{ parent() }}
+    {% endif %}
+{% endblock %}
+
+{% block page_checkout_confirm_address_billing_actions %}
+    {% if not page.extensions.payone or not page.extensions.payone.preventAddressEdit %}
+        {{ parent() }}
+    {% endif %}
+{% endblock %}

src/Resources/views/storefront/page/checkout/confirm/confirm-payment.html.twig

@@ -0,0 +1,14 @@
+{% sw_extends '@Storefront/storefront/page/checkout/confirm/confirm-payment.html.twig' %}
+
+{% block page_checkout_change_payment_form %}
+    {{ parent() }}
+
+    {% block page_checkout_change_payment_form_payone_back_to_standard_checkout %}
+        {% if page.extensions.payone and page.extensions.payone.showExitExpressCheckoutLink|default(false) %}
+            <div class="card-actions">
+                <a href="{{ url('frontend.payone.delete-checkout-data') }}">{{ 'PayonePayment.checkoutConfirmPage.back-to-standard-checkout' | trans }}</a>
+            </div>
+        {% endif %}
+    {% endblock %}
+
+{% endblock %}

src/Storefront/Controller/CheckoutController.php

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PayonePayment\Storefront\Controller;
+
+use PayonePayment\Storefront\Struct\CheckoutCartPaymentData;
+use Shopware\Core\Checkout\Cart\SalesChannel\CartService;
+use Shopware\Core\System\SalesChannel\SalesChannelContext;
+use Shopware\Storefront\Controller\StorefrontController;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\RouterInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+#[Route(defaults: ['_routeScope' => ['storefront']])]
+class CheckoutController
+{
+    public function __construct(
+        private readonly CartService $cartService,
+        private readonly RouterInterface $router,
+        private readonly TranslatorInterface $translator
+    ) {
+    }
+
+    #[Route(path: '/payone/delete-checkout-data', name: 'frontend.payone.delete-checkout-data')]
+    public function deleteCheckoutData(
+        Request $request,
+        SalesChannelContext $salesChannelContext
+    ): Response {
+        $cart = $this->cartService->getCart($salesChannelContext->getToken(), $salesChannelContext);
+        $cart->removeExtension(CheckoutCartPaymentData::EXTENSION_NAME);
+        $this->cartService->recalculate($cart, $salesChannelContext);
+
+        $session = $request->getSession();
+        if (method_exists($session, 'getFlashBag')) {
+            $session->getFlashBag()->add(
+                StorefrontController::SUCCESS,
+                $this->translator->trans('PayonePayment.checkoutConfirmPage.express-checkout-canceled')
+            );
+        }
+
+        return new RedirectResponse($this->router->generate('frontend.checkout.confirm.page'));
+    }
+}

src/Storefront/Struct/CheckoutConfirmPaymentData.php

@@ -25,6 +25,10 @@ class CheckoutConfirmPaymentData extends Struct
 
     protected ?EntitySearchResult $savedMandates = null;
 
+    protected bool $showExitExpressCheckoutLink = false;
+
+    protected bool $preventAddressEdit = false;
+
     public function getCardRequest(): array
     {
         return $this->cardRequest;
@@ -59,4 +63,14 @@ public function getSavedMandates(): ?EntitySearchResult
     {
         return $this->savedMandates;
     }
+
+    public function isshowExitExpressCheckoutLink(): bool
+    {
+        return $this->showExitExpressCheckoutLink;
+    }
+
+    public function isPreventAddressEdit(): bool
+    {
+        return $this->preventAddressEdit;
+    }
 }