diff --git a/src/Action/ConvertMolliePaymentAction.php b/src/Action/ConvertMolliePaymentAction.php index cb3a5e98..421255ee 100644 --- a/src/Action/ConvertMolliePaymentAction.php +++ b/src/Action/ConvertMolliePaymentAction.php @@ -112,7 +112,10 @@ public function execute($request): void $cartToken = $paymentOptions['cartToken']; $saveCardInfo = $paymentOptions['saveCardInfo']; $useSavedCards = $paymentOptions['useSavedCards']; - $selectedIssuer = PaymentMethod::IDEAL === $paymentMethod ? $paymentOptions['issuers']['id'] : null; + $selectedIssuer = null; + if (PaymentMethod::IDEAL === $paymentMethod && null !== $paymentOptions['issuers']) { + $selectedIssuer = $paymentOptions['issuers']['id']; + } } /** @var MollieGatewayConfigInterface $method */ diff --git a/src/DependencyInjection/SyliusMollieExtension.php b/src/DependencyInjection/SyliusMollieExtension.php index cbbcb349..1938b7ce 100644 --- a/src/DependencyInjection/SyliusMollieExtension.php +++ b/src/DependencyInjection/SyliusMollieExtension.php @@ -29,10 +29,11 @@ public function prepend(ContainerBuilder $container): void return; } + $doctrineConfig = $container->getExtensionConfig('doctrine_migrations'); $container->prependExtensionConfig('doctrine_migrations', [ - 'migrations_paths' => [ + 'migrations_paths' => \array_merge(\array_pop($doctrineConfig)['migrations_paths'] ?? [], [ 'SyliusMolliePlugin\Migrations' => __DIR__ . '/../Migrations', - ], + ]), ]); $container->prependExtensionConfig('sylius_labs_doctrine_migrations_extra', [ diff --git a/src/Payments/Methods/KlarnaOne.php b/src/Payments/Methods/KlarnaOne.php new file mode 100644 index 00000000..6d07a9fb --- /dev/null +++ b/src/Payments/Methods/KlarnaOne.php @@ -0,0 +1,18 @@ + {% if methodForm.vars.value.methodId == mealvouchersId or + methodForm.vars.value.methodId == klarnaOne or methodForm.vars.value.methodId == klarnaPayLater or methodForm.vars.value.methodId == klarnaSliceIt or methodForm.vars.value.methodId == billie or