NTR: PISHPS-337: add satispay (#809)

Co-authored-by: Vitalij Mik <[email protected]>

src/Handler/Method/SatispayPayment.php

@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+namespace Kiener\MolliePayments\Handler\Method;
+
+use Kiener\MolliePayments\Handler\PaymentHandler;
+
+class SatispayPayment extends PaymentHandler
+{
+    public const PAYMENT_METHOD_NAME = 'satispay';
+    public const PAYMENT_METHOD_DESCRIPTION = 'Satispay';
+
+    /** @var string */
+    protected $paymentMethod = self::PAYMENT_METHOD_NAME;
+}

src/Resources/config/services/handlers.xml

@@ -234,6 +234,14 @@
             <tag name="shopware.payment.method.async"/>
         </service>
 
+        <!-- Satispay PaymentHandler -->
+        <service id="Kiener\MolliePayments\Handler\Method\SatispayPayment">
+            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="service_container"/>
+            <tag name="shopware.payment.method.async"/>
+        </service>
+
+
 
     </services>
 </container>

src/Service/PaymentMethodService.php

@@ -29,6 +29,7 @@
 use Kiener\MolliePayments\Handler\Method\PosPayment;
 use Kiener\MolliePayments\Handler\Method\Przelewy24Payment;
 use Kiener\MolliePayments\Handler\Method\RivertyPayment;
+use Kiener\MolliePayments\Handler\Method\SatispayPayment;
 use Kiener\MolliePayments\Handler\Method\SofortPayment;
 use Kiener\MolliePayments\Handler\Method\TrustlyPayment;
 use Kiener\MolliePayments\Handler\Method\TwintPayment;
@@ -450,6 +451,7 @@ public function getPaymentHandlers(): array
             TrustlyPayment::class,
             PayconiqPayment::class,
             RivertyPayment::class,
+            SatispayPayment::class,
             // IngHomePayPayment::class, // not allowed anymore
             // DirectDebitPayment::class, // only allowed when updating subsriptions, aka => not allowed anymore
         ];

tests/Cypress/cypress/e2e/storefront/checkout/checkout-success.cy.js

@@ -60,6 +60,8 @@ const payments = [
     {caseId: 'C4143', key: 'voucher', name: 'Voucher', sanity: false},
     {caseId: 'C3362894', key: 'trustly', name: 'Trustly', sanity: false},
     {caseId: 'C3362897', key: 'payconiq', name: 'Payconiq', sanity: false},
+    {caseId: 'C3713510', key: 'riverty', name: 'Riverty', sanity: false},
+    {caseId: 'C3713512', key: 'satispay', name: 'Satispay', sanity: false},
     // unfortunately address and product prices need to match, so we cannot do in3 automatically for now
     // {caseId: '', key: 'in3', name: 'in3'},
 ];

tests/Cypress/cypress/e2e/storefront/payment-methods/riverty.cy.js

@@ -0,0 +1,43 @@
+import Devices from "Services/utils/Devices";
+import Session from "Services/utils/Session"
+// ------------------------------------------------------
+import PaymentAction from "Actions/storefront/checkout/PaymentAction";
+import DummyBasketScenario from "Scenarios/DummyBasketScenario";
+// ------------------------------------------------------
+
+
+const devices = new Devices();
+const session = new Session();
+
+const paymentAction = new PaymentAction();
+const scenarioDummyBasket = new DummyBasketScenario(1);
+
+const device = devices.getFirstDevice();
+
+
+describe('Riverty', () => {
+
+    context(devices.getDescription(device), () => {
+
+        before(function () {
+            devices.setDevice(device);
+        })
+
+        beforeEach(() => {
+            session.resetBrowserSession();
+            devices.setDevice(device);
+        });
+
+        it('C3713511: Riverty is existing in checkout', () => {
+
+            scenarioDummyBasket.execute();
+
+            paymentAction.switchPaymentMethod('Riverty');
+
+            // payment would only work using currency CHF which cannot be done at the moment
+        })
+
+    })
+
+})
+

tests/Cypress/cypress/e2e/storefront/payment-methods/satispay.cy.js

@@ -0,0 +1,43 @@
+import Devices from "Services/utils/Devices";
+import Session from "Services/utils/Session"
+// ------------------------------------------------------
+import PaymentAction from "Actions/storefront/checkout/PaymentAction";
+import DummyBasketScenario from "Scenarios/DummyBasketScenario";
+// ------------------------------------------------------
+
+
+const devices = new Devices();
+const session = new Session();
+
+const paymentAction = new PaymentAction();
+const scenarioDummyBasket = new DummyBasketScenario(1);
+
+const device = devices.getFirstDevice();
+
+
+describe('Satispay', () => {
+
+    context(devices.getDescription(device), () => {
+
+        before(function () {
+            devices.setDevice(device);
+        })
+
+        beforeEach(() => {
+            session.resetBrowserSession();
+            devices.setDevice(device);
+        });
+
+        it('C3713513: Satispay is existing in checkout', () => {
+
+            scenarioDummyBasket.execute();
+
+            paymentAction.switchPaymentMethod('Satispay');
+
+            // payment would only work using currency CHF which cannot be done at the moment
+        })
+
+    })
+
+})
+

