Fix subscriptions

src/Payment/MollieSubscription.php

@@ -18,14 +18,15 @@ class MollieSubscription extends MollieObject
      * Molliesubscription constructor.
      *
      */
-    public function __construct($pluginId, Api $apiHelper, $settingsHelper, $dataHelper, $logger, $paymentMethod)
+    public function __construct($pluginId, Api $apiHelper, $settingsHelper, $dataHelper, $logger, $paymentMethod, $middleware)
     {
         $this->pluginId = $pluginId;
         $this->apiHelper = $apiHelper;
         $this->settingsHelper = $settingsHelper;
         $this->dataHelper = $dataHelper;
         $this->logger = $logger;
         $this->paymentMethod = $paymentMethod;
+        $this->middleware = $middleware;
     }
     /**
      * @param $order
@@ -46,11 +47,8 @@ public function getRecurringPaymentRequestData($order, $customerId, $initialPaym
         $option = get_option($optionName);
         $paymentDescription = $this->getRecurringPaymentDescription($order, $option, $initialPaymentUsedOrderAPI);
         $selectedIssuer = $this->paymentMethod->getSelectedIssuer();
-        $returnUrl = $gateway->get_return_url($order);
-        $returnUrl = $this->getReturnUrl($order, $returnUrl);
-        $webhookUrl = $this->getWebhookUrl($order, $gatewayId);
 
-        return array_filter([
+        $requestData =  array_filter([
                                 'amount' =>  [
                                     'currency' => $this->dataHelper->getOrderCurrency($order),
                                     'value' => $this->dataHelper->formatCurrencyValue(
@@ -59,8 +57,6 @@ public function getRecurringPaymentRequestData($order, $customerId, $initialPaym
                                     ),
                                 ],
                                 'description' => $paymentDescription,
-                                'redirectUrl' => $returnUrl,
-                                'webhookUrl' => $webhookUrl,
                                 'method' => $methodId,
                                 'issuer' => $selectedIssuer,
                                 'locale' => $paymentLocale,
@@ -70,6 +66,11 @@ public function getRecurringPaymentRequestData($order, $customerId, $initialPaym
                                 'sequenceType' => 'recurring',
                                 'customerId' => $customerId,
                             ]);
+        $context = 'payment';
+        foreach ($this->middleware as $field) {
+            $requestData = $field->decorate($requestData, $order, $context);
+        }
+        return $requestData;
     }
 
     protected function getRecurringPaymentDescription($order, $option, $initialPaymentUsedOrderAPI)

src/Payment/Request/Decorators/StoreCustomerDecorator.php

@@ -18,16 +18,15 @@ public function __construct(Settings $settingsHelper)
     public function decorate(array $requestData, WC_Order $order, $context = null): array
     {
         $storeCustomer = $this->settingsHelper->shouldStoreCustomer();
-        $customerId = $order->get_meta('_mollie_customer_id');
-        if (!$storeCustomer || !$customerId) {
-            return $requestData;
-        }
-        if ($context === 'order') {
-            $requestData['payment']['customerId'] = $customerId;
-        } elseif ($context === 'payment') {
-            $requestData['customerId'] = $customerId;
+        if (!$storeCustomer) {
+            if ($context === 'order') {
+               unset($requestData['payment']['customerId']);
+            } elseif ($context === 'payment') {
+                unset($requestData['customerId']);
+            }
         }
 
+
         return $requestData;
     }
 }

src/Payment/Request/Strategies/OrderRequestStrategy.php

@@ -52,7 +52,9 @@ public function createRequest(WC_Order $order, $customerId): array
                 ]
             ),
             'orderNumber' => $order->get_order_number(),
-            'payment' => []
+            'payment' => [
+                'customerId' => $customerId,
+            ]
         ];
 
         $context = 'order';

src/Payment/Request/Strategies/PaymentRequestStrategy.php

@@ -51,6 +51,7 @@ public function createRequest(WC_Order $order, $customerId): array
                     'order_id' => $order->get_id(),
                 ]
             ),
+            'customerId' => $customerId,
         ];
 
         $context = 'payment';

src/Subscription/MollieSubscriptionGatewayHandler.php

@@ -13,6 +13,7 @@
 use Mollie\WooCommerce\Payment\PaymentProcessor;
 use Mollie\WooCommerce\Notice\NoticeInterface;
 use Mollie\WooCommerce\Payment\MollieOrderService;
+use Mollie\WooCommerce\Payment\Request\Decorators\UrlDecorator;
 use Mollie\WooCommerce\PaymentMethods\InstructionStrategies\OrderInstructionsManager;
 use Mollie\WooCommerce\PaymentMethods\PaymentMethodI;
 use Mollie\WooCommerce\SDK\Api;
@@ -37,7 +38,7 @@ class MollieSubscriptionGatewayHandler extends MolliePaymentGatewayHandler
         'mollie_wc_gateway_sofort', ];
     protected const DIRECTDEBIT = Constants::DIRECTDEBIT;
 
-    protected $isSubscriptionPayment = false;
+    public $isSubscriptionPayment = false;
     protected $apiHelper;
     protected $settingsHelper;
     /**
@@ -86,6 +87,7 @@ public function __construct(
             $dataService,
             $logger,
             $paymentMethod,
+            new UrlDecorator($pluginId, $logger)
         );
     }