Fix/mol 978

mollie-payments-for-woocommerce.php

@@ -3,7 +3,7 @@
  * Plugin Name: Mollie Payments for WooCommerce
  * Plugin URI: https://www.mollie.com
  * Description: Accept payments in WooCommerce with the official Mollie plugin
- * Version: 7.3.4
+ * Version: 7.3.5-beta
  * Author: Mollie
  * Author URI: https://www.mollie.com
  * Requires at least: 5.0
@@ -12,7 +12,7 @@
  * Domain Path: /languages
  * License: GPLv2 or later
  * WC requires at least: 3.0
- * WC tested up to: 7.0
+ * WC tested up to: 7.3
  * Requires PHP: 7.2
  */
 declare(strict_types=1);

resources/js/paypalButtonCart.js

@@ -49,7 +49,7 @@ import {ajaxCallToOrder} from "./paypalButtonUtils";
         const calculateTotal = () => {
             let subtotalPath = document.getElementsByClassName('cart-subtotal')[0].getElementsByClassName('woocommerce-Price-amount')[0].childNodes[0]
             let workingNode = subtotalPath.cloneNode(true);
-            let currency = workingNode.lastChild
+            let currency = workingNode.getElementsByClassName('woocommerce-Price-currencySymbol')[0]
             workingNode.removeChild(currency)
             let total = parseFloat(extractValue(workingNode));
             total += calculateTaxes()

src/Activation/ActivationModule.php

@@ -6,6 +6,7 @@
 
 namespace Mollie\WooCommerce\Activation;
 
+use Automattic\WooCommerce\Utilities\FeaturesUtil;
 use Inpsyde\Modularity\Module\ExecutableModule;
 use Inpsyde\Modularity\Module\ModuleClassNameIdTrait;
 use Inpsyde\Modularity\Package;
@@ -43,7 +44,7 @@ public function run(ContainerInterface $container): bool
             'init',
             [$this, 'pluginInit']
         );
-
+        $this->declareCompatibleWithHPOS();
         $this->handleTranslations();
         $this->mollieWcNoticeApiKeyMissing();
         $this->appleValidationFileRewriteRules();
@@ -209,4 +210,17 @@ public function pluginInit()
         $this->markUpdatedOrNew();
         $this->initDb();
     }
+
+    /**
+     * @return void
+     */
+    protected function declareCompatibleWithHPOS(): void
+    {
+        $baseFile = $this->baseFile;
+        add_action('before_woocommerce_init', static function () use ($baseFile) {
+            if (class_exists('\Automattic\WooCommerce\Utilities\FeaturesUtil')) {
+                FeaturesUtil::declare_compatibility('custom_order_tables', $baseFile, true);
+            }
+        });
+    }
 }

src/Buttons/PayPalButton/PayPalAjaxRequests.php

@@ -209,13 +209,11 @@ protected function PayPalDataObjectHttp(): PayPalDataObjectHttp
      */
     protected function updateOrderPostMeta($orderId, $order)
     {
-        update_post_meta($orderId, '_customer_user', get_current_user_id());
-        update_post_meta(
-            $orderId,
-            '_payment_method',
-            'mollie_wc_gateway_paypal'
-        );
-        update_post_meta($orderId, '_payment_method_title', 'PayPal');
+        $order->update_meta_data('_customer_user', get_current_user_id());
+        $order->update_meta_data('_payment_method', 'mollie_wc_gateway_paypal');
+        $order->update_meta_data('_payment_method_title', 'PayPal');
+        $order->update_meta_data('_mollie_payment_method_button', 'PayPalButton');
+        //this saves the order
         $order->update_status(
             'Processing',
             'PayPal Button order',

src/Gateway/GatewayModule.php

@@ -470,6 +470,9 @@ public function instantiatePaymentMethodGateways(ContainerInterface $container):
 
         foreach ($paymentMethods as $paymentMethod) {
             $paymentMethodId = $paymentMethod->getIdFromConfig();
+            if(! in_array($paymentMethodId, $container->get('gateway.paymentMethodsEnabledAtMollie'))) {
+                continue;
+            }
             $isSepa = $paymentMethod->getProperty('SEPA');
             $key = 'mollie_wc_gateway_' . $paymentMethodId;
             if ($isSepa) {
@@ -532,7 +535,7 @@ public function instantiatePaymentMethodGateways(ContainerInterface $container):
     protected function instantiatePaymentMethods($container): array
     {
         $paymentMethods = [];
-        $paymentMethodsNames = $container->get('gateway.paymentMethodsEnabledAtMollie');
+        $paymentMethodsNames = SharedDataDictionary::GATEWAY_CLASSNAMES;
         $iconFactory = $container->get(IconFactory::class);
         assert($iconFactory instanceof IconFactory);
         $settingsHelper = $container->get('settings.settings_helper');
@@ -546,6 +549,8 @@ protected function instantiatePaymentMethods($container): array
             $paymentMethodsNames[] = 'directdebit';
         }
         foreach ($paymentMethodsNames as $paymentMethodName) {
+            $paymentMethodName = strtolower($paymentMethodName);
+            $paymentMethodName = str_replace('mollie_wc_gateway_','',$paymentMethodName);
             $paymentMethodClassName = 'Mollie\\WooCommerce\\PaymentMethods\\' . ucfirst($paymentMethodName);
             $paymentMethod = new $paymentMethodClassName(
                 $iconFactory,

src/Gateway/MolliePaymentGateway.php

@@ -921,10 +921,7 @@ public function onOrderReceivedTitle($title, $id = null)
 
             if ($payment->isOpen()) {
                 // Add a message to log and order explaining a payment with status "open", only if it hasn't been added already
-                if (
-                get_post_meta($order_id, '_mollie_open_status_note', true)
-                    !== '1'
-                ) {
+                if ($order->get_meta('_mollie_open_status_note') !== '1') {
                     // Get payment method title
                     $payment_method_title = $this->method_title;
 
@@ -952,12 +949,8 @@ public function onOrderReceivedTitle($title, $id = null)
                                 )) : '')
                         )
                     );
-
-                    update_post_meta(
-                        $order_id,
-                        '_mollie_open_status_note',
-                        '1'
-                    );
+                    $order->update_meta_data('_mollie_open_status_note', '1');
+                    $order->save();
                 }
 
                 // Update the title on the Order received page to better communicate that the payment is pending.

src/Gateway/Surcharge.php

@@ -54,7 +54,7 @@ public function buildDescriptionWithSurcharge($description, PaymentMethodI $paym
 
         $feeText = $this->feeTextByType($surchargeType, $paymentMethod);
         if ($feeText) {
-            $feeLabel = '<span class="mollie-gateway-fee">' . $feeText . '</span>';
+            $feeLabel = '<p class="mollie-gateway-fee">' . $feeText . '</p>';
             return $description . $feeLabel;
         }
         return $description;

src/Gateway/Voucher/MaybeDisableGateway.php

@@ -26,20 +26,20 @@ public function maybeDisableMealVoucherGateway(array $gateways)
             'wc-api',
             FILTER_SANITIZE_STRING
         );
+        // To exclude we are in Checkout or Order Pay page. These are the other options where gateways are required.
+        $notInCheckoutOrPayPage = $isWcApiRequest
+            || !doing_action('woocommerce_payment_gateways')
+            || (!wp_doing_ajax() && !is_wc_endpoint_url('order-pay'))
+            || is_admin();
+        $notHasBlocks = !has_block('woocommerce/checkout');
         /*
-         * There are 2 cases where we want to filter the gateway and it's when the checkout
-         * page render the available payments methods.(classic and block)
+         * There are 3 cases where we want to filter the gateway and it's when the checkout
+         * page render the available payments methods, either classic or block
+         * and when we are in the order-pay page.
          *
          * For any other case we want to be sure voucher gateway is included.
          */
-        if (
-        ($isWcApiRequest
-            || !doing_action('woocommerce_payment_gateways')
-            || !wp_doing_ajax()
-            || is_admin())
-        && !has_block('woocommerce/checkout')
-
-        ) {
+        if ($notInCheckoutOrPayPage && $notHasBlocks) {
             return $gateways;
         }
         $mealVoucherGatewayIndex = false;

src/Payment/MollieObject.php

@@ -525,9 +525,8 @@ protected function setOrderPaidAndProcessed(WC_Order $order)
      */
     protected function isOrderPaymentStartedByOtherGateway(WC_Order $order)
     {
-        $order_id = $order->get_id();
         // Get the current payment method id for the order
-        $payment_method_id = get_post_meta($order_id, '_payment_method', $single = true);
+        $payment_method_id = $order->get_meta('_payment_method', true);
         // If the current payment method id for the order is not Mollie, return true
         return strpos($payment_method_id, 'mollie') === false;
     }
@@ -694,17 +693,12 @@ function_exists('wcs_order_contains_renewal')
     }
 
     /**
-     * @param $orderId
      * @param string $gatewayId
      * @param WC_Order $order
      */
-    protected function informNotUpdatingStatus($orderId, $gatewayId, WC_Order $order)
+    protected function informNotUpdatingStatus($gatewayId, WC_Order $order)
     {
-        $orderPaymentMethodTitle = get_post_meta(
-            $orderId,
-            '_payment_method_title',
-            $single = true
-        );
+        $orderPaymentMethodTitle = $order->get_meta('_payment_method_title');
 
         // Add message to log
         $this->logger->debug(
@@ -734,14 +728,18 @@ protected function addPaypalTransactionIdToOrder(
         $payment = $this->getActiveMolliePayment($order->get_id());
 
         if ($payment->isPaid() && $payment->details) {
-            update_post_meta($order->get_id(), '_paypal_transaction_id', $payment->details->paypalReference);
+            $order->add_meta_data(
+                '_paypal_transaction_id',
+                $payment->details->paypalReference
+            );
             $order->add_order_note(sprintf(
                                    /* translators: Placeholder 1: PayPal consumer name, placeholder 2: PayPal email, placeholder 3: PayPal transaction ID */
                 __("Payment completed by <strong>%1\$s</strong> - %2\$s (PayPal transaction ID: %3\$s)", 'mollie-payments-for-woocommerce'),
                 $payment->details->consumerName,
                 $payment->details->consumerAccount,
                 $payment->details->paypalReference
             ));
+            $order->save();
         }
     }
     /**