tests/PHPUnit/Service/MollieApi/Builder/Payments/SatispayOrderBuilderTest.php

@@ -0,0 +1,68 @@
+<?php declare(strict_types=1);
+
+namespace MolliePayments\Tests\Service\MollieApi\Builder\Payments;
+
+use DateTime;
+use DateTimeZone;
+use Faker\Extension\Container;
+use Kiener\MolliePayments\Handler\Method\KlarnaPayLaterPayment;
+use Kiener\MolliePayments\Handler\Method\SatispayPayment;
+use Kiener\MolliePayments\Handler\Method\TrustlyPayment;
+use Kiener\MolliePayments\Handler\Method\TwintPayment;
+use Kiener\MolliePayments\Service\MollieApi\Builder\MollieOrderPriceBuilder;
+use Mollie\Api\Types\PaymentMethod;
+use MolliePayments\Tests\Fakes\FakeContainer;
+use MolliePayments\Tests\Service\MollieApi\Builder\AbstractMollieOrderBuilder;
+use Shopware\Core\Checkout\Cart\Price\Struct\CartPrice;
+use Shopware\Core\Framework\Uuid\Uuid;
+use Shopware\Core\System\Currency\CurrencyEntity;
+
+class SatispayOrderBuilderTest extends AbstractMollieOrderBuilder
+{
+    public function testOrderBuild(): void
+    {
+        $redirectWebhookUrl = 'https://foo';
+        $this->router->method('generate')->willReturn($redirectWebhookUrl);
+
+        $this->paymentHandler = new SatispayPayment(
+            $this->loggerService,
+            new FakeContainer()
+        );
+
+        $transactionId = Uuid::randomHex();
+        $amountTotal = 27.0;
+        $taxStatus = CartPrice::TAX_STATE_GROSS;
+        $currencyISO = 'EUR';
+
+        $currency = new CurrencyEntity();
+        $currency->setId(Uuid::randomHex());
+        $currency->setIsoCode($currencyISO);
+
+        $orderNumber = 'foo number';
+        $lineItems = $this->getDummyLineItems();
+
+        $order = $this->getOrderEntity($amountTotal, $taxStatus, $currencyISO, $lineItems, $orderNumber);
+
+        $actual = $this->builder->buildOrderPayload($order, $transactionId, $this->paymentHandler::PAYMENT_METHOD_NAME, $this->salesChannelContext, $this->paymentHandler, []);
+
+        $expectedOrderLifeTime = (new DateTime())->setTimezone(new DateTimeZone('UTC'))
+            ->modify(sprintf('+%d day', $this->expiresAt))
+            ->format('Y-m-d');
+
+        $expected = [
+            'amount' => (new MollieOrderPriceBuilder())->build($amountTotal, $currencyISO),
+            'locale' => $this->localeCode,
+            'method' => $this->paymentHandler::PAYMENT_METHOD_NAME,
+            'orderNumber' => $orderNumber,
+            'payment' => ['webhookUrl' => $redirectWebhookUrl],
+            'redirectUrl' => $redirectWebhookUrl,
+            'webhookUrl' => $redirectWebhookUrl,
+            'lines' => $this->getExpectedLineItems($taxStatus, $lineItems, $currency),
+            'billingAddress' => $this->getExpectedTestAddress($this->address, $this->email),
+            'shippingAddress' => $this->getExpectedTestAddress($this->address, $this->email),
+            'expiresAt' => $expectedOrderLifeTime
+        ];
+
+        self::assertSame($expected, $actual);
+    }
+}

tests/PHPUnit/Service/PaymentMethodServiceTest.php

@@ -28,6 +28,7 @@
 use Kiener\MolliePayments\Handler\Method\PosPayment;
 use Kiener\MolliePayments\Handler\Method\Przelewy24Payment;
 use Kiener\MolliePayments\Handler\Method\RivertyPayment;
+use Kiener\MolliePayments\Handler\Method\SatispayPayment;
 use Kiener\MolliePayments\Handler\Method\SofortPayment;
 use Kiener\MolliePayments\Handler\Method\TrustlyPayment;
 use Kiener\MolliePayments\Handler\Method\TwintPayment;
@@ -141,7 +142,8 @@ public function testSupportedMethods(): void
             AlmaPayment::class,
             TrustlyPayment::class,
             PayconiqPayment::class,
-            RivertyPayment::class
+            RivertyPayment::class,
+            SatispayPayment::class,
         ];
 
         $handlers = $this->paymentMethodService->getPaymentHandlers();