Changeset 3114383

multisafepay/tags/6.6.0/multisafepay.php

-                      r3099249
+                      r3114383
  * Plugin URI:              https://docs.multisafepay.com/docs/woocommerce
  * Description:             MultiSafepay Payment Plugin
  * Version:                 6.5.1
+ * Version:                 6.6.0
  * Author:                  MultiSafepay
  * Author URI:              https://www.multisafepay.com
 …
  * License URI:             http://www.gnu.org/licenses/gpl-3.0.html
  * Requires at least:       6.0
  * Tested up to:            6.5.4
+ * Tested up to:            6.5.5
  * WC requires at least:    6.0.0
  * WC tested up to:         8.8.3
+ * WC tested up to:         9.0.2
  * Requires PHP:            7.3
  * Text Domain:             multisafepay
 …
  * Plugin version
  */
 define( 'MULTISAFEPAY_PLUGIN_VERSION', '6.5.1' );
+define( 'MULTISAFEPAY_PLUGIN_VERSION', '6.6.0' );
 /**

multisafepay/tags/6.6.0/readme.txt

-                      r3099249
+                      r3114383
 Tags: multisafepay, payment gateway, credit cards, ideal, bnpl
 Requires at least: 6.0
 Tested up to: 6.5.4
+Tested up to: 6.5.5
 Requires PHP: 7.3
 Stable tag: 6.5.1
+Stable tag: 6.6.0
 License: MIT
 …
 == Upgrade Notice ==
 = 6.5.1 =
+= 6.6.0 =
 .x.x is a major upgrade in which the MultiSafepay payment methods are registered dynamically via an API request to MultiSafepay. If you are upgrading from 5.X.X version, after the upgrade, please navigate to the MultiSafepay settings page, and to each one of the payment methods enabled in your account, and confirm the settings in each section are set up according to your preferences.
 …
 == Changelog ==
+= Release Notes - WooCommerce 6.6.0 (Jul 8th, 2024) =
+### Added
++ PLGWOOS-946: Add support for branded credit and debit cards
+### Changed
++ PLGWOOS-943: Refactor PaymentMethodCallback class (#574)
++ PLGWOOS-948: General improvements to increase unit test coverage
 = Release Notes - WooCommerce 6.5.1 (Jun 7th, 2024) =

multisafepay/tags/6.6.0/src/Client/MultiSafepayClient.php

-                      r3090804
+                      r3114383
  */
 class MultiSafepayClient implements ClientInterface {
+    /**
+     * @var Logger
+     */
+    private $logger;
+    /**
+     * @param Logger|null $logger
+     */
+    public function __construct( ?Logger $logger = null ) {
+        $this->logger = $logger ?? new Logger();
+    }
     /**
 …
+            }
         } catch ( Exception $exception ) {
             Logger::log_error( 'Error when process request via MultiSafepayClient: ' . $exception->getMessage() );
+            $this->logger->log_error( 'Error when process request via MultiSafepayClient: ' . $exception->getMessage() );
             throw new Exception( $exception->getMessage() );
+        }

multisafepay/tags/6.6.0/src/PaymentMethods/Base/BasePaymentMethod.php

-                      r3099249
+                      r3114383
     /**
+     * Defines if the payment method is tokenizable
+     * @var Logger
+     */
+    private $logger;
+    /**
+     * BasePaymentMethod constructor.
+     *
      * @param PaymentMethod $payment_method
+     */
+    public function __construct( PaymentMethod $payment_method ) {
+     * @param Logger|null   $logger
+     */
+    public function __construct( PaymentMethod $payment_method, ?Logger $logger = null ) {
+        $this->logger         = $logger ?? new Logger();
         $this->payment_method = $payment_method;
         $this->supports       = array( 'products', 'refunds' );
 …
             $transaction = $transaction_manager->create( $order_request );
         } catch ( ApiException | ClientExceptionInterface $exception ) {
             Logger::log_error( $exception->getMessage() );
+            $this->logger->log_error( $exception->getMessage() );
             wc_add_notice( __( 'There was a problem processing your payment. Please try again later or contact with us.', 'multisafepay' ), 'error' );
             return;
 …
         if ( get_option( 'multisafepay_debugmode', false ) ) {
             Logger::log_info( 'Start MultiSafepay transaction for the order ID ' . $order_id . ' on ' . date( 'd/m/Y H:i:s' ) . ' with payment URL ' . $transaction->getPaymentUrl() );
+            $this->logger->log_info( 'Start MultiSafepay transaction for the order ID ' . $order_id . ' on ' . date( 'd/m/Y H:i:s' ) . ' with payment URL ' . $transaction->getPaymentUrl() );
+        }

multisafepay/tags/6.6.0/src/PaymentMethods/Base/BasePaymentMethodBlocks.php

-                      r3090804
+                      r3114383
             $multisafepay_payment_methods = $payment_method_service->get_multisafepay_payment_methods_from_api();
             foreach ( $multisafepay_payment_methods as $multisafepay_payment_method ) {
+                $woocommerce_payment_gateway = null;
+                $woocommerce_payment_gateways = array();
                 if ( isset( $multisafepay_payment_method['type'] ) && ( 'coupon' === $multisafepay_payment_method['type'] ) ) {
+                    $woocommerce_payment_gateway = new BaseGiftCardPaymentMethod( new PaymentMethod( $multisafepay_payment_method ) );
+                }
+                if ( isset( $multisafepay_payment_method['type'] ) && ( 'payment-method' === $multisafepay_payment_method['type'] ) ) {
+                    $woocommerce_payment_gateway = new BasePaymentMethod( new PaymentMethod( $multisafepay_payment_method ) );
+                    $woocommerce_payment_gateways[] = new BaseGiftCardPaymentMethod( new PaymentMethod( $multisafepay_payment_method ) );
+                }
+                // Include direct payment methods without components just in the checkout page of the frontend context
+                if (
+                    $woocommerce_payment_gateway->check_direct_payment_methods_without_components() &&
+                    ! $woocommerce_payment_gateway->admin_editing_checkout_page()
+                ) {
+                    $this->gateways[] = $woocommerce_payment_gateway;
+                if ( isset( $multisafepay_payment_method['type'] ) && ( 'payment-method' === $multisafepay_payment_method['type'] ) ) {
+                    $woocommerce_payment_gateways[] = new BasePaymentMethod( new PaymentMethod( $multisafepay_payment_method ) );
+                    foreach ( $multisafepay_payment_method['brands'] as $brand ) {
+                        if ( ! empty( $brand['allowed_countries'] ) ) {
+                            $woocommerce_payment_gateways[] = new BaseBrandedPaymentMethod( new PaymentMethod( $multisafepay_payment_method ), $brand );
+                        }
+                    }
+                }
+                if ( ( 'redirect' === $woocommerce_payment_gateway->get_payment_method_type() ) && $woocommerce_payment_gateway->is_available() ) {
+                    $this->gateways[] = $woocommerce_payment_gateway;
+                foreach ( $woocommerce_payment_gateways as $woocommerce_payment_gateway ) {
+                    // Include direct payment methods without components just in the checkout page of the frontend context
+                    if (
+                        $woocommerce_payment_gateway->check_direct_payment_methods_without_components() &&
+                        ! $woocommerce_payment_gateway->admin_editing_checkout_page()
+                    ) {
+                        $this->gateways[] = $woocommerce_payment_gateway;
+                    }
+                    if ( ( 'redirect' === $woocommerce_payment_gateway->get_payment_method_type() ) && $woocommerce_payment_gateway->is_available() ) {
+                        $this->gateways[] = $woocommerce_payment_gateway;
+                    }
+                }
+            }

multisafepay/tags/6.6.0/src/PaymentMethods/Base/BaseRefunds.php

-                      r3048898
+                      r3114383
 use MultiSafepay\ValueObject\CartItem;
 use MultiSafepay\WooCommerce\Services\SdkService;
-use MultiSafepay\WooCommerce\Utils\Logger;
 use MultiSafepay\WooCommerce\Utils\MoneyUtil;
 use Psr\Http\Client\ClientExceptionInterface;
 …
         } catch ( Exception | ClientExceptionInterface | ApiException $exception ) {
             $error = __( 'Error:', 'multisafepay' ) . htmlspecialchars( $exception->getMessage() );
             Logger::log_error( $error );
+            $this->logger->log_error( $error );
             wc_add_notice( $error, 'error' );
+        }
 …
             /* translators: %1$: The currency code. %2$ The transaction amount */
             $note = sprintf( __( 'Refund of %1$s%2$s has been processed successfully.', 'multisafepay' ), get_woocommerce_currency_symbol( $order->get_currency() ), $amount );
             Logger::log_info( $note );
+            $this->logger->log_info( $note );
             $order->add_order_note( $note );
             return true;
 …
             /* translators: %1$: The order ID. %2$ The PSP transaction ID */
             $message = sprintf( __( 'Refund for Order ID: %1$s with transactionId: %2$s gives message: %3$s.', 'multisafepay' ), $order_id, $multisafepay_transaction->getTransactionId(), $error );
             Logger::log_warning( $message );
+            $this->logger->log_warning( $message );
+        }

multisafepay/tags/6.6.0/src/PaymentMethods/PaymentMethodCallback.php

-                      r3048898
+                      r3114383
 use MultiSafepay\WooCommerce\Settings\SettingsFields;
 use MultiSafepay\WooCommerce\Utils\Logger;
+use MultiSafepay\WooCommerce\Utils\Order as OrderUtil;
 use Psr\Http\Client\ClientExceptionInterface;
 use WC_Data_Exception;
 …
     /**
+     * PaymentMethodCallback constructor
+     *
+     * @param  string               $multisafepay_order_id
+     * @param  ?TransactionResponse $multisafepay_transaction
+     */
+    public function __construct( string $multisafepay_order_id, $multisafepay_transaction = null ) {
+        $this->multisafepay_order_id = $multisafepay_order_id;
+        if ( ! isset( $multisafepay_transaction ) ) {
+            $multisafepay_transaction = $this->get_transaction();
+        }
+        $this->multisafepay_transaction = $multisafepay_transaction;
+        // For most transactions, var2 contains the order id since the order request is being register using order number
+        if ( ! empty( $this->multisafepay_transaction->getVar2() ) ) {
+            $this->woocommerce_order_id = (int) $this->multisafepay_transaction->getVar2();
+        }
+        // In case we need it, a filter to set the right order id, based on order number
+        if ( empty( $this->multisafepay_transaction->getVar2() ) ) {
+            $this->woocommerce_order_id = apply_filters( 'multisafepay_transaction_order_id', $this->multisafepay_order_id );
+        }
+        $this->time_stamp = date( 'd/m/Y H:i:s' );
+        $this->order      = wc_get_order( $this->woocommerce_order_id );
+     * @var Logger
+     */
+    private $logger;
+    /**
+     * @param string                   $multisafepay_order_id
+     * @param TransactionResponse|null $multisafepay_transaction
+     * @param Logger|null              $logger
+     */
+    public function __construct( string $multisafepay_order_id, ?TransactionResponse $multisafepay_transaction = null, ?Logger $logger = null ) {
+        $this->logger                   = $logger ?? new Logger();
+        $this->multisafepay_order_id    = $multisafepay_order_id;
+        $this->multisafepay_transaction = $multisafepay_transaction ?? $this->get_transaction();
+        $this->woocommerce_order_id     = $this->get_woocommerce_order_id();
+        $this->time_stamp               = date( 'd/m/Y H:i:s' );
+        $this->order                    = wc_get_order( $this->woocommerce_order_id );
+    }
 …
             $transaction = $transaction_manager->get( $this->multisafepay_order_id );
         } catch ( ClientExceptionInterface $client_exception ) {
             Logger::log_error( $client_exception->getMessage() );
+            $this->logger->log_error( $client_exception->getMessage() );
             wp_die( esc_html__( 'Invalid request', 'multisafepay' ), esc_html__( 'Invalid request', 'multisafepay' ), 400 );
         } catch ( ApiException $api_exception ) {
             Logger::log_error( $api_exception->getMessage() );
+            $this->logger->log_error( $api_exception->getMessage() );
             wp_die( esc_html__( 'Invalid request', 'multisafepay' ), esc_html__( 'Invalid request', 'multisafepay' ), 400 );
+        }
 …
     /**
+     * Return the WooCommerce order id
+     *
+     * @return int
+     */
+    private function get_woocommerce_order_id(): int {
+        // For most transactions, var2 contains the order id since the order request is being registered using order number
+        if ( ! empty( $this->multisafepay_transaction->getVar2() ) ) {
+            return (int) $this->multisafepay_transaction->getVar2();
+        }
+        return apply_filters( 'multisafepay_transaction_order_id', $this->multisafepay_order_id );
+    }
+    /**
      * Return the WooCommerce order status
+     *
      * @return string
      */
     private function get_wc_order_status(): string {
+    private function get_woocommerce_order_status(): string {
         return $this->order->get_status();
+    }
 …
     /**
+     * Return the initial order status configured in the payment method settings
+     *
+     * @return string|null
+     */
+    private function get_initial_order_status(): ?string {
+        $registered_payment_method = ( new PaymentMethodService() )->get_woocommerce_payment_gateway_by_id( $this->order->get_payment_method() );
+        return $registered_payment_method ? $registered_payment_method->initial_order_status : null;
+    }
+    /**
      * Check if the order status should be updated or not
+     *
 …
     private function should_status_be_updated(): bool {
         // Check if the WooCommerce completed order status is considered as the final one
         if ( $this->is_completed_the_final_status( $this->get_wc_order_status() ) ) {
+        if ( $this->is_completed_the_final_status( $this->get_woocommerce_order_status() ) ) {
             // phpcs:ignore WordPress.Security.NonceVerification.Recommended
             $message = 'It seems a notification is trying to process an order which already has defined completed as the final order status. For this reason notification is being ignored. Transaction ID received is ' . sanitize_text_field( (string) wp_unslash( $this->get_multisafepay_transaction_id() ) ) . ' with status ' . $this->get_multisafepay_transaction_status();
             Logger::log_warning( $message );
+            $this->logger->log_warning( $message );
             $this->order->add_order_note( $message );
             return false;
 …
         // On pre-transactions notification, and using sequential order numbers plugins, var 2 is not received in the notification, then order doesn't exist
         if ( ! $this->order ) {
+            if ( get_option( 'multisafepay_debugmode', false ) ) {
+                Logger::log_info( 'Notification has been received for the transaction ID ' . $this->multisafepay_order_id . ' but WooCommerce order object has not been found' );
+            }
+            $this->logger->log_info( 'Notification has been received for the transaction ID ' . $this->multisafepay_order_id . ' but WooCommerce order object has not been found' );
             header( 'Content-type: text/plain' );
             die( 'OK' );
 …
         // If payment method of the order does not belong to MultiSafepay
+        if ( strpos( $this->order->get_payment_method(), 'multisafepay_' ) === false ) {
+            if ( get_option( 'multisafepay_debugmode', false ) ) {
+                $message = 'It seems a notification is trying to process an order processed by another payment method. Transaction ID received is ' . $this->order->get_id();
+                Logger::log_info( $message );
+            }
+            header( 'Content-type: text/plain' );
+            die( 'OK' );
+        }
+        if ( $this->get_wc_order_status() === 'trash' ) {
+            if ( get_option( 'multisafepay_debugmode', false ) ) {
+                $message = 'It seems a notification is trying to change the order status, but the order has been moved to the trash. Transaction ID received is ' . $this->order->get_id() . ' and transaction status is ' . $this->get_multisafepay_transaction_status();
+                Logger::log_info( $message );
+                $this->order->add_order_note( $message );
+            }
+        if ( ! OrderUtil::is_multisafepay_order( $this->order ) ) {
+            $message = 'It seems a notification is trying to process an order processed by another payment method. Transaction ID received is ' . $this->order->get_id();
+            $this->logger->log_info( $message );
+            header( 'Content-type: text/plain' );
+            die( 'OK' );
+        }
+        if ( $this->get_woocommerce_order_status() === 'trash' ) {
+            $message = 'It seems a notification is trying to change the order status, but the order has been moved to the trash. Transaction ID received is ' . $this->order->get_id() . ' and transaction status is ' . $this->get_multisafepay_transaction_status();
+            $this->logger->log_info( $message );
+            OrderUtil::add_order_note( $this->order, $message, true );
             header( 'Content-type: text/plain' );
             die( 'OK' );
 …
         if ( $this->get_multisafepay_transaction_status() === Transaction::PARTIAL_REFUNDED ) {
             $message = 'A partial refund has been registered within MultiSafepay Control for Order ID: ' . $this->woocommerce_order_id . ' and Order Number: ' . $this->multisafepay_order_id;
             $this->order->add_order_note( $message );
+            OrderUtil::add_order_note( $this->order, $message );
             header( 'Content-type: text/plain' );
             die( 'OK' );
 …
         $payment_method_id_registered_by_wc               = $this->order->get_payment_method();
         $payment_method_title_registered_by_wc            = $this->order->get_payment_method_title();
+        $registered_by_woocommerce_payment_method_object  = ( new PaymentMethodService() )->get_woocommerce_payment_gateway_by_id( $payment_method_id_registered_by_wc );
+        $initial_order_status                             = $registered_by_woocommerce_payment_method_object ? $registered_by_woocommerce_payment_method_object->initial_order_status : false;
+        $initial_order_status                             = $this->get_initial_order_status();
         $default_order_status                             = SettingsFields::get_multisafepay_order_statuses();
 …
         // Or if the custom initial order status of the gateway is different than the general one, and the MultiSafepay transaction status is initialized, and custom initial order status is different than the current WooCommerce order status
         if (
             $this->get_wc_order_status() !== str_replace( 'wc-', '', get_option( 'multisafepay_' . $this->get_multisafepay_transaction_status() . '_status', $default_order_status[ $this->get_multisafepay_transaction_status() . '_status' ]['default'] ) ) ||
             get_option( 'multisafepay_' . $this->get_multisafepay_transaction_status() . '_status', $default_order_status[ $this->get_multisafepay_transaction_status() . '_status' ]['default'] ) !== $initial_order_status && $this->get_multisafepay_transaction_status() === Transaction::INITIALIZED && $this->get_wc_order_status() !== $initial_order_status
+            $this->get_woocommerce_order_status() !== str_replace( 'wc-', '', get_option( 'multisafepay_' . $this->get_multisafepay_transaction_status() . '_status', $default_order_status[ $this->get_multisafepay_transaction_status() . '_status' ]['default'] ) ) ||
+            get_option( 'multisafepay_' . $this->get_multisafepay_transaction_status() . '_status', $default_order_status[ $this->get_multisafepay_transaction_status() . '_status' ]['default'] ) !== $initial_order_status && $this->get_multisafepay_transaction_status() === Transaction::INITIALIZED && $this->get_woocommerce_order_status() !== $initial_order_status
         ) {
             // If MultiSafepay transaction status is initialized, check if there is a custom initial order status for this payment method.
             if ( $this->get_multisafepay_transaction_status() === Transaction::INITIALIZED ) {
                 if ( $initial_order_status && 'wc-default' !== $initial_order_status && $this->get_wc_order_status() !== $initial_order_status ) {
+                if ( $initial_order_status && 'wc-default' !== $initial_order_status && $this->get_woocommerce_order_status() !== $initial_order_status ) {
                     $this->order->update_status( str_replace( 'wc-', '', $initial_order_status ), __( 'Transaction has been initialized.', 'multisafepay' ) );
+                }
 …
+            }
+            if ( get_option( 'multisafepay_debugmode', false ) ) {
+                $message = 'Callback received for Order ID: ' . $this->woocommerce_order_id . ' and Order Number: ' . $this->multisafepay_order_id . ' on ' . $this->time_stamp . ' with status: ' . $this->get_multisafepay_transaction_status() . ' and PSP ID: ' . $this->get_multisafepay_transaction_id() . '.';
+                Logger::log_info( $message );
+                $this->order->add_order_note( $message );
+            }
+            $message = 'Callback received for Order ID: ' . $this->woocommerce_order_id . ' and Order Number: ' . $this->multisafepay_order_id . ' on ' . $this->time_stamp . ' with status: ' . $this->get_multisafepay_transaction_status() . ' and PSP ID: ' . $this->get_multisafepay_transaction_id() . '.';
+            $this->logger->log_info( $message );
+            OrderUtil::add_order_note( $this->order, $message, true );
+        }
         // If the payment method changed in MultiSafepay payment page, after leave WooCommerce checkout page
         if ( $payment_method_id_registered_by_multisafepay && $payment_method_id_registered_by_wc !== $payment_method_id_registered_by_multisafepay ) {
+            if ( get_option( 'multisafepay_debugmode', false ) ) {
+                $message = 'Callback received with a different payment method for Order ID: ' . $this->woocommerce_order_id . ' and Order Number: ' . $this->multisafepay_order_id . ' on ' . $this->time_stamp . '. Payment method changed from ' . $payment_method_title_registered_by_wc . ' to ' . $payment_method_title_registered_by_multisafepay . '.';
+                Logger::log_info( $message );
+                $this->order->add_order_note( $message );
+            }
+            $message = 'Callback received with a different payment method for Order ID: ' . $this->woocommerce_order_id . ' and Order Number: ' . $this->multisafepay_order_id . ' on ' . $this->time_stamp . '. Payment method changed from ' . $payment_method_title_registered_by_wc . ' to ' . $payment_method_title_registered_by_multisafepay . '.';
+            $this->logger->log_info( $message );
+            OrderUtil::add_order_note( $this->order, $message, true );
             $this->order = wc_get_order( $this->woocommerce_order_id );
             $this->order->set_payment_method( $registered_by_multisafepay_payment_method_object );

multisafepay/tags/6.6.0/src/PaymentMethods/PaymentMethodsController.php

-                      r3050467
+                      r3114383
 use MultiSafepay\Api\Transactions\TransactionResponse;
 use MultiSafepay\Api\Transactions\UpdateRequest;
+use MultiSafepay\Api\Wallets\ApplePay\MerchantSessionRequest;
 use MultiSafepay\Exception\ApiException;
-use MultiSafepay\Api\Wallets\ApplePay\MerchantSessionRequest;
 use MultiSafepay\Util\Notification;
 use MultiSafepay\WooCommerce\Services\OrderService;
 …
 use MultiSafepay\WooCommerce\Utils\Hpos;
 use MultiSafepay\WooCommerce\Utils\Logger;
+use MultiSafepay\WooCommerce\Utils\Order as OrderUtil;
 use Psr\Http\Client\ClientExceptionInterface;
 use WC_Data_Exception;
 …
     public const VALIDATION_URL_KEY = 'validation_url';
     public const ORIGIN_DOMAIN_KEY  = 'origin_domain';
+    /**
+     * @var Logger
+     */
+    private $logger;
+    /**
+     * @param Logger|null $logger
+     */
+    public function __construct( ?Logger $logger = null ) {
+        $this->logger = $logger ?? new Logger();
+    }
     /**
 …
     public function set_multisafepay_transaction_as_shipped( int $order_id ): void {
         $order = wc_get_order( $order_id );
         if ( strpos( $order->get_payment_method(), 'multisafepay_' ) !== false ) {
+        if ( OrderUtil::is_multisafepay_order( $order ) ) {
             $sdk                 = new SdkService();
             $transaction_manager = $sdk->get_transaction_manager();
 …
                 $transaction_manager->update( (string) $order->get_order_number(), $update_order );
             } catch ( ApiException $api_exception ) {
                 Logger::log_error( $api_exception->getMessage() );
+                $this->logger->log_error( $api_exception->getMessage() );
                 return;
+            }
 …
     public function set_multisafepay_transaction_as_invoiced( int $order_id ): void {
         $order = wc_get_order( $order_id );
         if ( strpos( $order->get_payment_method(), 'multisafepay_' ) !== false ) {
+        if ( OrderUtil::is_multisafepay_order( $order ) ) {
             $sdk                 = new SdkService();
             $transaction_manager = $sdk->get_transaction_manager();
 …
                 $transaction_manager->update( (string) $order->get_order_number(), $update_order );
             } catch ( ApiException $api_exception ) {
                 Logger::log_error( $api_exception->getMessage() );
+                $this->logger->log_error( $api_exception->getMessage() );
                 return;
+            }
 …
         if ( ! $request->sanitize_params() ) {
             Logger::log_info( 'Notification for transactionid . ' . $transactionid . ' has been received but could not be sanitized' );
+            $this->logger->log_info( 'Notification for transactionid . ' . $transactionid . ' has been received but could not be sanitized' );
             header( 'Content-type: text/plain' );
             die( 'OK' );
 …
         $payload_type = $request->get_param( 'payload_type' ) ?? '';
         if ( 'pretransaction' === $payload_type ) {
             Logger::log_info( 'Notification for transactionid . ' . $transactionid . ' has been received but is going to be ignored, because is pretransaction type' );
+            $this->logger->log_info( 'Notification for transactionid . ' . $transactionid . ' has been received but is going to be ignored, because is pretransaction type' );
             header( 'Content-type: text/plain' );
             die( 'OK' );
 …
         if ( ! $verify_notification ) {
             Logger::log_info( 'Notification for transactionid . ' . $transactionid . ' has been received but is not validated' );
+            $this->logger->log_info( 'Notification for transactionid . ' . $transactionid . ' has been received but is not validated' );
             header( 'Content-type: text/plain' );
             die( 'OK' );
 …
         if ( get_option( 'multisafepay_debugmode', false ) ) {
             Logger::log_info( 'Notification has been received and validated for transaction id ' . $transactionid );
+            $this->logger->log_info( 'Notification has been received and validated for transaction id ' . $transactionid );
             if ( ! empty( $body ) ) {
                 Logger::log_info( 'Body of the POST notification: ' . wc_print_r( $body, true ) );
+                $this->logger->log_info( 'Body of the POST notification: ' . wc_print_r( $body, true ) );
+            }
+        }
 …
         // Check if the payment method belongs to MultiSafepay
         if ( strpos( $order->get_payment_method(), 'multisafepay_' ) === false ) {
+        if ( ! OrderUtil::is_multisafepay_order( $order ) ) {
             return;
+        }
 …
         $gateway_object      = ( new PaymentMethodService() )->get_woocommerce_payment_gateway_by_id( $order->get_payment_method() );
         if ( ! $gateway_object ) {
             Logger::log_error( ' Gateway object is null ' );
+            $this->logger->log_error( ' Gateway object is null ' );
             return;
+        }
 …
                 if ( get_option( 'multisafepay_debugmode', false ) ) {
                     $message = 'Order details has been registered in MultiSafepay and a payment link has been generated: ' . esc_url( $transaction->getPaymentUrl() );
                     Logger::log_info( $message );
+                    $this->logger->log_info( $message );
                     $order->add_order_note( $message );
+                }
+            }
         } catch ( Exception | ApiException | ClientExceptionInterface $exception ) {
             Logger::log_error( $exception->getMessage() );
+            $this->logger->log_error( $exception->getMessage() );
+        }
+    }
 …
      */
     public function allow_cancel_multisafepay_orders_with_on_hold_status( array $order_status, WC_Order $order ): array {
         if ( strpos( $order->get_payment_method(), 'multisafepay_' ) !== false ) {
+        if ( OrderUtil::is_multisafepay_order( $order ) ) {
             $gateway = ( new PaymentMethodService() )->get_woocommerce_payment_gateway_by_id( $order->get_payment_method() );
             if ( ! $gateway ) {
                 Logger::log_error( ' Gateway object is null ' );
+                $this->logger->log_error( ' Gateway object is null ' );
                 return $order_status;
+            }
 …
         } catch ( ApiException | Exception | ClientExceptionInterface $exception ) {
             $error_message = 'Error when trying to get the ApplePay session via MultiSafepay SDK';
             Logger::log_error( $error_message . ': ' . $exception->getMessage() );
+            $this->logger->log_error( $error_message . ': ' . $exception->getMessage() );
             wp_send_json( array( 'message' => $error_message ) );
+        }
 …
         if ( empty( $validation_url ) ) {
             Logger::log_error( 'Error when trying to get the ApplePay session. Validation URL empty' );
+            $this->logger->log_error( 'Error when trying to get the ApplePay session. Validation URL empty' );
             exit;
+        }
         if ( empty( $origin_domain ) ) {
             Logger::log_error( 'Error when trying to get the ApplePay session. Origin domain empty' );
+            $this->logger->log_error( 'Error when trying to get the ApplePay session. Origin domain empty' );
             exit;
+        }

multisafepay/tags/6.6.0/src/Services/ApiTokenService.php

-                      r2974626
+                      r3114383
     /**
+     * @var Logger
+     */
+    private $logger;
+    /**
      * ApiTokenService constructor.
+     *
+     * @param Logger|null $logger
      */
+    public function __construct() {
+    public function __construct( ?Logger $logger = null ) {
+        $this->logger            = $logger ?? new Logger();
         $this->api_token_manager = ( new SdkService() )->get_api_token_manager();
+    }
 …
             $api_token = $this->api_token_manager->get()->getApiToken();
         } catch ( ApiException | ClientExceptionInterface $exception ) {
             Logger::log_error( $exception->getMessage() );
+            $this->logger->log_error( $exception->getMessage() );
             return '';
+        }

multisafepay/tags/6.6.0/src/Services/OrderService.php

-                      r3048898
+                      r3114383
+        }
         if ( ! empty( $_POST[ ( $this->payment_method_service->get_woocommerce_payment_gateway_by_multisafepay_gateway_code( $gateway_code ) )->get_payment_method_id() . '_payment_component_payload' ] ) ) {
             $payment_method_id             = ( new PaymentMethodService() )->get_woocommerce_payment_gateway_by_multisafepay_gateway_code( $gateway_code )->get_payment_method_id();
+        if ( ! empty( $_POST[ $order->get_payment_method() . '_payment_component_payload' ] ) ) {
+            $payment_method_id             = $order->get_payment_method();
             $payment_component_payload_key = $payment_method_id . '_payment_component_payload';
             $payment_component_payload     = sanitize_text_field( wp_unslash( $_POST[ $payment_component_payload_key ] ?? '' ) );

multisafepay/tags/6.6.0/src/Services/PaymentMethodService.php

-                      r3088253
+                      r3114383
 use MultiSafepay\WooCommerce\PaymentMethods\Base\BaseGiftCardPaymentMethod;
 use MultiSafepay\WooCommerce\PaymentMethods\Base\BasePaymentMethod;
+use MultiSafepay\WooCommerce\PaymentMethods\Base\BaseBrandedPaymentMethod;
 use MultiSafepay\WooCommerce\Utils\Logger;
 use Psr\Http\Client\ClientExceptionInterface;
 …
     /**
+     * PaymentMethodsService constructor.
+     *
+     * @return void
+     */
+    public function __construct() {
+     * @var Logger
+     */
+    private $logger;
+    /**
+     * @param Logger|null $logger
+     */
+    public function __construct( ?Logger $logger = null ) {
+        $this->logger = $logger ?? new Logger();
         try {
             $this->payment_method_manager = ( new SdkService() )->get_payment_method_manager();
         } catch ( ApiException $api_exception ) {
             Logger::log_error( $api_exception->getMessage() );
+            $this->logger->log_error( $api_exception->getMessage() );
+        }
+    }
 …
         if ( null === $this->payment_method_manager ) {
             Logger::log_error( 'SDK is not initialized' );
+            $this->logger->log_error( 'SDK is not initialized' );
             return array();
+        }
 …
             );
         } catch ( Exception | ApiException | InvalidDataInitializationException | ClientExceptionInterface $exception ) {
             Logger::log_error( $exception->getMessage() );
+            $this->logger->log_error( $exception->getMessage() );
             return array();
+        }
 …
         $multisafepay_payment_methods = $this->get_multisafepay_payment_methods_from_api();
         foreach ( $multisafepay_payment_methods as $multisafepay_payment_method ) {
+            if ( isset( $multisafepay_payment_method['type'] ) && 'coupon' === $multisafepay_payment_method['type'] ) {
+                $woocommerce_payment_gateways[ self::get_legacy_woocommerce_payment_gateway_ids( $multisafepay_payment_method['id'] ) ] = new BaseGiftCardPaymentMethod( new PaymentMethod( $multisafepay_payment_method ) );
+            }
+            if ( isset( $multisafepay_payment_method['type'] ) && 'payment-method' === $multisafepay_payment_method['type'] ) {
+                $woocommerce_payment_gateways[ self::get_legacy_woocommerce_payment_gateway_ids( $multisafepay_payment_method['id'] ) ] = new BasePaymentMethod( new PaymentMethod( $multisafepay_payment_method ) );
+            }
+        }
+            if ( isset( $multisafepay_payment_method['type'] ) ) {
+                $woocommerce_payment_gateways = $this->create_woocommerce_payment_gateways( $multisafepay_payment_method, $woocommerce_payment_gateways );
+            }
+        }
+        return $woocommerce_payment_gateways;
+    }
+    /**
+     * @param array $multisafepay_payment_method
+     * @param array $woocommerce_payment_gateways
+     * @return array
+     */
+    public function create_woocommerce_payment_gateways( array $multisafepay_payment_method, array $woocommerce_payment_gateways ) : array {
+        $payment_method_id = self::get_legacy_woocommerce_payment_gateway_ids( $multisafepay_payment_method['id'] );
+        try {
+            $payment_method = new PaymentMethod( $multisafepay_payment_method );
+        } catch ( InvalidDataInitializationException $exception ) {
+            $this->logger->log_error( $exception->getMessage() );
+            return $woocommerce_payment_gateways;
+        }
+        if ( 'payment-method' === $multisafepay_payment_method['type'] ) {
+            $woocommerce_payment_gateways[ $payment_method_id ] = new BasePaymentMethod( $payment_method );
+            $woocommerce_payment_gateways                       = $this->create_branded_woocommerce_payment_gateways( $multisafepay_payment_method, $woocommerce_payment_gateways, $payment_method );
+        }
+        if ( 'coupon' === $multisafepay_payment_method['type'] ) {
+            $woocommerce_payment_gateways[ $payment_method_id ] = new BaseGiftCardPaymentMethod( $payment_method );
+        }
+        return $woocommerce_payment_gateways;
+    }
+    /**
+     * @param array         $multisafepay_payment_method
+     * @param array         $woocommerce_payment_gateways
+     * @param PaymentMethod $payment_method
+     * @return array
+     */
+    public function create_branded_woocommerce_payment_gateways( array $multisafepay_payment_method, array $woocommerce_payment_gateways, PaymentMethod $payment_method ) : array {
+        foreach ( $multisafepay_payment_method['brands'] as $brand ) {
+            if ( ! empty( $brand['allowed_countries'] ) ) {
+                $payment_method_id                                  = self::get_legacy_woocommerce_payment_gateway_ids( $brand['id'] );
+                $woocommerce_payment_gateways[ $payment_method_id ] = new BaseBrandedPaymentMethod( $payment_method, $brand );
+            }
+        }
         return $woocommerce_payment_gateways;
+    }
 …
             if ( $payment_method_object->supportsPaymentComponent() ) {
                 $payment_methods_with_payment_component[] = self::get_legacy_woocommerce_payment_gateway_ids( $payment_method_object->getId() );
+                foreach ( $payment_method['brands'] as $brand ) {
+                    if ( ! empty( $brand['allowed_countries'] ) ) {
+                        $payment_methods_with_payment_component[] = self::get_legacy_woocommerce_payment_gateway_ids( $brand['id'] );
+                    }
+                }
+            }
+        }
 …
      */
     public static function get_legacy_woocommerce_payment_gateway_ids( string $code ): string {
         $woocommerce_payment_gateway_id = 'multisafepay_' . str_replace( '-', '_', sanitize_title( strtolower( $code ) ) );

multisafepay/tags/6.6.0/src/Services/SdkService.php

-                      r3048898
+                      r3114383
 use MultiSafepay\Sdk;
 use MultiSafepay\WooCommerce\Client\MultiSafepayClient;
-use MultiSafepay\WooCommerce\Services\PaymentMethodService;
 use MultiSafepay\WooCommerce\Utils\Logger;
 use Nyholm\Psr7\Factory\Psr17Factory;
 …
     private $sdk = null;
+    /**
+     * @var Logger
+     */
+    private $logger;
     /**
      * SdkService constructor.
+     *
+     * @param  string  $api_key
+     * @param  boolean $test_mode
+     */
+    public function __construct( string $api_key = null, bool $test_mode = null ) {
+     * @param  string      $api_key
+     * @param  boolean     $test_mode
+     * @param Logger|null $logger
+     */
+    public function __construct( string $api_key = null, bool $test_mode = null, ?Logger $logger = null ) {
         $this->api_key   = $api_key ?? $this->get_api_key();
         $this->test_mode = $test_mode ?? $this->get_test_mode();
+        $this->logger    = $logger ?? new Logger();
         $psr_factory     = new Psr17Factory();
         $client          = new MultiSafepayClient();
 …
         } catch ( InvalidApiKeyException $invalid_api_key_exception ) {
             set_transient( 'multisafepay_payment_methods', array() );
             Logger::log_error( $invalid_api_key_exception->getMessage() );
+            $this->logger->log_error( $invalid_api_key_exception->getMessage() );
+        }
+    }
 …
             return $this->sdk->getGatewayManager();
         } catch ( ApiException $api_exception ) {
             Logger::log_error( $api_exception->getMessage() );
+            $this->logger->log_error( $api_exception->getMessage() );
             return new WP_Error( 'multisafepay-warning', $api_exception->getMessage() );
+        }
 …
             return $this->get_gateway_manager()->getGateways( true );
         } catch ( ApiException $api_exception ) {
             Logger::log_error( $api_exception->getMessage() );
+            $this->logger->log_error( $api_exception->getMessage() );
             return new WP_Error( 'multisafepay-warning', $api_exception->getMessage() );
+        }
 …
     public function get_api_token_manager(): ?ApiTokenManager {
         if ( null === $this->sdk ) {
             Logger::log_error( 'SDK is not initialized' );
+            $this->logger->log_error( 'SDK is not initialized' );
             return null;
+        }
 …
     public function get_payment_method_manager(): ?PaymentMethodManager {
         if ( null === $this->sdk ) {
             Logger::log_error( 'SDK is not initialized' );
+            $this->logger->log_error( 'SDK is not initialized' );
             return null;
+        }
 …
             return $this->sdk->getPaymentMethodManager();
         } catch ( ApiException $api_exception ) {
             Logger::log_error( $api_exception->getMessage() );
+            $this->logger->log_error( $api_exception->getMessage() );
             return null;
+        }
 …
             $tokens = $this->sdk->getTokenManager()->getListByGatewayCodeAsArray( $customer_reference, $gateway_code );
         } catch ( ApiException $api_exception ) {
             Logger::log_error( $api_exception->getMessage() );
+            $this->logger->log_error( $api_exception->getMessage() );
             return array();
         } catch ( ClientExceptionInterface $client_exception ) {
             Logger::log_error( $client_exception->getMessage() );
+            $this->logger->log_error( $client_exception->getMessage() );
             return array();
         } catch ( Exception $exception ) {
             Logger::log_error( $exception->getMessage() );
+            $this->logger->log_error( $exception->getMessage() );
             return array();
+        }
 …
             $gateway_merchant_id = $account_manager->get()->getAccountId();
         } catch ( ApiException | ClientExceptionInterface | Exception $exception ) {
             Logger::log_error( 'Error when try to set the merchant credentials: ' . $exception->getMessage() );
+            $this->logger->log_error( 'Error when try to set the merchant credentials: ' . $exception->getMessage() );
+        }

multisafepay/tags/6.6.0/src/Services/ShoppingCartService.php

-                      r2995309
+                      r3114383
     /**
+     * @var Logger
+     */
+    private $logger;
+    /**
+     * @param Logger|null $logger
+     */
+    public function __construct( ?Logger $logger = null ) {
+        $this->logger = $logger ?? new Logger();
+    }
+    /**
      * @param WC_Order $order
      * @param string   $currency
 …
         if ( get_option( 'multisafepay_debugmode', false ) ) {
             Logger::log_info( wc_print_r( $order->get_items(), true ) );
+            $this->logger->log_info( wc_print_r( $order->get_items(), true ) );
+        }
 …
         if ( get_option( 'multisafepay_debugmode', false ) ) {
             Logger::log_info( wp_json_encode( $shopping_cart->getData() ) );
+            $this->logger->log_info( wp_json_encode( $shopping_cart->getData() ) );
+        }

multisafepay/tags/6.6.0/src/Utils/Logger.php

-                      r2974626
+                      r3114383
 use WC_Log_Handler_File;
+use WC_Logger_Interface;
 /**
 …
  */
 class Logger {
+    /**
+     * @var WC_Logger_Interface
+     */
+    private $logger;
+    /**
+     * @param WC_Logger_Interface|null $logger
+     */
+    public function __construct( ?WC_Logger_Interface $logger = null ) {
+        $this->logger = $logger ?? wc_get_logger();
+    }
     /**
 …
      * @param string $message
      */
+    public static function log_emergency( string $message ) {
+        $logger = wc_get_logger();
+        $logger->log( 'emergency', $message, array( 'source' => 'multisafepay' ) );
+    public function log_emergency( string $message ) {
+        $this->logger->log( 'emergency', $message, array( 'source' => 'multisafepay' ) );
+    }
 …
      * @param string $message
      */
+    public static function log_alert( string $message ) {
+        $logger = wc_get_logger();
+        $logger->log( 'alert', $message, array( 'source' => 'multisafepay' ) );
+    public function log_alert( string $message ) {
+        $this->logger->log( 'alert', $message, array( 'source' => 'multisafepay' ) );
+    }
 …
      * @param string $message
      */
+    public static function log_critical( string $message ) {
+        $logger = wc_get_logger();
+        $logger->log( 'critical', $message, array( 'source' => 'multisafepay' ) );
+    public function log_critical( string $message ) {
+        $this->logger->log( 'critical', $message, array( 'source' => 'multisafepay' ) );
+    }
 …
      * @param string $message
      */
+    public static function log_error( string $message ) {
+        $logger = wc_get_logger();
+        $logger->log( 'error', $message, array( 'source' => 'multisafepay' ) );
+    public function log_error( string $message ) {
+        $this->logger->log( 'error', $message, array( 'source' => 'multisafepay' ) );
+    }
 …
      * @param string $message
      */
+    public static function log_warning( string $message ) {
+        $logger = wc_get_logger();
+        $logger->log( 'warning', $message, array( 'source' => 'multisafepay' ) );
+    public function log_warning( string $message ) {
+        $this->logger->log( 'warning', $message, array( 'source' => 'multisafepay' ) );
+    }
 …
      * @param string $message
      */
+    public static function log_notice( string $message ) {
+        $logger = wc_get_logger();
+        $logger->log( 'notice', $message, array( 'source' => 'multisafepay' ) );
+    public function log_notice( string $message ) {
+        $this->logger->log( 'notice', $message, array( 'source' => 'multisafepay' ) );
+    }
 …
      * @param string $message
      */
     public static function log_info( string $message ) {
+    public function log_info( string $message ) {
         if ( get_option( 'multisafepay_debugmode', false ) ) {
+            $logger = wc_get_logger();
+            $logger->log( 'info', $message, array( 'source' => 'multisafepay' ) );
+            $this->logger->log( 'info', $message, array( 'source' => 'multisafepay' ) );
+        }
+    }
 …
      * @param string $message
      */
     public static function log_debug( string $message ) {
+    public function log_debug( string $message ) {
         if ( get_option( 'multisafepay_debugmode', false ) ) {
+            $logger = wc_get_logger();
+            $logger->log( 'debug', $message, array( 'source' => 'multisafepay' ) );
+            $this->logger->log( 'debug', $message, array( 'source' => 'multisafepay' ) );
+        }
+    }
 …
      */
     private function get_logs(): array {
+        $logs = WC_Log_Handler_File::get_log_files();
+        return $logs;
+        return WC_Log_Handler_File::get_log_files();
+    }

multisafepay/tags/6.6.0/vendor/autoload.php

r3048898	r3114383
23	23	require_once __DIR__ . '/composer/autoload_real.php';
24	24
25		return ComposerAutoloaderInit~~8122490751e95ad36d38dc1115ae59ff~~::getLoader();
	25	return ComposerAutoloaderInitdbc0eb47ba0f8cbc67eba2344d97c2f8::getLoader();

multisafepay/tags/6.6.0/vendor/composer/autoload_real.php

-                      r3048898
+                      r3114383
 // autoload_real.php @generated by Composer
 class ComposerAutoloaderInit8122490751e95ad36d38dc1115ae59ff
+class ComposerAutoloaderInitdbc0eb47ba0f8cbc67eba2344d97c2f8
+{
     private static $loader;
 …
         require __DIR__ . '/platform_check.php';
         spl_autoload_register(array('ComposerAutoloaderInit8122490751e95ad36d38dc1115ae59ff', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitdbc0eb47ba0f8cbc67eba2344d97c2f8', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInit8122490751e95ad36d38dc1115ae59ff', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitdbc0eb47ba0f8cbc67eba2344d97c2f8', 'loadClassLoader'));
         require __DIR__ . '/autoload_static.php';
         call_user_func(\Composer\Autoload\ComposerStaticInit8122490751e95ad36d38dc1115ae59ff::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitdbc0eb47ba0f8cbc67eba2344d97c2f8::getInitializer($loader));
         $loader->register(true);

multisafepay/tags/6.6.0/vendor/composer/autoload_static.php

-                      r3048898
+                      r3114383
 namespace Composer\Autoload;
 class ComposerStaticInit8122490751e95ad36d38dc1115ae59ff
+class ComposerStaticInitdbc0eb47ba0f8cbc67eba2344d97c2f8
+{
     public static $prefixLengthsPsr4 = array (
 …
+    {
         return \Closure::bind(function () use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInit8122490751e95ad36d38dc1115ae59ff::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit8122490751e95ad36d38dc1115ae59ff::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInit8122490751e95ad36d38dc1115ae59ff::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitdbc0eb47ba0f8cbc67eba2344d97c2f8::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitdbc0eb47ba0f8cbc67eba2344d97c2f8::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitdbc0eb47ba0f8cbc67eba2344d97c2f8::$classMap;
         }, null, ClassLoader::class);

multisafepay/tags/6.6.0/vendor/composer/installed.json

-                      r3088253
+                      r3114383
+        {
             "name": "multisafepay/php-sdk",
             "version": "5.13.0",
             "version_normalized": "5.13.0.0",
+            "version": "5.14.0",
+            "version_normalized": "5.14.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MultiSafepay/php-sdk.git",
                 "reference": "b88fa079981d590a70275d528cf52d8fd07affab"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/MultiSafepay/php-sdk/zipball/b88fa079981d590a70275d528cf52d8fd07affab",
                 "reference": "b88fa079981d590a70275d528cf52d8fd07affab",
+                "reference": "408f102e3228f072f2c1bcc76ac29a8031415480"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/MultiSafepay/php-sdk/zipball/408f102e3228f072f2c1bcc76ac29a8031415480",
+                "reference": "408f102e3228f072f2c1bcc76ac29a8031415480",
                 "shasum": ""
             },
 …
                 "jschaedl/iban-validation": "Adds additional IBAN validation for \\MultiSafepay\\ValueObject\\IbanNumber"
             },
             "time": "2024-04-16T11:41:31+00:00",
+            "time": "2024-07-08T12:43:31+00:00",
             "type": "library",
             "installation-source": "dist",
 …
             "support": {
                 "issues": "https://github.com/MultiSafepay/php-sdk/issues",
                 "source": "https://github.com/MultiSafepay/php-sdk/tree/5.13.0"
+                "source": "https://github.com/MultiSafepay/php-sdk/tree/5.14.0"
             },
             "install-path": "../multisafepay/php-sdk"

multisafepay/tags/6.6.0/vendor/composer/installed.php

-                      r3099249
+                      r3114383
     'root' => array(
         'name' => 'multisafepay/woocommerce',
         'pretty_version' => '6.5.1',
         'version' => '6.5.1.0',
         'reference' => 'a57a06a32837f1542476a9726a1e3749e08ba92d',
+        'pretty_version' => '6.6.0',
+        'version' => '6.6.0.0',
+        'reference' => null,
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
 …
     'versions' => array(
         'multisafepay/php-sdk' => array(
             'pretty_version' => '5.13.0',
             'version' => '5.13.0.0',
             'reference' => 'b88fa079981d590a70275d528cf52d8fd07affab',
+            'pretty_version' => '5.14.0',
+            'version' => '5.14.0.0',
+            'reference' => '408f102e3228f072f2c1bcc76ac29a8031415480',
             'type' => 'library',
             'install_path' => __DIR__ . '/../multisafepay/php-sdk',
 …
         ),
         'multisafepay/woocommerce' => array(
             'pretty_version' => '6.5.1',
             'version' => '6.5.1.0',
             'reference' => 'a57a06a32837f1542476a9726a1e3749e08ba92d',
+            'pretty_version' => '6.6.0',
+            'version' => '6.6.0.0',
+            'reference' => null,
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',

multisafepay/tags/6.6.0/vendor/multisafepay/php-sdk/CHANGELOG.md

-                      r3072171
+                      r3114383
 ## [Unreleased]
+## [5.14.0] - 2024-07-08
+### Added
+- PHPSDK-155: Throw ApiUnavailableException when API returns 501/503 HTTP codes
+- PHPSDK-156: Add getGatewayId in TransactionResponse class
 ## [5.13.0] - 2024-04-16
 ### Added
 + PHPSDK-151: Update Gateways::SHOPPING_CART_REQUIRED_GATEWAYS adding 'BNPL_INST', 'IN3B2B', 'SANTANDER', 'ZINIA', 'ZINIA_IN3', 'BNPL_OB', 'BNPL_MF' gateways codes
+- PHPSDK-151: Update Gateways::SHOPPING_CART_REQUIRED_GATEWAYS adding 'BNPL_INST', 'IN3B2B', 'SANTANDER', 'ZINIA', 'ZINIA_IN3', 'BNPL_OB', 'BNPL_MF' gateways codes
 ## [5.12.1] - 2024-03-11
 ### Fixed
 + PHPSDK-146: Fix ApiException not being hinted as a thrown exception, even though it is, by fixing the PHP DocBlocks @throws tags
+- PHPSDK-146: Fix ApiException not being hinted as a thrown exception, even though it is, by fixing the PHP DocBlocks @throws tags
 ## [5.12.0] - 2023-12-01
 ### Added
 + PHPSDK-139: Add support to set var1, var2 and var3, within the OrderRequest object
 + PHPSDK-140: Add support to set custom_info, within the OrderRequest object, thanks to @DaanDeSmedt
+- PHPSDK-139: Add support to set var1, var2 and var3, within the OrderRequest object
+- PHPSDK-140: Add support to set custom_info, within the OrderRequest object, thanks to @DaanDeSmedt
 ## [5.11.2] - 2023-10-13
 ### Fixed
 + PHPSDK-134: Fix errors when only reference is set, within the CustomerDetails object
 ### Changed
 + PHPSDK-136: Remove PluginDetails as mandatory from the Order Request
+- PHPSDK-134: Fix errors when only reference is set, within the CustomerDetails object
+### Changed
+- PHPSDK-136: Remove PluginDetails as mandatory from the Order Request
 ## [5.11.1] - 2023-07-31
 …
 ## [5.5.0] - 2022-05-11
 ### Added
 + PHPSDK-90: Add MAESTRO tokens within the results of the CREDITCARD tokens request
 ### Changed
 + PHPSDK-91: Add trim on API key when initializing the SDK
+- PHPSDK-90: Add MAESTRO tokens within the results of the CREDITCARD tokens request
+### Changed
+- PHPSDK-91: Add trim on API key when initializing the SDK
 ## [5.4.0] - 2021-11-30

multisafepay/tags/6.6.0/vendor/multisafepay/php-sdk/composer.json

r3072171	r3114383
4	4	"type": "library",
5	5	"license": "MIT",
6		"version": "5.13.0",
	6	"version": "5.14.0",
7	7	"require": {
8	8	"php": "^7.2\|^8.0",

multisafepay/tags/6.6.0/vendor/multisafepay/php-sdk/src/Api/Base/Response.php

-                      r3050467
+                      r3114383
 use MultiSafepay\Api\Pager\Pager;
 use MultiSafepay\Exception\ApiException;
+use MultiSafepay\Exception\ApiUnavailableException;
 /**
 …
      * @param array $context
      * @return Response
      * @throws ApiException
+     * @throws ApiException|ApiUnavailableException
      */
     public static function withJson(string $json, array $context = []): Response
 …
      * @param array $context
      * @param string $raw
      * @throws ApiException
+     * @throws ApiException|ApiUnavailableException
      */
     public function __construct(array $data, array $context = [], string $raw = '')
 …
      * @return void
      * @throws ApiException
+     * @throws ApiUnavailableException
      */
     private function validate(array $data, array $context = []): void
 …
         if (!empty($data['data']) && !is_array($data['data'])) {
             [$errorCode, $errorInfo] = self::ERROR_INVALID_DATA_TYPE;
+        }
+        if (in_array($context['http_response_code'], [501, 503])) {
+            throw (new ApiUnavailableException(
+                'The MultiSafepay API could not be reached',
+                $context['http_response_code']
+            ));
+        }

multisafepay/tags/6.6.0/vendor/multisafepay/php-sdk/src/Api/Transactions/TransactionResponse.php

-                      r3050467
+                      r3114383
 class TransactionResponse extends ResponseBody
+{
     /**
      * @var string
 …
         return in_array($this->getPaymentDetails()->getType(), Gateways::SHOPPING_CART_REQUIRED_GATEWAYS, true);
+    }
+    /**
+     * Retrieve the gateway ID from the transaction
+     * Will return multiple gateway IDs as a string of comma separated values if multiple payment methods are used
+     *
+     * @return string
+     */
+    public function getGatewayId(): string
+    {
+        $paymentMethods = [];
+        foreach ($this->getPaymentMethods() as $paymentMethod) {
+            if ($paymentMethod->getType() === 'COUPON') {
+                $paymentMethods[] = $paymentMethod->getData()['coupon_brand'] ?? 'unknown';
+                continue;
+            }
+            $paymentMethods[] = $paymentMethod->getType();
+        }
+        return implode(', ', $paymentMethods);
+    }
+}

multisafepay/tags/6.6.0/vendor/multisafepay/php-sdk/src/Client/Client.php

-                      r3050467
+                      r3114383
 use MultiSafepay\Api\Base\Response as ApiResponse;
 use MultiSafepay\Exception\ApiException;
+use MultiSafepay\Exception\ApiUnavailableException;
 use MultiSafepay\Exception\InvalidApiKeyException;
-use MultiSafepay\Exception\StrictModeException;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Client\ClientInterface;
 …
      * @param array $context
      * @return ApiResponse
+     * @throws ClientExceptionInterface
+     * @throws ApiException
+     * @throws ClientExceptionInterface|ApiException|ApiUnavailableException
      */
     public function createPostRequest(
 …
             ->withBody($this->createBody($this->getRequestBody($requestBody)))
             ->withHeader('Content-Length', strlen($this->getRequestBody($requestBody)));
+        $httpResponse = $this->httpClient->sendRequest($request);
         $context['headers'] = $request->getHeaders();
         $context['request_body'] = $this->getRequestBody($requestBody);
+        $httpResponse = $this->httpClient->sendRequest($request);
+        $context['http_response_code'] = $httpResponse->getStatusCode() ?? 0;
         return ApiResponse::withJson($httpResponse->getBody()->getContents(), $context);
+    }
 …
      * @param array $context
      * @return ApiResponse
      * @throws ClientExceptionInterface|ApiException
+     * @throws ClientExceptionInterface|ApiException|ApiUnavailableException
      */
     public function createPatchRequest(
 …
             ->withBody($this->createBody($this->getRequestBody($requestBody)))
             ->withHeader('Content-Length', strlen($this->getRequestBody($requestBody)));
+        $httpResponse = $this->httpClient->sendRequest($request);
         $context['headers'] = $request->getHeaders();
         $context['request_body'] = $this->getRequestBody($requestBody);
+        $httpResponse = $this->httpClient->sendRequest($request);
+        return ApiResponse::withJson($httpResponse->getBody()->getContents(), $context);
+    }
+    /**
+     * @param string $endpoint
+     * @param array $parameters
+     * @param array $context
+     * @return ApiResponse
+     * @throws ClientExceptionInterface|ApiException
+        $context['http_response_code'] = $httpResponse->getStatusCode() ?? 0;
+        return ApiResponse::withJson($httpResponse->getBody()->getContents(), $context);
+    }
+    /**
+     * @param string $endpoint
+     * @param array $parameters
+     * @param array $context
+     * @return ApiResponse
+     * @throws ClientExceptionInterface|ApiException|ApiUnavailableException
      */
     public function createGetRequest(string $endpoint, array $parameters = [], array $context = []): ApiResponse
 …
         $request = $this->createRequest($endpoint, self::METHOD_GET, $parameters);
         $httpResponse = $this->httpClient->sendRequest($request);
         $context['headers'] = $request->getHeaders();
         $context['request_params'] = $parameters;
+        return ApiResponse::withJson($httpResponse->getBody()->getContents(), $context);
+    }
+    /**
+     * @param string $endpoint
+     * @param array $parameters
+     * @param array $context
+     * @return ApiResponse
+     * @throws ClientExceptionInterface|ApiException
+        $context['http_response_code'] = $httpResponse->getStatusCode() ?? 0;
+        return ApiResponse::withJson($httpResponse->getBody()->getContents(), $context);
+    }
+    /**
+     * @param string $endpoint
+     * @param array $parameters
+     * @param array $context
+     * @return ApiResponse
+     * @throws ClientExceptionInterface|ApiException|ApiUnavailableException
      */
     public function createDeleteRequest(string $endpoint, array $parameters = [], array $context = []): ApiResponse
 …
         $request = $this->createRequest($endpoint, self::METHOD_DELETE, $parameters);
         $httpResponse = $this->httpClient->sendRequest($request);
         $context['headers'] = $request->getHeaders();
         $context['request_params'] = $parameters;
+        $context['http_response_code'] = $httpResponse->getStatusCode() ?? 0;
         return ApiResponse::withJson($httpResponse->getBody()->getContents(), $context);
+    }
 …
+        }
         $endpoint .= '?' . http_build_query($parameters);
         return $this->url . $endpoint;
+    }
 …
+    {
         $this->strictMode = $strictMode;
         return $this;
+    }
 …
         $url = $this->getRequestUrl($endpoint, $parameters);
         $requestFactory = $this->getRequestFactory();
         return $requestFactory->createRequest($method, $url)
             ->withHeader('api_key', $this->apiKey->get())
 …
+    {
         $requestBody->useStrictMode($this->strictMode);
         return json_encode($requestBody->getData(), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+    }

multisafepay/tags/6.6.0/vendor/multisafepay/php-sdk/src/Util/Version.php

r3072171	r3114383
18	18	class Version
19	19	{
20		public const SDK_VERSION = '5.13.0';
	20	public const SDK_VERSION = '5.14.0';
21	21
22	22	/**

multisafepay/trunk/multisafepay.php

-                      r3099249
+                      r3114383
  * Plugin URI:              https://docs.multisafepay.com/docs/woocommerce
  * Description:             MultiSafepay Payment Plugin
  * Version:                 6.5.1
+ * Version:                 6.6.0
  * Author:                  MultiSafepay
  * Author URI:              https://www.multisafepay.com
 …
  * License URI:             http://www.gnu.org/licenses/gpl-3.0.html
  * Requires at least:       6.0
  * Tested up to:            6.5.4
+ * Tested up to:            6.5.5
  * WC requires at least:    6.0.0
  * WC tested up to:         8.8.3
+ * WC tested up to:         9.0.2
  * Requires PHP:            7.3
  * Text Domain:             multisafepay
 …
  * Plugin version
  */
 define( 'MULTISAFEPAY_PLUGIN_VERSION', '6.5.1' );
+define( 'MULTISAFEPAY_PLUGIN_VERSION', '6.6.0' );
 /**

multisafepay/trunk/readme.txt

-                      r3099249
+                      r3114383
 Tags: multisafepay, payment gateway, credit cards, ideal, bnpl
 Requires at least: 6.0
 Tested up to: 6.5.4
+Tested up to: 6.5.5
 Requires PHP: 7.3
 Stable tag: 6.5.1
+Stable tag: 6.6.0
 License: MIT
 …
 == Upgrade Notice ==
 = 6.5.1 =
+= 6.6.0 =
 .x.x is a major upgrade in which the MultiSafepay payment methods are registered dynamically via an API request to MultiSafepay. If you are upgrading from 5.X.X version, after the upgrade, please navigate to the MultiSafepay settings page, and to each one of the payment methods enabled in your account, and confirm the settings in each section are set up according to your preferences.
 …
 == Changelog ==
+= Release Notes - WooCommerce 6.6.0 (Jul 8th, 2024) =
+### Added
++ PLGWOOS-946: Add support for branded credit and debit cards
+### Changed
++ PLGWOOS-943: Refactor PaymentMethodCallback class (#574)
++ PLGWOOS-948: General improvements to increase unit test coverage
 = Release Notes - WooCommerce 6.5.1 (Jun 7th, 2024) =

multisafepay/trunk/src/Client/MultiSafepayClient.php

-                      r3090804
+                      r3114383
  */
 class MultiSafepayClient implements ClientInterface {
+    /**
+     * @var Logger
+     */
+    private $logger;
+    /**
+     * @param Logger|null $logger
+     */
+    public function __construct( ?Logger $logger = null ) {
+        $this->logger = $logger ?? new Logger();
+    }
     /**
 …
+            }
         } catch ( Exception $exception ) {
             Logger::log_error( 'Error when process request via MultiSafepayClient: ' . $exception->getMessage() );
+            $this->logger->log_error( 'Error when process request via MultiSafepayClient: ' . $exception->getMessage() );
             throw new Exception( $exception->getMessage() );
+        }

multisafepay/trunk/src/PaymentMethods/Base/BasePaymentMethod.php

-                      r3099249
+                      r3114383
     /**
+     * Defines if the payment method is tokenizable
+     * @var Logger
+     */
+    private $logger;
+    /**
+     * BasePaymentMethod constructor.
+     *
      * @param PaymentMethod $payment_method
+     */
+    public function __construct( PaymentMethod $payment_method ) {
+     * @param Logger|null   $logger
+     */
+    public function __construct( PaymentMethod $payment_method, ?Logger $logger = null ) {
+        $this->logger         = $logger ?? new Logger();
         $this->payment_method = $payment_method;
         $this->supports       = array( 'products', 'refunds' );
 …
             $transaction = $transaction_manager->create( $order_request );
         } catch ( ApiException | ClientExceptionInterface $exception ) {
             Logger::log_error( $exception->getMessage() );
+            $this->logger->log_error( $exception->getMessage() );
             wc_add_notice( __( 'There was a problem processing your payment. Please try again later or contact with us.', 'multisafepay' ), 'error' );
             return;
 …
         if ( get_option( 'multisafepay_debugmode', false ) ) {
             Logger::log_info( 'Start MultiSafepay transaction for the order ID ' . $order_id . ' on ' . date( 'd/m/Y H:i:s' ) . ' with payment URL ' . $transaction->getPaymentUrl() );
+            $this->logger->log_info( 'Start MultiSafepay transaction for the order ID ' . $order_id . ' on ' . date( 'd/m/Y H:i:s' ) . ' with payment URL ' . $transaction->getPaymentUrl() );
+        }

multisafepay/trunk/src/PaymentMethods/Base/BasePaymentMethodBlocks.php

-                      r3090804
+                      r3114383
             $multisafepay_payment_methods = $payment_method_service->get_multisafepay_payment_methods_from_api();
             foreach ( $multisafepay_payment_methods as $multisafepay_payment_method ) {
+                $woocommerce_payment_gateway = null;
+                $woocommerce_payment_gateways = array();
                 if ( isset( $multisafepay_payment_method['type'] ) && ( 'coupon' === $multisafepay_payment_method['type'] ) ) {
+                    $woocommerce_payment_gateway = new BaseGiftCardPaymentMethod( new PaymentMethod( $multisafepay_payment_method ) );
+                }
+                if ( isset( $multisafepay_payment_method['type'] ) && ( 'payment-method' === $multisafepay_payment_method['type'] ) ) {
+                    $woocommerce_payment_gateway = new BasePaymentMethod( new PaymentMethod( $multisafepay_payment_method ) );
+                    $woocommerce_payment_gateways[] = new BaseGiftCardPaymentMethod( new PaymentMethod( $multisafepay_payment_method ) );
+                }
+                // Include direct payment methods without components just in the checkout page of the frontend context
+                if (
+                    $woocommerce_payment_gateway->check_direct_payment_methods_without_components() &&
+                    ! $woocommerce_payment_gateway->admin_editing_checkout_page()
+                ) {
+                    $this->gateways[] = $woocommerce_payment_gateway;
+                if ( isset( $multisafepay_payment_method['type'] ) && ( 'payment-method' === $multisafepay_payment_method['type'] ) ) {
+                    $woocommerce_payment_gateways[] = new BasePaymentMethod( new PaymentMethod( $multisafepay_payment_method ) );
+                    foreach ( $multisafepay_payment_method['brands'] as $brand ) {
+                        if ( ! empty( $brand['allowed_countries'] ) ) {
+                            $woocommerce_payment_gateways[] = new BaseBrandedPaymentMethod( new PaymentMethod( $multisafepay_payment_method ), $brand );
+                        }
+                    }
+                }
+                if ( ( 'redirect' === $woocommerce_payment_gateway->get_payment_method_type() ) && $woocommerce_payment_gateway->is_available() ) {
+                    $this->gateways[] = $woocommerce_payment_gateway;
+                foreach ( $woocommerce_payment_gateways as $woocommerce_payment_gateway ) {
+                    // Include direct payment methods without components just in the checkout page of the frontend context
+                    if (
+                        $woocommerce_payment_gateway->check_direct_payment_methods_without_components() &&
+                        ! $woocommerce_payment_gateway->admin_editing_checkout_page()
+                    ) {
+                        $this->gateways[] = $woocommerce_payment_gateway;
+                    }
+                    if ( ( 'redirect' === $woocommerce_payment_gateway->get_payment_method_type() ) && $woocommerce_payment_gateway->is_available() ) {
+                        $this->gateways[] = $woocommerce_payment_gateway;
+                    }
+                }
+            }

multisafepay/trunk/src/PaymentMethods/Base/BaseRefunds.php

-                      r3048898
+                      r3114383
 use MultiSafepay\ValueObject\CartItem;
 use MultiSafepay\WooCommerce\Services\SdkService;
-use MultiSafepay\WooCommerce\Utils\Logger;
 use MultiSafepay\WooCommerce\Utils\MoneyUtil;
 use Psr\Http\Client\ClientExceptionInterface;
 …
         } catch ( Exception | ClientExceptionInterface | ApiException $exception ) {
             $error = __( 'Error:', 'multisafepay' ) . htmlspecialchars( $exception->getMessage() );
             Logger::log_error( $error );
+            $this->logger->log_error( $error );
             wc_add_notice( $error, 'error' );
+        }
 …
             /* translators: %1$: The currency code. %2$ The transaction amount */
             $note = sprintf( __( 'Refund of %1$s%2$s has been processed successfully.', 'multisafepay' ), get_woocommerce_currency_symbol( $order->get_currency() ), $amount );
             Logger::log_info( $note );
+            $this->logger->log_info( $note );
             $order->add_order_note( $note );
             return true;
 …
             /* translators: %1$: The order ID. %2$ The PSP transaction ID */
             $message = sprintf( __( 'Refund for Order ID: %1$s with transactionId: %2$s gives message: %3$s.', 'multisafepay' ), $order_id, $multisafepay_transaction->getTransactionId(), $error );
             Logger::log_warning( $message );
+            $this->logger->log_warning( $message );
+        }

multisafepay/trunk/src/PaymentMethods/PaymentMethodCallback.php

-                      r3048898
+                      r3114383
 use MultiSafepay\WooCommerce\Settings\SettingsFields;
 use MultiSafepay\WooCommerce\Utils\Logger;
+use MultiSafepay\WooCommerce\Utils\Order as OrderUtil;
 use Psr\Http\Client\ClientExceptionInterface;
 use WC_Data_Exception;
 …
     /**
+     * PaymentMethodCallback constructor
+     *
+     * @param  string               $multisafepay_order_id
+     * @param  ?TransactionResponse $multisafepay_transaction
+     */
+    public function __construct( string $multisafepay_order_id, $multisafepay_transaction = null ) {
+        $this->multisafepay_order_id = $multisafepay_order_id;
+        if ( ! isset( $multisafepay_transaction ) ) {
+            $multisafepay_transaction = $this->get_transaction();
+        }
+        $this->multisafepay_transaction = $multisafepay_transaction;
+        // For most transactions, var2 contains the order id since the order request is being register using order number
+        if ( ! empty( $this->multisafepay_transaction->getVar2() ) ) {
+            $this->woocommerce_order_id = (int) $this->multisafepay_transaction->getVar2();
+        }
+        // In case we need it, a filter to set the right order id, based on order number
+        if ( empty( $this->multisafepay_transaction->getVar2() ) ) {
+            $this->woocommerce_order_id = apply_filters( 'multisafepay_transaction_order_id', $this->multisafepay_order_id );
+        }
+        $this->time_stamp = date( 'd/m/Y H:i:s' );
+        $this->order      = wc_get_order( $this->woocommerce_order_id );
+     * @var Logger
+     */
+    private $logger;
+    /**
+     * @param string                   $multisafepay_order_id
+     * @param TransactionResponse|null $multisafepay_transaction
+     * @param Logger|null              $logger
+     */
+    public function __construct( string $multisafepay_order_id, ?TransactionResponse $multisafepay_transaction = null, ?Logger $logger = null ) {
+        $this->logger                   = $logger ?? new Logger();
+        $this->multisafepay_order_id    = $multisafepay_order_id;
+        $this->multisafepay_transaction = $multisafepay_transaction ?? $this->get_transaction();
+        $this->woocommerce_order_id     = $this->get_woocommerce_order_id();
+        $this->time_stamp               = date( 'd/m/Y H:i:s' );
+        $this->order                    = wc_get_order( $this->woocommerce_order_id );
+    }
 …
             $transaction = $transaction_manager->get( $this->multisafepay_order_id );
         } catch ( ClientExceptionInterface $client_exception ) {
             Logger::log_error( $client_exception->getMessage() );
+            $this->logger->log_error( $client_exception->getMessage() );
             wp_die( esc_html__( 'Invalid request', 'multisafepay' ), esc_html__( 'Invalid request', 'multisafepay' ), 400 );
         } catch ( ApiException $api_exception ) {
             Logger::log_error( $api_exception->getMessage() );
+            $this->logger->log_error( $api_exception->getMessage() );
             wp_die( esc_html__( 'Invalid request', 'multisafepay' ), esc_html__( 'Invalid request', 'multisafepay' ), 400 );
+        }
 …
     /**
+     * Return the WooCommerce order id
+     *
+     * @return int
+     */
+    private function get_woocommerce_order_id(): int {
+        // For most transactions, var2 contains the order id since the order request is being registered using order number
+        if ( ! empty( $this->multisafepay_transaction->getVar2() ) ) {
+            return (int) $this->multisafepay_transaction->getVar2();
+        }
+        return apply_filters( 'multisafepay_transaction_order_id', $this->multisafepay_order_id );
+    }
+    /**
      * Return the WooCommerce order status
+     *
      * @return string
      */
     private function get_wc_order_status(): string {
+    private function get_woocommerce_order_status(): string {
         return $this->order->get_status();
+    }
 …
     /**
+     * Return the initial order status configured in the payment method settings
+     *
+     * @return string|null
+     */
+    private function get_initial_order_status(): ?string {
+        $registered_payment_method = ( new PaymentMethodService() )->get_woocommerce_payment_gateway_by_id( $this->order->get_payment_method() );
+        return $registered_payment_method ? $registered_payment_method->initial_order_status : null;
+    }
+    /**
      * Check if the order status should be updated or not
+     *
 …
     private function should_status_be_updated(): bool {
         // Check if the WooCommerce completed order status is considered as the final one
         if ( $this->is_completed_the_final_status( $this->get_wc_order_status() ) ) {
+        if ( $this->is_completed_the_final_status( $this->get_woocommerce_order_status() ) ) {
             // phpcs:ignore WordPress.Security.NonceVerification.Recommended
             $message = 'It seems a notification is trying to process an order which already has defined completed as the final order status. For this reason notification is being ignored. Transaction ID received is ' . sanitize_text_field( (string) wp_unslash( $this->get_multisafepay_transaction_id() ) ) . ' with status ' . $this->get_multisafepay_transaction_status();
             Logger::log_warning( $message );
+            $this->logger->log_warning( $message );
             $this->order->add_order_note( $message );
             return false;
 …
         // On pre-transactions notification, and using sequential order numbers plugins, var 2 is not received in the notification, then order doesn't exist
         if ( ! $this->order ) {
+            if ( get_option( 'multisafepay_debugmode', false ) ) {
+                Logger::log_info( 'Notification has been received for the transaction ID ' . $this->multisafepay_order_id . ' but WooCommerce order object has not been found' );
+            }
+            $this->logger->log_info( 'Notification has been received for the transaction ID ' . $this->multisafepay_order_id . ' but WooCommerce order object has not been found' );
             header( 'Content-type: text/plain' );
             die( 'OK' );
 …
         // If payment method of the order does not belong to MultiSafepay
+        if ( strpos( $this->order->get_payment_method(), 'multisafepay_' ) === false ) {
+            if ( get_option( 'multisafepay_debugmode', false ) ) {
+                $message = 'It seems a notification is trying to process an order processed by another payment method. Transaction ID received is ' . $this->order->get_id();
+                Logger::log_info( $message );
+            }
+            header( 'Content-type: text/plain' );
+            die( 'OK' );
+        }
+        if ( $this->get_wc_order_status() === 'trash' ) {
+            if ( get_option( 'multisafepay_debugmode', false ) ) {
+                $message = 'It seems a notification is trying to change the order status, but the order has been moved to the trash. Transaction ID received is ' . $this->order->get_id() . ' and transaction status is ' . $this->get_multisafepay_transaction_status();
+                Logger::log_info( $message );
+                $this->order->add_order_note( $message );
+            }
+        if ( ! OrderUtil::is_multisafepay_order( $this->order ) ) {
+            $message = 'It seems a notification is trying to process an order processed by another payment method. Transaction ID received is ' . $this->order->get_id();
+            $this->logger->log_info( $message );
+            header( 'Content-type: text/plain' );
+            die( 'OK' );
+        }
+        if ( $this->get_woocommerce_order_status() === 'trash' ) {
+            $message = 'It seems a notification is trying to change the order status, but the order has been moved to the trash. Transaction ID received is ' . $this->order->get_id() . ' and transaction status is ' . $this->get_multisafepay_transaction_status();
+            $this->logger->log_info( $message );
+            OrderUtil::add_order_note( $this->order, $message, true );
             header( 'Content-type: text/plain' );
             die( 'OK' );
 …
         if ( $this->get_multisafepay_transaction_status() === Transaction::PARTIAL_REFUNDED ) {
             $message = 'A partial refund has been registered within MultiSafepay Control for Order ID: ' . $this->woocommerce_order_id . ' and Order Number: ' . $this->multisafepay_order_id;
             $this->order->add_order_note( $message );
+            OrderUtil::add_order_note( $this->order, $message );
             header( 'Content-type: text/plain' );
             die( 'OK' );
 …
         $payment_method_id_registered_by_wc               = $this->order->get_payment_method();
         $payment_method_title_registered_by_wc            = $this->order->get_payment_method_title();
+        $registered_by_woocommerce_payment_method_object  = ( new PaymentMethodService() )->get_woocommerce_payment_gateway_by_id( $payment_method_id_registered_by_wc );
+        $initial_order_status                             = $registered_by_woocommerce_payment_method_object ? $registered_by_woocommerce_payment_method_object->initial_order_status : false;
+        $initial_order_status                             = $this->get_initial_order_status();
         $default_order_status                             = SettingsFields::get_multisafepay_order_statuses();
 …
         // Or if the custom initial order status of the gateway is different than the general one, and the MultiSafepay transaction status is initialized, and custom initial order status is different than the current WooCommerce order status
         if (
             $this->get_wc_order_status() !== str_replace( 'wc-', '', get_option( 'multisafepay_' . $this->get_multisafepay_transaction_status() . '_status', $default_order_status[ $this->get_multisafepay_transaction_status() . '_status' ]['default'] ) ) ||
             get_option( 'multisafepay_' . $this->get_multisafepay_transaction_status() . '_status', $default_order_status[ $this->get_multisafepay_transaction_status() . '_status' ]['default'] ) !== $initial_order_status && $this->get_multisafepay_transaction_status() === Transaction::INITIALIZED && $this->get_wc_order_status() !== $initial_order_status
+            $this->get_woocommerce_order_status() !== str_replace( 'wc-', '', get_option( 'multisafepay_' . $this->get_multisafepay_transaction_status() . '_status', $default_order_status[ $this->get_multisafepay_transaction_status() . '_status' ]['default'] ) ) ||
+            get_option( 'multisafepay_' . $this->get_multisafepay_transaction_status() . '_status', $default_order_status[ $this->get_multisafepay_transaction_status() . '_status' ]['default'] ) !== $initial_order_status && $this->get_multisafepay_transaction_status() === Transaction::INITIALIZED && $this->get_woocommerce_order_status() !== $initial_order_status
         ) {
             // If MultiSafepay transaction status is initialized, check if there is a custom initial order status for this payment method.
             if ( $this->get_multisafepay_transaction_status() === Transaction::INITIALIZED ) {
                 if ( $initial_order_status && 'wc-default' !== $initial_order_status && $this->get_wc_order_status() !== $initial_order_status ) {
+                if ( $initial_order_status && 'wc-default' !== $initial_order_status && $this->get_woocommerce_order_status() !== $initial_order_status ) {
                     $this->order->update_status( str_replace( 'wc-', '', $initial_order_status ), __( 'Transaction has been initialized.', 'multisafepay' ) );
+                }
 …
+            }
+            if ( get_option( 'multisafepay_debugmode', false ) ) {
+                $message = 'Callback received for Order ID: ' . $this->woocommerce_order_id . ' and Order Number: ' . $this->multisafepay_order_id . ' on ' . $this->time_stamp . ' with status: ' . $this->get_multisafepay_transaction_status() . ' and PSP ID: ' . $this->get_multisafepay_transaction_id() . '.';
+                Logger::log_info( $message );
+                $this->order->add_order_note( $message );
+            }
+            $message = 'Callback received for Order ID: ' . $this->woocommerce_order_id . ' and Order Number: ' . $this->multisafepay_order_id . ' on ' . $this->time_stamp . ' with status: ' . $this->get_multisafepay_transaction_status() . ' and PSP ID: ' . $this->get_multisafepay_transaction_id() . '.';
+            $this->logger->log_info( $message );
+            OrderUtil::add_order_note( $this->order, $message, true );
+        }
         // If the payment method changed in MultiSafepay payment page, after leave WooCommerce checkout page
         if ( $payment_method_id_registered_by_multisafepay && $payment_method_id_registered_by_wc !== $payment_method_id_registered_by_multisafepay ) {
+            if ( get_option( 'multisafepay_debugmode', false ) ) {
+                $message = 'Callback received with a different payment method for Order ID: ' . $this->woocommerce_order_id . ' and Order Number: ' . $this->multisafepay_order_id . ' on ' . $this->time_stamp . '. Payment method changed from ' . $payment_method_title_registered_by_wc . ' to ' . $payment_method_title_registered_by_multisafepay . '.';
+                Logger::log_info( $message );
+                $this->order->add_order_note( $message );
+            }
+            $message = 'Callback received with a different payment method for Order ID: ' . $this->woocommerce_order_id . ' and Order Number: ' . $this->multisafepay_order_id . ' on ' . $this->time_stamp . '. Payment method changed from ' . $payment_method_title_registered_by_wc . ' to ' . $payment_method_title_registered_by_multisafepay . '.';
+            $this->logger->log_info( $message );
+            OrderUtil::add_order_note( $this->order, $message, true );
             $this->order = wc_get_order( $this->woocommerce_order_id );
             $this->order->set_payment_method( $registered_by_multisafepay_payment_method_object );

multisafepay/trunk/src/PaymentMethods/PaymentMethodsController.php

-                      r3050467
+                      r3114383
 use MultiSafepay\Api\Transactions\TransactionResponse;
 use MultiSafepay\Api\Transactions\UpdateRequest;
+use MultiSafepay\Api\Wallets\ApplePay\MerchantSessionRequest;
 use MultiSafepay\Exception\ApiException;
-use MultiSafepay\Api\Wallets\ApplePay\MerchantSessionRequest;
 use MultiSafepay\Util\Notification;
 use MultiSafepay\WooCommerce\Services\OrderService;
 …
 use MultiSafepay\WooCommerce\Utils\Hpos;
 use MultiSafepay\WooCommerce\Utils\Logger;
+use MultiSafepay\WooCommerce\Utils\Order as OrderUtil;
 use Psr\Http\Client\ClientExceptionInterface;
 use WC_Data_Exception;
 …
     public const VALIDATION_URL_KEY = 'validation_url';
     public const ORIGIN_DOMAIN_KEY  = 'origin_domain';
+    /**
+     * @var Logger
+     */
+    private $logger;
+    /**
+     * @param Logger|null $logger
+     */
+    public function __construct( ?Logger $logger = null ) {
+        $this->logger = $logger ?? new Logger();
+    }
     /**
 …
     public function set_multisafepay_transaction_as_shipped( int $order_id ): void {
         $order = wc_get_order( $order_id );
         if ( strpos( $order->get_payment_method(), 'multisafepay_' ) !== false ) {
+        if ( OrderUtil::is_multisafepay_order( $order ) ) {
             $sdk                 = new SdkService();
             $transaction_manager = $sdk->get_transaction_manager();
 …
                 $transaction_manager->update( (string) $order->get_order_number(), $update_order );
             } catch ( ApiException $api_exception ) {
                 Logger::log_error( $api_exception->getMessage() );
+                $this->logger->log_error( $api_exception->getMessage() );
                 return;
+            }
 …
     public function set_multisafepay_transaction_as_invoiced( int $order_id ): void {
         $order = wc_get_order( $order_id );
         if ( strpos( $order->get_payment_method(), 'multisafepay_' ) !== false ) {
+        if ( OrderUtil::is_multisafepay_order( $order ) ) {
             $sdk                 = new SdkService();
             $transaction_manager = $sdk->get_transaction_manager();
 …
                 $transaction_manager->update( (string) $order->get_order_number(), $update_order );
             } catch ( ApiException $api_exception ) {
                 Logger::log_error( $api_exception->getMessage() );
+                $this->logger->log_error( $api_exception->getMessage() );
                 return;
+            }
 …
         if ( ! $request->sanitize_params() ) {
             Logger::log_info( 'Notification for transactionid . ' . $transactionid . ' has been received but could not be sanitized' );
+            $this->logger->log_info( 'Notification for transactionid . ' . $transactionid . ' has been received but could not be sanitized' );
             header( 'Content-type: text/plain' );
             die( 'OK' );
 …
         $payload_type = $request->get_param( 'payload_type' ) ?? '';
         if ( 'pretransaction' === $payload_type ) {
             Logger::log_info( 'Notification for transactionid . ' . $transactionid . ' has been received but is going to be ignored, because is pretransaction type' );
+            $this->logger->log_info( 'Notification for transactionid . ' . $transactionid . ' has been received but is going to be ignored, because is pretransaction type' );
             header( 'Content-type: text/plain' );
             die( 'OK' );
 …
         if ( ! $verify_notification ) {
             Logger::log_info( 'Notification for transactionid . ' . $transactionid . ' has been received but is not validated' );
+            $this->logger->log_info( 'Notification for transactionid . ' . $transactionid . ' has been received but is not validated' );
             header( 'Content-type: text/plain' );
             die( 'OK' );
 …
         if ( get_option( 'multisafepay_debugmode', false ) ) {
             Logger::log_info( 'Notification has been received and validated for transaction id ' . $transactionid );
+            $this->logger->log_info( 'Notification has been received and validated for transaction id ' . $transactionid );
             if ( ! empty( $body ) ) {
                 Logger::log_info( 'Body of the POST notification: ' . wc_print_r( $body, true ) );
+                $this->logger->log_info( 'Body of the POST notification: ' . wc_print_r( $body, true ) );
+            }
+        }
 …
         // Check if the payment method belongs to MultiSafepay
         if ( strpos( $order->get_payment_method(), 'multisafepay_' ) === false ) {
+        if ( ! OrderUtil::is_multisafepay_order( $order ) ) {
             return;
+        }
 …
         $gateway_object      = ( new PaymentMethodService() )->get_woocommerce_payment_gateway_by_id( $order->get_payment_method() );
         if ( ! $gateway_object ) {
             Logger::log_error( ' Gateway object is null ' );
+            $this->logger->log_error( ' Gateway object is null ' );
             return;
+        }
 …
                 if ( get_option( 'multisafepay_debugmode', false ) ) {
                     $message = 'Order details has been registered in MultiSafepay and a payment link has been generated: ' . esc_url( $transaction->getPaymentUrl() );
                     Logger::log_info( $message );
+                    $this->logger->log_info( $message );
                     $order->add_order_note( $message );
+                }
+            }
         } catch ( Exception | ApiException | ClientExceptionInterface $exception ) {
             Logger::log_error( $exception->getMessage() );
+            $this->logger->log_error( $exception->getMessage() );
+        }
+    }
 …
      */
     public function allow_cancel_multisafepay_orders_with_on_hold_status( array $order_status, WC_Order $order ): array {
         if ( strpos( $order->get_payment_method(), 'multisafepay_' ) !== false ) {
+        if ( OrderUtil::is_multisafepay_order( $order ) ) {
             $gateway = ( new PaymentMethodService() )->get_woocommerce_payment_gateway_by_id( $order->get_payment_method() );
             if ( ! $gateway ) {
                 Logger::log_error( ' Gateway object is null ' );
+                $this->logger->log_error( ' Gateway object is null ' );
                 return $order_status;
+            }
 …
         } catch ( ApiException | Exception | ClientExceptionInterface $exception ) {
             $error_message = 'Error when trying to get the ApplePay session via MultiSafepay SDK';
             Logger::log_error( $error_message . ': ' . $exception->getMessage() );
+            $this->logger->log_error( $error_message . ': ' . $exception->getMessage() );
             wp_send_json( array( 'message' => $error_message ) );
+        }
 …
         if ( empty( $validation_url ) ) {
             Logger::log_error( 'Error when trying to get the ApplePay session. Validation URL empty' );
+            $this->logger->log_error( 'Error when trying to get the ApplePay session. Validation URL empty' );
             exit;
+        }
         if ( empty( $origin_domain ) ) {
             Logger::log_error( 'Error when trying to get the ApplePay session. Origin domain empty' );
+            $this->logger->log_error( 'Error when trying to get the ApplePay session. Origin domain empty' );
             exit;
+        }

multisafepay/trunk/src/Services/ApiTokenService.php

-                      r2974626
+                      r3114383
     /**
+     * @var Logger
+     */
+    private $logger;
+    /**
      * ApiTokenService constructor.
+     *
+     * @param Logger|null $logger
      */
+    public function __construct() {
+    public function __construct( ?Logger $logger = null ) {
+        $this->logger            = $logger ?? new Logger();
         $this->api_token_manager = ( new SdkService() )->get_api_token_manager();
+    }
 …
             $api_token = $this->api_token_manager->get()->getApiToken();
         } catch ( ApiException | ClientExceptionInterface $exception ) {
             Logger::log_error( $exception->getMessage() );
+            $this->logger->log_error( $exception->getMessage() );
             return '';
+        }

multisafepay/trunk/src/Services/OrderService.php

-                      r3048898
+                      r3114383
+        }
         if ( ! empty( $_POST[ ( $this->payment_method_service->get_woocommerce_payment_gateway_by_multisafepay_gateway_code( $gateway_code ) )->get_payment_method_id() . '_payment_component_payload' ] ) ) {
             $payment_method_id             = ( new PaymentMethodService() )->get_woocommerce_payment_gateway_by_multisafepay_gateway_code( $gateway_code )->get_payment_method_id();
+        if ( ! empty( $_POST[ $order->get_payment_method() . '_payment_component_payload' ] ) ) {
+            $payment_method_id             = $order->get_payment_method();
             $payment_component_payload_key = $payment_method_id . '_payment_component_payload';
             $payment_component_payload     = sanitize_text_field( wp_unslash( $_POST[ $payment_component_payload_key ] ?? '' ) );

multisafepay/trunk/src/Services/PaymentMethodService.php

-                      r3088253
+                      r3114383
 use MultiSafepay\WooCommerce\PaymentMethods\Base\BaseGiftCardPaymentMethod;
 use MultiSafepay\WooCommerce\PaymentMethods\Base\BasePaymentMethod;
+use MultiSafepay\WooCommerce\PaymentMethods\Base\BaseBrandedPaymentMethod;
 use MultiSafepay\WooCommerce\Utils\Logger;
 use Psr\Http\Client\ClientExceptionInterface;
 …
     /**
+     * PaymentMethodsService constructor.
+     *
+     * @return void
+     */
+    public function __construct() {
+     * @var Logger
+     */
+    private $logger;
+    /**
+     * @param Logger|null $logger
+     */
+    public function __construct( ?Logger $logger = null ) {
+        $this->logger = $logger ?? new Logger();
         try {
             $this->payment_method_manager = ( new SdkService() )->get_payment_method_manager();
         } catch ( ApiException $api_exception ) {
             Logger::log_error( $api_exception->getMessage() );
+            $this->logger->log_error( $api_exception->getMessage() );
+        }
+    }
 …
         if ( null === $this->payment_method_manager ) {
             Logger::log_error( 'SDK is not initialized' );
+            $this->logger->log_error( 'SDK is not initialized' );
             return array();
+        }
 …
             );
         } catch ( Exception | ApiException | InvalidDataInitializationException | ClientExceptionInterface $exception ) {
             Logger::log_error( $exception->getMessage() );
+            $this->logger->log_error( $exception->getMessage() );
             return array();
+        }
 …
         $multisafepay_payment_methods = $this->get_multisafepay_payment_methods_from_api();
         foreach ( $multisafepay_payment_methods as $multisafepay_payment_method ) {
+            if ( isset( $multisafepay_payment_method['type'] ) && 'coupon' === $multisafepay_payment_method['type'] ) {
+                $woocommerce_payment_gateways[ self::get_legacy_woocommerce_payment_gateway_ids( $multisafepay_payment_method['id'] ) ] = new BaseGiftCardPaymentMethod( new PaymentMethod( $multisafepay_payment_method ) );
+            }
+            if ( isset( $multisafepay_payment_method['type'] ) && 'payment-method' === $multisafepay_payment_method['type'] ) {
+                $woocommerce_payment_gateways[ self::get_legacy_woocommerce_payment_gateway_ids( $multisafepay_payment_method['id'] ) ] = new BasePaymentMethod( new PaymentMethod( $multisafepay_payment_method ) );
+            }
+        }
+            if ( isset( $multisafepay_payment_method['type'] ) ) {
+                $woocommerce_payment_gateways = $this->create_woocommerce_payment_gateways( $multisafepay_payment_method, $woocommerce_payment_gateways );
+            }
+        }
+        return $woocommerce_payment_gateways;
+    }
+    /**
+     * @param array $multisafepay_payment_method
+     * @param array $woocommerce_payment_gateways
+     * @return array
+     */
+    public function create_woocommerce_payment_gateways( array $multisafepay_payment_method, array $woocommerce_payment_gateways ) : array {
+        $payment_method_id = self::get_legacy_woocommerce_payment_gateway_ids( $multisafepay_payment_method['id'] );
+        try {
+            $payment_method = new PaymentMethod( $multisafepay_payment_method );
+        } catch ( InvalidDataInitializationException $exception ) {
+            $this->logger->log_error( $exception->getMessage() );
+            return $woocommerce_payment_gateways;
+        }
+        if ( 'payment-method' === $multisafepay_payment_method['type'] ) {
+            $woocommerce_payment_gateways[ $payment_method_id ] = new BasePaymentMethod( $payment_method );
+            $woocommerce_payment_gateways                       = $this->create_branded_woocommerce_payment_gateways( $multisafepay_payment_method, $woocommerce_payment_gateways, $payment_method );
+        }
+        if ( 'coupon' === $multisafepay_payment_method['type'] ) {
+            $woocommerce_payment_gateways[ $payment_method_id ] = new BaseGiftCardPaymentMethod( $payment_method );
+        }
+        return $woocommerce_payment_gateways;
+    }
+    /**
+     * @param array         $multisafepay_payment_method
+     * @param array         $woocommerce_payment_gateways
+     * @param PaymentMethod $payment_method
+     * @return array
+     */
+    public function create_branded_woocommerce_payment_gateways( array $multisafepay_payment_method, array $woocommerce_payment_gateways, PaymentMethod $payment_method ) : array {
+        foreach ( $multisafepay_payment_method['brands'] as $brand ) {
+            if ( ! empty( $brand['allowed_countries'] ) ) {
+                $payment_method_id                                  = self::get_legacy_woocommerce_payment_gateway_ids( $brand['id'] );
+                $woocommerce_payment_gateways[ $payment_method_id ] = new BaseBrandedPaymentMethod( $payment_method, $brand );
+            }
+        }
         return $woocommerce_payment_gateways;
+    }
 …
             if ( $payment_method_object->supportsPaymentComponent() ) {
                 $payment_methods_with_payment_component[] = self::get_legacy_woocommerce_payment_gateway_ids( $payment_method_object->getId() );
+                foreach ( $payment_method['brands'] as $brand ) {
+                    if ( ! empty( $brand['allowed_countries'] ) ) {
+                        $payment_methods_with_payment_component[] = self::get_legacy_woocommerce_payment_gateway_ids( $brand['id'] );
+                    }
+                }
+            }
+        }
 …
      */
     public static function get_legacy_woocommerce_payment_gateway_ids( string $code ): string {
         $woocommerce_payment_gateway_id = 'multisafepay_' . str_replace( '-', '_', sanitize_title( strtolower( $code ) ) );

multisafepay/trunk/src/Services/SdkService.php

-                      r3048898
+                      r3114383
 use MultiSafepay\Sdk;
 use MultiSafepay\WooCommerce\Client\MultiSafepayClient;
-use MultiSafepay\WooCommerce\Services\PaymentMethodService;
 use MultiSafepay\WooCommerce\Utils\Logger;
 use Nyholm\Psr7\Factory\Psr17Factory;
 …
     private $sdk = null;
+    /**
+     * @var Logger
+     */
+    private $logger;
     /**
      * SdkService constructor.
+     *
+     * @param  string  $api_key
+     * @param  boolean $test_mode
+     */
+    public function __construct( string $api_key = null, bool $test_mode = null ) {
+     * @param  string      $api_key
+     * @param  boolean     $test_mode
+     * @param Logger|null $logger
+     */
+    public function __construct( string $api_key = null, bool $test_mode = null, ?Logger $logger = null ) {
         $this->api_key   = $api_key ?? $this->get_api_key();
         $this->test_mode = $test_mode ?? $this->get_test_mode();
+        $this->logger    = $logger ?? new Logger();
         $psr_factory     = new Psr17Factory();
         $client          = new MultiSafepayClient();
 …
         } catch ( InvalidApiKeyException $invalid_api_key_exception ) {
             set_transient( 'multisafepay_payment_methods', array() );
             Logger::log_error( $invalid_api_key_exception->getMessage() );
+            $this->logger->log_error( $invalid_api_key_exception->getMessage() );
+        }
+    }
 …
             return $this->sdk->getGatewayManager();
         } catch ( ApiException $api_exception ) {
             Logger::log_error( $api_exception->getMessage() );
+            $this->logger->log_error( $api_exception->getMessage() );
             return new WP_Error( 'multisafepay-warning', $api_exception->getMessage() );
+        }
 …
             return $this->get_gateway_manager()->getGateways( true );
         } catch ( ApiException $api_exception ) {
             Logger::log_error( $api_exception->getMessage() );
+            $this->logger->log_error( $api_exception->getMessage() );
             return new WP_Error( 'multisafepay-warning', $api_exception->getMessage() );
+        }
 …
     public function get_api_token_manager(): ?ApiTokenManager {
         if ( null === $this->sdk ) {
             Logger::log_error( 'SDK is not initialized' );
+            $this->logger->log_error( 'SDK is not initialized' );
             return null;
+        }
 …
     public function get_payment_method_manager(): ?PaymentMethodManager {
         if ( null === $this->sdk ) {
             Logger::log_error( 'SDK is not initialized' );
+            $this->logger->log_error( 'SDK is not initialized' );
             return null;
+        }
 …
             return $this->sdk->getPaymentMethodManager();
         } catch ( ApiException $api_exception ) {
             Logger::log_error( $api_exception->getMessage() );
+            $this->logger->log_error( $api_exception->getMessage() );
             return null;
+        }
 …
             $tokens = $this->sdk->getTokenManager()->getListByGatewayCodeAsArray( $customer_reference, $gateway_code );
         } catch ( ApiException $api_exception ) {
             Logger::log_error( $api_exception->getMessage() );
+            $this->logger->log_error( $api_exception->getMessage() );
             return array();
         } catch ( ClientExceptionInterface $client_exception ) {
             Logger::log_error( $client_exception->getMessage() );
+            $this->logger->log_error( $client_exception->getMessage() );
             return array();
         } catch ( Exception $exception ) {
             Logger::log_error( $exception->getMessage() );
+            $this->logger->log_error( $exception->getMessage() );
             return array();
+        }
 …
             $gateway_merchant_id = $account_manager->get()->getAccountId();
         } catch ( ApiException | ClientExceptionInterface | Exception $exception ) {
             Logger::log_error( 'Error when try to set the merchant credentials: ' . $exception->getMessage() );
+            $this->logger->log_error( 'Error when try to set the merchant credentials: ' . $exception->getMessage() );
+        }

multisafepay/trunk/src/Services/ShoppingCartService.php

-                      r2995309
+                      r3114383
     /**
+     * @var Logger
+     */
+    private $logger;
+    /**
+     * @param Logger|null $logger
+     */
+    public function __construct( ?Logger $logger = null ) {
+        $this->logger = $logger ?? new Logger();
+    }
+    /**
      * @param WC_Order $order
      * @param string   $currency
 …
         if ( get_option( 'multisafepay_debugmode', false ) ) {
             Logger::log_info( wc_print_r( $order->get_items(), true ) );
+            $this->logger->log_info( wc_print_r( $order->get_items(), true ) );
+        }
 …
         if ( get_option( 'multisafepay_debugmode', false ) ) {
             Logger::log_info( wp_json_encode( $shopping_cart->getData() ) );
+            $this->logger->log_info( wp_json_encode( $shopping_cart->getData() ) );
+        }

multisafepay/trunk/src/Utils/Logger.php

-                      r2974626
+                      r3114383
 use WC_Log_Handler_File;
+use WC_Logger_Interface;
 /**
 …
  */
 class Logger {
+    /**
+     * @var WC_Logger_Interface
+     */
+    private $logger;
+    /**
+     * @param WC_Logger_Interface|null $logger
+     */
+    public function __construct( ?WC_Logger_Interface $logger = null ) {
+        $this->logger = $logger ?? wc_get_logger();
+    }
     /**
 …
      * @param string $message
      */
+    public static function log_emergency( string $message ) {
+        $logger = wc_get_logger();
+        $logger->log( 'emergency', $message, array( 'source' => 'multisafepay' ) );
+    public function log_emergency( string $message ) {
+        $this->logger->log( 'emergency', $message, array( 'source' => 'multisafepay' ) );
+    }
 …
      * @param string $message
      */
+    public static function log_alert( string $message ) {
+        $logger = wc_get_logger();
+        $logger->log( 'alert', $message, array( 'source' => 'multisafepay' ) );
+    public function log_alert( string $message ) {
+        $this->logger->log( 'alert', $message, array( 'source' => 'multisafepay' ) );
+    }
 …
      * @param string $message
      */
+    public static function log_critical( string $message ) {
+        $logger = wc_get_logger();
+        $logger->log( 'critical', $message, array( 'source' => 'multisafepay' ) );
+    public function log_critical( string $message ) {
+        $this->logger->log( 'critical', $message, array( 'source' => 'multisafepay' ) );
+    }
 …
      * @param string $message
      */
+    public static function log_error( string $message ) {
+        $logger = wc_get_logger();
+        $logger->log( 'error', $message, array( 'source' => 'multisafepay' ) );
+    public function log_error( string $message ) {
+        $this->logger->log( 'error', $message, array( 'source' => 'multisafepay' ) );
+    }
 …
      * @param string $message
      */
+    public static function log_warning( string $message ) {
+        $logger = wc_get_logger();
+        $logger->log( 'warning', $message, array( 'source' => 'multisafepay' ) );
+    public function log_warning( string $message ) {
+        $this->logger->log( 'warning', $message, array( 'source' => 'multisafepay' ) );
+    }
 …
      * @param string $message
      */
+    public static function log_notice( string $message ) {
+        $logger = wc_get_logger();
+        $logger->log( 'notice', $message, array( 'source' => 'multisafepay' ) );
+    public function log_notice( string $message ) {
+        $this->logger->log( 'notice', $message, array( 'source' => 'multisafepay' ) );
+    }
 …
      * @param string $message
      */
     public static function log_info( string $message ) {
+    public function log_info( string $message ) {
         if ( get_option( 'multisafepay_debugmode', false ) ) {
+            $logger = wc_get_logger();
+            $logger->log( 'info', $message, array( 'source' => 'multisafepay' ) );
+            $this->logger->log( 'info', $message, array( 'source' => 'multisafepay' ) );
+        }
+    }
 …
      * @param string $message
      */
     public static function log_debug( string $message ) {
+    public function log_debug( string $message ) {
         if ( get_option( 'multisafepay_debugmode', false ) ) {
+            $logger = wc_get_logger();
+            $logger->log( 'debug', $message, array( 'source' => 'multisafepay' ) );
+            $this->logger->log( 'debug', $message, array( 'source' => 'multisafepay' ) );
+        }
+    }
 …
      */
     private function get_logs(): array {
+        $logs = WC_Log_Handler_File::get_log_files();
+        return $logs;
+        return WC_Log_Handler_File::get_log_files();
+    }

multisafepay/trunk/vendor/autoload.php

r3048898	r3114383
23	23	require_once __DIR__ . '/composer/autoload_real.php';
24	24
25		return ComposerAutoloaderInit~~8122490751e95ad36d38dc1115ae59ff~~::getLoader();
	25	return ComposerAutoloaderInitdbc0eb47ba0f8cbc67eba2344d97c2f8::getLoader();

multisafepay/trunk/vendor/composer/autoload_real.php

-                      r3048898
+                      r3114383
 // autoload_real.php @generated by Composer
 class ComposerAutoloaderInit8122490751e95ad36d38dc1115ae59ff
+class ComposerAutoloaderInitdbc0eb47ba0f8cbc67eba2344d97c2f8
+{
     private static $loader;
 …
         require __DIR__ . '/platform_check.php';
         spl_autoload_register(array('ComposerAutoloaderInit8122490751e95ad36d38dc1115ae59ff', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitdbc0eb47ba0f8cbc67eba2344d97c2f8', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInit8122490751e95ad36d38dc1115ae59ff', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitdbc0eb47ba0f8cbc67eba2344d97c2f8', 'loadClassLoader'));
         require __DIR__ . '/autoload_static.php';
         call_user_func(\Composer\Autoload\ComposerStaticInit8122490751e95ad36d38dc1115ae59ff::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInitdbc0eb47ba0f8cbc67eba2344d97c2f8::getInitializer($loader));
         $loader->register(true);

multisafepay/trunk/vendor/composer/autoload_static.php

-                      r3048898
+                      r3114383
 namespace Composer\Autoload;
 class ComposerStaticInit8122490751e95ad36d38dc1115ae59ff
+class ComposerStaticInitdbc0eb47ba0f8cbc67eba2344d97c2f8
+{
     public static $prefixLengthsPsr4 = array (
 …
+    {
         return \Closure::bind(function () use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInit8122490751e95ad36d38dc1115ae59ff::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInit8122490751e95ad36d38dc1115ae59ff::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInit8122490751e95ad36d38dc1115ae59ff::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInitdbc0eb47ba0f8cbc67eba2344d97c2f8::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitdbc0eb47ba0f8cbc67eba2344d97c2f8::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitdbc0eb47ba0f8cbc67eba2344d97c2f8::$classMap;
         }, null, ClassLoader::class);

multisafepay/trunk/vendor/composer/installed.json

-                      r3088253
+                      r3114383
+        {
             "name": "multisafepay/php-sdk",
             "version": "5.13.0",
             "version_normalized": "5.13.0.0",
+            "version": "5.14.0",
+            "version_normalized": "5.14.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MultiSafepay/php-sdk.git",
                 "reference": "b88fa079981d590a70275d528cf52d8fd07affab"
             },
             "dist": {
                 "type": "zip",
                 "url": "https://api.github.com/repos/MultiSafepay/php-sdk/zipball/b88fa079981d590a70275d528cf52d8fd07affab",
                 "reference": "b88fa079981d590a70275d528cf52d8fd07affab",
+                "reference": "408f102e3228f072f2c1bcc76ac29a8031415480"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/MultiSafepay/php-sdk/zipball/408f102e3228f072f2c1bcc76ac29a8031415480",
+                "reference": "408f102e3228f072f2c1bcc76ac29a8031415480",
                 "shasum": ""
             },
 …
                 "jschaedl/iban-validation": "Adds additional IBAN validation for \\MultiSafepay\\ValueObject\\IbanNumber"
             },
             "time": "2024-04-16T11:41:31+00:00",
+            "time": "2024-07-08T12:43:31+00:00",
             "type": "library",
             "installation-source": "dist",
 …
             "support": {
                 "issues": "https://github.com/MultiSafepay/php-sdk/issues",
                 "source": "https://github.com/MultiSafepay/php-sdk/tree/5.13.0"
+                "source": "https://github.com/MultiSafepay/php-sdk/tree/5.14.0"
             },
             "install-path": "../multisafepay/php-sdk"

multisafepay/trunk/vendor/composer/installed.php

-                      r3099249
+                      r3114383
     'root' => array(
         'name' => 'multisafepay/woocommerce',
         'pretty_version' => '6.5.1',
         'version' => '6.5.1.0',
         'reference' => 'a57a06a32837f1542476a9726a1e3749e08ba92d',
+        'pretty_version' => '6.6.0',
+        'version' => '6.6.0.0',
+        'reference' => null,
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
 …
     'versions' => array(
         'multisafepay/php-sdk' => array(
             'pretty_version' => '5.13.0',
             'version' => '5.13.0.0',
             'reference' => 'b88fa079981d590a70275d528cf52d8fd07affab',
+            'pretty_version' => '5.14.0',
+            'version' => '5.14.0.0',
+            'reference' => '408f102e3228f072f2c1bcc76ac29a8031415480',
             'type' => 'library',
             'install_path' => __DIR__ . '/../multisafepay/php-sdk',
 …
         ),
         'multisafepay/woocommerce' => array(
             'pretty_version' => '6.5.1',
             'version' => '6.5.1.0',
             'reference' => 'a57a06a32837f1542476a9726a1e3749e08ba92d',
+            'pretty_version' => '6.6.0',
+            'version' => '6.6.0.0',
+            'reference' => null,
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',

multisafepay/trunk/vendor/multisafepay/php-sdk/CHANGELOG.md

-                      r3072171
+                      r3114383
 ## [Unreleased]
+## [5.14.0] - 2024-07-08
+### Added
+- PHPSDK-155: Throw ApiUnavailableException when API returns 501/503 HTTP codes
+- PHPSDK-156: Add getGatewayId in TransactionResponse class
 ## [5.13.0] - 2024-04-16
 ### Added
 + PHPSDK-151: Update Gateways::SHOPPING_CART_REQUIRED_GATEWAYS adding 'BNPL_INST', 'IN3B2B', 'SANTANDER', 'ZINIA', 'ZINIA_IN3', 'BNPL_OB', 'BNPL_MF' gateways codes
+- PHPSDK-151: Update Gateways::SHOPPING_CART_REQUIRED_GATEWAYS adding 'BNPL_INST', 'IN3B2B', 'SANTANDER', 'ZINIA', 'ZINIA_IN3', 'BNPL_OB', 'BNPL_MF' gateways codes
 ## [5.12.1] - 2024-03-11
 ### Fixed
 + PHPSDK-146: Fix ApiException not being hinted as a thrown exception, even though it is, by fixing the PHP DocBlocks @throws tags
+- PHPSDK-146: Fix ApiException not being hinted as a thrown exception, even though it is, by fixing the PHP DocBlocks @throws tags
 ## [5.12.0] - 2023-12-01
 ### Added
 + PHPSDK-139: Add support to set var1, var2 and var3, within the OrderRequest object
 + PHPSDK-140: Add support to set custom_info, within the OrderRequest object, thanks to @DaanDeSmedt
+- PHPSDK-139: Add support to set var1, var2 and var3, within the OrderRequest object
+- PHPSDK-140: Add support to set custom_info, within the OrderRequest object, thanks to @DaanDeSmedt
 ## [5.11.2] - 2023-10-13
 ### Fixed
 + PHPSDK-134: Fix errors when only reference is set, within the CustomerDetails object
 ### Changed
 + PHPSDK-136: Remove PluginDetails as mandatory from the Order Request
+- PHPSDK-134: Fix errors when only reference is set, within the CustomerDetails object
+### Changed
+- PHPSDK-136: Remove PluginDetails as mandatory from the Order Request
 ## [5.11.1] - 2023-07-31
 …
 ## [5.5.0] - 2022-05-11
 ### Added
 + PHPSDK-90: Add MAESTRO tokens within the results of the CREDITCARD tokens request
 ### Changed
 + PHPSDK-91: Add trim on API key when initializing the SDK
+- PHPSDK-90: Add MAESTRO tokens within the results of the CREDITCARD tokens request
+### Changed
+- PHPSDK-91: Add trim on API key when initializing the SDK
 ## [5.4.0] - 2021-11-30

multisafepay/trunk/vendor/multisafepay/php-sdk/composer.json

r3072171	r3114383
4	4	"type": "library",
5	5	"license": "MIT",
6		"version": "5.13.0",
	6	"version": "5.14.0",
7	7	"require": {
8	8	"php": "^7.2\|^8.0",

multisafepay/trunk/vendor/multisafepay/php-sdk/src/Api/Base/Response.php

-                      r3050467
+                      r3114383
 use MultiSafepay\Api\Pager\Pager;
 use MultiSafepay\Exception\ApiException;
+use MultiSafepay\Exception\ApiUnavailableException;
 /**
 …
      * @param array $context
      * @return Response
      * @throws ApiException
+     * @throws ApiException|ApiUnavailableException
      */
     public static function withJson(string $json, array $context = []): Response
 …
      * @param array $context
      * @param string $raw
      * @throws ApiException
+     * @throws ApiException|ApiUnavailableException
      */
     public function __construct(array $data, array $context = [], string $raw = '')
 …
      * @return void
      * @throws ApiException
+     * @throws ApiUnavailableException
      */
     private function validate(array $data, array $context = []): void
 …
         if (!empty($data['data']) && !is_array($data['data'])) {
             [$errorCode, $errorInfo] = self::ERROR_INVALID_DATA_TYPE;
+        }
+        if (in_array($context['http_response_code'], [501, 503])) {
+            throw (new ApiUnavailableException(
+                'The MultiSafepay API could not be reached',
+                $context['http_response_code']
+            ));
+        }

multisafepay/trunk/vendor/multisafepay/php-sdk/src/Api/Transactions/TransactionResponse.php

-                      r3050467
+                      r3114383
 class TransactionResponse extends ResponseBody
+{
     /**
      * @var string
 …
         return in_array($this->getPaymentDetails()->getType(), Gateways::SHOPPING_CART_REQUIRED_GATEWAYS, true);
+    }
+    /**
+     * Retrieve the gateway ID from the transaction
+     * Will return multiple gateway IDs as a string of comma separated values if multiple payment methods are used
+     *
+     * @return string
+     */
+    public function getGatewayId(): string
+    {
+        $paymentMethods = [];
+        foreach ($this->getPaymentMethods() as $paymentMethod) {
+            if ($paymentMethod->getType() === 'COUPON') {
+                $paymentMethods[] = $paymentMethod->getData()['coupon_brand'] ?? 'unknown';
+                continue;
+            }
+            $paymentMethods[] = $paymentMethod->getType();
+        }
+        return implode(', ', $paymentMethods);
+    }
+}

multisafepay/trunk/vendor/multisafepay/php-sdk/src/Client/Client.php

-                      r3050467
+                      r3114383
 use MultiSafepay\Api\Base\Response as ApiResponse;
 use MultiSafepay\Exception\ApiException;
+use MultiSafepay\Exception\ApiUnavailableException;
 use MultiSafepay\Exception\InvalidApiKeyException;
-use MultiSafepay\Exception\StrictModeException;
 use Psr\Http\Client\ClientExceptionInterface;
 use Psr\Http\Client\ClientInterface;
 …
      * @param array $context
      * @return ApiResponse
+     * @throws ClientExceptionInterface
+     * @throws ApiException
+     * @throws ClientExceptionInterface|ApiException|ApiUnavailableException
      */
     public function createPostRequest(
 …
             ->withBody($this->createBody($this->getRequestBody($requestBody)))
             ->withHeader('Content-Length', strlen($this->getRequestBody($requestBody)));
+        $httpResponse = $this->httpClient->sendRequest($request);
         $context['headers'] = $request->getHeaders();
         $context['request_body'] = $this->getRequestBody($requestBody);
+        $httpResponse = $this->httpClient->sendRequest($request);
+        $context['http_response_code'] = $httpResponse->getStatusCode() ?? 0;
         return ApiResponse::withJson($httpResponse->getBody()->getContents(), $context);
+    }
 …
      * @param array $context
      * @return ApiResponse
      * @throws ClientExceptionInterface|ApiException
+     * @throws ClientExceptionInterface|ApiException|ApiUnavailableException
      */
     public function createPatchRequest(
 …
             ->withBody($this->createBody($this->getRequestBody($requestBody)))
             ->withHeader('Content-Length', strlen($this->getRequestBody($requestBody)));
+        $httpResponse = $this->httpClient->sendRequest($request);
         $context['headers'] = $request->getHeaders();
         $context['request_body'] = $this->getRequestBody($requestBody);
+        $httpResponse = $this->httpClient->sendRequest($request);
+        return ApiResponse::withJson($httpResponse->getBody()->getContents(), $context);
+    }
+    /**
+     * @param string $endpoint
+     * @param array $parameters
+     * @param array $context
+     * @return ApiResponse
+     * @throws ClientExceptionInterface|ApiException
+        $context['http_response_code'] = $httpResponse->getStatusCode() ?? 0;
+        return ApiResponse::withJson($httpResponse->getBody()->getContents(), $context);
+    }
+    /**
+     * @param string $endpoint
+     * @param array $parameters
+     * @param array $context
+     * @return ApiResponse
+     * @throws ClientExceptionInterface|ApiException|ApiUnavailableException
      */
     public function createGetRequest(string $endpoint, array $parameters = [], array $context = []): ApiResponse
 …
         $request = $this->createRequest($endpoint, self::METHOD_GET, $parameters);
         $httpResponse = $this->httpClient->sendRequest($request);
         $context['headers'] = $request->getHeaders();
         $context['request_params'] = $parameters;
+        return ApiResponse::withJson($httpResponse->getBody()->getContents(), $context);
+    }
+    /**
+     * @param string $endpoint
+     * @param array $parameters
+     * @param array $context
+     * @return ApiResponse
+     * @throws ClientExceptionInterface|ApiException
+        $context['http_response_code'] = $httpResponse->getStatusCode() ?? 0;
+        return ApiResponse::withJson($httpResponse->getBody()->getContents(), $context);
+    }
+    /**
+     * @param string $endpoint
+     * @param array $parameters
+     * @param array $context
+     * @return ApiResponse
+     * @throws ClientExceptionInterface|ApiException|ApiUnavailableException
      */
     public function createDeleteRequest(string $endpoint, array $parameters = [], array $context = []): ApiResponse
 …
         $request = $this->createRequest($endpoint, self::METHOD_DELETE, $parameters);
         $httpResponse = $this->httpClient->sendRequest($request);
         $context['headers'] = $request->getHeaders();
         $context['request_params'] = $parameters;
+        $context['http_response_code'] = $httpResponse->getStatusCode() ?? 0;
         return ApiResponse::withJson($httpResponse->getBody()->getContents(), $context);
+    }
 …
+        }
         $endpoint .= '?' . http_build_query($parameters);
         return $this->url . $endpoint;
+    }
 …
+    {
         $this->strictMode = $strictMode;
         return $this;
+    }
 …
         $url = $this->getRequestUrl($endpoint, $parameters);
         $requestFactory = $this->getRequestFactory();
         return $requestFactory->createRequest($method, $url)
             ->withHeader('api_key', $this->apiKey->get())
 …
+    {
         $requestBody->useStrictMode($this->strictMode);
         return json_encode($requestBody->getData(), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
+    }

multisafepay/trunk/vendor/multisafepay/php-sdk/src/Util/Version.php

r3072171	r3114383
18	18	class Version
19	19	{
20		public const SDK_VERSION = '5.13.0';
	20	public const SDK_VERSION = '5.14.0';
21	21
22	22	/**

Context Navigation

Legend:

Download in other formats: