NTR: Merge branch 'master' into users/vm/PISHPS-281-mybank

# Conflicts:
#	src/Resources/config/services/handlers.xml
#	src/Service/PaymentMethodService.php
#	tests/PHPUnit/Service/PaymentMethodServiceTest.php

src/Handler/Method/AlmaPayment.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Kiener\MolliePayments\Handler\Method;
+
+use Kiener\MolliePayments\Handler\PaymentHandler;
+use Mollie\Api\Types\PaymentMethod;
+use Shopware\Core\Checkout\Customer\CustomerEntity;
+use Shopware\Core\Checkout\Order\OrderEntity;
+use Shopware\Core\System\Locale\LocaleEntity;
+use Shopware\Core\System\SalesChannel\SalesChannelContext;
+
+class AlmaPayment extends PaymentHandler
+{
+    public const PAYMENT_METHOD_NAME = PaymentMethod::ALMA;
+    public const PAYMENT_METHOD_DESCRIPTION = 'Alma';
+
+    /** @var string */
+    protected $paymentMethod = self::PAYMENT_METHOD_NAME;
+
+
+    /**
+     * @param array<mixed> $orderData
+     * @param OrderEntity $orderEntity
+     * @param SalesChannelContext $salesChannelContext
+     * @param CustomerEntity $customer
+     * @return array<mixed>
+     */
+    public function processPaymentMethodSpecificParameters(array $orderData, OrderEntity $orderEntity, SalesChannelContext $salesChannelContext, CustomerEntity $customer): array
+    {
+        return $orderData;
+    }
+}

src/Resources/config/services/handlers.xml

@@ -204,6 +204,14 @@
             <tag name="shopware.payment.method.async"/>
         </service>
 
+        <!-- Palma PaymentHandler-->
+        <service id="Kiener\MolliePayments\Handler\Method\AlmaPayment">
+            <argument type="service" id="mollie_payments.logger"/>
+            <argument type="service" id="service_container"/>
+            <tag name="shopware.payment.method.async"/>
+        </service>
+
+
         <!-- MyBank PaymentHandler-->
         <service id="Kiener\MolliePayments\Handler\Method\MyBankPayment">
             <argument type="service" id="mollie_payments.logger"/>

src/Service/PaymentMethodService.php

@@ -3,6 +3,7 @@
 namespace Kiener\MolliePayments\Service;
 
 use Kiener\MolliePayments\Compatibility\VersionCompare;
+use Kiener\MolliePayments\Handler\Method\AlmaPayment;
 use Kiener\MolliePayments\Handler\Method\ApplePayPayment;
 use Kiener\MolliePayments\Handler\Method\BancomatPayment;
 use Kiener\MolliePayments\Handler\Method\BanContactPayment;
@@ -445,6 +446,7 @@ public function getPaymentHandlers(): array
             BlikPayment::class,
             BancomatPayment::class,
             MyBankPayment::class,
+            AlmaPayment::class,
             // IngHomePayPayment::class, // not allowed anymore
             // DirectDebitPayment::class, // only allowed when updating subsriptions, aka => not allowed anymore
         ];

src/Subscriber/SystemConfigSubscriber.php

@@ -53,6 +53,10 @@ public static function getSubscribedEvents()
     public function onSystemConfigWritten(EntityWrittenEvent $event): void
     {
         foreach ($event->getPayloads() as $payload) {
+            if (! isset($payload['configurationKey'])) {
+                continue;
+            }
+
             $this->checkSystemConfigChange(
                 (string)$payload['configurationKey'],
                 $payload['configurationValue'],

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

@@ -0,0 +1,67 @@
+<?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\KlarnaOnePayment;
+use Kiener\MolliePayments\Handler\Method\KlarnaPayLaterPayment;
+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 AlmaOrderBuilderTest extends AbstractMollieOrderBuilder
+{
+    public function testOrderBuild(): void
+    {
+        $redirectWebhookUrl = 'https://foo';
+        $this->router->method('generate')->willReturn($redirectWebhookUrl);
+        $paymentMethod = PaymentMethod::ALMA;
+
+        $this->paymentHandler = new KlarnaOnePayment(
+            $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, $paymentMethod, $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' => $paymentMethod,
+            '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

@@ -2,6 +2,7 @@
 
 namespace Kiener\MolliePayments\Tests\Service;
 
+use Kiener\MolliePayments\Handler\Method\AlmaPayment;
 use Kiener\MolliePayments\Handler\Method\ApplePayPayment;
 use Kiener\MolliePayments\Handler\Method\BancomatPayment;
 use Kiener\MolliePayments\Handler\Method\BanContactPayment;
@@ -135,6 +136,7 @@ public function testSupportedMethods(): void
             BlikPayment::class,
             BancomatPayment::class,
             MyBankPayment::class,
+            AlmaPayment::class,
         ];
 
         $handlers = $this->paymentMethodService->getPaymentHandlers();