Release/7.5.2 beta

src/Gateway/GatewayModule.php

@@ -6,7 +6,6 @@
 
 namespace Mollie\WooCommerce\Gateway;
 
-use Automattic\WooCommerce\Admin\Overrides\Order;
 use Automattic\WooCommerce\Internal\DataStores\Orders\CustomOrdersTableController;
 use Mollie\WooCommerce\Vendor\Inpsyde\Modularity\Module\ExecutableModule;
 use Mollie\WooCommerce\Vendor\Inpsyde\Modularity\Module\ModuleClassNameIdTrait;
@@ -639,9 +638,9 @@ public function in3FieldsMandatory($fields, $errors)
     }
 
     /**
-     * @param Order $order
+     * @param $order
      */
-    public function in3FieldsMandatoryPayForOrder(Order $order)
+    public function in3FieldsMandatoryPayForOrder($order)
     {
         $paymentMethod = filter_input(INPUT_POST, 'payment_method', FILTER_SANITIZE_SPECIAL_CHARS) ?? false;
 

src/Log/WcPsrLoggerAdapter.php

@@ -80,7 +80,7 @@ public function log($level, $message, array $context = [])
         }
 
         if (\WC_Log_Levels::get_level_severity($wcLevel) < \WC_Log_Levels::get_level_severity($this->loggingLevel)) {
-            throw new InvalidArgumentException("Unknown log level ${$wcLevel}");
+            throw new InvalidArgumentException("Unknown log level {$wcLevel}");
         }
 
         if (isset($context['source']) && $context['source'] !== $this-> loggerSource) {

src/MerchantCapture/MerchantCaptureModule.php

@@ -147,13 +147,17 @@ public function run(ContainerInterface $container): bool
         add_action('init', static function () use ($container) {
             $pluginId = $container->get('shared.plugin_id');
             $captureSettings = new MollieCaptureSettings();
-            if (!apply_filters('mollie_wc_gateway_enable_merchant_capture_module', false)) {
+            if (!apply_filters('mollie_wc_gateway_enable_merchant_capture_module', true)) {
                 return;
             }
 
             add_action(
                 $pluginId . '_after_webhook_action',
-                static function (Payment $payment, WC_Order $order) use ($container) {
+                static function ($payment, WC_Order $order) use ($container) {
+
+                    if (!$payment instanceof Payment) {
+                        return;
+                    }
 
                     if ($payment->isAuthorized()) {
                         if (!$payment->getAmountCaptured() == 0.0) {

src/Payment/MollieObject.php

@@ -588,13 +588,13 @@ protected function addMandateIdMetaToFirstPaymentSubscriptionOrder(
                 $subscription->update_meta_data('_mollie_payment_id', $payment->id);
                 $subscription->set_payment_method('mollie_wc_gateway_' . $payment->method);
                 $subscription->save();
-                $subcriptionParentOrder = $subscription->get_parent();
-                if ($subcriptionParentOrder) {
-                    $subcriptionParentOrder->update_meta_data(
+                $subscriptionParentOrder = $subscription->get_parent();
+                if ($subscriptionParentOrder) {
+                    $subscriptionParentOrder->update_meta_data(
                         '_mollie_mandate_id',
                         $payment->mandateId
                     );
-                    $subcriptionParentOrder->save();
+                    $subscriptionParentOrder->save();
                 }
             }
         }

src/Payment/PaymentService.php

@@ -467,6 +467,11 @@ protected function processAsMolliePayment(
             $data,
             $order
         );
+        $data = apply_filters(
+            'woocommerce_' . $this->gateway->id . 'payment_args',
+            $data,
+            $order
+        );
 
         try {
             // Only enable this for hardcore debugging!
@@ -524,6 +529,21 @@ protected function processPaymentForMollie(
         // PROCESS REGULAR PAYMENT AS MOLLIE ORDER
         //
         if ($molliePaymentType === self::PAYMENT_METHOD_TYPE_ORDER) {
+            // if the capture is set to manual, and this is a credit card payment, we need to create a payment instead of an order
+            $captureType = get_option('mollie-payments-for-woocommerce_place_payment_onhold');
+            if ($captureType === 'later_capture' && $this->gateway->id === 'mollie_wc_gateway_creditcard') {
+                $this->logger->debug(
+                    "{$this->gateway->id}: Create payment for order {$orderId} capture set to manual",
+                    [true]
+                );
+
+                $paymentObject = $this->processAsMolliePayment(
+                    $order,
+                    $customer_id,
+                    $apiKey
+                );
+                return $paymentObject;
+            }
             $this->logger->debug(
                 "{$this->gateway->id}: Create Mollie payment object for order {$orderId}",
                 [true]

src/PaymentMethods/Banktransfer.php

@@ -82,7 +82,7 @@ public function getFormFields($generalFormFields): array
 
     public function filtersOnBuild()
     {
-        add_filter('woocommerce_mollie_wc_gateway_' . $this->getProperty('id') . '_args', function (array $args, \WC_Order $order): array {
+        add_filter('woocommerce_mollie_wc_gateway_' . $this->getProperty('id') . 'payment_args', function (array $args, \WC_Order $order): array {
             return $this->addPaymentArguments($args, $order);
         }, 10, 2);
     }

src/PaymentMethods/PaymentFieldsStrategies/GiftcardFieldsStrategy.php

@@ -26,9 +26,13 @@ public function execute($gateway, $dataHelper)
         if (count($issuers) === 1) {
             $issuer = $issuers[0];
             $issuerImageSvg = $this->checkSvgIssuers($issuers);
-            $issuerImageSvg && ($html .= '<img src="' . $issuerImageSvg . '" style="vertical-align:middle" />');
-            $html .= $issuer->name;
-            echo esc_html(wpautop(wptexturize($html)));
+            if ($issuerImageSvg && isset($issuer->name)) {
+                $issuerImageSvg = esc_url($issuerImageSvg);
+                $issuerName = esc_html($issuer->name);
+                $html .= '<img src="' . $issuerImageSvg . '" style="vertical-align:middle" />' . $issuerName;
+            }
+            //phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+            echo wpautop(wptexturize($html));
 
             return;
         }

src/Shared/Data.php

@@ -705,7 +705,7 @@ public function getAllAvailablePaymentMethods($useCache = true)
                 delete_transient($transient_id);
             }
             // No cache exists, call the API and cache the result
-            if ($methods === false) {
+            if (empty($methods)) {
                 if (!$apiKey) {
                     return [];
                 }
@@ -720,8 +720,8 @@ public function getAllAvailablePaymentMethods($useCache = true)
                 // $methods_cleaned is empty array when the API doesn't return any methods, cache the empty array
                 $methods = $methods_cleaned;
 
-                // Set new transients (as cache)
-                if ($useCache) {
+                // Set new transients (as cache) only if we have something in
+                if ($useCache && !empty($methods)) {
                     set_transient($transient_id, $methods, HOUR_IN_SECONDS);
                 }
             }

src/Subscription/MollieSubscriptionGateway.php

@@ -235,15 +235,15 @@ public function scheduled_subscription_payment($renewal_total, WC_Order $renewal
         $subscriptions = wcs_get_subscriptions_for_renewal_order($renewal_order->get_id());
         $subscription = array_pop($subscriptions); // Just need one valid subscription
         $subscription_mollie_payment_id = $subscription->get_meta('_mollie_payment_id');
-        $subcriptionParentOrder = $subscription->get_parent();
-        $mandateId = !empty($subcriptionParentOrder) ? $subcriptionParentOrder->get_meta('_mollie_mandate_id') : null;
+        $subscriptionParentOrder = $subscription->get_parent();
+        $mandateId = !empty($subscriptionParentOrder) ? $subscriptionParentOrder->get_meta('_mollie_mandate_id') : null;
 
         if (! empty($subscription_mollie_payment_id) && ! empty($subscription)) {
             $customer_id = $this->restore_mollie_customer_id_and_mandate($customer_id, $subscription_mollie_payment_id, $subscription);
         }
 
         // Get all data for the renewal payment
-        $initialPaymentUsedOrderAPI = $this->initialPaymentUsedOrderAPI($subcriptionParentOrder);
+        $initialPaymentUsedOrderAPI = $this->initialPaymentUsedOrderAPI($subscriptionParentOrder);
         $data = $this->subscriptionObject->getRecurringPaymentRequestData($renewal_order, $customer_id, $initialPaymentUsedOrderAPI);
 
         // Allow filtering the renewal payment data
@@ -301,14 +301,14 @@ public function scheduled_subscription_payment($renewal_total, WC_Order $renewal
                         (property_exists($payment, 'mandateId')
                             && $payment->mandateId !== null)
                         && $payment->mandateId !== $mandateId
-                        && !empty($subcriptionParentOrder)
+                        && !empty($subscriptionParentOrder)
                     ) {
                         $this->logger->debug("{$this->id}: updating to mandate {$payment->mandateId}");
-                        $subcriptionParentOrder->update_meta_data(
+                        $subscriptionParentOrder->update_meta_data(
                             '_mollie_mandate_id',
                             $payment->mandateId
                         );
-                        $subcriptionParentOrder->save();
+                        $subscriptionParentOrder->save();
                         $mandateId = $payment->mandateId;
                     }
                 } else {
@@ -722,15 +722,15 @@ public function is_available(): bool
     }
 
     /**
-     * @param $subcriptionParentOrder
+     * @param $subscriptionParentOrder
      * @return bool
      */
-    protected function initialPaymentUsedOrderAPI($subcriptionParentOrder): bool
+    protected function initialPaymentUsedOrderAPI($subscriptionParentOrder): bool
     {
-        if (!$subcriptionParentOrder) {
+        if (!$subscriptionParentOrder) {
             return false;
         }
-        $orderIdMeta = $subcriptionParentOrder->get_meta('_mollie_order_id');
+        $orderIdMeta = $subscriptionParentOrder->get_meta('_mollie_order_id');
 
         $parentOrderMeta = $orderIdMeta ?: PaymentService::PAYMENT_METHOD_TYPE_PAYMENT;
 

tests/php/Functional/Subscription/MollieSubscriptionTest.php

@@ -38,7 +38,7 @@ public function __construct($name = null, array $data = [], $dataName = '')
      * THEN THE ORDER NOTES ARE CREATED
      * @test
      */
-    public function renewSubcriptionPaymentTest()
+    public function renewSubscriptionPaymentTest()
     {
         $gatewayName = 'mollie_wc_gateway_ideal';
         $renewalOrder = $this->wcOrder();