Pass container to fix onMollieReturn

src/Gateway/inc/services.php

@@ -158,7 +158,7 @@
             $data = $container->get('settings.data_helper');
             assert($data instanceof Data);
             $pluginId = $container->get('shared.plugin_id');
-            return new MollieOrderService($HttpResponseService, $logger, $paymentFactory, $data, $pluginId);
+            return new MollieOrderService($HttpResponseService, $logger, $paymentFactory, $data, $pluginId, $container);
         },
         OrderMandatoryGatewayDisabler::class => static function (ContainerInterface $container): OrderMandatoryGatewayDisabler {
             $settings = $container->get('settings.settings_helper');

src/Payment/MollieOrderService.php

@@ -13,6 +13,7 @@
 use Mollie\WooCommerce\SDK\HttpResponse;
 use Mollie\WooCommerce\Shared\Data;
 use Mollie\WooCommerce\Shared\SharedDataDictionary;
+use Psr\Container\ContainerInterface;
 use Psr\Log\LoggerInterface as Logger;
 use Psr\Log\LogLevel;
 use WC_Order;
@@ -37,6 +38,7 @@ class MollieOrderService
      */
     protected $data;
     protected $pluginId;
+    private ContainerInterface $container;
 
     /**
      * PaymentService constructor.
@@ -46,14 +48,16 @@ public function __construct(
         Logger $logger,
         PaymentFactory $paymentFactory,
         Data $data,
-        string $pluginId
+        string $pluginId,
+        ContainerInterface $container
     ) {
 
         $this->httpResponse = $httpResponse;
         $this->logger = $logger;
         $this->paymentFactory = $paymentFactory;
         $this->data = $data;
         $this->pluginId = $pluginId;
+        $this->container = $container;
     }
 
     public function setGateway($gateway)
@@ -213,7 +217,7 @@ public function orderNeedsPayment(WC_Order $order)
     {
         $order_id = $order->get_id();
         $gateway = wc_get_payment_gateway_by_order($order);
-        $paymentMethod = $gateway->locate('getPaymentMethod')($gateway->id);
+        $paymentMethod = $this->container->get('payment_gateway.getPaymentMethod')($gateway->id);
 
         // Check whether the order is processed and paid via another gateway
         if ($this->isOrderPaidByOtherGateway($order)) {

src/Payment/PaymentModule.php

@@ -9,6 +9,7 @@
 use Inpsyde\Modularity\Module\ExecutableModule;
 use Inpsyde\Modularity\Module\ModuleClassNameIdTrait;
 use Inpsyde\Modularity\Module\ServiceModule;
+use Inpsyde\PaymentGateway\PaymentGateway;
 use Mollie\Api\Exceptions\ApiException;
 use Mollie\Api\Resources\Refund;
 use Mollie\WooCommerce\Gateway\MolliePaymentGateway;