+
+
 }})
+
+
+
+
+
+
+ {% if is_save_card_enabled(paymentMethod) %}
+
+ {# No name to not trigger LiveComponent #}
+
+
+ {% endif %}
+
+
+
+
+ {% include '@PayPlugSyliusPayPlugPlugin/shop/hosted_fields/index.html.twig' with {
+ 'paymentMethod': method,
+ } %}
+
diff --git a/tests/Behat/Context/Setup/PayPlugContext.php b/tests/Behat/Context/Setup/PayPlugContext.php
index 493e38b6..4b91cc1c 100644
--- a/tests/Behat/Context/Setup/PayPlugContext.php
+++ b/tests/Behat/Context/Setup/PayPlugContext.php
@@ -8,6 +8,7 @@
use Doctrine\Persistence\ObjectManager;
use PayPlug\SyliusPayPlugPlugin\Gateway\OneyGatewayFactory;
use PayPlug\SyliusPayPlugPlugin\Gateway\PayPlugGatewayFactory;
+use PayPlug\SyliusPayPlugPlugin\Gateway\UhfGatewayFactory;
use Sylius\Behat\Service\SharedStorageInterface;
use Sylius\Bundle\CoreBundle\Fixture\Factory\ExampleFactoryInterface;
use Sylius\Component\Core\Model\PaymentMethodInterface;
@@ -67,6 +68,29 @@ public function theStoreHasAPaymentMethodWithACodeAndPayPlugPaymentGateway(
$this->paymentMethodManager->flush();
}
+ /**
+ * @Given the store has a payment method :paymentMethodName with a code :paymentMethodCode and PayPlug Hosted Fields payment gateway
+ */
+ public function theStoreHasAPaymentMethodWithACodeAndPayPlugHostedFieldsPaymentGateway(
+ string $paymentMethodName,
+ string $paymentMethodCode,
+ ): void {
+ $paymentMethod = $this->createPaymentMethodPayPlug(
+ $paymentMethodName,
+ $paymentMethodCode,
+ UhfGatewayFactory::FACTORY_NAME,
+ UhfGatewayFactory::FACTORY_TITLE,
+ );
+
+ $paymentMethod->getGatewayConfig()->setConfig([
+ 'secretKey' => 'test',
+ 'payum.http_client' => '@payplug_sylius_payplug_plugin.api_client.uhf',
+ UhfGatewayFactory::HF_IDENTIFIER_DEFAULT => 'test-company-id',
+ ]);
+
+ $this->paymentMethodManager->flush();
+ }
+
/**
* @Given the store has a payment method :paymentMethodName with a code :paymentMethodCode and Oney payment gateway
*/
diff --git a/tests/Behat/Context/Ui/Shop/CheckoutContext.php b/tests/Behat/Context/Ui/Shop/CheckoutContext.php
index ae35eef1..85b10294 100644
--- a/tests/Behat/Context/Ui/Shop/CheckoutContext.php
+++ b/tests/Behat/Context/Ui/Shop/CheckoutContext.php
@@ -4,7 +4,7 @@
namespace Tests\PayPlug\SyliusPayPlugPlugin\Behat\Context\Ui\Shop;
-use Behat\Behat\Context\Context;
+use Behat\MinkExtension\Context\RawMinkContext;
use PayPlug\SyliusPayPlugPlugin\ApiClient\PayPlugApiClientInterface;
use Sylius\Behat\Page\Shop\Checkout\CompletePageInterface;
use Sylius\Behat\Page\Shop\Order\ShowPageInterface;
@@ -13,7 +13,7 @@
use Tests\PayPlug\SyliusPayPlugPlugin\Behat\Page\Shop\Payum\PaymentPageInterface;
use Webmozart\Assert\Assert;
-final class CheckoutContext implements Context
+final class CheckoutContext extends RawMinkContext
{
/** @var CompletePageInterface */
private $summaryPage;
@@ -157,4 +157,15 @@ public function oneyIsDisabled(): void
{
$this->payPlugApiMocker->disableOney();
}
+
+ /**
+ * @Then I should see the :selector element on the page
+ */
+ public function iShouldSeeTheElementOnThePage(string $selector): void
+ {
+ Assert::notNull(
+ $this->getSession()->getPage()->find('css', $selector),
+ sprintf('Element matching selector "%s" was not found on the page.', $selector),
+ );
+ }
}
diff --git a/tests/Behat/Resources/suites/ui/paying_with_payplug_for_order.yml b/tests/Behat/Resources/suites/ui/paying_with_payplug_for_order.yml
index 659d5003..df97f112 100644
--- a/tests/Behat/Resources/suites/ui/paying_with_payplug_for_order.yml
+++ b/tests/Behat/Resources/suites/ui/paying_with_payplug_for_order.yml
@@ -30,6 +30,9 @@ default:
- sylius.behat.context.setup.user
- payplug_sylius_payplug_plugin.behat.context.setup.payplug
+ # Provides "This secret Key is valid", which installs the static Payplug\Core\HttpClient
+ # mock for the whole test process (needed by templates calling is_payplug_test_mode_enabled).
+ - payplug_sylius_payplug_plugin.behat.context.ui.admin.managing_payment_method_payplug
# - sylius.behat.context.ui.paypal
- sylius.behat.context.ui.shop.cart
diff --git a/tests/PHPUnit/EventSubscriber/PostPaymentSelectEventSubscriberTest.php b/tests/PHPUnit/EventSubscriber/PostPaymentSelectEventSubscriberTest.php
new file mode 100644
index 00000000..a13e10d5
--- /dev/null
+++ b/tests/PHPUnit/EventSubscriber/PostPaymentSelectEventSubscriberTest.php
@@ -0,0 +1,312 @@
+requestStack = $this->createMock(RequestStack::class);
+ $this->entityManager = $this->createMock(EntityManagerInterface::class);
+ $this->stateMachine = $this->createMock(StateMachineInterface::class);
+ $this->hostedFieldsPaymentProcessor = $this->createMock(HostedFieldsPaymentProcessorInterface::class);
+
+ $this->subscriber = new PostPaymentSelectEventSubscriber(
+ $this->requestStack,
+ $this->entityManager,
+ $this->stateMachine,
+ $this->hostedFieldsPaymentProcessor,
+ );
+ }
+
+ public function testHandle_withHostedFieldsToken_delegatesToProcessorAndCompletesCheckout(): void
+ {
+ $request = Request::create('/checkout/select-payment', 'POST', [
+ 'hostedfields_token' => 'hf_token_abc',
+ 'hostedfields_selected_brand' => 'VISA',
+ 'hostedfields_save_card' => 'true',
+ ]);
+ $request->attributes->set('_route', 'sylius_shop_checkout_select_payment');
+ $this->requestStack->method('getCurrentRequest')->willReturn($request);
+
+ $payment = $this->createMock(PaymentInterface::class);
+ $payment->method('getMethod')->willReturn(
+ $this->buildPaymentMethod(UhfGatewayFactory::FACTORY_NAME),
+ );
+ $order = $this->createMock(OrderInterface::class);
+ $order->method('getLastPayment')->willReturn($payment);
+ $payment->method('getOrder')->willReturn($order);
+
+ $event = $this->createMock(ResourceControllerEvent::class);
+ $event->method('getSubject')->willReturn($order);
+
+ $this->hostedFieldsPaymentProcessor->expects(self::once())
+ ->method('process')
+ ->with($payment, 'hf_token_abc', 'VISA', true)
+ ;
+
+ $this->stateMachine->method('can')
+ ->with($order, OrderCheckoutTransitions::GRAPH, OrderCheckoutTransitions::TRANSITION_COMPLETE)
+ ->willReturn(true)
+ ;
+ $this->stateMachine->expects(self::once())->method('apply');
+ $this->entityManager->expects(self::once())->method('flush');
+
+ $this->subscriber->handle($event);
+ }
+
+ /**
+ * A crafted POST carrying a hosted fields token must not be able to complete checkout
+ * for a payment method that is not on the payplug_uhf factory.
+ */
+ public function testHandle_withHostedFieldsTokenButNotUhfFactory_doesNotProcessNorCompleteCheckout(): void
+ {
+ $request = Request::create('/checkout/select-payment', 'POST', [
+ 'hostedfields_token' => 'hf_token_abc',
+ 'hostedfields_selected_brand' => 'VISA',
+ 'hostedfields_save_card' => 'true',
+ ]);
+ $request->attributes->set('_route', 'sylius_shop_checkout_select_payment');
+ $this->requestStack->method('getCurrentRequest')->willReturn($request);
+
+ $payment = $this->createMock(PaymentInterface::class);
+ $payment->method('getMethod')->willReturn(
+ $this->buildPaymentMethod(PayPlugGatewayFactory::FACTORY_NAME),
+ );
+ $order = $this->createMock(OrderInterface::class);
+ $order->method('getLastPayment')->willReturn($payment);
+ $payment->method('getOrder')->willReturn($order);
+
+ $event = $this->createMock(ResourceControllerEvent::class);
+ $event->method('getSubject')->willReturn($order);
+
+ $this->hostedFieldsPaymentProcessor->expects(self::never())->method('process');
+ $this->stateMachine->expects(self::never())->method('apply');
+ $this->entityManager->expects(self::never())->method('flush');
+
+ $this->subscriber->handle($event);
+ }
+
+ /**
+ * Pins the dispatch precedence that alterRequestConfigurationForInlineCardCapture() mirrors:
+ * when both token fields are present, handle() treats the request as Hosted Fields (no
+ * payment_id is ever written). Flipping this order without flipping the redirect ternary would
+ * send a payment_id-less order to sylius_shop_order_pay.
+ */
+ public function testHandle_withBothTokens_isProcessedAsHostedFields(): void
+ {
+ $request = Request::create('/checkout/select-payment', 'POST', [
+ 'payplug_integrated_payment_token' => 'pay_123',
+ 'hostedfields_token' => 'hf_token_abc',
+ 'hostedfields_selected_brand' => 'CB',
+ ]);
+ $request->attributes->set('_route', 'sylius_shop_checkout_select_payment');
+ $this->requestStack->method('getCurrentRequest')->willReturn($request);
+
+ $payment = $this->createMock(PaymentInterface::class);
+ $payment->method('getMethod')->willReturn(
+ $this->buildPaymentMethod(UhfGatewayFactory::FACTORY_NAME),
+ );
+ $order = $this->createMock(OrderInterface::class);
+ $order->method('getLastPayment')->willReturn($payment);
+ $payment->method('getOrder')->willReturn($order);
+
+ $event = $this->createMock(ResourceControllerEvent::class);
+ $event->method('getSubject')->willReturn($order);
+
+ // Hosted Fields path: the processor is used and no payment_id is written to the details.
+ $this->hostedFieldsPaymentProcessor->expects(self::once())
+ ->method('process')
+ ->with($payment, 'hf_token_abc', 'CB', false)
+ ;
+ $payment->expects(self::never())->method('setDetails');
+
+ $this->subscriber->handle($event);
+ }
+
+ public function testHandle_withHostedFieldsTokenButNoPaymentMethod_doesNotProcess(): void
+ {
+ $request = Request::create('/checkout/select-payment', 'POST', [
+ 'hostedfields_token' => 'hf_token_abc',
+ ]);
+ $request->attributes->set('_route', 'sylius_shop_checkout_select_payment');
+ $this->requestStack->method('getCurrentRequest')->willReturn($request);
+
+ $payment = $this->createMock(PaymentInterface::class);
+ $payment->method('getMethod')->willReturn(null);
+ $order = $this->createMock(OrderInterface::class);
+ $order->method('getLastPayment')->willReturn($payment);
+
+ $event = $this->createMock(ResourceControllerEvent::class);
+ $event->method('getSubject')->willReturn($order);
+
+ $this->hostedFieldsPaymentProcessor->expects(self::never())->method('process');
+ $this->entityManager->expects(self::never())->method('flush');
+
+ $this->subscriber->handle($event);
+ }
+
+ public function testHandle_withoutAnyToken_doesNothing(): void
+ {
+ $request = Request::create('/checkout/select-payment', 'POST');
+ $request->attributes->set('_route', 'sylius_shop_checkout_select_payment');
+ $this->requestStack->method('getCurrentRequest')->willReturn($request);
+
+ $payment = $this->createMock(PaymentInterface::class);
+ $order = $this->createMock(OrderInterface::class);
+ $order->method('getLastPayment')->willReturn($payment);
+
+ $event = $this->createMock(ResourceControllerEvent::class);
+ $event->method('getSubject')->willReturn($order);
+
+ $this->hostedFieldsPaymentProcessor->expects(self::never())->method('process');
+ $this->entityManager->expects(self::never())->method('flush');
+
+ $this->subscriber->handle($event);
+ }
+
+ // -------------------------------------------------------------------------
+ // alterRequestConfigurationForInlineCardCapture()
+ // -------------------------------------------------------------------------
+
+ /**
+ * Integrated Payment relays a real PayPlug payment_id, so the redirect override to
+ * `sylius_shop_order_pay` (Payum capture/status) must stay in place.
+ */
+ public function testAlterRequestConfiguration_withIntegratedPaymentToken_overridesRedirect(): void
+ {
+ $request = Request::create('/checkout/select-payment', 'POST', [
+ 'payplug_integrated_payment_token' => 'pay_123',
+ ]);
+ $request->attributes->set('_route', 'sylius_shop_checkout_select_payment');
+ $request->attributes->set('_sylius', ['redirect' => ['route' => 'sylius_shop_checkout_complete']]);
+
+ $this->subscriber->alterRequestConfigurationForInlineCardCapture($this->buildRequestEvent($request));
+
+ self::assertSame(
+ [
+ 'redirect' => [
+ 'route' => 'sylius_shop_order_pay',
+ 'parameters' => ['tokenValue' => 'resource.tokenValue'],
+ ],
+ ],
+ $request->attributes->get('_sylius'),
+ );
+ }
+
+ /**
+ * Hosted Fields has no PayPlug payment_id yet (PRE-3551): reaching `sylius_shop_order_pay` would
+ * make StatusAction markNew() and end up issuing a real createPayment() API call. A `redirect`
+ * entry is still required (Sylius's CheckoutRedirectListener would otherwise fail to resolve a
+ * route for the `completed` checkout state), so it points at `sylius_shop_order_show` instead.
+ */
+ public function testAlterRequestConfiguration_withOnlyHostedFieldsToken_redirectsToOrderShowNotOrderPay(): void
+ {
+ $request = Request::create('/checkout/select-payment', 'POST', [
+ 'hostedfields_token' => 'hf_token_abc',
+ 'hostedfields_selected_brand' => 'VISA',
+ ]);
+ $request->attributes->set('_route', 'sylius_shop_checkout_select_payment');
+ $request->attributes->set('_sylius', ['redirect' => ['route' => 'sylius_shop_checkout_complete']]);
+
+ $this->subscriber->alterRequestConfigurationForInlineCardCapture($this->buildRequestEvent($request));
+
+ self::assertSame(
+ [
+ 'redirect' => [
+ 'route' => 'sylius_shop_order_show',
+ 'parameters' => ['tokenValue' => 'resource.tokenValue'],
+ ],
+ ],
+ $request->attributes->get('_sylius'),
+ );
+ }
+
+ /**
+ * A crafted request carrying both token fields is dispatched as Hosted Fields by handle()
+ * (it checks hasHostedFieldsToken() first), so it must be routed as Hosted Fields too —
+ * otherwise no payment_id is ever set and the order still lands on the Payum capture/status
+ * chain this redirect exists to avoid.
+ */
+ public function testAlterRequestConfiguration_withBothTokens_followsHandleAndRedirectsToOrderShow(): void
+ {
+ $request = Request::create('/checkout/select-payment', 'POST', [
+ 'payplug_integrated_payment_token' => 'pay_123',
+ 'hostedfields_token' => 'hf_token_abc',
+ ]);
+ $request->attributes->set('_route', 'sylius_shop_checkout_select_payment');
+ $request->attributes->set('_sylius', []);
+
+ $this->subscriber->alterRequestConfigurationForInlineCardCapture($this->buildRequestEvent($request));
+
+ $syliusRequestConfig = $request->attributes->get('_sylius');
+ self::assertSame('sylius_shop_order_show', $syliusRequestConfig['redirect']['route']);
+ }
+
+ public function testAlterRequestConfiguration_withoutAnyToken_leavesRedirectUntouched(): void
+ {
+ $request = Request::create('/checkout/select-payment', 'POST');
+ $request->attributes->set('_route', 'sylius_shop_checkout_select_payment');
+ $syliusRequestConfig = ['redirect' => ['route' => 'sylius_shop_checkout_complete']];
+ $request->attributes->set('_sylius', $syliusRequestConfig);
+
+ $this->subscriber->alterRequestConfigurationForInlineCardCapture($this->buildRequestEvent($request));
+
+ self::assertSame($syliusRequestConfig, $request->attributes->get('_sylius'));
+ }
+
+ // -------------------------------------------------------------------------
+ // Helpers
+ // -------------------------------------------------------------------------
+
+ private function buildRequestEvent(Request $request): RequestEvent
+ {
+ return new RequestEvent(
+ $this->createMock(HttpKernelInterface::class),
+ $request,
+ HttpKernelInterface::MAIN_REQUEST,
+ );
+ }
+
+ private function buildPaymentMethod(string $factoryName): PaymentMethodInterface&MockObject
+ {
+ $gatewayConfig = $this->createMock(GatewayConfigInterface::class);
+ $gatewayConfig->method('getFactoryName')->willReturn($factoryName);
+
+ $paymentMethod = $this->createMock(PaymentMethodInterface::class);
+ $paymentMethod->method('getGatewayConfig')->willReturn($gatewayConfig);
+
+ return $paymentMethod;
+ }
+}
diff --git a/tests/PHPUnit/Gateway/Form/Extension/UhfGatewayConfigurationTypeExtensionTest.php b/tests/PHPUnit/Gateway/Form/Extension/UhfGatewayConfigurationTypeExtensionTest.php
index 0d1e7d7d..57a464d5 100644
--- a/tests/PHPUnit/Gateway/Form/Extension/UhfGatewayConfigurationTypeExtensionTest.php
+++ b/tests/PHPUnit/Gateway/Form/Extension/UhfGatewayConfigurationTypeExtensionTest.php
@@ -9,6 +9,7 @@
use PayPlug\SyliusPayPlugPlugin\Gateway\Form\Type\UhfGatewayConfigurationType;
use PayPlug\SyliusPayPlugPlugin\Gateway\UhfGatewayFactory;
use PHPUnit\Framework\TestCase;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
use Symfony\Component\Form\Extension\Core\Type\TextType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\Validator\Constraints\NotBlank;
@@ -24,20 +25,7 @@ protected function setUp(): void
public function testBuildForm_addsHfIdentifierDefaultTextField(): void
{
- $builder = $this->createMock(FormBuilderInterface::class);
-
- $addCalls = [];
- $builder
- ->expects(self::once())
- ->method('add')
- ->willReturnCallback(function ($name, $type = null, array $options = []) use (&$addCalls, $builder) {
- $addCalls[] = [$name, $type, $options];
-
- return $builder;
- })
- ;
-
- $this->extension->buildForm($builder, []);
+ [, $addCalls] = $this->buildFormAndCollectAddCalls();
[$name, $type, $options] = $addCalls[0];
self::assertSame(UhfGatewayFactory::HF_IDENTIFIER_DEFAULT, $name);
@@ -52,8 +40,46 @@ public function testBuildForm_addsHfIdentifierDefaultTextField(): void
self::assertInstanceOf(NotBlank::class, $options['constraints'][0]);
}
+ public function testBuildForm_addsOneClickCheckboxField(): void
+ {
+ [, $addCalls] = $this->buildFormAndCollectAddCalls();
+
+ [$name, $type, $options] = $addCalls[1];
+ self::assertSame(UhfGatewayFactory::ONE_CLICK, $name);
+ self::assertSame(CheckboxType::class, $type);
+ self::assertSame('payplug_checkbox', $options['block_name']);
+ self::assertSame('payplug_sylius_payplug_plugin.form.one_click_enable', $options['label']);
+ self::assertSame('payplug_sylius_payplug_plugin.form.one_click_help', $options['help']);
+ self::assertTrue($options['help_html']);
+ self::assertFalse($options['required']);
+ self::assertSame(AbstractGatewayConfigurationType::VALIDATION_GROUPS, $options['validation_groups']);
+ }
+
public function testGetExtendedTypes_returnsUhfGatewayConfigurationType(): void
{
self::assertSame([UhfGatewayConfigurationType::class], UhfGatewayConfigurationTypeExtension::getExtendedTypes());
}
+
+ /**
+ * @return array{0: FormBuilderInterface, 1: array