From 21c93db714045e90dc9850938189a0f9ac03eb64 Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Sun, 23 Nov 2025 15:44:02 +0100
Subject: [PATCH 01/44] PHPCS

---
 src/Gateway.php           | 1642 +++++++++++++++++++------------------
 src/View/CheckoutForm.php |   25 +-
 2 files changed, 842 insertions(+), 825 deletions(-)

diff --git a/src/Gateway.php b/src/Gateway.php
index b4f47419..bc9cb29b 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -58,8 +58,6 @@ final class Gateway extends \WC_Payment_Gateway {
 
 	/**
 	 *  Transaction settlement declaration
-	 *
-	 *
 	 */
 	protected $transaction_settlement_enable;
 
@@ -70,6 +68,7 @@ final class Gateway extends \WC_Payment_Gateway {
 	 */
 	public $enable_test_mode = false;
 
+
 	/**
 	 * Whether the debug mode is enabled.
 	 *
@@ -84,7 +83,7 @@ final class Gateway extends \WC_Payment_Gateway {
 	 *
 	 * @var array
 	 */
-	public $supports = [
+	public $supports = array(
 		'products',
 		'refunds',
 		'tokenization',
@@ -97,15 +96,15 @@ final class Gateway extends \WC_Payment_Gateway {
 		'subscription_payment_method_change',
 		'subscription_payment_method_change_customer',
 		'subscription_payment_method_change_admin',
-		'multiple_subscriptions'
-	];
+		'multiple_subscriptions',
+	);
 
 	/**
 	 * Dynamic method info that will be populated from an endpoint.
 	 *
 	 * @var array
 	 */
-	public $method_info = [];
+	public $method_info = array();
 
 	/**
 	 * WooCommerce logger instance
@@ -127,13 +126,14 @@ final class Gateway extends \WC_Payment_Gateway {
 	 * @var Helper
 	 */
 	protected $helper = null;
-	const TAX_RATE_PRECISION = 1;
-	const SUPPORTED_CURRENCIES = ['EUR'];
+
+	const TAX_RATE_PRECISION   = 1;
+	const SUPPORTED_CURRENCIES = array( 'EUR' );
 
 	/**
 	 * Object constructor
 	 */
-	public function __construct( $params = []) {
+	public function __construct( $params = array() ) {
 		// Set payment gateway ID
 		$this->id = Plugin::GATEWAY_ID;
 
@@ -147,8 +147,8 @@ public function __construct( $params = []) {
 		$this->method_description = $this->method_info['description'];
 
 		// These strings may show in the frontend.
-		$this->title       = !empty($this->get_option('custom_provider_name')) ? $this->get_option('custom_provider_name') : $this->method_info['title'];
-		$this->description = !empty($this->get_option('custom_provider_description')) ? $this->get_option('custom_provider_description') : $this->method_info['description'];
+		$this->title       = ! empty( $this->get_option( 'custom_provider_name' ) ) ? $this->get_option( 'custom_provider_name' ) : $this->method_info['title'];
+		$this->description = ! empty( $this->get_option( 'custom_provider_description' ) ) ? $this->get_option( 'custom_provider_description' ) : $this->method_info['description'];
 
 		// Icon temporarily disabled for size issues
 		// $this->icon = Plugin::ICON_URL;
@@ -160,15 +160,15 @@ public function __construct( $params = []) {
 		$this->init_settings();
 
 		// Whether we are in test mode or not.
-		$this->enable_test_mode = 'yes' === $this->get_option('enable_test_mode', 'no');
+		$this->enable_test_mode = 'yes' === $this->get_option( 'enable_test_mode', 'no' );
 
 		// Set merchant ID and secret key either from the options or for test mode.
-		if ($this->enable_test_mode) {
+		if ( $this->enable_test_mode ) {
 			$this->merchant_id = (int) Plugin::TEST_MERCHANT_ID;
 			$this->secret_key  = Plugin::TEST_SECRET_KEY;
 		} else {
-			$this->merchant_id = (int) $this->get_option('merchant_id');
-			$this->secret_key  = $this->get_option('secret_key');
+			$this->merchant_id = (int) $this->get_option( 'merchant_id' );
+			$this->secret_key  = $this->get_option( 'secret_key' );
 		}
 
 		$platformName = 'paytrail-for-woocommerce-' . \Paytrail\WooCommercePaymentGateway\Plugin::$version;
@@ -184,15 +184,17 @@ public function __construct( $params = []) {
 		$this->helper = new Helper();
 
 		// Whether we are in debug mode or not.
-		$this->debug = 'yes' === $this->get_option('debug', 'no');
+		$this->debug = 'yes' === $this->get_option( 'debug', 'no' );
 
 		// Check if transaction settlement is enabled
 		$this->transaction_settlement_enable = $this->get_option( 'settlement_enablement', 'no' ) === 'yes';
 
-		if (!empty($params) && isset($params['callbackMode'])) {
+		if ( ! empty( $params ) && isset( $params['callbackMode'] ) ) {
 			$this->callbackMode = true;
 		}
 
+		$this->settlement_prefix = $this->get_option( 'settlement_prefix', '10' );
+
 		// Add actions and filters.
 		$this->add_actions();
 
@@ -212,41 +214,40 @@ public function __construct( $params = []) {
 	 * @return void
 	 */
 	protected function add_actions() {
-		add_action('woocommerce_update_options_payment_gateways_' . $this->id, [ $this, 'process_admin_options' ]);
-		add_action('woocommerce_scheduled_subscription_payment_' . Plugin::GATEWAY_ID, [ $this, 'scheduled_subscription_payment' ], 10, 2);
-		add_action('woocommerce_receipt_' . $this->id, [ $this, 'receipt_page' ]);
-		add_filter('woocommerce_admin_order_items_after_refunds', [ $this, 'refund_items' ], 10, 1);
-		add_filter('woocommerce_order_data_store_cpt_get_orders_query', [ $this, 'handle_custom_searches' ], 10, 2);
-		add_filter('woocommerce_payment_gateway_get_saved_payment_method_option_html', [ $this, 'get_token_payment_option_html' ], 10, 2);
-		add_action('admin_footer', [$this, 'display_user_data_form']);
-		add_action('admin_notices', [$this, 'admin_notices']);
-		add_action('admin_enqueue_scripts', [$this, 'enqueue_admin_scripts']);
-		add_action('admin_enqueue_scripts', [$this, 'enqueue_admin_styles']);
-
+		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
+		add_action( 'woocommerce_scheduled_subscription_payment_' . Plugin::GATEWAY_ID, array( $this, 'scheduled_subscription_payment' ), 10, 2 );
+		add_action( 'woocommerce_receipt_' . $this->id, array( $this, 'receipt_page' ) );
+		add_filter( 'woocommerce_admin_order_items_after_refunds', array( $this, 'refund_items' ), 10, 1 );
+		add_filter( 'woocommerce_order_data_store_cpt_get_orders_query', array( $this, 'handle_custom_searches' ), 10, 2 );
+		add_filter( 'woocommerce_payment_gateway_get_saved_payment_method_option_html', array( $this, 'get_token_payment_option_html' ), 10, 2 );
+		add_action( 'admin_footer', array( $this, 'display_user_data_form' ) );
+		add_action( 'admin_notices', array( $this, 'admin_notices' ) );
+		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ) );
+		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_styles' ) );
 	}
 
 	/**
 	 * Display the user_data_form as an overlay
 	 */
 	public function display_user_data_form() {
-		$merchant_id = $this->get_option('merchant_id');
-		$test_mode_enabled = $this->get_option('enable_test_mode', 'no') === 'yes';
-		$current_screen = get_current_screen();
+		$merchant_id               = $this->get_option( 'merchant_id' );
+		$test_mode_enabled         = $this->get_option( 'enable_test_mode', 'no' ) === 'yes';
+		$current_screen            = get_current_screen();
 		$is_paytrail_settings_page = (
-			!$test_mode_enabled &&
+			! $test_mode_enabled &&
 			$current_screen && 'woocommerce_page_wc-settings' === $current_screen->id &&
-			isset($_GET['tab']) && 'checkout' === $_GET['tab'] &&
-			isset($_GET['section']) && 'paytrail' === $_GET['section']
+			isset( $_GET['tab'] ) && 'checkout' === $_GET['tab'] &&
+			isset( $_GET['section'] ) && 'paytrail' === $_GET['section']
 		);
 
 		// Check if merchant_id is already submitted
-		if (!empty($merchant_id) || $this->get_option('enable_test_mode', 'no') === 'yes') {
+		if ( ! empty( $merchant_id ) || $this->get_option( 'enable_test_mode', 'no' ) === 'yes' ) {
 			return;
 		}
 
-		if ($is_paytrail_settings_page) {
-			$template_path = plugin_dir_path(__FILE__) . 'View/Intro-form.php';
-			if (file_exists($template_path)) {
+		if ( $is_paytrail_settings_page ) {
+			$template_path = plugin_dir_path( __FILE__ ) . 'View/Intro-form.php';
+			if ( file_exists( $template_path ) ) {
 				include_once $template_path;
 			}
 		}
@@ -258,33 +259,32 @@ public function display_user_data_form() {
 	 */
 	public function user_data_form() {
 		$current_user = wp_get_current_user();
-		$user_email = $current_user->user_email;
-		$first_name = $current_user->first_name;
-		$last_name = $current_user->last_name;
+		$user_email   = $current_user->user_email;
+		$first_name   = $current_user->first_name;
+		$last_name    = $current_user->last_name;
 
-		if (class_exists('WooCommerce')) {
-			$wc_billing_data = get_user_meta($current_user->ID, 'billing', true);
-			$company_name = isset($wc_billing_data['company']) ? $wc_billing_data['company'] : '';
-			$phone_number = isset($wc_billing_data['phone']) ? $wc_billing_data['phone'] : '';
+		if ( class_exists( 'WooCommerce' ) ) {
+			$wc_billing_data = get_user_meta( $current_user->ID, 'billing', true );
+			$company_name    = isset( $wc_billing_data['company'] ) ? $wc_billing_data['company'] : '';
+			$phone_number    = isset( $wc_billing_data['phone'] ) ? $wc_billing_data['phone'] : '';
 
 			// Fetch shop's address using WC_Countries
-			$wc_countries = WC()->countries;
-			$shop_address = $wc_countries->get_base_address();
-			$shop_city = $wc_countries->get_base_city();
+			$wc_countries  = WC()->countries;
+			$shop_address  = $wc_countries->get_base_address();
+			$shop_city     = $wc_countries->get_base_city();
 			$shop_postcode = $wc_countries->get_base_postcode();
 		} else {
-			$company_name = '';
-			$phone_number = '';
-			$shop_address = '';
-			$shop_city = '';
+			$company_name  = '';
+			$phone_number  = '';
+			$shop_address  = '';
+			$shop_city     = '';
 			$shop_postcode = '';
 		}
 
+		$site_url = esc_url( get_site_url() );
 
-		$site_url = esc_url(get_site_url());
-
-		$template_path = plugin_dir_path(__FILE__) . 'View/User-data-form.php';
-		if (file_exists($template_path)) {
+		$template_path = plugin_dir_path( __FILE__ ) . 'View/User-data-form.php';
+		if ( file_exists( $template_path ) ) {
 			include_once $template_path;
 		}
 	}
@@ -296,11 +296,11 @@ public function user_data_form() {
 	 * @return array
 	 */
 	protected function get_method_info() {
-		$method_info = [
-			'title' => __('Paytrail for WooCommerce', 'paytrail-for-woocommerce'),
-			'description' => __('Paytrail for WooCommerce - the most comprehensive suite of payment methods in the market with a single contract', 'paytrail-for-woocommerce'),
-			'save_card' => 1,
-		];
+		$method_info = array(
+			'title'       => __( 'Paytrail for WooCommerce', 'paytrail-for-woocommerce' ),
+			'description' => __( 'Paytrail for WooCommerce - the most comprehensive suite of payment methods in the market with a single contract', 'paytrail-for-woocommerce' ),
+			'save_card'   => 1,
+		);
 		return $method_info;
 	}
 
@@ -310,131 +310,131 @@ protected function get_method_info() {
 	 * @return void
 	 */
 	protected function set_form_fields() {
-		$test_mode_enabled = $this->get_option('enable_test_mode', 'no') === 'yes';
-		$merchant_id_disabled = $this->get_option( 'enable_test_mode', 'no' ) === 'yes';
-		$secret_key_disabled = $this->get_option( 'enable_test_mode', 'no' ) === 'yes';
-		$enable_test_mode_disabled = !$test_mode_enabled && (
-			!empty($this->get_option('merchant_id')) ||
-			!empty($this->get_option('secret_key'))
+		$test_mode_enabled         = $this->get_option( 'enable_test_mode', 'no' ) === 'yes';
+		$merchant_id_disabled      = $this->get_option( 'enable_test_mode', 'no' ) === 'yes';
+		$secret_key_disabled       = $this->get_option( 'enable_test_mode', 'no' ) === 'yes';
+		$enable_test_mode_disabled = ! $test_mode_enabled && (
+			! empty( $this->get_option( 'merchant_id' ) ) ||
+			! empty( $this->get_option( 'secret_key' ) )
 		);
-		$this->form_fields = [
+		$this->form_fields         = array(
 			// Whether the payment gateway is enabled.
-			'enabled'     => [
-				'title'   => __('Payment gateway status', 'paytrail-for-woocommerce'),
+			'enabled'                     => array(
+				'title'   => __( 'Payment gateway status', 'paytrail-for-woocommerce' ),
 				'type'    => 'checkbox',
-				'label'   => __('Enable Paytrail for WooCommerce', 'paytrail-for-woocommerce'),
+				'label'   => __( 'Enable Paytrail for WooCommerce', 'paytrail-for-woocommerce' ),
 				'default' => 'yes',
-			],
+			),
 			// Credentials
-			'credentials_title' => [
-				'title' => __('Credentials', 'paytrail-for-woocommerce'),
-				'type' => 'title',
-			],
+			'credentials_title'           => array(
+				'title' => __( 'Credentials', 'paytrail-for-woocommerce' ),
+				'type'  => 'title',
+			),
 			// Paytrail credentials
-			'merchant_id' => [
-				'title'   => __('Paytrail Merchant ID', 'paytrail-for-woocommerce'),
-				'type'    => 'text',
-				'label'   => __('Merchant ID', 'paytrail-for-woocommerce'),
-				'default' => '',
+			'merchant_id'                 => array(
+				'title'    => __( 'Paytrail Merchant ID', 'paytrail-for-woocommerce' ),
+				'type'     => 'text',
+				'label'    => __( 'Merchant ID', 'paytrail-for-woocommerce' ),
+				'default'  => '',
 				'disabled' => $merchant_id_disabled, // Disable if enable_test_mode is checked
-			],
-			'secret_key'  => [
-				'title'   => __('Paytrail Secret key', 'paytrail-for-woocommerce'),
-				'type'    => 'password',
-				'label'   => __('Secret key', 'paytrail-for-woocommerce'),
-				'default' => '',
-				'description' => __('Credentials can be found in <a target="_blank" href="https://merchant.paytrail.com/">the merchant panel</a>.', 'paytrail-for-woocommerce'),
-				'disabled' => $secret_key_disabled, // Disable if enable_test_mode is checked
-			],
+			),
+			'secret_key'                  => array(
+				'title'       => __( 'Paytrail Secret key', 'paytrail-for-woocommerce' ),
+				'type'        => 'password',
+				'label'       => __( 'Secret key', 'paytrail-for-woocommerce' ),
+				'default'     => '',
+				'description' => __( 'Credentials can be found in <a target="_blank" href="https://merchant.paytrail.com/">the merchant panel</a>.', 'paytrail-for-woocommerce' ),
+				'disabled'    => $secret_key_disabled, // Disable if enable_test_mode is checked
+			),
 			// Whether test mode is enabled
-			'enable_test_mode' => [
-				'title'       => __('Test mode', 'paytrail-for-woocommerce'),
+			'enable_test_mode'            => array(
+				'title'       => __( 'Test mode', 'paytrail-for-woocommerce' ),
 				'type'        => 'checkbox',
-				'label'       => __('Enable test mode', 'paytrail-for-woocommerce'),
+				'label'       => __( 'Enable test mode', 'paytrail-for-woocommerce' ),
 				'default'     => 'no',
-				'description' => __('You can use test mode to simulate payments with Paytrail\'s <a target="_blank" href="https://docs.paytrail.com/#/?id=test-credentials">test credentials</a>. To enable test mode, please first clear the Credentials and save settings.', 'paytrail-for-woocommerce'),
+				'description' => __( 'You can use test mode to simulate payments with Paytrail\'s <a target="_blank" href="https://docs.paytrail.com/#/?id=test-credentials">test credentials</a>. To enable test mode, please first clear the Credentials and save settings.', 'paytrail-for-woocommerce' ),
 				'disabled'    => $enable_test_mode_disabled, // Disable the checkbox if merchant_id or secret_key has a value
-			],
+			),
 			// General settings
-			'general_settings_title' => [
-				'title' => __('General settings', 'paytrail-for-woocommerce'),
-				'type' => 'title',
-			],
+			'general_settings_title'      => array(
+				'title' => __( 'General settings', 'paytrail-for-woocommerce' ),
+				'type'  => 'title',
+			),
 			// Whether to show the payment provider wall or choose the method in the store
-			'provider_selection' => [
-				'title'       => __('Payment provider selection', 'paytrail-for-woocommerce'),
+			'provider_selection'          => array(
+				'title'       => __( 'Payment provider selection', 'paytrail-for-woocommerce' ),
 				'type'        => 'checkbox',
-				'label'       => __('Enable payment provider selection in the checkout page', 'paytrail-for-woocommerce'),
+				'label'       => __( 'Enable payment provider selection in the checkout page', 'paytrail-for-woocommerce' ),
 				'default'     => 'yes',
-				'description' => __('Choose whether you want the payment provider selection to happen in the checkout page or in a separate page.', 'paytrail-for-woocommerce'),
-			],
+				'description' => __( 'Choose whether you want the payment provider selection to happen in the checkout page or in a separate page.', 'paytrail-for-woocommerce' ),
+			),
 			// Alternative text + description to show on the Checkout page
-			'custom_provider_name' => [
-				'title'       => __('Payment provider title', 'paytrail-for-woocommerce'),
+			'custom_provider_name'        => array(
+				'title'       => __( 'Payment provider title', 'paytrail-for-woocommerce' ),
 				'type'        => 'text',
-				'label'       => __('Used on the Checkout page title', 'paytrail-for-woocommerce'),
+				'label'       => __( 'Used on the Checkout page title', 'paytrail-for-woocommerce' ),
 				'default'     => 'Paytrail for WooCommerce',
-				'description' => __('This title is displayed on the Checkout page before the payment provider images.', 'paytrail-for-woocommerce')
-			],
-			'custom_provider_description' => [
-				'title'       => __('Payment provider description', 'paytrail-for-woocommerce'),
+				'description' => __( 'This title is displayed on the Checkout page before the payment provider images.', 'paytrail-for-woocommerce' ),
+			),
+			'custom_provider_description' => array(
+				'title'       => __( 'Payment provider description', 'paytrail-for-woocommerce' ),
 				'type'        => 'text',
-				'label'       => __('Used on the Checkout page title', 'paytrail-for-woocommerce'),
+				'label'       => __( 'Used on the Checkout page title', 'paytrail-for-woocommerce' ),
 				'default'     => 'Paytrail for WooCommerce',
-				'description' => __('Depending on your theme, this description might be displayed on the Checkout page before the payment provider images.', 'paytrail-for-woocommerce')
-			],
+				'description' => __( 'Depending on your theme, this description might be displayed on the Checkout page before the payment provider images.', 'paytrail-for-woocommerce' ),
+			),
 			// OP Lasku
-			'op_lasku_calculator' => [
+			'op_lasku_calculator'         => array(
 				'title'       => OPLasku::settings_title(),
 				'type'        => 'checkbox',
-				'label'       => __('Enable OP Lasku calculator', 'paytrail-for-woocommerce'),
+				'label'       => __( 'Enable OP Lasku calculator', 'paytrail-for-woocommerce' ),
 				'default'     => 'no',
-				'description' => __('Display OP Lasku calculator on the product and cart page.', 'paytrail-for-woocommerce'),
-			],
+				'description' => __( 'Display OP Lasku calculator on the product and cart page.', 'paytrail-for-woocommerce' ),
+			),
 			// Advanced settings
-			'advanced_settings_title' => [
-				'title' => __('Advanced settings', 'paytrail-for-woocommerce'),
-				'type' => 'title',
-			],
-			'settlement_enablement' => [
-				'title' => __( 'Enable individual settlements', 'paytrail-for-woocommerce' ),
-				'type' => 'checkbox',
-				'default' => 'no',
+			'advanced_settings_title'     => array(
+				'title' => __( 'Advanced settings', 'paytrail-for-woocommerce' ),
+				'type'  => 'title',
+			),
+			'settlement_enablement'       => array(
+				'title'       => __( 'Enable individual settlements', 'paytrail-for-woocommerce' ),
+				'type'        => 'checkbox',
+				'default'     => 'no',
 				'description' => __( 'This setting is required only if you are using transaction-by-transaction settlements in Paytrail.', 'paytrail-for-woocommerce' ),
-			],
-			'settlement_prefix' => [
-				'title' => __( 'Bank reference prefix', 'paytrail-for-woocommerce' ),
-				'type' => 'text',
+			),
+			'settlement_prefix'           => array(
+				'title'       => __( 'Bank reference prefix', 'paytrail-for-woocommerce' ),
+				'type'        => 'text',
 				'description' => __( 'Add Prefix', 'paytrail-for-woocommerce' ),
-				'default' => '10'
-			],
-			'fallback_country'  => [
-				'title'   => __('Default country', 'paytrail-for-woocommerce'),
-				'type'    => 'select',
-				'label'   => __('Fallback country', 'paytrail-for-woocommerce'),
-				'default' => '',
-				'description' => __('Select country to be used as fallback if no country specified in checkout.', 'paytrail-for-woocommerce'),
-				'options' => array_merge(['' => 'Select country'], WC()->countries->get_countries())
-			],
+				'default'     => '10',
+			),
+			'fallback_country'            => array(
+				'title'       => __( 'Default country', 'paytrail-for-woocommerce' ),
+				'type'        => 'select',
+				'label'       => __( 'Fallback country', 'paytrail-for-woocommerce' ),
+				'default'     => '',
+				'description' => __( 'Select country to be used as fallback if no country specified in checkout.', 'paytrail-for-woocommerce' ),
+				'options'     => array_merge( array( '' => 'Select country' ), WC()->countries->get_countries() ),
+			),
 			// Whether debug mode is enabled
-			'debug'       => [
-				'title'       => __('Debug log', 'paytrail-for-woocommerce'),
+			'debug'                       => array(
+				'title'       => __( 'Debug log', 'paytrail-for-woocommerce' ),
 				'type'        => 'checkbox',
-				'label'       => __('Enable logging', 'paytrail-for-woocommerce'),
+				'label'       => __( 'Enable logging', 'paytrail-for-woocommerce' ),
 				'default'     => 'no',
 				// translators: %s: URL
-				'description' => sprintf(__('This enables logging all payment gateway events. The log will be written in %1$s. Recommended only for debugging purposes as this might save personal data. All logs can be viewed here: %2$s', 'paytrail-for-woocommerce'), '<code>' . \WC_Log_Handler_File::get_log_file_path(Plugin::GATEWAY_ID) . '</code>', '<a target="_blank" href="/wp-admin/admin.php?page=wc-status&tab=logs">Logs</a>'),
-			],
+				'description' => sprintf( __( 'This enables logging all payment gateway events. The log will be written in %1$s. Recommended only for debugging purposes as this might save personal data. All logs can be viewed here: %2$s', 'paytrail-for-woocommerce' ), '<code>' . \WC_Log_Handler_File::get_log_file_path( Plugin::GATEWAY_ID ) . '</code>', '<a target="_blank" href="/wp-admin/admin.php?page=wc-status&tab=logs">Logs</a>' ),
+			),
 			// Update tokens if enabled
-			'tokenize'       => [
-				'title'       => __('Update tokens', 'paytrail-for-woocommerce'),
+			'tokenize'                    => array(
+				'title'       => __( 'Update tokens', 'paytrail-for-woocommerce' ),
 				'type'        => 'checkbox',
-				'label'       => __('Enable token update', 'paytrail-for-woocommerce'),
+				'label'       => __( 'Enable token update', 'paytrail-for-woocommerce' ),
 				'default'     => 'no',
 				// translators: %s: URL
-				'description' => __('Choose this to update card information (tokens) from the old Checkout Finland for WooCommerce -plugin. The update is done upon saving settings. This will also update tokens for the current WooCommerce Subscriptions orders, if that module is in use. </br> <b>CAUTION:</b> This action cannot be reverted.', 'paytrail-for-woocommerce'),
-			],
-		];
+				'description' => __( 'Choose this to update card information (tokens) from the old Checkout Finland for WooCommerce -plugin. The update is done upon saving settings. This will also update tokens for the current WooCommerce Subscriptions orders, if that module is in use. </br> <b>CAUTION:</b> This action cannot be reverted.', 'paytrail-for-woocommerce' ),
+			),
+		);
 	}
 
 	/**
@@ -446,16 +446,16 @@ public function process_admin_options() {
 		$saved = parent::process_admin_options();
 
 		// Clear logs if debugging was disabled.
-		if ('yes' !== $this->get_option('debug', 'no')) {
-			if (empty($this->logger)) {
+		if ( 'yes' !== $this->get_option( 'debug', 'no' ) ) {
+			if ( empty( $this->logger ) ) {
 				$this->logger = wc_get_logger();
 			}
 
-			$this->logger->clear(Plugin::GATEWAY_ID);
+			$this->logger->clear( Plugin::GATEWAY_ID );
 		}
 
 		// Update tokens if checkbx was checked
-		if ('yes' === $this->get_option('tokenize', 'yes')) {
+		if ( 'yes' === $this->get_option( 'tokenize', 'yes' ) ) {
 			$token_migration = new PaymentTokenMigration();
 			$token_migration->execute();
 			$subscription_migration = new PaymentSubscriptionMigration();
@@ -470,19 +470,19 @@ public function process_admin_options() {
 	 */
 	public function display_test_mode_notice() {
 		// Check if test mode is enabled
-		$test_mode_enabled = $this->get_option('enable_test_mode', 'no') === 'yes';
+		$test_mode_enabled = $this->get_option( 'enable_test_mode', 'no' ) === 'yes';
 
 		// Check if the notice should be displayed
-		if ($test_mode_enabled) {
+		if ( $test_mode_enabled ) {
 			?>
 			<div class="notice notice-warning">
 				<p>
 				<?php
-					esc_html_e('Paytrail for WooCommerce test mode is enabled. Please disable it to insert your Merchant ID and secret key.', 'paytrail-for-woocommerce');
+					esc_html_e( 'Paytrail for WooCommerce test mode is enabled. Please disable it to insert your Merchant ID and secret key.', 'paytrail-for-woocommerce' );
 					echo ' ' . sprintf(
 						/* translators: If you have not registered yet, you can do so on our website %s to get your credentials! */
-						esc_html__('If you have not registered yet, you can do so on our website %s to get your credentials!', 'paytrail-for-woocommerce'),
-						'<a href="https://www.paytrail.com/en/get-started" target="_blank">' . esc_html__('here', 'paytrail-for-woocommerce') . '</a>'
+						esc_html__( 'If you have not registered yet, you can do so on our website %s to get your credentials!', 'paytrail-for-woocommerce' ),
+						'<a href="https://www.paytrail.com/en/get-started" target="_blank">' . esc_html__( 'here', 'paytrail-for-woocommerce' ) . '</a>'
 					);
 				?>
 				</p>
@@ -498,20 +498,21 @@ public function display_test_mode_notice() {
 	 */
 	public function display_currency_notice() {
 		// Check the currently selected currency
-		$current_currency = get_woocommerce_currency();
-		$currency_is_not_supported =  !in_array($current_currency, self::SUPPORTED_CURRENCIES);
+		$current_currency          = get_woocommerce_currency();
+		$currency_is_not_supported = ! in_array( $current_currency, self::SUPPORTED_CURRENCIES );
 
 		// Check if the notice should be displayed
-		if ($currency_is_not_supported) {
-			$currency_settings_url = admin_url('admin.php?page=wc-settings&tab=general');
+		if ( $currency_is_not_supported ) {
+			$currency_settings_url = admin_url( 'admin.php?page=wc-settings&tab=general' );
 			?>
 			<div class="notice notice-warning">
 				<p>
 					<?php
-					esc_html_e('Paytrail for WooCommerce - Unsupported Currency Chosen.', 'paytrail-for-woocommerce');
+					esc_html_e( 'Paytrail for WooCommerce - Unsupported Currency Chosen.', 'paytrail-for-woocommerce' );
 					echo ' ' . sprintf(
-						'<a href="%s">' . esc_html__('Please set the WooCommerce currency to Euro (€)', 'paytrail-for-woocommerce') . '</a>', esc_url($currency_settings_url)
-						);
+						'<a href="%s">' . esc_html__( 'Please set the WooCommerce currency to Euro (€)', 'paytrail-for-woocommerce' ) . '</a>',
+						esc_url( $currency_settings_url )
+					);
 					?>
 				</p>
 			</div>
@@ -531,9 +532,9 @@ public function admin_notices() {
 	 * Calculate bank reference
 	 */
 	private function calculate_reference( $base ) {
-		$base = sprintf( '%s%s', $this->settlement_prefix, $base );
-		$base = trim( str_replace( ' ', '', $base ) );
-		$base = str_split( $base );
+		$base          = sprintf( '%s%s', $this->settlement_prefix, $base );
+		$base          = trim( str_replace( ' ', '', $base ) );
+		$base          = str_split( $base );
 		$reversed_base = array_reverse( $base );
 
 		$weights = array( 7, 3, 1, 7, 3, 1, 7, 3, 1, 7, 3, 1, 7, 3, 1, 7, 3, 1, 7 );
@@ -541,7 +542,7 @@ private function calculate_reference( $base ) {
 		$sum = 0;
 		for ( $i = 0; $i < count( $reversed_base ); $i++ ) {
 			$coefficient = array_shift( $weights );
-			$sum += intval( $reversed_base[$i] ) * $coefficient;
+			$sum        += intval( $reversed_base[ $i ] ) * $coefficient;
 		}
 
 		$checksum = ( 0 == ( $sum % 10 ) ) ? 0 : ( 10 - ( $sum % 10 ) );
@@ -557,11 +558,11 @@ private function calculate_reference( $base ) {
 	 * @return void
 	 */
 	public function receipt_page() {
-		$view = new View('CheckoutForm');
+		$view = new View( 'CheckoutForm' );
 
-		$provider = WC()->session->get('payment_provider');
+		$provider = WC()->session->get( 'payment_provider' );
 
-		$view->render($provider);
+		$view->render( $provider );
 	}
 
 	/**
@@ -570,7 +571,7 @@ public function receipt_page() {
 	 * @return void
 	 */
 	public function render_saved_payment_methods() {
-		$view = new View('SavedPaymentMethods');
+		$view = new View( 'SavedPaymentMethods' );
 
 		$view->render();
 	}
@@ -582,44 +583,44 @@ public function render_saved_payment_methods() {
 	 * @throws HmacException
 	 * @throws ValidationException
 	 */
-	public function add_card_form( $context = Plugin::ADD_CARD_CONTEXT_CHECKOUT) {
-		$datetime = new \DateTime();
-		$checkout_nonce = sha1(uniqid(true));
+	public function add_card_form( $context = Plugin::ADD_CARD_CONTEXT_CHECKOUT ) {
+		$datetime       = new \DateTime();
+		$checkout_nonce = sha1( uniqid( true ) );
 
-		if (Plugin::ADD_CARD_CONTEXT_MY_ACCOUNT === $context) {
-			$success_url = Router::get_url(Plugin::ADD_CARD_REDIRECT_SUCCESS_URL, Plugin::ADD_CARD_CONTEXT_MY_ACCOUNT);
-			$cancel_url = Router::get_url(Plugin::ADD_CARD_REDIRECT_CANCEL_URL, Plugin::ADD_CARD_CONTEXT_MY_ACCOUNT);
-		} elseif (Helper::getIsChangeSubscriptionPaymentMethod()) {
+		if ( Plugin::ADD_CARD_CONTEXT_MY_ACCOUNT === $context ) {
+			$success_url = Router::get_url( Plugin::ADD_CARD_REDIRECT_SUCCESS_URL, Plugin::ADD_CARD_CONTEXT_MY_ACCOUNT );
+			$cancel_url  = Router::get_url( Plugin::ADD_CARD_REDIRECT_CANCEL_URL, Plugin::ADD_CARD_CONTEXT_MY_ACCOUNT );
+		} elseif ( Helper::getIsChangeSubscriptionPaymentMethod() ) {
 			$success_url = Router::get_url(
 				Plugin::ADD_CARD_REDIRECT_SUCCESS_URL,
 				Plugin::ADD_CARD_CONTEXT_CHANGE_PAYMENT_METHOD
 			);
-			$cancel_url = Router::get_url(
+			$cancel_url  = Router::get_url(
 				Plugin::ADD_CARD_REDIRECT_CANCEL_URL,
 				Plugin::ADD_CARD_CONTEXT_CHANGE_PAYMENT_METHOD
 			);
 		} else {
-			$success_url = Router::get_url(Plugin::ADD_CARD_REDIRECT_SUCCESS_URL, Plugin::ADD_CARD_CONTEXT_CHECKOUT);
-			$cancel_url = Router::get_url(Plugin::ADD_CARD_REDIRECT_CANCEL_URL, Plugin::ADD_CARD_CONTEXT_CHECKOUT);
+			$success_url = Router::get_url( Plugin::ADD_CARD_REDIRECT_SUCCESS_URL, Plugin::ADD_CARD_CONTEXT_CHECKOUT );
+			$cancel_url  = Router::get_url( Plugin::ADD_CARD_REDIRECT_CANCEL_URL, Plugin::ADD_CARD_CONTEXT_CHECKOUT );
 		}
-		$this->log('Paytrail: try to add new card', 'debug');
+		$this->log( 'Paytrail: try to add new card', 'debug' );
 
 		$add_card_form_request = new AddCardFormRequest();
-		$add_card_form_request->setCheckoutAccount($this->merchant_id);
-		$add_card_form_request->setCheckoutAlgorithm('sha256');
-		$add_card_form_request->setCheckoutMethod('POST');
-		$add_card_form_request->setCheckoutTimestamp($datetime->format('Y-m-d\TH:i:s.u\Z'));
-		$add_card_form_request->setCheckoutNonce($checkout_nonce);
-		$add_card_form_request->setCheckoutRedirectSuccessUrl($success_url);
-		$add_card_form_request->setCheckoutRedirectCancelUrl($cancel_url);
-		$add_card_form_request->setLanguage(Helper::getLocale());
+		$add_card_form_request->setCheckoutAccount( $this->merchant_id );
+		$add_card_form_request->setCheckoutAlgorithm( 'sha256' );
+		$add_card_form_request->setCheckoutMethod( 'POST' );
+		$add_card_form_request->setCheckoutTimestamp( $datetime->format( 'Y-m-d\TH:i:s.u\Z' ) );
+		$add_card_form_request->setCheckoutNonce( $checkout_nonce );
+		$add_card_form_request->setCheckoutRedirectSuccessUrl( $success_url );
+		$add_card_form_request->setCheckoutRedirectCancelUrl( $cancel_url );
+		$add_card_form_request->setLanguage( Helper::getLocale() );
 
 		// Create a addCardFormRequest via Paytrail SDK
 		// @var \GuzzleHttp\Psr7\Response $response
-		$response = $this->client->createAddCardFormRequest($add_card_form_request);
+		$response = $this->client->createAddCardFormRequest( $add_card_form_request );
 
-		if ($response->getHeader('Location')) {
-			wp_redirect($response->getHeader('Location')[0]);
+		if ( $response->getHeader( 'Location' ) ) {
+			wp_redirect( $response->getHeader( 'Location' )[0] );
 			exit;
 		}
 	}
@@ -633,12 +634,12 @@ public function add_card_form( $context = Plugin::ADD_CARD_CONTEXT_CHECKOUT) {
 	 */
 	public function process_card_token() {
 		$getTokenRequest = new GetTokenRequest();
-		$getTokenRequest->setCheckoutTokenizationId(filter_input(INPUT_GET, 'checkout-tokenization-id'));
-		$this->log('Paytrail: process_card_token', 'debug');
+		$getTokenRequest->setCheckoutTokenizationId( filter_input( INPUT_GET, 'checkout-tokenization-id' ) );
+		$this->log( 'Paytrail: process_card_token', 'debug' );
 
-		$response = $this->client->createGetTokenRequest($getTokenRequest);
+		$response = $this->client->createGetTokenRequest( $getTokenRequest );
 
-		return (bool) $this->save_card_token($response);
+		return (bool) $this->save_card_token( $response );
 	}
 
 	/**
@@ -646,18 +647,18 @@ public function process_card_token() {
 	 *
 	 * @param GetTokenResponse $card_token
 	 */
-	private function save_card_token( GetTokenResponse $card_token) {
-		$this->log('Paytrail: save_card_token', 'debug');
+	private function save_card_token( GetTokenResponse $card_token ) {
+		$this->log( 'Paytrail: save_card_token', 'debug' );
 
 		$token = new WC_Payment_Token_CC();
-		$token->set_card_type($card_token->getCard()->getType());
-		$token->set_expiry_month($card_token->getCard()->getExpireMonth());
-		$token->set_expiry_year($card_token->getCard()->getExpireYear());
-		$token->set_last4($card_token->getCard()->getPartialPan());
-		$token->set_token($card_token->getToken());
-		$token->set_user_id(get_current_user_id());
-		$token->set_gateway_id(Plugin::GATEWAY_ID);
-		\WC_Payment_Tokens::set_users_default(get_current_user_id(), $token->get_id());
+		$token->set_card_type( $card_token->getCard()->getType() );
+		$token->set_expiry_month( $card_token->getCard()->getExpireMonth() );
+		$token->set_expiry_year( $card_token->getCard()->getExpireYear() );
+		$token->set_last4( $card_token->getCard()->getPartialPan() );
+		$token->set_token( $card_token->getToken() );
+		$token->set_user_id( get_current_user_id() );
+		$token->set_gateway_id( Plugin::GATEWAY_ID );
+		\WC_Payment_Tokens::set_users_default( get_current_user_id(), $token->get_id() );
 
 		return $token->save();
 	}
@@ -670,11 +671,11 @@ private function save_card_token( GetTokenResponse $card_token) {
 	 * @throws ValidationException
 	 */
 	public function add_payment_method() {
-		$this->add_card_form(Plugin::ADD_CARD_CONTEXT_MY_ACCOUNT);
+		$this->add_card_form( Plugin::ADD_CARD_CONTEXT_MY_ACCOUNT );
 
 		return array(
-			'result' => 'success',
-			'redirect' => wc_get_endpoint_url('payment-methods'),
+			'result'   => 'success',
+			'redirect' => wc_get_endpoint_url( 'payment-methods' ),
 		);
 	}
 
@@ -682,33 +683,33 @@ public function add_payment_method() {
 	 * Grab and display users saved card payment methods.
 	 */
 	public function saved_payment_methods() {
-		$html = '<ul class="woocommerce-SavedPaymentMethods wc-saved-payment-methods" data-count="' . esc_attr(count($this->get_tokens())) . '">';
-		foreach ($this->get_tokens() as $token) {
-			$html .= $this->get_saved_payment_method_option_html($token);
+		$html = '<ul class="woocommerce-SavedPaymentMethods wc-saved-payment-methods" data-count="' . esc_attr( count( $this->get_tokens() ) ) . '">';
+		foreach ( $this->get_tokens() as $token ) {
+			$html .= $this->get_saved_payment_method_option_html( $token );
 		}
 
 		$html .= '</ul>';
 
-		$kses_arr = [
-			'li' => ['class' => []],
-			'label' => ['for' => []],
-			'input' => [
-				'id' => [],
-				'type' => [],
-				'name' => [],
-				'value'=> [],
-				'class' => []
-			],
-			'div' => ['class' => []],
-			'ul' => ['class' => []]
-		];
+		$kses_arr = array(
+			'li'    => array( 'class' => array() ),
+			'label' => array( 'for' => array() ),
+			'input' => array(
+				'id'    => array(),
+				'type'  => array(),
+				'name'  => array(),
+				'value' => array(),
+				'class' => array(),
+			),
+			'div'   => array( 'class' => array() ),
+			'ul'    => array( 'class' => array() ),
+		);
 
 		/**
 		 * Show payment methods
 		 *
 		 * @since 1.0
 		 */
-		echo wp_kses(apply_filters('wc_payment_gateway_form_saved_payment_methods_html', $html, $this), $kses_arr);
+		echo wp_kses( apply_filters( 'wc_payment_gateway_form_saved_payment_methods_html', $html, $this ), $kses_arr );
 	}
 
 	/**
@@ -718,9 +719,9 @@ public function saved_payment_methods() {
 	 * @param $token
 	 * @return string
 	 */
-	public function get_token_payment_option_html( $html, $token) {
-		if (Plugin::GATEWAY_ID !== $token->get_gateway_id()) {
-			error_log('Not the expected gateway ID. Returning original HTML.');
+	public function get_token_payment_option_html( $html, $token ) {
+		if ( Plugin::GATEWAY_ID !== $token->get_gateway_id() ) {
+			error_log( 'Not the expected gateway ID. Returning original HTML.' );
 			return $html;
 		}
 		$html = sprintf(
@@ -730,12 +731,12 @@ public function get_token_payment_option_html( $html, $token) {
 				<div class="paytrail-for-woocommerce-tokenized-payment-method-title" title="%4$s">%5$s%3$s</div>
 				</label>
 			</li>',
-			esc_attr($this->id),
-			esc_attr($token->get_id()),
-			$this->get_display_name($token),
-			esc_html($token->get_display_name()),
-			$this->get_card_image($token),
-			checked($token->is_default(), true, false)
+			esc_attr( $this->id ),
+			esc_attr( $token->get_id() ),
+			$this->get_display_name( $token ),
+			esc_html( $token->get_display_name() ),
+			$this->get_card_image( $token ),
+			checked( $token->is_default(), true, false )
 		);
 
 		return $html;
@@ -747,13 +748,13 @@ public function get_token_payment_option_html( $html, $token) {
 	 * @param $token
 	 * @return string
 	 */
-	private function get_display_name( $token) {
+	private function get_display_name( $token ) {
 		$display = sprintf(
 			/* translators: 1: last 4 digits 2: expiry month 3: expiry year */
-			__('xxxx xxxx xxxx %1$s %2$s/%3$s', 'paytrail-for-woocommerce'),
+			__( 'xxxx xxxx xxxx %1$s %2$s/%3$s', 'paytrail-for-woocommerce' ),
 			$token->get_last4(),
 			'<span id="paytrail-for-woocommerce-tokenized-payment-method-card-expire-date">' . $token->get_expiry_month(),
-			substr($token->get_expiry_year(), 2) . '</span>'
+			substr( $token->get_expiry_year(), 2 ) . '</span>'
 		);
 
 		return $display;
@@ -765,16 +766,16 @@ private function get_display_name( $token) {
 	 * @param $token
 	 * @return string
 	 */
-	private function get_card_image( $token) {
-		$token_card_type = strtolower($token->get_card_type());
+	private function get_card_image( $token ) {
+		$token_card_type = strtolower( $token->get_card_type() );
 
-		if ('amex' === $token_card_type) {
+		if ( 'amex' === $token_card_type ) {
 			$token_card_type = 'american-express';
 		}
 
 		$html = sprintf(
 			'<img alt="' . $token->get_card_type() . '" src="' . Plugin::PAYMENT_METHOD_IMG_URL . '/%1$s.svg" class="paytrail-for-woocommerce-tokenized-payment-method-title-image" />',
-			esc_html(preg_replace('/[[:space:]]+/', '-', $token_card_type))
+			esc_html( preg_replace( '/[[:space:]]+/', '-', $token_card_type ) )
 		);
 
 		return $html;
@@ -786,78 +787,78 @@ private function get_card_image( $token) {
 	 * @return void
 	 */
 	public function check_paytrail_response() {
-		$status           = filter_input(INPUT_GET, 'checkout-status');
-		$refund_callback  = filter_input(INPUT_GET, 'refund_callback');
-		$refund_unique_id = filter_input(INPUT_GET, 'refund_unique_id');
-		$order_id         = filter_input(INPUT_GET, 'order_id');
-		$reference        = filter_input(INPUT_GET, 'checkout-reference');
-		$cancel_order     = filter_input(INPUT_GET, 'cancel_order');
-		$pay_for_order    = filter_input(INPUT_GET, 'pay_for_order');
-		$payment_method = filter_input(INPUT_POST, 'payment_method');
-
-		if (!$status && !$reference && !$refund_callback && !$refund_unique_id) {
-			//no log to reduce number of log entries
+		$status           = filter_input( INPUT_GET, 'checkout-status' );
+		$refund_callback  = filter_input( INPUT_GET, 'refund_callback' );
+		$refund_unique_id = filter_input( INPUT_GET, 'refund_unique_id' );
+		$order_id         = filter_input( INPUT_GET, 'order_id' );
+		$reference        = filter_input( INPUT_GET, 'checkout-reference' );
+		$cancel_order     = filter_input( INPUT_GET, 'cancel_order' );
+		$pay_for_order    = filter_input( INPUT_GET, 'pay_for_order' );
+		$payment_method   = filter_input( INPUT_POST, 'payment_method' );
+
+		if ( ! $status && ! $reference && ! $refund_callback && ! $refund_unique_id ) {
+			// no log to reduce number of log entries
 			return;
 		}
 
-		if (!$reference && $status && !$refund_callback && !$refund_unique_id) {
-			$this->log('Paytrail: check_paytrail_response, no reference found for status: ' . $status, 'debug');
+		if ( ! $reference && $status && ! $refund_callback && ! $refund_unique_id ) {
+			$this->log( 'Paytrail: check_paytrail_response, no reference found for status: ' . $status, 'debug' );
 			return;
 		}
 
-		if (!$status && $reference && !$refund_callback && !$refund_unique_id) {
-			$this->log('Paytrail: check_paytrail_response, no status found for reference ' . $reference, 'debug');
+		if ( ! $status && $reference && ! $refund_callback && ! $refund_unique_id ) {
+			$this->log( 'Paytrail: check_paytrail_response, no status found for reference ' . $reference, 'debug' );
 			return;
 		}
 
-		if ($cancel_order) {
-			//Do not attempt to process further. Woo Commerce will cancel the order
-			$this->log('Paytrail: check_paytrail_response, cancel_order is true. Order will be cancelled. Reference: ' . $reference, 'debug');
+		if ( $cancel_order ) {
+			// Do not attempt to process further. Woo Commerce will cancel the order
+			$this->log( 'Paytrail: check_paytrail_response, cancel_order is true. Order will be cancelled. Reference: ' . $reference, 'debug' );
 			return;
 		}
 
-		if ($pay_for_order) {
-			//The customer will be shown a page to choose payment methods
+		if ( $pay_for_order ) {
+			// The customer will be shown a page to choose payment methods
 			wc_clear_notices();
 			$message = __(
 				'Payment failed or was cancelled. Please try again',
 				'paytrail-for-woocommerce'
 			);
 
-			wc_add_notice( $message, 'notice');
-			$this->log('Paytrail: check_paytrail_response, pay_for_order is true. Payment page will be shown. Reference: ' . $reference, 'debug');
+			wc_add_notice( $message, 'notice' );
+			$this->log( 'Paytrail: check_paytrail_response, pay_for_order is true. Payment page will be shown. Reference: ' . $reference, 'debug' );
 
-			//Check to see if this is the first load of the page
-			if (!$payment_method) {
-				//Handle the payment response so that orders will change to Failed status
-				$this->log('Paytrail: Start handle_payment_response for reference ' . $reference, 'debug');
+			// Check to see if this is the first load of the page
+			if ( ! $payment_method ) {
+				// Handle the payment response so that orders will change to Failed status
+				$this->log( 'Paytrail: Start handle_payment_response for reference ' . $reference, 'debug' );
 				$this->handle_payment_response( $status );
 			}
 
 			return;
 		}
 
-		$sleepTime = rand(0, 3);
-		$sleepTimeCallback = rand(3, 6);
+		$sleepTime         = rand( 0, 3 );
+		$sleepTimeCallback = rand( 3, 6 );
 
-		if (true === $this->callbackMode) {
-			$this->log('Paytrail: Callback check_paytrail_response for order ' . $reference, 'debug');
-			$this->log('Paytrail: Wait for ' . $sleepTimeCallback . ' seconds until processing order ' . $reference, 'debug');
-			sleep($sleepTimeCallback);
+		if ( true === $this->callbackMode ) {
+			$this->log( 'Paytrail: Callback check_paytrail_response for order ' . $reference, 'debug' );
+			$this->log( 'Paytrail: Wait for ' . $sleepTimeCallback . ' seconds until processing order ' . $reference, 'debug' );
+			sleep( $sleepTimeCallback );
 		} else {
-			$this->log('Paytrail: Redirect check_paytrail_response for reference ' . $reference, 'debug');
-			$this->log('Paytrail: Wait for ' . $sleepTime . ' seconds until processing reference ' . $reference, 'debug');
-			sleep($sleepTime);
+			$this->log( 'Paytrail: Redirect check_paytrail_response for reference ' . $reference, 'debug' );
+			$this->log( 'Paytrail: Wait for ' . $sleepTime . ' seconds until processing reference ' . $reference, 'debug' );
+			sleep( $sleepTime );
 		}
 
 		// Handle the response only if the status exists.
-		if ($refund_callback) {
-			$this->log('Paytrail: Start handle_refund_response for order_id ' . $order_id, 'debug');
-			$this->handle_refund_response($refund_callback, $refund_unique_id, $order_id);
+		if ( $refund_callback ) {
+			$this->log( 'Paytrail: Start handle_refund_response for order_id ' . $order_id, 'debug' );
+			$this->handle_refund_response( $refund_callback, $refund_unique_id, $order_id );
 
 		} else {
-			$this->log('Paytrail: Start handle_payment_response for reference ' . $reference, 'debug');
-			$this->handle_payment_response($status);
+			$this->log( 'Paytrail: Start handle_payment_response for reference ' . $reference, 'debug' );
+			$this->handle_payment_response( $status );
 		}
 	}
 
@@ -868,125 +869,125 @@ public function check_paytrail_response() {
 	 *
 	 * @return void
 	 */
-	public function handle_payment_response( $status) {
+	public function handle_payment_response( $status ) {
 		// Check the HMAC
 		try {
-			$this->client->validateHmac(filter_input_array(INPUT_GET), '', filter_input(INPUT_GET, 'signature'));
-		} catch (HmacException $exception) {
-			$this->signature_error($exception);
+			$this->client->validateHmac( filter_input_array( INPUT_GET ), '', filter_input( INPUT_GET, 'signature' ) );
+		} catch ( HmacException $exception ) {
+			$this->signature_error( $exception );
 		}
 
-		$reference = filter_input(INPUT_GET, 'checkout-reference');
-		$transaction_id = filter_input(INPUT_GET, 'checkout-transaction-id');
+		$reference      = filter_input( INPUT_GET, 'checkout-reference' );
+		$transaction_id = filter_input( INPUT_GET, 'checkout-transaction-id' );
 
 		try {
-			$order_query = new WC_Order_Query([
-				'limit'        => 1,
-				'meta_key'     => '_checkout_reference',
-				'meta_value'   => $reference,
-			]);
+			$order_query = new WC_Order_Query(
+				array(
+					'limit'      => 1,
+					'meta_key'   => '_checkout_reference',
+					'meta_value' => $reference,
+				)
+			);
 
 			$orders = $order_query->get_orders();
 
-			if (empty($orders)) {
-				$this->log('Paytrail: handle_payment_response, orders collection empty for reference: ' . $reference, 'debug');
+			if ( empty( $orders ) ) {
+				$this->log( 'Paytrail: handle_payment_response, orders collection empty for reference: ' . $reference, 'debug' );
 				return;
 			}
 			$order = $orders[0];
 
-		} catch (\Exception $e) {
-			$this->log('Paytrail: order_query, failed for reference: ' . $reference, 'debug');
+		} catch ( \Exception $e ) {
+			$this->log( 'Paytrail: order_query, failed for reference: ' . $reference, 'debug' );
 			return false;
 		}
 
 		try {
-			$transaction_query = new WC_Order_Query( [
-				'transaction_id' => $transaction_id,
-			] );
+			$transaction_query = new WC_Order_Query(
+				array(
+					'transaction_id' => $transaction_id,
+				)
+			);
 
 			$existing_orders = $transaction_query->get_orders();
 
 			// Cross-check if any other order already has this transaction ID
-			foreach ($existing_orders as $existing_order) {
+			foreach ( $existing_orders as $existing_order ) {
 				$existing_transaction_id = $existing_order->get_transaction_id();
 
-				if (empty($existing_transaction_id)) {
-					$this->log('Paytrail: Order ID ' . $existing_order->get_id() . ' has an empty transaction ID. Aborting processing.', 'debug');
+				if ( empty( $existing_transaction_id ) ) {
+					$this->log( 'Paytrail: Order ID ' . $existing_order->get_id() . ' has an empty transaction ID. Aborting processing.', 'debug' );
 					return false;
 				}
 
-				if ($existing_order->get_id() !== $order->get_id()) {
-					$this->log('Paytrail: Duplicate transaction ID ' . $transaction_id . ' detected. Already associated with order ' . $existing_order->get_id() . '.', 'debug');
+				if ( $existing_order->get_id() !== $order->get_id() ) {
+					$this->log( 'Paytrail: Duplicate transaction ID ' . $transaction_id . ' detected. Already associated with order ' . $existing_order->get_id() . '.', 'debug' );
 					return false;
 				}
 			}
-
-		} catch (\Exception $e) {
-			$this->log('Paytrail: transaction_query, failed for reference: ' . $reference, 'debug');
+		} catch ( \Exception $e ) {
+			$this->log( 'Paytrail: transaction_query, failed for reference: ' . $reference, 'debug' );
 			return false;
 		}
 
-
-
 		// Store information that transaction-specific settlement was used
 		if ( $this->transaction_settlement_enable ) {
 			$order->update_meta_data( '_paytrail_ppa_transaction_settlement', true );
 			$order->save();
 		}
 
-
-		switch ($status) {
+		switch ( $status ) {
 			case 'ok':
-				$this->log('Paytrail: handle_payment_response, case = ok for order ' . $order->get_id(), 'debug');
-				if (!$this->validate_order_payment_processing($order)) {
+				$this->log( 'Paytrail: handle_payment_response, case = ok for order ' . $order->get_id(), 'debug' );
+				if ( ! $this->validate_order_payment_processing( $order ) ) {
 					return;
 				}
-				$this->log('Paytrail: handle_payment_response payment_complete, order ' . $order->get_id() . ' needs processing ' . $order->needs_processing(), 'debug');
+				$this->log( 'Paytrail: handle_payment_response payment_complete, order ' . $order->get_id() . ' needs processing ' . $order->needs_processing(), 'debug' );
 
-				$transaction_id = filter_input(INPUT_GET, 'checkout-transaction-id');
+				$transaction_id = filter_input( INPUT_GET, 'checkout-transaction-id' );
 
 				// If this transaction has already been processed, don't process again
-				if ($order->get_transaction_id() === $transaction_id) {
-					$this->log('Paytrail: handle_payment_response, transaction id ' . $transaction_id . ' already processed for order ' . $order->get_id(), 'debug');
+				if ( $order->get_transaction_id() === $transaction_id ) {
+					$this->log( 'Paytrail: handle_payment_response, transaction id ' . $transaction_id . ' already processed for order ' . $order->get_id(), 'debug' );
 					return false;
 				}
 
 				// Save transient to avoid race condition between redirect and callback processing
-				\set_transient('checkout_transaction_id_processing_' . $transaction_id, 'yes', 60);
+				\set_transient( 'checkout_transaction_id_processing_' . $transaction_id, 'yes', 60 );
 
-				if (! $this->use_provider_selection()) {
-					$this->log('Paytrail: handle_payment_response, use_provider_selection = false for order ' . $order->get_id(), 'debug');
+				if ( ! $this->use_provider_selection() ) {
+					$this->log( 'Paytrail: handle_payment_response, use_provider_selection = false for order ' . $order->get_id(), 'debug' );
 					// Get the chosen payment provider and save it to the order
-					$payment_provider = filter_input(INPUT_GET, 'checkout-provider');
-					$payment_amount   = filter_input(INPUT_GET, 'checkout-amount');
+					$payment_provider = filter_input( INPUT_GET, 'checkout-provider' );
+					$payment_amount   = filter_input( INPUT_GET, 'checkout-amount' );
 
-					$order->update_meta_data('_checkout_payment_provider', $payment_provider);
+					$order->update_meta_data( '_checkout_payment_provider', $payment_provider );
 					$order->save();
-					$providers = $this->get_payment_providers($payment_amount);
+					$providers = $this->get_payment_providers( $payment_amount );
 
-					if (! empty($providers['error'])) {
-						$provider_name = ucfirst($payment_provider);
+					if ( ! empty( $providers['error'] ) ) {
+						$provider_name = ucfirst( $payment_provider );
 					} else {
 						// Get only the wanted payment provider object
-						$wanted_provider = $this->get_wanted_provider($providers, $payment_provider);
-						if (null !== $wanted_provider) {
-							$provider_name = !empty($wanted_provider->getName()) ? $wanted_provider->getName() : ucfirst($wanted_provider->getId());
+						$wanted_provider = $this->get_wanted_provider( $providers, $payment_provider );
+						if ( null !== $wanted_provider ) {
+							$provider_name = ! empty( $wanted_provider->getName() ) ? $wanted_provider->getName() : ucfirst( $wanted_provider->getId() );
 						} else {
-							$provider_name = ucfirst($payment_provider);
+							$provider_name = ucfirst( $payment_provider );
 						}
 					}
 
-					WC()->session->set('payment_provider', $wanted_provider);
+					WC()->session->set( 'payment_provider', $wanted_provider );
 
 					$message = sprintf(
 						// translators: First parameter is transaction ID, the other is the name of the payment provider.
-						__('Payment completed with transaction ID %1$s and payment provider %2$s.', 'paytrail-for-woocommerce'),
+						__( 'Payment completed with transaction ID %1$s and payment provider %2$s.', 'paytrail-for-woocommerce' ),
 						$transaction_id,
 						$provider_name
 					);
-					$this->log('Paytrail: handle_payment_response, use_provider_selection = false, add_order_note', 'debug');
+					$this->log( 'Paytrail: handle_payment_response, use_provider_selection = false, add_order_note', 'debug' );
 
-					$order->add_order_note($message);
+					$order->add_order_note( $message );
 				} else {
 					$order_note = sprintf(
 						// Translators: The placeholder is a transaction ID.
@@ -996,51 +997,53 @@ public function handle_payment_response( $status) {
 						),
 						$transaction_id
 					);
-					$this->log('Paytrail: handle_payment_response, use_provider_selection = true, add_order_note', 'debug');
+					$this->log( 'Paytrail: handle_payment_response, use_provider_selection = true, add_order_note', 'debug' );
 
-					$order->add_order_note($order_note);
+					$order->add_order_note( $order_note );
 				}
 
 				// Mark payment completed and store the transaction ID.
-				$order->payment_complete($transaction_id);
+				$order->payment_complete( $transaction_id );
 
 				// Clear the cart.
 				WC()->cart->empty_cart();
 
 				// Delete transient
-				\delete_transient('checkout_transaction_id_processing_' . $transaction_id);
+				\delete_transient( 'checkout_transaction_id_processing_' . $transaction_id );
 
 				break;
 			case 'pending':
-				$this->log('Paytrail: handle_payment_response, case = pending', 'debug');
-				if (!$this->validate_order_payment_process_status($order)) {
+				$this->log( 'Paytrail: handle_payment_response, case = pending', 'debug' );
+				if ( ! $this->validate_order_payment_process_status( $order ) ) {
 					break;
 				}
-				$order->update_status('on-hold');
-				$order->add_order_note(__('Payment pending.', 'paytrail-for-woocommerce'));
+				$order->update_status( 'on-hold' );
+				$order->add_order_note( __( 'Payment pending.', 'paytrail-for-woocommerce' ) );
 				break;
 			default:
-				$this->log('Paytrail: handle_payment_response, case = failed', 'debug');
-				if (!$this->validate_order_payment_process_status($order)) {
+				$this->log( 'Paytrail: handle_payment_response, case = failed', 'debug' );
+				if ( ! $this->validate_order_payment_process_status( $order ) ) {
 					break;
 				}
-				$order->update_status('failed');
-				$failed_order_note = __('Payment failed.', 'paytrail-for-woocommerce');
-				
-				$latest_order_note = wc_get_order_notes([
-					'order_id' => $order->get_id(),
-					'limit'    => 1,
-					'orderby'  => 'date_created',
-					'order'    => 'DESC',
-				]);
-
-				if (is_array($latest_order_note) && isset($latest_order_note[0])) {
-					if ($latest_order_note[0]->content === $failed_order_note) {
-						break;//Don't add another note if the latest note is the same
+				$order->update_status( 'failed' );
+				$failed_order_note = __( 'Payment failed.', 'paytrail-for-woocommerce' );
+
+				$latest_order_note = wc_get_order_notes(
+					array(
+						'order_id' => $order->get_id(),
+						'limit'    => 1,
+						'orderby'  => 'date_created',
+						'order'    => 'DESC',
+					)
+				);
+
+				if ( is_array( $latest_order_note ) && isset( $latest_order_note[0] ) ) {
+					if ( $latest_order_note[0]->content === $failed_order_note ) {
+						break;// Don't add another note if the latest note is the same
 					}
 				}
 
-				$order->add_order_note($failed_order_note);
+				$order->add_order_note( $failed_order_note );
 				break;
 		}
 	}
@@ -1049,49 +1052,49 @@ public function handle_payment_response( $status) {
 	 * Validate payment processing
 	 *
 	 * @param WC_Order $order
-	 * @param bool $retry Whether to try again after 15 seconds if order is being processed
+	 * @param bool     $retry Whether to try again after 15 seconds if order is being processed
 	 * @return bool
 	 */
-	protected function validate_order_payment_processing( WC_Order $order, $retry = true) {
-		$transaction_id = filter_input(INPUT_GET, 'checkout-transaction-id');
+	protected function validate_order_payment_processing( WC_Order $order, $retry = true ) {
+		$transaction_id = filter_input( INPUT_GET, 'checkout-transaction-id' );
 
-		if (!$transaction_id) {
-			$this->log('Paytrail: validate_order_payment_processing, transaction id empty for order: ' . $order->get_id(), 'debug');
+		if ( ! $transaction_id ) {
+			$this->log( 'Paytrail: validate_order_payment_processing, transaction id empty for order: ' . $order->get_id(), 'debug' );
 			return false;
 		}
 
 		$order_status = $order->get_status();
 
-		if ('completed' === $order_status || 'processing' === $order_status) {
-			$this->log('Paytrail: validate_order_payment_processing, order already processed ' . $order->get_id(), 'debug');
+		if ( 'completed' === $order_status || 'processing' === $order_status ) {
+			$this->log( 'Paytrail: validate_order_payment_processing, order already processed ' . $order->get_id(), 'debug' );
 			// This order has already been processed.
 			return false;
 		}
 
 		// If the transaction is currently being processed, wait for 15 seconds and check again
-		if ('yes' === \get_transient('checkout_transaction_id_processing_' . $transaction_id)) {
-			$this->log('Paytrail: validate_order_payment_processing, order is currently being processed ' . $order->get_id(), 'debug');
+		if ( 'yes' === \get_transient( 'checkout_transaction_id_processing_' . $transaction_id ) ) {
+			$this->log( 'Paytrail: validate_order_payment_processing, order is currently being processed ' . $order->get_id(), 'debug' );
 
-			if (true === $retry) {
-				$this->log('Paytrail: validate_order_payment_processing, waiting for 15 seconds ' . $order->get_id(), 'debug');
-				sleep(15);
+			if ( true === $retry ) {
+				$this->log( 'Paytrail: validate_order_payment_processing, waiting for 15 seconds ' . $order->get_id(), 'debug' );
+				sleep( 15 );
 
-				return $this->validate_order_payment_processing($order, false);
+				return $this->validate_order_payment_processing( $order, false );
 			}
 
-			$this->log('Paytrail: validate_order_payment_processing, not trying again ' . $order->get_id(), 'debug');
+			$this->log( 'Paytrail: validate_order_payment_processing, not trying again ' . $order->get_id(), 'debug' );
 			return false;
 		}
 
-		$this->log('Paytrail: validate_order_payment_processing, order is valid ' . $order->get_id(), 'debug');
+		$this->log( 'Paytrail: validate_order_payment_processing, order is valid ' . $order->get_id(), 'debug' );
 
 		return true;
 	}
 
-	protected function validate_order_payment_process_status( WC_Order $order) {
+	protected function validate_order_payment_process_status( WC_Order $order ) {
 		$order_status = $order->get_status();
 
-		if ('completed' === $order_status || 'processing' === $order_status) {
+		if ( 'completed' === $order_status || 'processing' === $order_status ) {
 			// This order has already been processed.
 			return false;
 		}
@@ -1104,7 +1107,7 @@ protected function validate_order_payment_process_status( WC_Order $order) {
 	 * @return boolean
 	 */
 	protected function use_provider_selection() {
-		return 'yes' === $this->get_option('provider_selection', 'yes');
+		return 'yes' === $this->get_option( 'provider_selection', 'yes' );
 	}
 
 	/**
@@ -1115,84 +1118,88 @@ protected function use_provider_selection() {
 	 * @param string $order_id         Order ID.
 	 * @return void
 	 */
-	public function handle_refund_response( $refund_callback, $refund_unique_id, $order_id) {
+	public function handle_refund_response( $refund_callback, $refund_unique_id, $order_id ) {
 		// Remove the callback indicators from the GET array
-		$get = filter_input_array(INPUT_GET);
+		$get = filter_input_array( INPUT_GET );
 
-		unset($get['refund_callback']);
-		unset($get['refund_unique_id']);
-		unset($get['order_id']);
+		unset( $get['refund_callback'] );
+		unset( $get['refund_unique_id'] );
+		unset( $get['order_id'] );
 
 		// Check the HMAC
 		try {
-			$this->client->validateHmac($get, '', filter_input(INPUT_GET, 'signature'));
-		} catch (HmacException $exception) {
-			$this->signature_error($exception);
+			$this->client->validateHmac( $get, '', filter_input( INPUT_GET, 'signature' ) );
+		} catch ( HmacException $exception ) {
+			$this->signature_error( $exception );
 		}
 
 		// Check if HPOS is enabled
-		if (class_exists('Automattic\WooCommerce\Utilities\OrderUtil') && \Automattic\WooCommerce\Utilities\OrderUtil::custom_orders_table_usage_is_enabled()) {
-			$refunds = \wc_get_orders([
-				'type' => 'shop_order_refund',
-				'meta_query' => [
-					[
-						'key' => '_checkout_refund_unique_id',
-						'value' => $refund_unique_id,
-						'compare' => '='
-					]
-				]
-			]);
+		if ( class_exists( 'Automattic\WooCommerce\Utilities\OrderUtil' ) && \Automattic\WooCommerce\Utilities\OrderUtil::custom_orders_table_usage_is_enabled() ) {
+			$refunds = \wc_get_orders(
+				array(
+					'type'       => 'shop_order_refund',
+					'meta_query' => array(
+						array(
+							'key'     => '_checkout_refund_unique_id',
+							'value'   => $refund_unique_id,
+							'compare' => '=',
+						),
+					),
+				)
+			);
 		} else {
-			$refunds = \wc_get_orders([
-				'type' => 'shop_order_refund',
-				'checkout_refund_unique_id' => $refund_unique_id,
-			]);
+			$refunds = \wc_get_orders(
+				array(
+					'type'                      => 'shop_order_refund',
+					'checkout_refund_unique_id' => $refund_unique_id,
+				)
+			);
 		}
 
-		if (empty($refunds)) {
-			wp_die(esc_html__('Refund cannot be found.', 'paytrail-for-woocommerce'), '', 404);
+		if ( empty( $refunds ) ) {
+			wp_die( esc_html__( 'Refund cannot be found.', 'paytrail-for-woocommerce' ), '', 404 );
 		} else {
 			$refund = $refunds[0];
 		}
 
-		switch ($refund_callback) {
+		switch ( $refund_callback ) {
 			case 'success':
-				$amount = $refund->get_meta('_checkout_refund_amount');
-				$reason = $refund->get_meta('_checkout_refund_reason');
+				$amount = $refund->get_meta( '_checkout_refund_amount' );
+				$reason = $refund->get_meta( '_checkout_refund_reason' );
 
-				$refund->set_amount($amount);
-				$refund->set_reason($reason);
+				$refund->set_amount( $amount );
+				$refund->set_reason( $reason );
 
-				$order = \wc_get_order($order_id);
+				$order = \wc_get_order( $order_id );
 
 				$order->add_order_note(
-					__('Refund process completed.', 'paytrail-for-woocommerce')
+					__( 'Refund process completed.', 'paytrail-for-woocommerce' )
 				);
 
-				$refund->update_meta_data('_checkout_refund_processing', false);
+				$refund->update_meta_data( '_checkout_refund_processing', false );
 				$refund->save();
 				break;
 			case 'cancel':
-				$refund->delete(true);
+				$refund->delete( true );
 
 				$order_note = __(
 					'Refund was cancelled by the payment provider.',
 					'paytrail-for-woocommerce'
 				);
 
-				$order = \wc_get_order($order_id);
-				$order->add_order_note($order_note);
+				$order = \wc_get_order( $order_id );
+				$order->add_order_note( $order_note );
 
 				/**
 				 * Delete refund action
 				 *
 				 * @since 1.0
 				 */
-				do_action('woocommerce_refund_delete', $refund->get_id(), $order_id);
+				do_action( 'woocommerce_refund_delete', $refund->get_id(), $order_id );
 				break;
 		}
 
-		die('ok');
+		die( 'ok' );
 	}
 
 	/**
@@ -1201,9 +1208,9 @@ public function handle_refund_response( $refund_callback, $refund_unique_id, $or
 	 * @return void
 	 */
 	public function payment_fields() {
-		if (is_checkout() && $this->use_provider_selection()) {
+		if ( is_checkout() && $this->use_provider_selection() ) {
 			$this->provider_form();
-		} elseif (is_checkout()) {
+		} elseif ( is_checkout() ) {
 			$this->payment_description();
 		}
 	}
@@ -1215,196 +1222,197 @@ public function payment_fields() {
 	 * @return array
 	 * @throws \Exception If the processing fails, this error is handled by WooCommerce.
 	 */
-	public function process_payment( $order_id) {
-		$this->log('Paytrail: process_payment', 'debug');
+	public function process_payment( $order_id ) {
+		$this->log( 'Paytrail: process_payment', 'debug' );
 		// @var WC_Order $order
-		$order = wc_get_order($order_id);
-		$token_id = filter_input(INPUT_POST, 'wc-paytrail-payment-token');
+		$order    = wc_get_order( $order_id );
+		$token_id = filter_input( INPUT_POST, 'wc-paytrail-payment-token' );
 
 		// Define if the process should die if an error occurs.
-		$die_on_error = filter_input(INPUT_POST, 'woocommerce_pay') ? true : false;
+		$die_on_error = filter_input( INPUT_POST, 'woocommerce_pay' ) ? true : false;
 
 		// Get the wanted payment provider and check that it exists
-		if ($this->use_provider_selection()) {
-			$this->log('Paytrail: use_provider_selection true', 'debug');
+		if ( $this->use_provider_selection() ) {
+			$this->log( 'Paytrail: use_provider_selection true', 'debug' );
 			// Try to get payment provider from POST
-			$payment_provider = filter_input(INPUT_POST, 'payment_provider');
+			$payment_provider = filter_input( INPUT_POST, 'payment_provider' );
 
 			// If empty, fallback to the meta data stored in the order
-			if (empty($payment_provider)) {
-				$payment_provider = get_post_meta($order_id, '_payment_provider', true);
-				$this->log('Paytrail: payment_provider retrieved from meta: ' . print_r($payment_provider, true), 'debug');
+			if ( empty( $payment_provider ) ) {
+				$payment_provider = get_post_meta( $order_id, '_payment_provider', true );
+				$this->log( 'Paytrail: payment_provider retrieved from meta: ' . print_r( $payment_provider, true ), 'debug' );
 			} else {
-				$this->log('Paytrail: payment_provider from POST: ' . print_r($payment_provider, true), 'debug');
+				$this->log( 'Paytrail: payment_provider from POST: ' . print_r( $payment_provider, true ), 'debug' );
 			}
-
 		} else {
 			// Try to get payment method from POST
-			$payment_provider = filter_input(INPUT_POST, 'payment_method');
-			$this->log('Paytrail: use_provider_selection false', 'debug');
+			$payment_provider = filter_input( INPUT_POST, 'payment_method' );
+			$this->log( 'Paytrail: use_provider_selection false', 'debug' );
 
 			// If empty, fallback to the meta data stored in the order
-			if (empty($payment_provider)) {
-				$payment_provider = get_post_meta($order_id, '_payment_method', true);
-				$this->log('Paytrail: payment_method retrieved from meta: ' . print_r($payment_provider, true), 'debug');
+			if ( empty( $payment_provider ) ) {
+				$payment_provider = get_post_meta( $order_id, '_payment_method', true );
+				$this->log( 'Paytrail: payment_method retrieved from meta: ' . print_r( $payment_provider, true ), 'debug' );
 			} else {
-				$this->log('Paytrail: payment_method from POST: ' . print_r($payment_provider, true), 'debug');
+				$this->log( 'Paytrail: payment_method from POST: ' . print_r( $payment_provider, true ), 'debug' );
 			}
 		}
 		return $this->process_paytrail_payment( $order, $token_id, $payment_provider, $die_on_error );
 	}
 
-	public function process_paytrail_payment( $order, $token_id, $payment_provider, $die_on_error) {
+	public function process_paytrail_payment( $order, $token_id, $payment_provider, $die_on_error ) {
 
-		$is_token_payment = !empty($token_id);
+		$is_token_payment = ! empty( $token_id );
 
-		if (! $payment_provider && ! $is_token_payment) {
-			wc_add_notice(__(
-				'The payment provider was not chosen.',
-				'paytrail-for-woocommerce'
-			), 'error');
-			return [
-				'result' => 'failure'
-			];
-		} elseif ($is_token_payment) {
-			$this->log('Paytrail: process_payment, is token payment', 'debug');
+		if ( ! $payment_provider && ! $is_token_payment ) {
+			wc_add_notice(
+				__(
+					'The payment provider was not chosen.',
+					'paytrail-for-woocommerce'
+				),
+				'error'
+			);
+			return array(
+				'result' => 'failure',
+			);
+		} elseif ( $is_token_payment ) {
+			$this->log( 'Paytrail: process_payment, is token payment', 'debug' );
 			$payment_provider = 'creditcard';
 		}
 
-		if ($is_token_payment) {
-			$token = \WC_Payment_Tokens::get($token_id);
+		if ( $is_token_payment ) {
+			$token = \WC_Payment_Tokens::get( $token_id );
 
-			$this->log('Paytrail: process_payment, add_payment_token', 'debug');
-			$order->add_payment_token($token);
+			$this->log( 'Paytrail: process_payment, add_payment_token', 'debug' );
+			$order->add_payment_token( $token );
 
-			if ($this->helper::getIsSubscriptionsEnabled()) {
-				$subscriptions = wcs_get_subscriptions_for_order($order->ID);
-				$this->log('Paytrail: add_payment_token to subscriptions', 'debug');
-				foreach ($subscriptions as $subscription) {
-					$subscription->add_payment_token($token);
+			if ( $this->helper::getIsSubscriptionsEnabled() ) {
+				$subscriptions = wcs_get_subscriptions_for_order( $order->ID );
+				$this->log( 'Paytrail: add_payment_token to subscriptions', 'debug' );
+				foreach ( $subscriptions as $subscription ) {
+					$subscription->add_payment_token( $token );
 				}
 			}
 
 			$payment = new CitPaymentRequest();
 
-			if ($token && method_exists($token, 'get_token')) {
-				$payment->setToken($token->get_token());
+			if ( $token && method_exists( $token, 'get_token' ) ) {
+				$payment->setToken( $token->get_token() );
 			} else {
-				$this->log('Paytrail: Token value: ' . print_r($token, true), 'debug');
+				$this->log( 'Paytrail: Token value: ' . print_r( $token, true ), 'debug' );
 			}
-
 		} else {
-			$this->log('Paytrail: init PaymentRequest', 'debug');
+			$this->log( 'Paytrail: init PaymentRequest', 'debug' );
 			$payment = new PaymentRequest();
 		}
 
-		if (0 == floatval($order->get_total())) {
-			$this->log('Paytrail: process_payment, order total 0, payment complete, order needs processing' . $order->needs_processing(), 'debug');
+		if ( 0 == floatval( $order->get_total() ) ) {
+			$this->log( 'Paytrail: process_payment, order total 0, payment complete, order needs processing' . $order->needs_processing(), 'debug' );
 			$order->payment_complete();
 
-			return [
+			return array(
 				'result'   => 'success',
-				'redirect' => $this->get_return_url($order)
-			];
+				'redirect' => $this->get_return_url( $order ),
+			);
 		}
 
-		$this->set_base_payment_data($payment, $order);
+		$this->set_base_payment_data( $payment, $order );
 
-		$this->log('Paytrail: process_payment, order update_meta_data', 'debug');
+		$this->log( 'Paytrail: process_payment, order update_meta_data', 'debug' );
 		// Save the reference for possible later use.
-		$order->update_meta_data('_checkout_reference', $payment->getReference());
+		$order->update_meta_data( '_checkout_reference', $payment->getReference() );
 		// Save it also as a key for fast indexed searches.
-		$order->update_meta_data('_checkout_reference_' . $payment->getReference(), true);
+		$order->update_meta_data( '_checkout_reference_' . $payment->getReference(), true );
 		// Save the wanted payment provider to the order
-		$order->update_meta_data('_checkout_payment_provider', $payment_provider);
+		$order->update_meta_data( '_checkout_payment_provider', $payment_provider );
 		$order->save();
 
 		// Create a payment via Paytrail SDK
 		try {
-			if ($is_token_payment) {
-				return $this->create_cit_payment($payment, $order);
+			if ( $is_token_payment ) {
+				return $this->create_cit_payment( $payment, $order );
 			} else {
-				return $this->create_normal_payment($payment, $order, $payment_provider);
+				return $this->create_normal_payment( $payment, $order, $payment_provider );
 			}
-		} catch (ValidationException $exception) {
+		} catch ( ValidationException $exception ) {
 			$message = __(
 				'An error occurred validating the payment.',
 				'paytrail-for-woocommerce'
 			);
 
-			$this->error($exception, $message, $die_on_error);
-		} catch (HmacException $exception) {
-			$this->signature_error($exception, $die_on_error);
-		} catch (\Exception $exception) {
+			$this->error( $exception, $message, $die_on_error );
+		} catch ( HmacException $exception ) {
+			$this->signature_error( $exception, $die_on_error );
+		} catch ( \Exception $exception ) {
 			$message = __(
 				'An error occurred performing the payment request.',
 				'paytrail-for-woocommerce'
 			);
 
-			$this->error($exception, $message, $die_on_error);
+			$this->error( $exception, $message, $die_on_error );
 		}
 
-		return [
-			'result'   => 'failure'
-		];
+		return array(
+			'result' => 'failure',
+		);
 	}
 
 	/**
 	 * Create payment
 	 *
 	 * @param PaymentRequest|CitPaymentRequest $payment
-	 * @param WC_Order $order
+	 * @param WC_Order                         $order
 	 * @param $payment_provider
 	 * @return array
 	 * @throws HmacException
 	 * @throws ValidationException
 	 * @throws \Exception
 	 */
-	private function create_normal_payment( $payment, $order, $payment_provider) {
-		$this->log('Paytrail: create_normal_payment', 'debug');
+	private function create_normal_payment( $payment, $order, $payment_provider ) {
+		$this->log( 'Paytrail: create_normal_payment', 'debug' );
 
 		try {
 			// Log the payment request if debug log is enabled.
-			$this->log('Paytrail\SDK\Request\PaymentRequest: ' . json_encode($payment), 'info');
-			$response = $this->client->createPayment($payment);
-		} catch (\Exception $exception) {
+			$this->log( 'Paytrail\SDK\Request\PaymentRequest: ' . json_encode( $payment ), 'info' );
+			$response = $this->client->createPayment( $payment );
+		} catch ( \Exception $exception ) {
 			// Log the error message if debug log is enabled.
-			$this->log($exception->getMessage() . $exception->getTraceAsString(), 'error');
-			new \WP_Error($exception->getCode(), $exception->getMessage());
+			$this->log( $exception->getMessage() . $exception->getTraceAsString(), 'error' );
+			new \WP_Error( $exception->getCode(), $exception->getMessage() );
 
-			//Add error messages to be displayed to the user by Woocommerce
+			// Add error messages to be displayed to the user by Woocommerce
 			$exceptionError = $exception->getMessage();
-			$jsonData = json_decode($exceptionError, true);
-
-			//The API may return JSON data in the message rather than plain string
-			if ($jsonData && isset($jsonData['message'])) {
-				wc_add_notice ($jsonData['message'], 'error');
-				//The API can return multiple error messages so add each of these messages
-				if (isset($jsonData['meta']) && is_array($jsonData['meta'])) {
-					foreach ($jsonData['meta'] as $meta) {
-						wc_add_notice ($meta, 'error');
+			$jsonData       = json_decode( $exceptionError, true );
+
+			// The API may return JSON data in the message rather than plain string
+			if ( $jsonData && isset( $jsonData['message'] ) ) {
+				wc_add_notice( $jsonData['message'], 'error' );
+				// The API can return multiple error messages so add each of these messages
+				if ( isset( $jsonData['meta'] ) && is_array( $jsonData['meta'] ) ) {
+					foreach ( $jsonData['meta'] as $meta ) {
+						wc_add_notice( $meta, 'error' );
 					}
 				}
 			} else {
-				wc_add_notice (ucwords($exceptionError), 'error');
+				wc_add_notice( ucwords( $exceptionError ), 'error' );
 			}
 		}
 
-		if (!isset($response) || null === $response) {
-			$this->log('FAILURE: Response is NULL or empty', 'error');
-			return [
-				'result'   => 'failure'
-			];
+		if ( ! isset( $response ) || null === $response ) {
+			$this->log( 'FAILURE: Response is NULL or empty', 'error' );
+			return array(
+				'result' => 'failure',
+			);
 		}
 
-		if ($this->use_provider_selection()) {
-			$this->log('Paytrail: create_normal_payment, use_provider_selection = true', 'debug');
+		if ( $this->use_provider_selection() ) {
+			$this->log( 'Paytrail: create_normal_payment, use_provider_selection = true', 'debug' );
 			$providers = $response->getProviders();
 
-			//Get only the wanted payment provider object
-			$wanted_provider = $this->get_wanted_provider($providers, $payment_provider);
+			// Get only the wanted payment provider object
+			$wanted_provider = $this->get_wanted_provider( $providers, $payment_provider );
 
-			WC()->session->set('payment_provider', $wanted_provider);
+			WC()->session->set( 'payment_provider', $wanted_provider );
 
 			$message = sprintf(
 				// translators: First parameter is transaction ID, the other is the name of the payment provider.
@@ -1413,17 +1421,17 @@ private function create_normal_payment( $payment, $order, $payment_provider) {
 					'paytrail-for-woocommerce'
 				),
 				$response->getTransactionId(),
-				!empty($wanted_provider->getName()) ? $wanted_provider->getName() : ucfirst($payment_provider)
+				! empty( $wanted_provider->getName() ) ? $wanted_provider->getName() : ucfirst( $payment_provider )
 			);
-			$this->log('Paytrail: create_normal_payment, use_provider_selection = true, redirect', 'debug');
-			$order->add_order_note($message);
+			$this->log( 'Paytrail: create_normal_payment, use_provider_selection = true, redirect', 'debug' );
+			$order->add_order_note( $message );
 
-			return [
+			return array(
 				'result'   => 'success',
-				'redirect' => $order->get_checkout_payment_url(true),
-			];
+				'redirect' => $order->get_checkout_payment_url( true ),
+			);
 		} else {
-			$this->log('Paytrail: create_normal_payment, use_provider_selection = false', 'debug');
+			$this->log( 'Paytrail: create_normal_payment, use_provider_selection = false', 'debug' );
 			$message = sprintf(
 				// translators: First parameter is transaction ID, the other is the name of the payment provider.
 				__(
@@ -1433,12 +1441,12 @@ private function create_normal_payment( $payment, $order, $payment_provider) {
 				$response->getTransactionId()
 			);
 
-			$order->add_order_note($message);
-			$this->log('Paytrail: create_normal_payment, use_provider_selection = false, redirect', 'debug');
-			return [
+			$order->add_order_note( $message );
+			$this->log( 'Paytrail: create_normal_payment, use_provider_selection = false, redirect', 'debug' );
+			return array(
 				'result'   => 'success',
 				'redirect' => $response->getHref(),
-			];
+			);
 		}
 	}
 
@@ -1446,37 +1454,37 @@ private function create_normal_payment( $payment, $order, $payment_provider) {
 	 * Create CIT payment
 	 *
 	 * @param CitPaymentRequest $payment
-	 * @param WC_Order $order
+	 * @param WC_Order          $order
 	 * @throws HmacException
 	 * @throws ValidationException
 	 */
-	private function create_cit_payment( $payment, $order) {
-		$this->log('Paytrail: create_cit_payment', 'debug');
+	private function create_cit_payment( $payment, $order ) {
+		$this->log( 'Paytrail: create_cit_payment', 'debug' );
 
 		try {
-			$response = $this->client->createCitPaymentCharge($payment);
+			$response = $this->client->createCitPaymentCharge( $payment );
 
 			// Log the payment request if debug log is enabled.
-			$this->log('Paytrail\SDK\Request\CitPaymentRequest: ' . json_encode($payment), 'info');
-		} catch (\Exception $exception) {
-			$fail_message = __('Failed to create token payment using card.', 'paytrail-for-woocommerce');
+			$this->log( 'Paytrail\SDK\Request\CitPaymentRequest: ' . json_encode( $payment ), 'info' );
+		} catch ( \Exception $exception ) {
+			$fail_message = __( 'Failed to create token payment using card.', 'paytrail-for-woocommerce' );
 
 			// Log the error message if debug log is enabled.
-			$this->log($exception->getMessage() . $exception->getTraceAsString(), 'error');
-			new \WP_Error($exception->getCode(), $exception->getMessage());
+			$this->log( $exception->getMessage() . $exception->getTraceAsString(), 'error' );
+			new \WP_Error( $exception->getCode(), $exception->getMessage() );
 
-			wc_add_notice($fail_message, 'error');
+			wc_add_notice( $fail_message, 'error' );
 
-			$order->add_order_note($fail_message);
+			$order->add_order_note( $fail_message );
 
-			return [
-				'result'   => 'fail'
-			];
+			return array(
+				'result' => 'fail',
+			);
 		}
 		$requires_threeds = $response->getThreeDSecureUrl() !== null;
 
-		if ($response->getTransactionId() === null && $requires_threeds) {
-			throw new \Exception('Transcaction Id not found');
+		if ( $response->getTransactionId() === null && $requires_threeds ) {
+			throw new \Exception( 'Transcaction Id not found' );
 		}
 
 		$message = sprintf(
@@ -1486,52 +1494,52 @@ private function create_cit_payment( $payment, $order) {
 				'paytrail-for-woocommerce'
 			),
 			$response->getTransactionId(),
-			$requires_threeds ? __('yes', 'paytrail-for-woocommerce') : __('no', 'paytrail-for-woocommerce')
+			$requires_threeds ? __( 'yes', 'paytrail-for-woocommerce' ) : __( 'no', 'paytrail-for-woocommerce' )
 		);
 
-		$order->add_order_note($message);
+		$order->add_order_note( $message );
 
-		if (!$requires_threeds) {
-			$this->log('Paytrail: create_cit_payment, No 3DS required, payment_complete ', 'info');
-			$order->payment_complete($response->getTransactionId());
+		if ( ! $requires_threeds ) {
+			$this->log( 'Paytrail: create_cit_payment, No 3DS required, payment_complete ', 'info' );
+			$order->payment_complete( $response->getTransactionId() );
 		}
 
-		$redirect_url = !empty($response->getThreeDSecureUrl()) ? $response->getThreeDSecureUrl() : $this->get_return_url($order);
+		$redirect_url = ! empty( $response->getThreeDSecureUrl() ) ? $response->getThreeDSecureUrl() : $this->get_return_url( $order );
 
-		return [
+		return array(
 			'result'   => 'success',
-			'redirect' => $redirect_url
-		];
+			'redirect' => $redirect_url,
+		);
 	}
 
 	/**
 	 * Create MIT payment
 	 *
 	 * @param MitPaymentRequest $payment
-	 * @param WC_Order $order
+	 * @param WC_Order          $order
 	 * @return bool
 	 * @throws \Exception
 	 */
-	private function create_mit_payment( $payment, $order) {
+	private function create_mit_payment( $payment, $order ) {
 		try {
-			$response = $this->client->createMitPaymentCharge($payment);
+			$response = $this->client->createMitPaymentCharge( $payment );
 
 			// Log the payment request if debug log is enabled.
-			$this->log('Paytrail\SDK\Request\MitPaymentRequest: ' . json_encode($payment), 'info');
-		} catch (\Exception $exception) {
-			$fail_message = __('Failed to create token payment using card.', 'paytrail-for-woocommerce');
+			$this->log( 'Paytrail\SDK\Request\MitPaymentRequest: ' . json_encode( $payment ), 'info' );
+		} catch ( \Exception $exception ) {
+			$fail_message = __( 'Failed to create token payment using card.', 'paytrail-for-woocommerce' );
 
 			// Log the error message if debug log is enabled.
-			$this->log($exception->getMessage() . $exception->getTraceAsString(), 'error');
-			new \WP_Error($exception->getCode(), $exception->getMessage());
+			$this->log( $exception->getMessage() . $exception->getTraceAsString(), 'error' );
+			new \WP_Error( $exception->getCode(), $exception->getMessage() );
 
-			$order->add_order_note($fail_message);
+			$order->add_order_note( $fail_message );
 
 			return false;
 		}
 
-		if ($response->getTransactionId() === null) {
-			throw new \Exception('Transcaction Id not found');
+		if ( $response->getTransactionId() === null ) {
+			throw new \Exception( 'Transcaction Id not found' );
 		}
 
 		$message = sprintf(
@@ -1543,9 +1551,9 @@ private function create_mit_payment( $payment, $order) {
 			$response->getTransactionId()
 		);
 
-		$order->add_order_note($message);
-		$this->log('Paytrail: create_mit_payment payment_complete ', 'info');
-		$order->payment_complete($response->getTransactionId());
+		$order->add_order_note( $message );
+		$this->log( 'Paytrail: create_mit_payment payment_complete ', 'info' );
+		$order->payment_complete( $response->getTransactionId() );
 
 		return true;
 	}
@@ -1554,13 +1562,13 @@ private function create_mit_payment( $payment, $order) {
 	 * Set payment data
 	 *
 	 * @param PaymentRequest|CitPaymentRequest|MitPaymentRequest $payment
-	 * @param WC_Order $order
+	 * @param WC_Order                                           $order
 	 * @return mixed
 	 * @throws \Exception
 	 */
-	private function set_base_payment_data( $payment, $order) {
+	private function set_base_payment_data( $payment, $order ) {
 		// Set the order ID as the stamp to the payment request
-		$payment->setStamp(get_current_blog_id() . '-' . $order->get_id() . '-' . time());
+		$payment->setStamp( get_current_blog_id() . '-' . $order->get_id() . '-' . time() );
 
 		// Use WooCom order number as reference
 		$reference = $order->get_order_number();
@@ -1571,50 +1579,50 @@ private function set_base_payment_data( $payment, $order) {
 		}
 
 		// Set WooCommerce order number as the payment reference
-		$payment->setReference($reference);
+		$payment->setReference( $reference );
 
 		// Fetch current currency and the cart total
 		$currency    = get_woocommerce_currency();
-		$order_total = $this->helper->handle_currency($order->get_total());
+		$order_total = $this->helper->handle_currency( $order->get_total() );
 
 		// Set the aforementioned values to the payment request
-		$payment->setCurrency($currency)
-			->setAmount($order_total);
+		$payment->setCurrency( $currency )
+			->setAmount( $order_total );
 
 		// Create a customer object from the order
-		$customer = $this->create_customer($order);
+		$customer = $this->create_customer( $order );
 
 		// Set the customer object to the payment request
-		$payment->setCustomer($customer);
+		$payment->setCustomer( $customer );
 
 		// Create a billing address and assign it to the payment request
-		$billing_address = $this->create_address($order, 'invoicing');
+		$billing_address = $this->create_address( $order, 'invoicing' );
 
-		if ($billing_address) {
-			$payment->setInvoicingAddress($billing_address);
+		if ( $billing_address ) {
+			$payment->setInvoicingAddress( $billing_address );
 		}
 
 		// Create a shipping address and assign it to the payment request
-		$shipping_address = $this->create_address($order, 'delivery');
+		$shipping_address = $this->create_address( $order, 'delivery' );
 
-		if ($shipping_address) {
-			$payment->setDeliveryAddress($shipping_address);
+		if ( $shipping_address ) {
+			$payment->setDeliveryAddress( $shipping_address );
 		}
 
-		$payment->setLanguage(Helper::getLocale());
+		$payment->setLanguage( Helper::getLocale() );
 
 		// Get the items from the order
-		$items = $this->get_order_items($order);
+		$items = $this->get_order_items( $order );
 
 		// Assign the items to the payment request.
-		$payment->setItems(array_filter($items));
+		$payment->setItems( array_filter( $items ) );
 
 		// Create and assign the return urls
-		$payment->setRedirectUrls($this->create_redirect_url($order));
-		$payment->setCallbackUrls($this->create_callback_url());
+		$payment->setRedirectUrls( $this->create_redirect_url( $order ) );
+		$payment->setCallbackUrls( $this->create_callback_url() );
 
 		// Set callback delay to the payment request
-		$payment->setCallbackDelay(3);
+		$payment->setCallbackDelay( 3 );
 
 		return $payment;
 	}
@@ -1626,41 +1634,48 @@ private function set_base_payment_data( $payment, $order) {
 	 * @return array
 	 * @throws \Exception
 	 */
-	private function get_order_items( $order) {
+	private function get_order_items( $order ) {
 		/**
 		 * Get the items from the order
 		 *
 		 * @since 1.0
 		 */
-		$order_items = apply_filters('woocommerce_paytrail_gateway_get_order_items', $order->get_items([ 'line_item', 'fee', 'shipping' ]), $order);
-		$order_total = intval($this->helper->handle_currency($order->get_total()));
+		$order_items = apply_filters( 'woocommerce_paytrail_gateway_get_order_items', $order->get_items( array( 'line_item', 'fee', 'shipping' ) ), $order );
+		$order_total = intval( $this->helper->handle_currency( $order->get_total() ) );
 
 		// Convert items to SDK Item objects.
 		$items = array_map(
-			function ( $item) use ( $order) {
-				return $this->create_item($item, $order);
+			function ( $item ) use ( $order ) {
+				return $this->create_item( $item, $order );
 			},
 			$order_items
 		);
 
-		$sub_sum = intval(array_sum(array_map(function ( Item $item) {
-			return ( $item->getUnitPrice() * $item->getUnits() );
-		}, $items)));
+		$sub_sum = intval(
+			array_sum(
+				array_map(
+					function ( Item $item ) {
+						return ( $item->getUnitPrice() * $item->getUnits() );
+					},
+					$items
+				)
+			)
+		);
 
 		$diff = $order_total - $sub_sum;
 
 		// If item total is negative, add positive amount for it.
-		if ($diff > 0) {
+		if ( $diff > 0 ) {
 			$rounding_item = new Item();
-			$rounding_item->setDescription(__('Rounding', 'paytrail-for-woocommerce'));
-			$rounding_item->setVatPercentage(0);
-			$rounding_item->setUnits(1);
-			$rounding_item->setUnitPrice(abs($diff));
-			$rounding_item->setProductCode('rounding-row');
-			$rounding_item->setStamp($this->helper->generate_item_stamp($order->get_id()));
+			$rounding_item->setDescription( __( 'Rounding', 'paytrail-for-woocommerce' ) );
+			$rounding_item->setVatPercentage( 0 );
+			$rounding_item->setUnits( 1 );
+			$rounding_item->setUnitPrice( abs( $diff ) );
+			$rounding_item->setProductCode( 'rounding-row' );
+			$rounding_item->setStamp( $this->helper->generate_item_stamp( $order->get_id() ) );
 			$items[] = $rounding_item;
-		} elseif ($diff < 0) {
-			$items = $this->fix_rounding_error($items, $diff, $order->get_id());
+		} elseif ( $diff < 0 ) {
+			$items = $this->fix_rounding_error( $items, $diff, $order->get_id() );
 		}
 
 		return $items;
@@ -1668,22 +1683,22 @@ function ( $item) use ( $order) {
 
 	private function fix_rounding_error( $items, $diff, $order_id ) {
 		// Subtract rounding error from first not zero price item if sub sum is too high.
-		$lastItemKey = $this->getLastNonZeroItemKey($items, $diff);
-		$lastItem = $items[$lastItemKey];
-		$lastItem->setUnitPrice($lastItem->getUnitPrice() + $diff);
-		$items[$lastItemKey] = $lastItem;
+		$lastItemKey = $this->getLastNonZeroItemKey( $items, $diff );
+		$lastItem    = $items[ $lastItemKey ];
+		$lastItem->setUnitPrice( $lastItem->getUnitPrice() + $diff );
+		$items[ $lastItemKey ] = $lastItem;
 
 		// If item quantity is not one, there's still negative difference to fix.
-		if ($lastItem->getUnits() > 1) {
-			$difference = ( $lastItem->getUnits() -1 )*$diff;
+		if ( $lastItem->getUnits() > 1 ) {
+			$difference = ( $lastItem->getUnits() - 1 ) * $diff;
 
 			$rounding_item = new Item();
-			$rounding_item->setDescription(__('Rounding', 'paytrail-for-woocommerce'));
-			$rounding_item->setVatPercentage(0);
-			$rounding_item->setUnits(1);
-			$rounding_item->setUnitPrice(abs($difference));
-			$rounding_item->setProductCode('rounding-row');
-			$rounding_item->setStamp($this->helper->generate_item_stamp($order_id));
+			$rounding_item->setDescription( __( 'Rounding', 'paytrail-for-woocommerce' ) );
+			$rounding_item->setVatPercentage( 0 );
+			$rounding_item->setUnits( 1 );
+			$rounding_item->setUnitPrice( abs( $difference ) );
+			$rounding_item->setProductCode( 'rounding-row' );
+			$rounding_item->setStamp( $this->helper->generate_item_stamp( $order_id ) );
 
 			$items[] = $rounding_item;
 		}
@@ -1695,8 +1710,8 @@ private function fix_rounding_error( $items, $diff, $order_id ) {
 	 * Loop items and find first non zero item to subtract difference.
 	 */
 	private function getLastNonZeroItemKey( $items, $diff ) {
-		foreach ($items as $key => $item) {
-			if (( $item->getUnitPrice() + $diff ) > 0) {
+		foreach ( $items as $key => $item ) {
+			if ( ( $item->getUnitPrice() + $diff ) > 0 ) {
 				// Return on first non zero item
 				return $key;
 			}
@@ -1710,18 +1725,17 @@ private function getLastNonZeroItemKey( $items, $diff ) {
 	 * @param $payment_provider
 	 * @return mixed|null
 	 */
-	private function get_wanted_provider( $providers, $payment_provider) {
+	private function get_wanted_provider( $providers, $payment_provider ) {
 		// Get only the wanted payment provider object
-		return
-			array_reduce(
-				$providers,
-				function ( $carry, $item = null) use ( $payment_provider) {
-					if ($item && $item->getId() === $payment_provider) {
-						return $item;
-					}
-					return $carry;
+		return array_reduce(
+			$providers,
+			function ( $carry, $item = null ) use ( $payment_provider ) {
+				if ( $item && $item->getId() === $payment_provider ) {
+					return $item;
 				}
-			);
+				return $carry;
+			}
+		);
 	}
 
 	/**
@@ -1731,42 +1745,42 @@ function ( $carry, $item = null) use ( $payment_provider) {
 	 * @param WC_Order $order
 	 * @throws \Exception
 	 */
-	public function scheduled_subscription_payment( $amount, $order) {
-		$this->log('Paytrail: scheduled_subscription_payment', 'debug');
-		$fail_message = __('Cannot schedule subscription payment. No valid tokens found for order.', 'paytrail-for-woocommerce');
+	public function scheduled_subscription_payment( $amount, $order ) {
+		$this->log( 'Paytrail: scheduled_subscription_payment', 'debug' );
+		$fail_message = __( 'Cannot schedule subscription payment. No valid tokens found for order.', 'paytrail-for-woocommerce' );
 
-		$tokens = \WC_Payment_Tokens::get_order_tokens($order->get_id());
-		$validTokens = [];
-		foreach ($tokens as $token) {
-			if (!$token->validate()) {
+		$tokens      = \WC_Payment_Tokens::get_order_tokens( $order->get_id() );
+		$validTokens = array();
+		foreach ( $tokens as $token ) {
+			if ( ! $token->validate() ) {
 				continue;
 			}
 			$validTokens[] = $token;
 		}
-		if (empty($validTokens)) {
+		if ( empty( $validTokens ) ) {
 			// Log the error message if debug log is enabled.
-			$this->log($fail_message, 'error');
-			$order->add_order_note($fail_message);
+			$this->log( $fail_message, 'error' );
+			$order->add_order_note( $fail_message );
 			return false;
 		}
 		try {
-			$token = reset($validTokens);
+			$token = reset( $validTokens );
 
 			$payment = new MitPaymentRequest();
-			$payment->setToken($token->get_token());
+			$payment->setToken( $token->get_token() );
 
-			$this->set_base_payment_data($payment, $order);
+			$this->set_base_payment_data( $payment, $order );
 
 			// Save the reference for possible later use.
-			$order->update_meta_data('_checkout_reference', $payment->getReference());
+			$order->update_meta_data( '_checkout_reference', $payment->getReference() );
 
 			// Save it also as a key for fast indexed searches.
-			$order->update_meta_data('_checkout_reference_' . $payment->getReference(), true);
+			$order->update_meta_data( '_checkout_reference_' . $payment->getReference(), true );
 			$order->save();
-			$this->create_mit_payment($payment, $order);
-		} catch (\Exception $exception) {
+			$this->create_mit_payment( $payment, $order );
+		} catch ( \Exception $exception ) {
 			// Log the error message if debug log is enabled.
-			$this->log($exception->getMessage() . $exception->getTraceAsString(), 'error');
+			$this->log( $exception->getMessage() . $exception->getTraceAsString(), 'error' );
 			return false;
 		}
 		return true;
@@ -1780,25 +1794,25 @@ public function scheduled_subscription_payment( $amount, $order) {
 	 * @param string  $reason   Optional reason for the refund.
 	 * @return boolean|\WP_Error
 	 */
-	public function process_refund( $order_id, $amount = null, $reason = '') {
-		$this->log('Paytrail: process_refund', 'debug');
+	public function process_refund( $order_id, $amount = null, $reason = '' ) {
+		$this->log( 'Paytrail: process_refund', 'debug' );
 
 		try {
-			$order = \wc_get_order($order_id);
+			$order = \wc_get_order( $order_id );
 
 			// Create a unique identifier for the refund
-			$refund_unique_id = sha1(uniqid(true));
+			$refund_unique_id = sha1( uniqid( true ) );
 
 			$refund = new RefundRequest();
 
-			if ($amount) {
-				$refund->setAmount($this->helper->handle_currency($amount));
+			if ( $amount ) {
+				$refund->setAmount( $this->helper->handle_currency( $amount ) );
 			} else {
-				$refund->setAmount($this->helper->handle_currency($order->get_total()));
+				$refund->setAmount( $this->helper->handle_currency( $order->get_total() ) );
 				$amount = $order->get_total();
 			}
 
-			if ($refund->getAmount() === 0) {
+			if ( $refund->getAmount() === 0 ) {
 				return new \WP_Error(
 					'400',
 					__(
@@ -1812,115 +1826,115 @@ public function process_refund( $order_id, $amount = null, $reason = '') {
 
 			$url = new CallbackUrl();
 
-			$callbacks = $this->create_redirect_url($order);
+			$callbacks = $this->create_redirect_url( $order );
 
 			$success_callback = add_query_arg(
 				array(
-					'refund_callback' => 'success',
+					'refund_callback'  => 'success',
 					'refund_unique_id' => $refund_unique_id,
-					'order_id' => $order_id
+					'order_id'         => $order_id,
 				),
 				$callbacks->getSuccess()
 			);
-			$cancel_callback = add_query_arg(
+			$cancel_callback  = add_query_arg(
 				array(
-					'refund_callback' => 'cancel',
+					'refund_callback'  => 'cancel',
 					'refund_unique_id' => $refund_unique_id,
-					'order_id' => $order_id
+					'order_id'         => $order_id,
 				),
 				$callbacks->getSuccess()
 			);
 
-			$url->setSuccess($success_callback)
-				->setCancel($cancel_callback);
+			$url->setSuccess( $success_callback )
+				->setCancel( $cancel_callback );
 
-			$refund->setCallbackUrls($url);
+			$refund->setCallbackUrls( $url );
 
 			$transaction_id = $order->get_transaction_id();
 
 			$order->add_order_note(
 				sprintf(
 					// Translators: placeholder is the optional reason for the refund.
-					__('Refunding process started.%s', 'paytrail-for-woocommerce'),
-					$reason ? esc_html__(' Reason: ', 'paytrail-for-woocommerce') . esc_html($reason) : ''
+					__( 'Refunding process started.%s', 'paytrail-for-woocommerce' ),
+					$reason ? esc_html__( ' Reason: ', 'paytrail-for-woocommerce' ) . esc_html( $reason ) : ''
 				)
 			);
 
 			// Do some additional stuff after the refund object has been created
 			add_action(
 				'woocommerce_order_refunded',
-				function ( $order_id, $refund_id) use ( $order, $refund, $reason, $transaction_id, $amount, $price, $refund_unique_id) {
-					$refund_object = wc_get_order($refund_id);
+				function ( $order_id, $refund_id ) use ( $order, $refund, $reason, $transaction_id, $amount, $price, $refund_unique_id ) {
+					$refund_object = wc_get_order( $refund_id );
 
 					try {
-						$this->client->refund($refund, $transaction_id);
-					} catch (\Exception $e) {
-						switch ($e->getCode()) {
+						$this->client->refund( $refund, $transaction_id );
+					} catch ( \Exception $e ) {
+						switch ( $e->getCode() ) {
 							case 422:
 								// An email refund request is needed
 								$email = $order->get_billing_email();
 
 								$email_refund_request = new EmailRefundRequest();
 
-								$email_refund_request->setEmail($email);
-								$email_refund_request->setAmount($refund->getAmount());
-								$email_refund_request->setCallbackUrls($refund->getCallbackUrls());
+								$email_refund_request->setEmail( $email );
+								$email_refund_request->setAmount( $refund->getAmount() );
+								$email_refund_request->setCallbackUrls( $refund->getCallbackUrls() );
 
-								if (count($refund->getItems()) > 0) {
-									$email_refund_request->setItems($refund->getItems());
+								if ( count( $refund->getItems() ) > 0 ) {
+									$email_refund_request->setItems( $refund->getItems() );
 								}
 
 								try {
-									$this->client->emailRefund($email_refund_request, $transaction_id);
-								} catch (\Exception $e) {
-									switch ($e->getCode()) {
+									$this->client->emailRefund( $email_refund_request, $transaction_id );
+								} catch ( \Exception $e ) {
+									switch ( $e->getCode() ) {
 										case 422:
-											$refund_object->delete(true);
+											$refund_object->delete( true );
 											$order->add_order_note(
 												__(
 													'The payment provider does not support either regular or email refunds. The refund was cancelled.',
 													'paytrail-for-woocommerce'
 												)
 											);
-											$order->update_status('failed');
+											$order->update_status( 'failed' );
 											return false; // Return when an error occurred.
 											// Default, should be 400.
 										default:
-											$refund_object->delete(true);
+											$refund_object->delete( true );
 											$order->add_order_note(
 												__(
 													'Something went wrong with the email refund and it was cancelled.',
 													'paytrail-for-woocommerce'
 												)
 											);
-											$order->update_status('failed');
+											$order->update_status( 'failed' );
 											return false; // Return when an error occurred.
 									}
 								}
 								break; // Break the email refund processing.
 								// Default, should be 400.
 							default:
-								$refund_object->delete(true);
+								$refund_object->delete( true );
 								$order->add_order_note(
 									__(
 										'Something went wrong with the refund and it was cancelled.',
 										'paytrail-for-woocommerce'
 									)
 								);
-								$order->update_status('failed');
+								$order->update_status( 'failed' );
 								return false; // Return when an error occurred.
 						}
 					}
 
 					$reason = $refund_object->get_reason();
 
-					$refund_object->update_meta_data( '_checkout_refund_amount', $amount);
-					$refund_object->update_meta_data( '_checkout_refund_reason', $reason);
-					$refund_object->update_meta_data( '_checkout_refund_unique_id', $refund_unique_id);
-					$refund_object->update_meta_data( '_checkout_refund_processing', true);
+					$refund_object->update_meta_data( '_checkout_refund_amount', $amount );
+					$refund_object->update_meta_data( '_checkout_refund_reason', $reason );
+					$refund_object->update_meta_data( '_checkout_refund_unique_id', $refund_unique_id );
+					$refund_object->update_meta_data( '_checkout_refund_processing', true );
 
-					$refund_object->set_amount(0);
-					$refund_object->set_reason($reason . ' Refund is still being processed. The status and the amount (' . $price . ') of the refund will update when the processing is completed.');
+					$refund_object->set_amount( 0 );
+					$refund_object->set_reason( $reason . ' Refund is still being processed. The status and the amount (' . $price . ') of the refund will update when the processing is completed.' );
 
 					$refund_object->save();
 
@@ -1931,10 +1945,10 @@ function ( $order_id, $refund_id) use ( $order, $refund, $reason, $transaction_i
 			);
 
 			return true;
-		} catch (\Exception $exception) {
-			$this->log($exception->getMessage() . $exception->getTraceAsString(), 'error');
+		} catch ( \Exception $exception ) {
+			$this->log( $exception->getMessage() . $exception->getTraceAsString(), 'error' );
 
-			return new \WP_Error($exception->getCode(), $exception->getMessage());
+			return new \WP_Error( $exception->getCode(), $exception->getMessage() );
 		}
 	}
 
@@ -1944,22 +1958,22 @@ function ( $order_id, $refund_id) use ( $order, $refund, $reason, $transaction_i
 	 * @param int $order_id Order ID to handle.
 	 * @return void
 	 */
-	public function refund_items( $order_id) {
-		$order = new \WC_Order($order_id);
+	public function refund_items( $order_id ) {
+		$order   = new \WC_Order( $order_id );
 		$refunds = $order->get_refunds();
 
-		if ($refunds) {
+		if ( $refunds ) {
 			array_walk(
 				$refunds,
-				function ( $refund) {
-					$meta = $refund->get_meta('_checkout_refund_processing');
-					if ($meta) {
+				function ( $refund ) {
+					$meta = $refund->get_meta( '_checkout_refund_processing' );
+					if ( $meta ) {
 						echo '<style>';
-						echo '[data-order_refund_id=' . esc_html($refund->get_id()) . '] span.amount {';
+						echo '[data-order_refund_id=' . esc_html( $refund->get_id() ) . '] span.amount {';
 						echo 'font-style: italic;';
 						echo '}';
 						echo '</style>';
-					};
+					}
 				}
 			);
 		}
@@ -1972,28 +1986,28 @@ function ( $refund) {
 	 */
 	protected function provider_form() {
 		$cart_total = $this->helper->get_cart_total();
-		$res = [];
+		$res        = array();
 
-		$providers = $this->get_grouped_payment_providers($cart_total, Helper::getLocale());
+		$providers = $this->get_grouped_payment_providers( $cart_total, Helper::getLocale() );
 
 		// If there was an error getting the payment providers, show it
-		if (! empty($providers['error'])) {
-			echo '<p>' . esc_html($providers['error']) . '</p>';
+		if ( ! empty( $providers['error'] ) ) {
+			echo '<p>' . esc_html( $providers['error'] ) . '</p>';
 			return;
 		}
-		$res['terms'] = !empty($providers['terms']) ? $providers['terms'] : '';
+		$res['terms']  = ! empty( $providers['terms'] ) ? $providers['terms'] : '';
 		$res['groups'] = $providers['groups'];
 
-		$provider_form_view = new View('ProviderForm');
+		$provider_form_view = new View( 'ProviderForm' );
 
-		$provider_form_view->render($res);
+		$provider_form_view->render( $res );
 	}
 
 	protected function payment_description() {
 		$data['description'] = $this->description;
 
-		$view = new View('PaymentDescription');
-		$view->render($data);
+		$view = new View( 'PaymentDescription' );
+		$view->render( $data );
 	}
 
 	/**
@@ -2003,18 +2017,18 @@ protected function payment_description() {
 	 *
 	 * @return \CheckoutFinland\SDK\Model\Customer
 	 */
-	protected function create_customer( \WC_Order $order) {
+	protected function create_customer( \WC_Order $order ) {
 		$customer = new Customer();
 
-		if (!$order) {
+		if ( ! $order ) {
 			return $customer;
 		}
 
-		$customer->setEmail($order->get_billing_email())
-			->setFirstName($order->get_billing_first_name())
-			->setLastName($order->get_billing_last_name())
-			->setPhone($order->get_billing_phone())
-			->setCompanyName($order->get_billing_company());
+		$customer->setEmail( $order->get_billing_email() )
+			->setFirstName( $order->get_billing_first_name() )
+			->setLastName( $order->get_billing_last_name() )
+			->setPhone( $order->get_billing_phone() )
+			->setCompanyName( $order->get_billing_company() );
 
 		return $customer;
 	}
@@ -2025,13 +2039,13 @@ protected function create_customer( \WC_Order $order) {
 	 * @param integer $payment_amount Payment amount in currency minor unit, eg. cents.
 	 * @return array
 	 */
-	protected function get_payment_providers( $payment_amount) {
+	protected function get_payment_providers( $payment_amount ) {
 		try {
-			$providers = $this->client->getPaymentProviders($payment_amount);
-		} catch (HmacException $exception) {
-			$providers = $this->get_payment_providers_error_handler($exception);
-		} catch (\Exception $exception) {
-			$providers = $this->get_payment_providers_error_handler($exception);
+			$providers = $this->client->getPaymentProviders( $payment_amount );
+		} catch ( HmacException $exception ) {
+			$providers = $this->get_payment_providers_error_handler( $exception );
+		} catch ( \Exception $exception ) {
+			$providers = $this->get_payment_providers_error_handler( $exception );
 		}
 
 		return $providers;
@@ -2041,27 +2055,27 @@ protected function get_payment_providers( $payment_amount) {
 	 * Get the grouped list of payment providers
 	 *
 	 * @param integer $payment_amount Payment amount in currency minor unit, eg. cents.
-	 * @param string $locale
+	 * @param string  $locale
 	 * @return array
 	 */
-	public function get_grouped_payment_providers( $payment_amount = null, $locale = null) {
-		$groups = [];
+	public function get_grouped_payment_providers( $payment_amount = null, $locale = null ) {
+		$groups = array();
 
-		if ($this->helper::getIsSubscriptionsEnabled()) {
-			$groups = ['creditcard'];
+		if ( $this->helper::getIsSubscriptionsEnabled() ) {
+			$groups = array( 'creditcard' );
 		}
 
 		try {
 			$providers = $this->client->getGroupedPaymentProviders(
-				isset($payment_amount) ? $payment_amount : $this->get_cart_total(),
-				isset($locale) ? $locale : Helper::getLocale(),
+				isset( $payment_amount ) ? $payment_amount : $this->get_cart_total(),
+				isset( $locale ) ? $locale : Helper::getLocale(),
 				$groups
 			);
 
-		} catch (HmacException $exception) {
-			$providers = $this->get_payment_providers_error_handler($exception);
-		} catch (\Exception $exception) {
-			$providers = $this->get_payment_providers_error_handler($exception);
+		} catch ( HmacException $exception ) {
+			$providers = $this->get_payment_providers_error_handler( $exception );
+		} catch ( \Exception $exception ) {
+			$providers = $this->get_payment_providers_error_handler( $exception );
 		}
 
 		return $providers;
@@ -2073,10 +2087,10 @@ public function get_grouped_payment_providers( $payment_amount = null, $locale =
 	 * @param \Exception $exception Exception to handle.
 	 * @return array
 	 */
-	protected function get_payment_providers_error_handler( \Exception $exception) {
+	protected function get_payment_providers_error_handler( \Exception $exception ) {
 
 		// Log the error message.
-		$this->log($exception->getMessage() . $exception->getTraceAsString(), 'error');
+		$this->log( $exception->getMessage() . $exception->getTraceAsString(), 'error' );
 
 		$error = __(
 			'An error occurred loading the payment providers.',
@@ -2088,10 +2102,10 @@ protected function get_payment_providers_error_handler( \Exception $exception) {
 		 *
 		 * @since 1.0
 		 */
-		$error = apply_filters('paytrail_provider_form_error', $error);
-		return [
+		$error = apply_filters( 'paytrail_provider_form_error', $error );
+		return array(
 			'error' => $error,
-		];
+		);
 	}
 
 	/**
@@ -2101,14 +2115,14 @@ protected function get_payment_providers_error_handler( \Exception $exception) {
 	 * @param string    $type  Whether we are creating an invoicing or a delivery address.
 	 * @return Address|null
 	 */
-	protected function create_address( \WC_Order $order, $type = 'invoicing') {
+	protected function create_address( \WC_Order $order, $type = 'invoicing' ) {
 		$address = new Address();
 
-		if (!$order) {
+		if ( ! $order ) {
 			return;
 		}
 
-		switch ($type) {
+		switch ( $type ) {
 			case 'delivery':
 				$prefix = 'shipping_';
 				break;
@@ -2117,25 +2131,25 @@ protected function create_address( \WC_Order $order, $type = 'invoicing') {
 				break;
 		}
 
-		$address_suffix = empty($order->{ 'get_' . $prefix . 'address_2' }())
+		$address_suffix = empty( $order->{ 'get_' . $prefix . 'address_2' }() )
 			? null : ' ' . $order->{ 'get_' . $prefix . 'address_2' }();
 
 		// Append 2nd address line to the address field if present
-		$address->setStreetAddress(( $order->{ 'get_' . $prefix . 'address_1' }() . $address_suffix ))
-			->setPostalCode($order->{ 'get_' . $prefix . 'postcode' }())
-			->setCity($order->{ 'get_' . $prefix . 'city' }())
-			->setCounty($order->{ 'get_' . $prefix . 'state' }())
-			->setCountry($order->{ 'get_' . $prefix . 'country' }());
+		$address->setStreetAddress( ( $order->{ 'get_' . $prefix . 'address_1' }() . $address_suffix ) )
+			->setPostalCode( $order->{ 'get_' . $prefix . 'postcode' }() )
+			->setCity( $order->{ 'get_' . $prefix . 'city' }() )
+			->setCounty( $order->{ 'get_' . $prefix . 'state' }() )
+			->setCountry( $order->{ 'get_' . $prefix . 'country' }() );
 
-		if (empty($address->getCountry())) {
-			$address->setCountry($this->get_option('fallback_country', ''));
+		if ( empty( $address->getCountry() ) ) {
+			$address->setCountry( $this->get_option( 'fallback_country', '' ) );
 		}
 
 		// If we have any of the listed properties, we are good to go
 		$has_values = array_filter(
-			[ 'StreetAddress', 'PostalCode', 'City', 'County' ],
-			function ( $key) use ( $address) {
-				return ! empty($address->{ 'get' . $key }());
+			array( 'StreetAddress', 'PostalCode', 'City', 'County' ),
+			function ( $key ) use ( $address ) {
+				return ! empty( $address->{ 'get' . $key }() );
 			}
 		);
 
@@ -2150,21 +2164,21 @@ function ( $key) use ( $address) {
 	 *
 	 * @return Item|null
 	 */
-	protected function create_item( WC_Order_Item $order_item, WC_Order $order) {
+	protected function create_item( WC_Order_Item $order_item, WC_Order $order ) {
 		$item = new Item();
 
 		// Get the item total with taxes and without rounding.
 		// Then convert it into the integer format required by Paytrail.
-		$sub_total = $this->helper->handle_currency($order->get_item_total($order_item, true, false));
-		$item->setUnitPrice($sub_total)
-			->setUnits((int) $order_item->get_quantity());
+		$sub_total = $this->helper->handle_currency( $order->get_item_total( $order_item, true, false ) );
+		$item->setUnitPrice( $sub_total )
+			->setUnits( (int) $order_item->get_quantity() );
 
-		$tax_rate = $this->get_item_tax_rate($order_item);
+		$tax_rate = $this->get_item_tax_rate( $order_item );
 
-		$item->setVatPercentage($tax_rate)
-			->setProductCode($this->get_item_product_code($order_item))
-			->setDescription($this->get_item_description($order_item))
-			->setStamp((string) $order_item->get_id());
+		$item->setVatPercentage( $tax_rate )
+			->setProductCode( $this->get_item_product_code( $order_item ) )
+			->setDescription( $this->get_item_description( $order_item ) )
+			->setStamp( (string) $order_item->get_id() );
 
 		return $item;
 	}
@@ -2176,18 +2190,18 @@ protected function create_item( WC_Order_Item $order_item, WC_Order $order) {
 	 *
 	 * @return string
 	 */
-	protected function get_item_product_code( WC_Order_Item $item) {
+	protected function get_item_product_code( WC_Order_Item $item ) {
 		$product_code = '';
-		switch (get_class($item)) {
+		switch ( get_class( $item ) ) {
 			case WC_Order_Item_Product::class:
-				$product_code = !empty($item->get_product()->get_sku()) ? $item->get_product()->get_sku() : $item->get_product()->get_id();
+				$product_code = ! empty( $item->get_product()->get_sku() ) ? $item->get_product()->get_sku() : $item->get_product()->get_id();
 				break;
 			case WC_Order_Item_Fee::class:
-				$product_code = __('fee', 'paytrail-for-woocommerce');
+				$product_code = __( 'fee', 'paytrail-for-woocommerce' );
 				$item->get_type();
 				break;
 			case WC_Order_Item_Shipping::class:
-				$product_code = __('shipping', 'paytrail-for-woocommerce');
+				$product_code = __( 'shipping', 'paytrail-for-woocommerce' );
 				break;
 		}
 
@@ -2196,7 +2210,7 @@ protected function get_item_product_code( WC_Order_Item $item) {
 		 *
 		 * @since 1.0
 		 */
-		return apply_filters('paytrail_item_product_code', $product_code, $item);
+		return apply_filters( 'paytrail_item_product_code', $product_code, $item );
 	}
 
 	/**
@@ -2206,10 +2220,10 @@ protected function get_item_product_code( WC_Order_Item $item) {
 	 *
 	 * @return string
 	 */
-	protected function get_item_description( WC_Order_Item $item) {
-		switch (get_class($item)) {
+	protected function get_item_description( WC_Order_Item $item ) {
+		switch ( get_class( $item ) ) {
 			case WC_Order_Item_Product::class:
-				$description = !empty($item->get_product()->get_name()) ? $item->get_product()->get_name() : $item->get_product()->get_id();
+				$description = ! empty( $item->get_product()->get_name() ) ? $item->get_product()->get_name() : $item->get_product()->get_id();
 				break;
 			default:
 				$description = $item->get_name();
@@ -2217,14 +2231,14 @@ protected function get_item_description( WC_Order_Item $item) {
 		}
 
 		// Ensure the description is maximum of 1000 characters long.
-		$description = mb_substr($description, 0, 1000);
+		$description = mb_substr( $description, 0, 1000 );
 
 		/**
 		 * Return item description
 		 *
 		 * @since 1.0
 		 */
-		return apply_filters('paytrail_item_description', $description, $item);
+		return apply_filters( 'paytrail_item_description', $description, $item );
 	}
 
 	/**
@@ -2234,7 +2248,7 @@ protected function get_item_description( WC_Order_Item $item) {
 	 *
 	 * @return float The tax percentage.
 	 */
-	protected function get_item_tax_rate( WC_Order_Item $item) {
+	protected function get_item_tax_rate( WC_Order_Item $item ) {
 		$taxes       = $item->get_taxes();
 		$tax_total   = 0;
 		$total_price = $item->get_total();
@@ -2243,7 +2257,7 @@ protected function get_item_tax_rate( WC_Order_Item $item) {
 			$tax_total += (float) $tax;
 		}
 
-		if ( $total_price > 0 && $tax_total > 0) {
+		if ( $total_price > 0 && $tax_total > 0 ) {
 			$tax_rate = NumberUtil::round( ( $tax_total / $total_price ) * 100, self::TAX_RATE_PRECISION );
 		} else {
 			$tax_rate = 0;
@@ -2258,12 +2272,12 @@ protected function get_item_tax_rate( WC_Order_Item $item) {
 	 * @param \WC_Order $order The order object.
 	 * @return CallbackUrl
 	 */
-	public function create_redirect_url( \WC_Order $order) {
+	public function create_redirect_url( \WC_Order $order ) {
 		$callback = new CallbackUrl();
 
-		$callback->setSuccess($this->get_return_url($order));
-		//Customers choosing cancel option will be shown a payment page to allow re-attempt to pay
-		$callback->setCancel($order->get_checkout_payment_url());
+		$callback->setSuccess( $this->get_return_url( $order ) );
+		// Customers choosing cancel option will be shown a payment page to allow re-attempt to pay
+		$callback->setCancel( $order->get_checkout_payment_url() );
 		return $callback;
 	}
 
@@ -2275,8 +2289,8 @@ public function create_redirect_url( \WC_Order $order) {
 	protected function create_callback_url() {
 		$callback = new CallbackUrl();
 
-		$callback->setSuccess(Router::get_url(Plugin::CALLBACK_URL, 'index'));
-		$callback->setCancel(Router::get_url(Plugin::CALLBACK_URL, 'index'));
+		$callback->setSuccess( Router::get_url( Plugin::CALLBACK_URL, 'index' ) );
+		$callback->setCancel( Router::get_url( Plugin::CALLBACK_URL, 'index' ) );
 
 		return $callback;
 	}
@@ -2288,28 +2302,28 @@ protected function create_callback_url() {
 	 * @param array $query_vars Query vars from WC_Order_Query.
 	 * @return array
 	 */
-	public function handle_custom_searches( $query, $query_vars) {
-		if (! empty($query_vars['checkout_reference'])) {
-			$query['meta_query'][] = [
-				'key'     => '_checkout_reference_' . esc_attr($query_vars['checkout_reference']),
+	public function handle_custom_searches( $query, $query_vars ) {
+		if ( ! empty( $query_vars['checkout_reference'] ) ) {
+			$query['meta_query'][] = array(
+				'key'     => '_checkout_reference_' . esc_attr( $query_vars['checkout_reference'] ),
 				'compare' => 'EXISTS',
-			];
+			);
 		}
 
-		if (! empty($query_vars['checkout_refund_unique_id'])) {
-			$query['meta_query'][] = [
+		if ( ! empty( $query_vars['checkout_refund_unique_id'] ) ) {
+			$query['meta_query'][] = array(
 				'key'     => '_checkout_refund_unique_id',
-				'value'   => esc_attr($query_vars['checkout_refund_unique_id']),
+				'value'   => esc_attr( $query_vars['checkout_refund_unique_id'] ),
 				'compare' => '=',
-			];
+			);
 		}
 
 		return $query;
 	}
 
 	public function get_cart_total() {
-		if (WC()->cart && is_callable([WC()->cart, 'get_total'])) {
-			return (int) round(WC()->cart->get_total('edit') * 100);
+		if ( WC()->cart && is_callable( array( WC()->cart, 'get_total' ) ) ) {
+			return (int) round( WC()->cart->get_total( 'edit' ) * 100 );
 		}
 		return 0;
 	}
@@ -2329,7 +2343,7 @@ protected function register_scripts() {
 		wp_register_script(
 			'paytrail-woocommerce-payment-fields',
 			$plugin_dir_url . 'dist/assets/frontend/main.js',
-			[],
+			array(),
 			$plugin_version
 		);
 	}
@@ -2338,9 +2352,9 @@ public function enqueue_admin_scripts() {
 		$screen = get_current_screen();
 
 		// Check if the current screen is the WooCommerce settings page
-		if ($screen && 'woocommerce_page_wc-settings' === $screen->id) {
+		if ( $screen && 'woocommerce_page_wc-settings' === $screen->id ) {
 			// Enqueue the introScripts only on the WooCommerce settings page
-			wp_enqueue_script('introScripts');
+			wp_enqueue_script( 'introScripts' );
 		}
 	}
 
@@ -2359,14 +2373,14 @@ protected function register_styles() {
 		wp_register_style(
 			'paytrail-woocommerce-payment-fields',
 			$plugin_dir_url . 'dist/assets/frontend/main.css',
-			[],
+			array(),
 			$plugin_version
 		);
 
 		wp_register_style(
 			'introStyles',
 			$plugin_dir_url . 'dist/assets/frontend/main.css',
-			[],
+			array(),
 			$plugin_version
 		);
 	}
@@ -2375,9 +2389,9 @@ public function enqueue_admin_styles() {
 		$screen = get_current_screen();
 
 		// Check if the current screen is the WooCommerce settings page
-		if ($screen && 'woocommerce_page_wc-settings' === $screen->id) {
+		if ( $screen && 'woocommerce_page_wc-settings' === $screen->id ) {
 			// Enqueue the style 'paytrail-woocommerce-payment-fields'
-			wp_enqueue_style('introStyles');
+			wp_enqueue_style( 'introStyles' );
 		}
 	}
 
@@ -2388,15 +2402,15 @@ public function enqueue_admin_styles() {
 	 * @param string $level   Log level. Defaults to 'info'. Possible values:
 	 *                        emergency|alert|critical|error|warning|notice|info|debug.
 	 */
-	public function log( $message, $level = 'info') {
-		if ($this->debug) {
-			if (empty($this->logger)) {
+	public function log( $message, $level = 'info' ) {
+		if ( $this->debug ) {
+			if ( empty( $this->logger ) ) {
 				$this->logger = \wc_get_logger();
 			}
 
-			$context = [ 'source' => Plugin::GATEWAY_ID ];
+			$context = array( 'source' => Plugin::GATEWAY_ID );
 
-			$this->logger->log($level, $message, $context);
+			$this->logger->log( $level, $message, $context );
 		}
 	}
 
@@ -2408,22 +2422,22 @@ public function log( $message, $level = 'info') {
 	 * @param bool       $die       Defines if the process should be terminated.
 	 * @throws \Exception If the process is not killed, the error is passed on.
 	 */
-	protected function error( \Exception $exception, $message, $die = true) {
+	protected function error( \Exception $exception, $message, $die = true ) {
 		$glue = PHP_EOL . '- ';
 
 		$log_message = $message . $glue;
 
-		$this->log($log_message . PHP_EOL . $exception->getTraceAsString(), 'error');
+		$this->log( $log_message . PHP_EOL . $exception->getTraceAsString(), 'error' );
 
 		/**
 		 * You can use this filter to modify the error message.
 		 *
 		 * @since 1.0
 		 */
-		$error = apply_filters('paytrail_error_message', $message, $exception);
+		$error = apply_filters( 'paytrail_error_message', $message, $exception );
 
-		if (true === $die) {
-			wp_die(esc_html($error), '', esc_html($exception->getCode()));
+		if ( true === $die ) {
+			wp_die( esc_html( $error ), '', esc_html( $exception->getCode() ) );
 		} else {
 			throw $exception;
 		}
@@ -2435,7 +2449,7 @@ protected function error( \Exception $exception, $message, $die = true) {
 	 * @param HmacException $exception The exception instance.
 	 * @param bool          $die       Defines if the process should be terminated.
 	 */
-	protected function signature_error( HmacException $exception, $die = true) {
+	protected function signature_error( HmacException $exception, $die = true ) {
 		$message = __(
 			'An error occurred validating the signature.',
 			'paytrail-for-woocommerce'
@@ -2446,8 +2460,8 @@ protected function signature_error( HmacException $exception, $die = true) {
 		 *
 		 * @since 1.0
 		 */
-		$message = apply_filters('paytrail_signature_error', $message, $exception);
+		$message = apply_filters( 'paytrail_signature_error', $message, $exception );
 
-		$this->error($exception, $message, $die);
+		$this->error( $exception, $message, $die );
 	}
 }
diff --git a/src/View/CheckoutForm.php b/src/View/CheckoutForm.php
index 94462cb7..b81069d9 100644
--- a/src/View/CheckoutForm.php
+++ b/src/View/CheckoutForm.php
@@ -4,27 +4,30 @@
  */
 
 // Ensure that the file is being run within the WordPress context.
-if (! defined('ABSPATH')) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die;
 }
 ?>
 
-<form action="<?php echo esc_html($data->getUrl()); ?>" method="POST" id="checkout-redirect-form">
+<form action="<?php echo esc_html( $data->getUrl() ); ?>" method="POST" id="checkout-redirect-form">
 	<?php
 		$parameters = $data->getParameters();
 
-array_walk($parameters, function ( $parameter) {
-		printf(
-		'<input type="hidden" name="%s" value="%s" />',
-		esc_html($parameter->name),
-		esc_html($parameter->value)
-		);
-	});
+	array_walk(
+		$parameters,
+		function ( $parameter ) {
+			printf(
+				'<input type="hidden" name="%s" value="%s" />',
+				esc_html( $parameter->name ),
+				esc_html( $parameter->value )
+			);
+		}
+	);
 
-esc_html_e('Redirecting... If nothing happens in a few seconds, click the button below.', 'paytrail-for-woocommerce');
+	esc_html_e( 'Redirecting... If nothing happens in a few seconds, click the button below.', 'paytrail-for-woocommerce' );
 	?>
 
-	<p><input type="submit" value="<?php esc_html_e('Submit', 'paytrail-for-woocommerce'); ?>" /></p>
+	<p><input type="submit" value="<?php esc_html_e( 'Submit', 'paytrail-for-woocommerce' ); ?>" /></p>
 </form>
 
 <script>

From edec60d7469a7dec34d49415f68c293f4f2139f3 Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Sun, 23 Nov 2025 15:44:15 +0100
Subject: [PATCH 02/44] Fix undefined $settlement_prefix

---
 src/Gateway.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Gateway.php b/src/Gateway.php
index bc9cb29b..bbf93962 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -127,6 +127,13 @@ final class Gateway extends \WC_Payment_Gateway {
 	 */
 	protected $helper = null;
 
+	/**
+	 * Settlement prefix
+	 *
+	 * @var int
+	 */
+	private $settlement_prefix = 10;
+
 	const TAX_RATE_PRECISION   = 1;
 	const SUPPORTED_CURRENCIES = array( 'EUR' );
 

From 4668aaaed52b8f256ec06d040198e4b7521f7c16 Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Sun, 23 Nov 2025 15:55:05 +0100
Subject: [PATCH 03/44] Process order on thankyou-page

---
 src/Gateway.php | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/Gateway.php b/src/Gateway.php
index bbf93962..73fa532c 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -210,9 +210,6 @@ public function __construct( $params = array() ) {
 
 		// Register scripts for payment fields
 		$this->register_scripts();
-
-		// Check if we are in response phase
-		$this->check_paytrail_response();
 	}
 
 	/**
@@ -231,6 +228,30 @@ protected function add_actions() {
 		add_action( 'admin_notices', array( $this, 'admin_notices' ) );
 		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ) );
 		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_styles' ) );
+
+		// Check if we are in response phase.
+		add_action( 'template_redirect', array( $this, 'on_redirect_to_thankyou_page' ) );
+	}
+
+
+	/**
+	 * Process Paytrail order on redirect to thankyou-page.
+	 *
+	 * @return void
+	 */
+	public function on_redirect_to_thankyou_page() {
+		$order_id = absint( get_query_var( 'order-received', 0 ) );
+		$order    = wc_get_order( $order_id );
+		if ( empty( $order ) ) {
+			return;
+		}
+
+		$order_key = filter_input( INPUT_GET, 'key', FILTER_SANITIZE_FULL_SPECIAL_CHARS );
+		if ( empty( $order_key ) || ! hash_equals( $order->get_order_key(), $order_key ) ) {
+			return;
+		}
+
+		$this->check_paytrail_response();
 	}
 
 	/**

From e499214332e25775e1372fb4b323b90b827edddc Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Mon, 24 Nov 2025 14:36:39 +0100
Subject: [PATCH 04/44] PHPCS formatting

---
 src/Controllers/AbstractController.php     |    6 +-
 src/Controllers/Callback.php               |    2 +-
 src/Controllers/Card.php                   |   58 +-
 src/Controllers/CardCancel.php             |   12 +-
 src/Controllers/CardSuccess.php            |   36 +-
 src/Gateway.php                            | 1640 ++++++++++----------
 src/Helper.php                             |   31 +-
 src/Model/PaymentSubscriptionMigration.php |   25 +-
 src/Model/PaymentTokenMigration.php        |    8 +-
 src/PaytrailBlocks.php                     |   66 +-
 src/Providers/OPLasku.php                  |   98 +-
 src/Router.php                             |   38 +-
 src/View.php                               |   12 +-
 src/View/CheckoutForm.php                  |   25 +-
 src/View/Intro-form.php                    |   26 +-
 src/View/PaymentDescription.php            |   62 +-
 src/View/ProviderForm.php                  |  147 +-
 src/View/SavedPaymentMethods.php           |   28 +-
 src/View/User-data-form.php                |   42 +-
 19 files changed, 1196 insertions(+), 1166 deletions(-)

diff --git a/src/Controllers/AbstractController.php b/src/Controllers/AbstractController.php
index b9741599..b516f90a 100644
--- a/src/Controllers/AbstractController.php
+++ b/src/Controllers/AbstractController.php
@@ -7,11 +7,11 @@
 
 abstract class AbstractController {
 
-	public function execute( $action = null) {
-		if (method_exists($this, $action)) {
+	public function execute( $action = null ) {
+		if ( method_exists( $this, $action ) ) {
 			$this->$action();
 		} else {
-			echo esc_html('Not found');
+			echo esc_html( 'Not found' );
 			return;
 		}
 	}
diff --git a/src/Controllers/Callback.php b/src/Controllers/Callback.php
index 90712e75..5cc3a57e 100644
--- a/src/Controllers/Callback.php
+++ b/src/Controllers/Callback.php
@@ -10,6 +10,6 @@
 class Callback extends AbstractController {
 
 	protected function index() {
-		new Gateway(['callbackMode' => true]);
+		new Gateway( array( 'callbackMode' => true ) );
 	}
 }
diff --git a/src/Controllers/Card.php b/src/Controllers/Card.php
index c0fb53da..2d5c981b 100644
--- a/src/Controllers/Card.php
+++ b/src/Controllers/Card.php
@@ -7,7 +7,7 @@
 
 use Paytrail\WooCommercePaymentGateway\Gateway;
 use Paytrail\WooCommercePaymentGateway\Plugin;
-//use Paytrail\WooCommercePaymentGateway\Exception;
+// use Paytrail\WooCommercePaymentGateway\Exception;
 use WC_Payment_Tokens;
 use WP_Error;
 use WP_HTTP_Response;
@@ -18,7 +18,7 @@ protected function add() {
 		$gateway = new Gateway();
 		try {
 			$gateway->add_card_form();
-		} catch (\Exception $e) {
+		} catch ( \Exception $e ) {
 			return null;
 		}
 	}
@@ -32,17 +32,17 @@ protected function add() {
 	protected function delete() {
 		try {
 			$this->validate_request();
-		} catch (\Exception $e) {
-			wc_add_notice(__('Card could not be deleted', 'paytrail-for-woocommerce'), 'error');
+		} catch ( \Exception $e ) {
+			wc_add_notice( __( 'Card could not be deleted', 'paytrail-for-woocommerce' ), 'error' );
 			wp_send_json_error();
-			return new WP_Error('invalid-request', $e->getMessage(), array('status' => 400));
+			return new WP_Error( 'invalid-request', $e->getMessage(), array( 'status' => 400 ) );
 		}
 
-		$body = file_get_contents('php://input');
-		$data = json_decode($body, true);
+		$body = file_get_contents( 'php://input' );
+		$data = json_decode( $body, true );
 
-		if (!is_array($data)) {
-			throw new \Exception('Failed to decode JSON object');
+		if ( ! is_array( $data ) ) {
+			throw new \Exception( 'Failed to decode JSON object' );
 		}
 
 		// @var \WP_User $current_user
@@ -50,44 +50,44 @@ protected function delete() {
 
 		$token_id = $data['token_id'];
 
-		if (!$current_user->ID || !$token_id) {
-			return new WP_Error('cant-delete', __('message', 'text-domain'), array('status' => 500));
+		if ( ! $current_user->ID || ! $token_id ) {
+			return new WP_Error( 'cant-delete', __( 'message', 'text-domain' ), array( 'status' => 500 ) );
 		}
 
-		$customer_tokens = WC_Payment_Tokens::get_customer_tokens($current_user->ID, Plugin::GATEWAY_ID);
-		$customer_token_ids = array_keys($customer_tokens);
+		$customer_tokens    = WC_Payment_Tokens::get_customer_tokens( $current_user->ID, Plugin::GATEWAY_ID );
+		$customer_token_ids = array_keys( $customer_tokens );
 
-		if (!in_array($token_id, $customer_token_ids)) {
-			return new WP_Error('cant-delete', __('message', 'text-domain'), array('status' => 500));
+		if ( ! in_array( $token_id, $customer_token_ids ) ) {
+			return new WP_Error( 'cant-delete', __( 'message', 'text-domain' ), array( 'status' => 500 ) );
 		}
 
 		try {
-			WC_Payment_Tokens::delete($token_id);
-			wc_add_notice(__('Card was deleted successfully', 'paytrail-for-woocommerce'), 'success');
-			wp_send_json_success($data);
-			return new WP_HTTP_Response(['type' => 'success'], 200);
-		} catch (\Exception $e) {
-			wc_add_notice(__('Card could not be deleted', 'paytrail-for-woocommerce'), 'error');
+			WC_Payment_Tokens::delete( $token_id );
+			wc_add_notice( __( 'Card was deleted successfully', 'paytrail-for-woocommerce' ), 'success' );
+			wp_send_json_success( $data );
+			return new WP_HTTP_Response( array( 'type' => 'success' ), 200 );
+		} catch ( \Exception $e ) {
+			wc_add_notice( __( 'Card could not be deleted', 'paytrail-for-woocommerce' ), 'error' );
 			wp_send_json_error();
-			return new WP_Error('cant-delete', __('message', 'text-domain'), array('status' => 500));
+			return new WP_Error( 'cant-delete', __( 'message', 'text-domain' ), array( 'status' => 500 ) );
 		}
 	}
 
 	private function validate_request() {
-		$request_method = isset($_SERVER['REQUEST_METHOD']) ? sanitize_text_field($_SERVER['REQUEST_METHOD']) : '';
+		$request_method = isset( $_SERVER['REQUEST_METHOD'] ) ? sanitize_text_field( $_SERVER['REQUEST_METHOD'] ) : '';
 
-		if (empty($request_method)) {
+		if ( empty( $request_method ) ) {
 			return;
 		}
 
-		if ('POST' !== $request_method) {
-			throw new \Exception('Only POST requests are allowed');
+		if ( 'POST' !== $request_method ) {
+			throw new \Exception( 'Only POST requests are allowed' );
 		}
 
-		$content_type = isset($_SERVER['CONTENT_TYPE']) ? sanitize_text_field($_SERVER['CONTENT_TYPE']) : '';
+		$content_type = isset( $_SERVER['CONTENT_TYPE'] ) ? sanitize_text_field( $_SERVER['CONTENT_TYPE'] ) : '';
 
-		if (stripos($content_type, 'application/json') === false) {
-			throw new \Exception('Content-Type must be application/json');
+		if ( stripos( $content_type, 'application/json' ) === false ) {
+			throw new \Exception( 'Content-Type must be application/json' );
 		}
 	}
 }
diff --git a/src/Controllers/CardCancel.php b/src/Controllers/CardCancel.php
index eb1077fe..87c885d4 100644
--- a/src/Controllers/CardCancel.php
+++ b/src/Controllers/CardCancel.php
@@ -8,20 +8,20 @@
 class CardCancel extends AbstractController {
 
 	protected function checkout() {
-		wc_add_notice(__('Could not add card details', 'paytrail-for-woocommerce'), 'error');
-		wp_safe_redirect(wc_get_checkout_url());
+		wc_add_notice( __( 'Could not add card details', 'paytrail-for-woocommerce' ), 'error' );
+		wp_safe_redirect( wc_get_checkout_url() );
 		exit;
 	}
 
 	protected function my_account() {
-		wc_add_notice(__('Could not add card details', 'paytrail-for-woocommerce'), 'error');
-		wp_safe_redirect(wc_get_account_endpoint_url('payment-methods'));
+		wc_add_notice( __( 'Could not add card details', 'paytrail-for-woocommerce' ), 'error' );
+		wp_safe_redirect( wc_get_account_endpoint_url( 'payment-methods' ) );
 		exit;
 	}
 
 	protected function change_payment_method() {
-		wc_add_notice(__('Could not add card details', 'paytrail-for-woocommerce'), 'error');
-		wp_safe_redirect(wc_get_account_endpoint_url('subscriptions'));
+		wc_add_notice( __( 'Could not add card details', 'paytrail-for-woocommerce' ), 'error' );
+		wp_safe_redirect( wc_get_account_endpoint_url( 'subscriptions' ) );
 		exit;
 	}
 }
diff --git a/src/Controllers/CardSuccess.php b/src/Controllers/CardSuccess.php
index d60363cc..39d045f5 100644
--- a/src/Controllers/CardSuccess.php
+++ b/src/Controllers/CardSuccess.php
@@ -15,13 +15,13 @@ protected function checkout() {
 		$gateway = new Gateway();
 		try {
 			$gateway->process_card_token();
-			wc_add_notice(__('Card was added successfully', 'paytrail-for-woocommerce'), 'success');
-		} catch (HmacException $e) {
-			wc_add_notice(__('Could not add card details', 'paytrail-for-woocommerce'), 'error');
-		} catch (ValidationException $e) {
-			wc_add_notice(__('Could not add card details', 'paytrail-for-woocommerce'), 'error');
+			wc_add_notice( __( 'Card was added successfully', 'paytrail-for-woocommerce' ), 'success' );
+		} catch ( HmacException $e ) {
+			wc_add_notice( __( 'Could not add card details', 'paytrail-for-woocommerce' ), 'error' );
+		} catch ( ValidationException $e ) {
+			wc_add_notice( __( 'Could not add card details', 'paytrail-for-woocommerce' ), 'error' );
 		}
-		wp_safe_redirect(wc_get_checkout_url());
+		wp_safe_redirect( wc_get_checkout_url() );
 		exit;
 	}
 
@@ -29,13 +29,13 @@ protected function my_account() {
 		$gateway = new Gateway();
 		try {
 			$gateway->process_card_token();
-			wc_add_notice(__('Card was added successfully', 'paytrail-for-woocommerce'), 'success');
-		} catch (HmacException $e) {
-			wc_add_notice(__('Could not add card details', 'paytrail-for-woocommerce'), 'error');
-		} catch (ValidationException $e) {
-			wc_add_notice(__('Could not add card details', 'paytrail-for-woocommerce'), 'error');
+			wc_add_notice( __( 'Card was added successfully', 'paytrail-for-woocommerce' ), 'success' );
+		} catch ( HmacException $e ) {
+			wc_add_notice( __( 'Could not add card details', 'paytrail-for-woocommerce' ), 'error' );
+		} catch ( ValidationException $e ) {
+			wc_add_notice( __( 'Could not add card details', 'paytrail-for-woocommerce' ), 'error' );
 		}
-		wp_safe_redirect(wc_get_account_endpoint_url('payment-methods'));
+		wp_safe_redirect( wc_get_account_endpoint_url( 'payment-methods' ) );
 		exit;
 	}
 
@@ -43,13 +43,13 @@ protected function change_payment_method() {
 		$gateway = new Gateway();
 		try {
 			$gateway->process_card_token();
-			wc_add_notice(__('Card was added successfully', 'paytrail-for-woocommerce'), 'success');
-		} catch (HmacException $e) {
-			wc_add_notice(__('Could not add card details', 'paytrail-for-woocommerce'), 'error');
-		} catch (ValidationException $e) {
-			wc_add_notice(__('Could not add card details', 'paytrail-for-woocommerce'), 'error');
+			wc_add_notice( __( 'Card was added successfully', 'paytrail-for-woocommerce' ), 'success' );
+		} catch ( HmacException $e ) {
+			wc_add_notice( __( 'Could not add card details', 'paytrail-for-woocommerce' ), 'error' );
+		} catch ( ValidationException $e ) {
+			wc_add_notice( __( 'Could not add card details', 'paytrail-for-woocommerce' ), 'error' );
 		}
-		wp_safe_redirect(wc_get_account_endpoint_url('subscriptions'));
+		wp_safe_redirect( wc_get_account_endpoint_url( 'subscriptions' ) );
 		exit;
 	}
 }
diff --git a/src/Gateway.php b/src/Gateway.php
index b4f47419..701e625d 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -58,8 +58,6 @@ final class Gateway extends \WC_Payment_Gateway {
 
 	/**
 	 *  Transaction settlement declaration
-	 *
-	 *
 	 */
 	protected $transaction_settlement_enable;
 
@@ -84,7 +82,7 @@ final class Gateway extends \WC_Payment_Gateway {
 	 *
 	 * @var array
 	 */
-	public $supports = [
+	public $supports = array(
 		'products',
 		'refunds',
 		'tokenization',
@@ -97,15 +95,15 @@ final class Gateway extends \WC_Payment_Gateway {
 		'subscription_payment_method_change',
 		'subscription_payment_method_change_customer',
 		'subscription_payment_method_change_admin',
-		'multiple_subscriptions'
-	];
+		'multiple_subscriptions',
+	);
 
 	/**
 	 * Dynamic method info that will be populated from an endpoint.
 	 *
 	 * @var array
 	 */
-	public $method_info = [];
+	public $method_info = array();
 
 	/**
 	 * WooCommerce logger instance
@@ -126,14 +124,14 @@ final class Gateway extends \WC_Payment_Gateway {
 	 *
 	 * @var Helper
 	 */
-	protected $helper = null;
-	const TAX_RATE_PRECISION = 1;
-	const SUPPORTED_CURRENCIES = ['EUR'];
+	protected $helper          = null;
+	const TAX_RATE_PRECISION   = 1;
+	const SUPPORTED_CURRENCIES = array( 'EUR' );
 
 	/**
 	 * Object constructor
 	 */
-	public function __construct( $params = []) {
+	public function __construct( $params = array() ) {
 		// Set payment gateway ID
 		$this->id = Plugin::GATEWAY_ID;
 
@@ -147,8 +145,8 @@ public function __construct( $params = []) {
 		$this->method_description = $this->method_info['description'];
 
 		// These strings may show in the frontend.
-		$this->title       = !empty($this->get_option('custom_provider_name')) ? $this->get_option('custom_provider_name') : $this->method_info['title'];
-		$this->description = !empty($this->get_option('custom_provider_description')) ? $this->get_option('custom_provider_description') : $this->method_info['description'];
+		$this->title       = ! empty( $this->get_option( 'custom_provider_name' ) ) ? $this->get_option( 'custom_provider_name' ) : $this->method_info['title'];
+		$this->description = ! empty( $this->get_option( 'custom_provider_description' ) ) ? $this->get_option( 'custom_provider_description' ) : $this->method_info['description'];
 
 		// Icon temporarily disabled for size issues
 		// $this->icon = Plugin::ICON_URL;
@@ -160,15 +158,15 @@ public function __construct( $params = []) {
 		$this->init_settings();
 
 		// Whether we are in test mode or not.
-		$this->enable_test_mode = 'yes' === $this->get_option('enable_test_mode', 'no');
+		$this->enable_test_mode = 'yes' === $this->get_option( 'enable_test_mode', 'no' );
 
 		// Set merchant ID and secret key either from the options or for test mode.
-		if ($this->enable_test_mode) {
+		if ( $this->enable_test_mode ) {
 			$this->merchant_id = (int) Plugin::TEST_MERCHANT_ID;
 			$this->secret_key  = Plugin::TEST_SECRET_KEY;
 		} else {
-			$this->merchant_id = (int) $this->get_option('merchant_id');
-			$this->secret_key  = $this->get_option('secret_key');
+			$this->merchant_id = (int) $this->get_option( 'merchant_id' );
+			$this->secret_key  = $this->get_option( 'secret_key' );
 		}
 
 		$platformName = 'paytrail-for-woocommerce-' . \Paytrail\WooCommercePaymentGateway\Plugin::$version;
@@ -184,12 +182,12 @@ public function __construct( $params = []) {
 		$this->helper = new Helper();
 
 		// Whether we are in debug mode or not.
-		$this->debug = 'yes' === $this->get_option('debug', 'no');
+		$this->debug = 'yes' === $this->get_option( 'debug', 'no' );
 
 		// Check if transaction settlement is enabled
 		$this->transaction_settlement_enable = $this->get_option( 'settlement_enablement', 'no' ) === 'yes';
 
-		if (!empty($params) && isset($params['callbackMode'])) {
+		if ( ! empty( $params ) && isset( $params['callbackMode'] ) ) {
 			$this->callbackMode = true;
 		}
 
@@ -212,41 +210,40 @@ public function __construct( $params = []) {
 	 * @return void
 	 */
 	protected function add_actions() {
-		add_action('woocommerce_update_options_payment_gateways_' . $this->id, [ $this, 'process_admin_options' ]);
-		add_action('woocommerce_scheduled_subscription_payment_' . Plugin::GATEWAY_ID, [ $this, 'scheduled_subscription_payment' ], 10, 2);
-		add_action('woocommerce_receipt_' . $this->id, [ $this, 'receipt_page' ]);
-		add_filter('woocommerce_admin_order_items_after_refunds', [ $this, 'refund_items' ], 10, 1);
-		add_filter('woocommerce_order_data_store_cpt_get_orders_query', [ $this, 'handle_custom_searches' ], 10, 2);
-		add_filter('woocommerce_payment_gateway_get_saved_payment_method_option_html', [ $this, 'get_token_payment_option_html' ], 10, 2);
-		add_action('admin_footer', [$this, 'display_user_data_form']);
-		add_action('admin_notices', [$this, 'admin_notices']);
-		add_action('admin_enqueue_scripts', [$this, 'enqueue_admin_scripts']);
-		add_action('admin_enqueue_scripts', [$this, 'enqueue_admin_styles']);
-
+		add_action( 'woocommerce_update_options_payment_gateways_' . $this->id, array( $this, 'process_admin_options' ) );
+		add_action( 'woocommerce_scheduled_subscription_payment_' . Plugin::GATEWAY_ID, array( $this, 'scheduled_subscription_payment' ), 10, 2 );
+		add_action( 'woocommerce_receipt_' . $this->id, array( $this, 'receipt_page' ) );
+		add_filter( 'woocommerce_admin_order_items_after_refunds', array( $this, 'refund_items' ), 10, 1 );
+		add_filter( 'woocommerce_order_data_store_cpt_get_orders_query', array( $this, 'handle_custom_searches' ), 10, 2 );
+		add_filter( 'woocommerce_payment_gateway_get_saved_payment_method_option_html', array( $this, 'get_token_payment_option_html' ), 10, 2 );
+		add_action( 'admin_footer', array( $this, 'display_user_data_form' ) );
+		add_action( 'admin_notices', array( $this, 'admin_notices' ) );
+		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_scripts' ) );
+		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_styles' ) );
 	}
 
 	/**
 	 * Display the user_data_form as an overlay
 	 */
 	public function display_user_data_form() {
-		$merchant_id = $this->get_option('merchant_id');
-		$test_mode_enabled = $this->get_option('enable_test_mode', 'no') === 'yes';
-		$current_screen = get_current_screen();
+		$merchant_id               = $this->get_option( 'merchant_id' );
+		$test_mode_enabled         = $this->get_option( 'enable_test_mode', 'no' ) === 'yes';
+		$current_screen            = get_current_screen();
 		$is_paytrail_settings_page = (
-			!$test_mode_enabled &&
+			! $test_mode_enabled &&
 			$current_screen && 'woocommerce_page_wc-settings' === $current_screen->id &&
-			isset($_GET['tab']) && 'checkout' === $_GET['tab'] &&
-			isset($_GET['section']) && 'paytrail' === $_GET['section']
+			isset( $_GET['tab'] ) && 'checkout' === $_GET['tab'] &&
+			isset( $_GET['section'] ) && 'paytrail' === $_GET['section']
 		);
 
 		// Check if merchant_id is already submitted
-		if (!empty($merchant_id) || $this->get_option('enable_test_mode', 'no') === 'yes') {
+		if ( ! empty( $merchant_id ) || $this->get_option( 'enable_test_mode', 'no' ) === 'yes' ) {
 			return;
 		}
 
-		if ($is_paytrail_settings_page) {
-			$template_path = plugin_dir_path(__FILE__) . 'View/Intro-form.php';
-			if (file_exists($template_path)) {
+		if ( $is_paytrail_settings_page ) {
+			$template_path = plugin_dir_path( __FILE__ ) . 'View/Intro-form.php';
+			if ( file_exists( $template_path ) ) {
 				include_once $template_path;
 			}
 		}
@@ -258,33 +255,32 @@ public function display_user_data_form() {
 	 */
 	public function user_data_form() {
 		$current_user = wp_get_current_user();
-		$user_email = $current_user->user_email;
-		$first_name = $current_user->first_name;
-		$last_name = $current_user->last_name;
+		$user_email   = $current_user->user_email;
+		$first_name   = $current_user->first_name;
+		$last_name    = $current_user->last_name;
 
-		if (class_exists('WooCommerce')) {
-			$wc_billing_data = get_user_meta($current_user->ID, 'billing', true);
-			$company_name = isset($wc_billing_data['company']) ? $wc_billing_data['company'] : '';
-			$phone_number = isset($wc_billing_data['phone']) ? $wc_billing_data['phone'] : '';
+		if ( class_exists( 'WooCommerce' ) ) {
+			$wc_billing_data = get_user_meta( $current_user->ID, 'billing', true );
+			$company_name    = isset( $wc_billing_data['company'] ) ? $wc_billing_data['company'] : '';
+			$phone_number    = isset( $wc_billing_data['phone'] ) ? $wc_billing_data['phone'] : '';
 
 			// Fetch shop's address using WC_Countries
-			$wc_countries = WC()->countries;
-			$shop_address = $wc_countries->get_base_address();
-			$shop_city = $wc_countries->get_base_city();
+			$wc_countries  = WC()->countries;
+			$shop_address  = $wc_countries->get_base_address();
+			$shop_city     = $wc_countries->get_base_city();
 			$shop_postcode = $wc_countries->get_base_postcode();
 		} else {
-			$company_name = '';
-			$phone_number = '';
-			$shop_address = '';
-			$shop_city = '';
+			$company_name  = '';
+			$phone_number  = '';
+			$shop_address  = '';
+			$shop_city     = '';
 			$shop_postcode = '';
 		}
 
+		$site_url = esc_url( get_site_url() );
 
-		$site_url = esc_url(get_site_url());
-
-		$template_path = plugin_dir_path(__FILE__) . 'View/User-data-form.php';
-		if (file_exists($template_path)) {
+		$template_path = plugin_dir_path( __FILE__ ) . 'View/User-data-form.php';
+		if ( file_exists( $template_path ) ) {
 			include_once $template_path;
 		}
 	}
@@ -296,11 +292,11 @@ public function user_data_form() {
 	 * @return array
 	 */
 	protected function get_method_info() {
-		$method_info = [
-			'title' => __('Paytrail for WooCommerce', 'paytrail-for-woocommerce'),
-			'description' => __('Paytrail for WooCommerce - the most comprehensive suite of payment methods in the market with a single contract', 'paytrail-for-woocommerce'),
-			'save_card' => 1,
-		];
+		$method_info = array(
+			'title'       => __( 'Paytrail for WooCommerce', 'paytrail-for-woocommerce' ),
+			'description' => __( 'Paytrail for WooCommerce - the most comprehensive suite of payment methods in the market with a single contract', 'paytrail-for-woocommerce' ),
+			'save_card'   => 1,
+		);
 		return $method_info;
 	}
 
@@ -310,131 +306,131 @@ protected function get_method_info() {
 	 * @return void
 	 */
 	protected function set_form_fields() {
-		$test_mode_enabled = $this->get_option('enable_test_mode', 'no') === 'yes';
-		$merchant_id_disabled = $this->get_option( 'enable_test_mode', 'no' ) === 'yes';
-		$secret_key_disabled = $this->get_option( 'enable_test_mode', 'no' ) === 'yes';
-		$enable_test_mode_disabled = !$test_mode_enabled && (
-			!empty($this->get_option('merchant_id')) ||
-			!empty($this->get_option('secret_key'))
+		$test_mode_enabled         = $this->get_option( 'enable_test_mode', 'no' ) === 'yes';
+		$merchant_id_disabled      = $this->get_option( 'enable_test_mode', 'no' ) === 'yes';
+		$secret_key_disabled       = $this->get_option( 'enable_test_mode', 'no' ) === 'yes';
+		$enable_test_mode_disabled = ! $test_mode_enabled && (
+			! empty( $this->get_option( 'merchant_id' ) ) ||
+			! empty( $this->get_option( 'secret_key' ) )
 		);
-		$this->form_fields = [
+		$this->form_fields         = array(
 			// Whether the payment gateway is enabled.
-			'enabled'     => [
-				'title'   => __('Payment gateway status', 'paytrail-for-woocommerce'),
+			'enabled'                     => array(
+				'title'   => __( 'Payment gateway status', 'paytrail-for-woocommerce' ),
 				'type'    => 'checkbox',
-				'label'   => __('Enable Paytrail for WooCommerce', 'paytrail-for-woocommerce'),
+				'label'   => __( 'Enable Paytrail for WooCommerce', 'paytrail-for-woocommerce' ),
 				'default' => 'yes',
-			],
+			),
 			// Credentials
-			'credentials_title' => [
-				'title' => __('Credentials', 'paytrail-for-woocommerce'),
-				'type' => 'title',
-			],
+			'credentials_title'           => array(
+				'title' => __( 'Credentials', 'paytrail-for-woocommerce' ),
+				'type'  => 'title',
+			),
 			// Paytrail credentials
-			'merchant_id' => [
-				'title'   => __('Paytrail Merchant ID', 'paytrail-for-woocommerce'),
-				'type'    => 'text',
-				'label'   => __('Merchant ID', 'paytrail-for-woocommerce'),
-				'default' => '',
+			'merchant_id'                 => array(
+				'title'    => __( 'Paytrail Merchant ID', 'paytrail-for-woocommerce' ),
+				'type'     => 'text',
+				'label'    => __( 'Merchant ID', 'paytrail-for-woocommerce' ),
+				'default'  => '',
 				'disabled' => $merchant_id_disabled, // Disable if enable_test_mode is checked
-			],
-			'secret_key'  => [
-				'title'   => __('Paytrail Secret key', 'paytrail-for-woocommerce'),
-				'type'    => 'password',
-				'label'   => __('Secret key', 'paytrail-for-woocommerce'),
-				'default' => '',
-				'description' => __('Credentials can be found in <a target="_blank" href="https://merchant.paytrail.com/">the merchant panel</a>.', 'paytrail-for-woocommerce'),
-				'disabled' => $secret_key_disabled, // Disable if enable_test_mode is checked
-			],
+			),
+			'secret_key'                  => array(
+				'title'       => __( 'Paytrail Secret key', 'paytrail-for-woocommerce' ),
+				'type'        => 'password',
+				'label'       => __( 'Secret key', 'paytrail-for-woocommerce' ),
+				'default'     => '',
+				'description' => __( 'Credentials can be found in <a target="_blank" href="https://merchant.paytrail.com/">the merchant panel</a>.', 'paytrail-for-woocommerce' ),
+				'disabled'    => $secret_key_disabled, // Disable if enable_test_mode is checked
+			),
 			// Whether test mode is enabled
-			'enable_test_mode' => [
-				'title'       => __('Test mode', 'paytrail-for-woocommerce'),
+			'enable_test_mode'            => array(
+				'title'       => __( 'Test mode', 'paytrail-for-woocommerce' ),
 				'type'        => 'checkbox',
-				'label'       => __('Enable test mode', 'paytrail-for-woocommerce'),
+				'label'       => __( 'Enable test mode', 'paytrail-for-woocommerce' ),
 				'default'     => 'no',
-				'description' => __('You can use test mode to simulate payments with Paytrail\'s <a target="_blank" href="https://docs.paytrail.com/#/?id=test-credentials">test credentials</a>. To enable test mode, please first clear the Credentials and save settings.', 'paytrail-for-woocommerce'),
+				'description' => __( 'You can use test mode to simulate payments with Paytrail\'s <a target="_blank" href="https://docs.paytrail.com/#/?id=test-credentials">test credentials</a>. To enable test mode, please first clear the Credentials and save settings.', 'paytrail-for-woocommerce' ),
 				'disabled'    => $enable_test_mode_disabled, // Disable the checkbox if merchant_id or secret_key has a value
-			],
+			),
 			// General settings
-			'general_settings_title' => [
-				'title' => __('General settings', 'paytrail-for-woocommerce'),
-				'type' => 'title',
-			],
+			'general_settings_title'      => array(
+				'title' => __( 'General settings', 'paytrail-for-woocommerce' ),
+				'type'  => 'title',
+			),
 			// Whether to show the payment provider wall or choose the method in the store
-			'provider_selection' => [
-				'title'       => __('Payment provider selection', 'paytrail-for-woocommerce'),
+			'provider_selection'          => array(
+				'title'       => __( 'Payment provider selection', 'paytrail-for-woocommerce' ),
 				'type'        => 'checkbox',
-				'label'       => __('Enable payment provider selection in the checkout page', 'paytrail-for-woocommerce'),
+				'label'       => __( 'Enable payment provider selection in the checkout page', 'paytrail-for-woocommerce' ),
 				'default'     => 'yes',
-				'description' => __('Choose whether you want the payment provider selection to happen in the checkout page or in a separate page.', 'paytrail-for-woocommerce'),
-			],
+				'description' => __( 'Choose whether you want the payment provider selection to happen in the checkout page or in a separate page.', 'paytrail-for-woocommerce' ),
+			),
 			// Alternative text + description to show on the Checkout page
-			'custom_provider_name' => [
-				'title'       => __('Payment provider title', 'paytrail-for-woocommerce'),
+			'custom_provider_name'        => array(
+				'title'       => __( 'Payment provider title', 'paytrail-for-woocommerce' ),
 				'type'        => 'text',
-				'label'       => __('Used on the Checkout page title', 'paytrail-for-woocommerce'),
+				'label'       => __( 'Used on the Checkout page title', 'paytrail-for-woocommerce' ),
 				'default'     => 'Paytrail for WooCommerce',
-				'description' => __('This title is displayed on the Checkout page before the payment provider images.', 'paytrail-for-woocommerce')
-			],
-			'custom_provider_description' => [
-				'title'       => __('Payment provider description', 'paytrail-for-woocommerce'),
+				'description' => __( 'This title is displayed on the Checkout page before the payment provider images.', 'paytrail-for-woocommerce' ),
+			),
+			'custom_provider_description' => array(
+				'title'       => __( 'Payment provider description', 'paytrail-for-woocommerce' ),
 				'type'        => 'text',
-				'label'       => __('Used on the Checkout page title', 'paytrail-for-woocommerce'),
+				'label'       => __( 'Used on the Checkout page title', 'paytrail-for-woocommerce' ),
 				'default'     => 'Paytrail for WooCommerce',
-				'description' => __('Depending on your theme, this description might be displayed on the Checkout page before the payment provider images.', 'paytrail-for-woocommerce')
-			],
+				'description' => __( 'Depending on your theme, this description might be displayed on the Checkout page before the payment provider images.', 'paytrail-for-woocommerce' ),
+			),
 			// OP Lasku
-			'op_lasku_calculator' => [
+			'op_lasku_calculator'         => array(
 				'title'       => OPLasku::settings_title(),
 				'type'        => 'checkbox',
-				'label'       => __('Enable OP Lasku calculator', 'paytrail-for-woocommerce'),
+				'label'       => __( 'Enable OP Lasku calculator', 'paytrail-for-woocommerce' ),
 				'default'     => 'no',
-				'description' => __('Display OP Lasku calculator on the product and cart page.', 'paytrail-for-woocommerce'),
-			],
+				'description' => __( 'Display OP Lasku calculator on the product and cart page.', 'paytrail-for-woocommerce' ),
+			),
 			// Advanced settings
-			'advanced_settings_title' => [
-				'title' => __('Advanced settings', 'paytrail-for-woocommerce'),
-				'type' => 'title',
-			],
-			'settlement_enablement' => [
-				'title' => __( 'Enable individual settlements', 'paytrail-for-woocommerce' ),
-				'type' => 'checkbox',
-				'default' => 'no',
+			'advanced_settings_title'     => array(
+				'title' => __( 'Advanced settings', 'paytrail-for-woocommerce' ),
+				'type'  => 'title',
+			),
+			'settlement_enablement'       => array(
+				'title'       => __( 'Enable individual settlements', 'paytrail-for-woocommerce' ),
+				'type'        => 'checkbox',
+				'default'     => 'no',
 				'description' => __( 'This setting is required only if you are using transaction-by-transaction settlements in Paytrail.', 'paytrail-for-woocommerce' ),
-			],
-			'settlement_prefix' => [
-				'title' => __( 'Bank reference prefix', 'paytrail-for-woocommerce' ),
-				'type' => 'text',
+			),
+			'settlement_prefix'           => array(
+				'title'       => __( 'Bank reference prefix', 'paytrail-for-woocommerce' ),
+				'type'        => 'text',
 				'description' => __( 'Add Prefix', 'paytrail-for-woocommerce' ),
-				'default' => '10'
-			],
-			'fallback_country'  => [
-				'title'   => __('Default country', 'paytrail-for-woocommerce'),
-				'type'    => 'select',
-				'label'   => __('Fallback country', 'paytrail-for-woocommerce'),
-				'default' => '',
-				'description' => __('Select country to be used as fallback if no country specified in checkout.', 'paytrail-for-woocommerce'),
-				'options' => array_merge(['' => 'Select country'], WC()->countries->get_countries())
-			],
+				'default'     => '10',
+			),
+			'fallback_country'            => array(
+				'title'       => __( 'Default country', 'paytrail-for-woocommerce' ),
+				'type'        => 'select',
+				'label'       => __( 'Fallback country', 'paytrail-for-woocommerce' ),
+				'default'     => '',
+				'description' => __( 'Select country to be used as fallback if no country specified in checkout.', 'paytrail-for-woocommerce' ),
+				'options'     => array_merge( array( '' => 'Select country' ), WC()->countries->get_countries() ),
+			),
 			// Whether debug mode is enabled
-			'debug'       => [
-				'title'       => __('Debug log', 'paytrail-for-woocommerce'),
+			'debug'                       => array(
+				'title'       => __( 'Debug log', 'paytrail-for-woocommerce' ),
 				'type'        => 'checkbox',
-				'label'       => __('Enable logging', 'paytrail-for-woocommerce'),
+				'label'       => __( 'Enable logging', 'paytrail-for-woocommerce' ),
 				'default'     => 'no',
 				// translators: %s: URL
-				'description' => sprintf(__('This enables logging all payment gateway events. The log will be written in %1$s. Recommended only for debugging purposes as this might save personal data. All logs can be viewed here: %2$s', 'paytrail-for-woocommerce'), '<code>' . \WC_Log_Handler_File::get_log_file_path(Plugin::GATEWAY_ID) . '</code>', '<a target="_blank" href="/wp-admin/admin.php?page=wc-status&tab=logs">Logs</a>'),
-			],
+				'description' => sprintf( __( 'This enables logging all payment gateway events. The log will be written in %1$s. Recommended only for debugging purposes as this might save personal data. All logs can be viewed here: %2$s', 'paytrail-for-woocommerce' ), '<code>' . \WC_Log_Handler_File::get_log_file_path( Plugin::GATEWAY_ID ) . '</code>', '<a target="_blank" href="/wp-admin/admin.php?page=wc-status&tab=logs">Logs</a>' ),
+			),
 			// Update tokens if enabled
-			'tokenize'       => [
-				'title'       => __('Update tokens', 'paytrail-for-woocommerce'),
+			'tokenize'                    => array(
+				'title'       => __( 'Update tokens', 'paytrail-for-woocommerce' ),
 				'type'        => 'checkbox',
-				'label'       => __('Enable token update', 'paytrail-for-woocommerce'),
+				'label'       => __( 'Enable token update', 'paytrail-for-woocommerce' ),
 				'default'     => 'no',
 				// translators: %s: URL
-				'description' => __('Choose this to update card information (tokens) from the old Checkout Finland for WooCommerce -plugin. The update is done upon saving settings. This will also update tokens for the current WooCommerce Subscriptions orders, if that module is in use. </br> <b>CAUTION:</b> This action cannot be reverted.', 'paytrail-for-woocommerce'),
-			],
-		];
+				'description' => __( 'Choose this to update card information (tokens) from the old Checkout Finland for WooCommerce -plugin. The update is done upon saving settings. This will also update tokens for the current WooCommerce Subscriptions orders, if that module is in use. </br> <b>CAUTION:</b> This action cannot be reverted.', 'paytrail-for-woocommerce' ),
+			),
+		);
 	}
 
 	/**
@@ -446,16 +442,16 @@ public function process_admin_options() {
 		$saved = parent::process_admin_options();
 
 		// Clear logs if debugging was disabled.
-		if ('yes' !== $this->get_option('debug', 'no')) {
-			if (empty($this->logger)) {
+		if ( 'yes' !== $this->get_option( 'debug', 'no' ) ) {
+			if ( empty( $this->logger ) ) {
 				$this->logger = wc_get_logger();
 			}
 
-			$this->logger->clear(Plugin::GATEWAY_ID);
+			$this->logger->clear( Plugin::GATEWAY_ID );
 		}
 
 		// Update tokens if checkbx was checked
-		if ('yes' === $this->get_option('tokenize', 'yes')) {
+		if ( 'yes' === $this->get_option( 'tokenize', 'yes' ) ) {
 			$token_migration = new PaymentTokenMigration();
 			$token_migration->execute();
 			$subscription_migration = new PaymentSubscriptionMigration();
@@ -470,19 +466,19 @@ public function process_admin_options() {
 	 */
 	public function display_test_mode_notice() {
 		// Check if test mode is enabled
-		$test_mode_enabled = $this->get_option('enable_test_mode', 'no') === 'yes';
+		$test_mode_enabled = $this->get_option( 'enable_test_mode', 'no' ) === 'yes';
 
 		// Check if the notice should be displayed
-		if ($test_mode_enabled) {
+		if ( $test_mode_enabled ) {
 			?>
 			<div class="notice notice-warning">
 				<p>
 				<?php
-					esc_html_e('Paytrail for WooCommerce test mode is enabled. Please disable it to insert your Merchant ID and secret key.', 'paytrail-for-woocommerce');
+					esc_html_e( 'Paytrail for WooCommerce test mode is enabled. Please disable it to insert your Merchant ID and secret key.', 'paytrail-for-woocommerce' );
 					echo ' ' . sprintf(
 						/* translators: If you have not registered yet, you can do so on our website %s to get your credentials! */
-						esc_html__('If you have not registered yet, you can do so on our website %s to get your credentials!', 'paytrail-for-woocommerce'),
-						'<a href="https://www.paytrail.com/en/get-started" target="_blank">' . esc_html__('here', 'paytrail-for-woocommerce') . '</a>'
+						esc_html__( 'If you have not registered yet, you can do so on our website %s to get your credentials!', 'paytrail-for-woocommerce' ),
+						'<a href="https://www.paytrail.com/en/get-started" target="_blank">' . esc_html__( 'here', 'paytrail-for-woocommerce' ) . '</a>'
 					);
 				?>
 				</p>
@@ -498,20 +494,21 @@ public function display_test_mode_notice() {
 	 */
 	public function display_currency_notice() {
 		// Check the currently selected currency
-		$current_currency = get_woocommerce_currency();
-		$currency_is_not_supported =  !in_array($current_currency, self::SUPPORTED_CURRENCIES);
+		$current_currency          = get_woocommerce_currency();
+		$currency_is_not_supported = ! in_array( $current_currency, self::SUPPORTED_CURRENCIES );
 
 		// Check if the notice should be displayed
-		if ($currency_is_not_supported) {
-			$currency_settings_url = admin_url('admin.php?page=wc-settings&tab=general');
+		if ( $currency_is_not_supported ) {
+			$currency_settings_url = admin_url( 'admin.php?page=wc-settings&tab=general' );
 			?>
 			<div class="notice notice-warning">
 				<p>
 					<?php
-					esc_html_e('Paytrail for WooCommerce - Unsupported Currency Chosen.', 'paytrail-for-woocommerce');
+					esc_html_e( 'Paytrail for WooCommerce - Unsupported Currency Chosen.', 'paytrail-for-woocommerce' );
 					echo ' ' . sprintf(
-						'<a href="%s">' . esc_html__('Please set the WooCommerce currency to Euro (€)', 'paytrail-for-woocommerce') . '</a>', esc_url($currency_settings_url)
-						);
+						'<a href="%s">' . esc_html__( 'Please set the WooCommerce currency to Euro (€)', 'paytrail-for-woocommerce' ) . '</a>',
+						esc_url( $currency_settings_url )
+					);
 					?>
 				</p>
 			</div>
@@ -531,9 +528,9 @@ public function admin_notices() {
 	 * Calculate bank reference
 	 */
 	private function calculate_reference( $base ) {
-		$base = sprintf( '%s%s', $this->settlement_prefix, $base );
-		$base = trim( str_replace( ' ', '', $base ) );
-		$base = str_split( $base );
+		$base          = sprintf( '%s%s', $this->settlement_prefix, $base );
+		$base          = trim( str_replace( ' ', '', $base ) );
+		$base          = str_split( $base );
 		$reversed_base = array_reverse( $base );
 
 		$weights = array( 7, 3, 1, 7, 3, 1, 7, 3, 1, 7, 3, 1, 7, 3, 1, 7, 3, 1, 7 );
@@ -541,7 +538,7 @@ private function calculate_reference( $base ) {
 		$sum = 0;
 		for ( $i = 0; $i < count( $reversed_base ); $i++ ) {
 			$coefficient = array_shift( $weights );
-			$sum += intval( $reversed_base[$i] ) * $coefficient;
+			$sum        += intval( $reversed_base[ $i ] ) * $coefficient;
 		}
 
 		$checksum = ( 0 == ( $sum % 10 ) ) ? 0 : ( 10 - ( $sum % 10 ) );
@@ -557,11 +554,11 @@ private function calculate_reference( $base ) {
 	 * @return void
 	 */
 	public function receipt_page() {
-		$view = new View('CheckoutForm');
+		$view = new View( 'CheckoutForm' );
 
-		$provider = WC()->session->get('payment_provider');
+		$provider = WC()->session->get( 'payment_provider' );
 
-		$view->render($provider);
+		$view->render( $provider );
 	}
 
 	/**
@@ -570,7 +567,7 @@ public function receipt_page() {
 	 * @return void
 	 */
 	public function render_saved_payment_methods() {
-		$view = new View('SavedPaymentMethods');
+		$view = new View( 'SavedPaymentMethods' );
 
 		$view->render();
 	}
@@ -582,44 +579,44 @@ public function render_saved_payment_methods() {
 	 * @throws HmacException
 	 * @throws ValidationException
 	 */
-	public function add_card_form( $context = Plugin::ADD_CARD_CONTEXT_CHECKOUT) {
-		$datetime = new \DateTime();
-		$checkout_nonce = sha1(uniqid(true));
+	public function add_card_form( $context = Plugin::ADD_CARD_CONTEXT_CHECKOUT ) {
+		$datetime       = new \DateTime();
+		$checkout_nonce = sha1( uniqid( true ) );
 
-		if (Plugin::ADD_CARD_CONTEXT_MY_ACCOUNT === $context) {
-			$success_url = Router::get_url(Plugin::ADD_CARD_REDIRECT_SUCCESS_URL, Plugin::ADD_CARD_CONTEXT_MY_ACCOUNT);
-			$cancel_url = Router::get_url(Plugin::ADD_CARD_REDIRECT_CANCEL_URL, Plugin::ADD_CARD_CONTEXT_MY_ACCOUNT);
-		} elseif (Helper::getIsChangeSubscriptionPaymentMethod()) {
+		if ( Plugin::ADD_CARD_CONTEXT_MY_ACCOUNT === $context ) {
+			$success_url = Router::get_url( Plugin::ADD_CARD_REDIRECT_SUCCESS_URL, Plugin::ADD_CARD_CONTEXT_MY_ACCOUNT );
+			$cancel_url  = Router::get_url( Plugin::ADD_CARD_REDIRECT_CANCEL_URL, Plugin::ADD_CARD_CONTEXT_MY_ACCOUNT );
+		} elseif ( Helper::getIsChangeSubscriptionPaymentMethod() ) {
 			$success_url = Router::get_url(
 				Plugin::ADD_CARD_REDIRECT_SUCCESS_URL,
 				Plugin::ADD_CARD_CONTEXT_CHANGE_PAYMENT_METHOD
 			);
-			$cancel_url = Router::get_url(
+			$cancel_url  = Router::get_url(
 				Plugin::ADD_CARD_REDIRECT_CANCEL_URL,
 				Plugin::ADD_CARD_CONTEXT_CHANGE_PAYMENT_METHOD
 			);
 		} else {
-			$success_url = Router::get_url(Plugin::ADD_CARD_REDIRECT_SUCCESS_URL, Plugin::ADD_CARD_CONTEXT_CHECKOUT);
-			$cancel_url = Router::get_url(Plugin::ADD_CARD_REDIRECT_CANCEL_URL, Plugin::ADD_CARD_CONTEXT_CHECKOUT);
+			$success_url = Router::get_url( Plugin::ADD_CARD_REDIRECT_SUCCESS_URL, Plugin::ADD_CARD_CONTEXT_CHECKOUT );
+			$cancel_url  = Router::get_url( Plugin::ADD_CARD_REDIRECT_CANCEL_URL, Plugin::ADD_CARD_CONTEXT_CHECKOUT );
 		}
-		$this->log('Paytrail: try to add new card', 'debug');
+		$this->log( 'Paytrail: try to add new card', 'debug' );
 
 		$add_card_form_request = new AddCardFormRequest();
-		$add_card_form_request->setCheckoutAccount($this->merchant_id);
-		$add_card_form_request->setCheckoutAlgorithm('sha256');
-		$add_card_form_request->setCheckoutMethod('POST');
-		$add_card_form_request->setCheckoutTimestamp($datetime->format('Y-m-d\TH:i:s.u\Z'));
-		$add_card_form_request->setCheckoutNonce($checkout_nonce);
-		$add_card_form_request->setCheckoutRedirectSuccessUrl($success_url);
-		$add_card_form_request->setCheckoutRedirectCancelUrl($cancel_url);
-		$add_card_form_request->setLanguage(Helper::getLocale());
+		$add_card_form_request->setCheckoutAccount( $this->merchant_id );
+		$add_card_form_request->setCheckoutAlgorithm( 'sha256' );
+		$add_card_form_request->setCheckoutMethod( 'POST' );
+		$add_card_form_request->setCheckoutTimestamp( $datetime->format( 'Y-m-d\TH:i:s.u\Z' ) );
+		$add_card_form_request->setCheckoutNonce( $checkout_nonce );
+		$add_card_form_request->setCheckoutRedirectSuccessUrl( $success_url );
+		$add_card_form_request->setCheckoutRedirectCancelUrl( $cancel_url );
+		$add_card_form_request->setLanguage( Helper::getLocale() );
 
 		// Create a addCardFormRequest via Paytrail SDK
 		// @var \GuzzleHttp\Psr7\Response $response
-		$response = $this->client->createAddCardFormRequest($add_card_form_request);
+		$response = $this->client->createAddCardFormRequest( $add_card_form_request );
 
-		if ($response->getHeader('Location')) {
-			wp_redirect($response->getHeader('Location')[0]);
+		if ( $response->getHeader( 'Location' ) ) {
+			wp_redirect( $response->getHeader( 'Location' )[0] );
 			exit;
 		}
 	}
@@ -633,12 +630,12 @@ public function add_card_form( $context = Plugin::ADD_CARD_CONTEXT_CHECKOUT) {
 	 */
 	public function process_card_token() {
 		$getTokenRequest = new GetTokenRequest();
-		$getTokenRequest->setCheckoutTokenizationId(filter_input(INPUT_GET, 'checkout-tokenization-id'));
-		$this->log('Paytrail: process_card_token', 'debug');
+		$getTokenRequest->setCheckoutTokenizationId( filter_input( INPUT_GET, 'checkout-tokenization-id' ) );
+		$this->log( 'Paytrail: process_card_token', 'debug' );
 
-		$response = $this->client->createGetTokenRequest($getTokenRequest);
+		$response = $this->client->createGetTokenRequest( $getTokenRequest );
 
-		return (bool) $this->save_card_token($response);
+		return (bool) $this->save_card_token( $response );
 	}
 
 	/**
@@ -646,18 +643,18 @@ public function process_card_token() {
 	 *
 	 * @param GetTokenResponse $card_token
 	 */
-	private function save_card_token( GetTokenResponse $card_token) {
-		$this->log('Paytrail: save_card_token', 'debug');
+	private function save_card_token( GetTokenResponse $card_token ) {
+		$this->log( 'Paytrail: save_card_token', 'debug' );
 
 		$token = new WC_Payment_Token_CC();
-		$token->set_card_type($card_token->getCard()->getType());
-		$token->set_expiry_month($card_token->getCard()->getExpireMonth());
-		$token->set_expiry_year($card_token->getCard()->getExpireYear());
-		$token->set_last4($card_token->getCard()->getPartialPan());
-		$token->set_token($card_token->getToken());
-		$token->set_user_id(get_current_user_id());
-		$token->set_gateway_id(Plugin::GATEWAY_ID);
-		\WC_Payment_Tokens::set_users_default(get_current_user_id(), $token->get_id());
+		$token->set_card_type( $card_token->getCard()->getType() );
+		$token->set_expiry_month( $card_token->getCard()->getExpireMonth() );
+		$token->set_expiry_year( $card_token->getCard()->getExpireYear() );
+		$token->set_last4( $card_token->getCard()->getPartialPan() );
+		$token->set_token( $card_token->getToken() );
+		$token->set_user_id( get_current_user_id() );
+		$token->set_gateway_id( Plugin::GATEWAY_ID );
+		\WC_Payment_Tokens::set_users_default( get_current_user_id(), $token->get_id() );
 
 		return $token->save();
 	}
@@ -670,11 +667,11 @@ private function save_card_token( GetTokenResponse $card_token) {
 	 * @throws ValidationException
 	 */
 	public function add_payment_method() {
-		$this->add_card_form(Plugin::ADD_CARD_CONTEXT_MY_ACCOUNT);
+		$this->add_card_form( Plugin::ADD_CARD_CONTEXT_MY_ACCOUNT );
 
 		return array(
-			'result' => 'success',
-			'redirect' => wc_get_endpoint_url('payment-methods'),
+			'result'   => 'success',
+			'redirect' => wc_get_endpoint_url( 'payment-methods' ),
 		);
 	}
 
@@ -682,33 +679,33 @@ public function add_payment_method() {
 	 * Grab and display users saved card payment methods.
 	 */
 	public function saved_payment_methods() {
-		$html = '<ul class="woocommerce-SavedPaymentMethods wc-saved-payment-methods" data-count="' . esc_attr(count($this->get_tokens())) . '">';
-		foreach ($this->get_tokens() as $token) {
-			$html .= $this->get_saved_payment_method_option_html($token);
+		$html = '<ul class="woocommerce-SavedPaymentMethods wc-saved-payment-methods" data-count="' . esc_attr( count( $this->get_tokens() ) ) . '">';
+		foreach ( $this->get_tokens() as $token ) {
+			$html .= $this->get_saved_payment_method_option_html( $token );
 		}
 
 		$html .= '</ul>';
 
-		$kses_arr = [
-			'li' => ['class' => []],
-			'label' => ['for' => []],
-			'input' => [
-				'id' => [],
-				'type' => [],
-				'name' => [],
-				'value'=> [],
-				'class' => []
-			],
-			'div' => ['class' => []],
-			'ul' => ['class' => []]
-		];
+		$kses_arr = array(
+			'li'    => array( 'class' => array() ),
+			'label' => array( 'for' => array() ),
+			'input' => array(
+				'id'    => array(),
+				'type'  => array(),
+				'name'  => array(),
+				'value' => array(),
+				'class' => array(),
+			),
+			'div'   => array( 'class' => array() ),
+			'ul'    => array( 'class' => array() ),
+		);
 
 		/**
 		 * Show payment methods
 		 *
 		 * @since 1.0
 		 */
-		echo wp_kses(apply_filters('wc_payment_gateway_form_saved_payment_methods_html', $html, $this), $kses_arr);
+		echo wp_kses( apply_filters( 'wc_payment_gateway_form_saved_payment_methods_html', $html, $this ), $kses_arr );
 	}
 
 	/**
@@ -718,9 +715,9 @@ public function saved_payment_methods() {
 	 * @param $token
 	 * @return string
 	 */
-	public function get_token_payment_option_html( $html, $token) {
-		if (Plugin::GATEWAY_ID !== $token->get_gateway_id()) {
-			error_log('Not the expected gateway ID. Returning original HTML.');
+	public function get_token_payment_option_html( $html, $token ) {
+		if ( Plugin::GATEWAY_ID !== $token->get_gateway_id() ) {
+			error_log( 'Not the expected gateway ID. Returning original HTML.' );
 			return $html;
 		}
 		$html = sprintf(
@@ -730,12 +727,12 @@ public function get_token_payment_option_html( $html, $token) {
 				<div class="paytrail-for-woocommerce-tokenized-payment-method-title" title="%4$s">%5$s%3$s</div>
 				</label>
 			</li>',
-			esc_attr($this->id),
-			esc_attr($token->get_id()),
-			$this->get_display_name($token),
-			esc_html($token->get_display_name()),
-			$this->get_card_image($token),
-			checked($token->is_default(), true, false)
+			esc_attr( $this->id ),
+			esc_attr( $token->get_id() ),
+			$this->get_display_name( $token ),
+			esc_html( $token->get_display_name() ),
+			$this->get_card_image( $token ),
+			checked( $token->is_default(), true, false )
 		);
 
 		return $html;
@@ -747,13 +744,13 @@ public function get_token_payment_option_html( $html, $token) {
 	 * @param $token
 	 * @return string
 	 */
-	private function get_display_name( $token) {
+	private function get_display_name( $token ) {
 		$display = sprintf(
 			/* translators: 1: last 4 digits 2: expiry month 3: expiry year */
-			__('xxxx xxxx xxxx %1$s %2$s/%3$s', 'paytrail-for-woocommerce'),
+			__( 'xxxx xxxx xxxx %1$s %2$s/%3$s', 'paytrail-for-woocommerce' ),
 			$token->get_last4(),
 			'<span id="paytrail-for-woocommerce-tokenized-payment-method-card-expire-date">' . $token->get_expiry_month(),
-			substr($token->get_expiry_year(), 2) . '</span>'
+			substr( $token->get_expiry_year(), 2 ) . '</span>'
 		);
 
 		return $display;
@@ -765,16 +762,16 @@ private function get_display_name( $token) {
 	 * @param $token
 	 * @return string
 	 */
-	private function get_card_image( $token) {
-		$token_card_type = strtolower($token->get_card_type());
+	private function get_card_image( $token ) {
+		$token_card_type = strtolower( $token->get_card_type() );
 
-		if ('amex' === $token_card_type) {
+		if ( 'amex' === $token_card_type ) {
 			$token_card_type = 'american-express';
 		}
 
 		$html = sprintf(
 			'<img alt="' . $token->get_card_type() . '" src="' . Plugin::PAYMENT_METHOD_IMG_URL . '/%1$s.svg" class="paytrail-for-woocommerce-tokenized-payment-method-title-image" />',
-			esc_html(preg_replace('/[[:space:]]+/', '-', $token_card_type))
+			esc_html( preg_replace( '/[[:space:]]+/', '-', $token_card_type ) )
 		);
 
 		return $html;
@@ -786,78 +783,78 @@ private function get_card_image( $token) {
 	 * @return void
 	 */
 	public function check_paytrail_response() {
-		$status           = filter_input(INPUT_GET, 'checkout-status');
-		$refund_callback  = filter_input(INPUT_GET, 'refund_callback');
-		$refund_unique_id = filter_input(INPUT_GET, 'refund_unique_id');
-		$order_id         = filter_input(INPUT_GET, 'order_id');
-		$reference        = filter_input(INPUT_GET, 'checkout-reference');
-		$cancel_order     = filter_input(INPUT_GET, 'cancel_order');
-		$pay_for_order    = filter_input(INPUT_GET, 'pay_for_order');
-		$payment_method = filter_input(INPUT_POST, 'payment_method');
-
-		if (!$status && !$reference && !$refund_callback && !$refund_unique_id) {
-			//no log to reduce number of log entries
+		$status           = filter_input( INPUT_GET, 'checkout-status' );
+		$refund_callback  = filter_input( INPUT_GET, 'refund_callback' );
+		$refund_unique_id = filter_input( INPUT_GET, 'refund_unique_id' );
+		$order_id         = filter_input( INPUT_GET, 'order_id' );
+		$reference        = filter_input( INPUT_GET, 'checkout-reference' );
+		$cancel_order     = filter_input( INPUT_GET, 'cancel_order' );
+		$pay_for_order    = filter_input( INPUT_GET, 'pay_for_order' );
+		$payment_method   = filter_input( INPUT_POST, 'payment_method' );
+
+		if ( ! $status && ! $reference && ! $refund_callback && ! $refund_unique_id ) {
+			// no log to reduce number of log entries
 			return;
 		}
 
-		if (!$reference && $status && !$refund_callback && !$refund_unique_id) {
-			$this->log('Paytrail: check_paytrail_response, no reference found for status: ' . $status, 'debug');
+		if ( ! $reference && $status && ! $refund_callback && ! $refund_unique_id ) {
+			$this->log( 'Paytrail: check_paytrail_response, no reference found for status: ' . $status, 'debug' );
 			return;
 		}
 
-		if (!$status && $reference && !$refund_callback && !$refund_unique_id) {
-			$this->log('Paytrail: check_paytrail_response, no status found for reference ' . $reference, 'debug');
+		if ( ! $status && $reference && ! $refund_callback && ! $refund_unique_id ) {
+			$this->log( 'Paytrail: check_paytrail_response, no status found for reference ' . $reference, 'debug' );
 			return;
 		}
 
-		if ($cancel_order) {
-			//Do not attempt to process further. Woo Commerce will cancel the order
-			$this->log('Paytrail: check_paytrail_response, cancel_order is true. Order will be cancelled. Reference: ' . $reference, 'debug');
+		if ( $cancel_order ) {
+			// Do not attempt to process further. Woo Commerce will cancel the order
+			$this->log( 'Paytrail: check_paytrail_response, cancel_order is true. Order will be cancelled. Reference: ' . $reference, 'debug' );
 			return;
 		}
 
-		if ($pay_for_order) {
-			//The customer will be shown a page to choose payment methods
+		if ( $pay_for_order ) {
+			// The customer will be shown a page to choose payment methods
 			wc_clear_notices();
 			$message = __(
 				'Payment failed or was cancelled. Please try again',
 				'paytrail-for-woocommerce'
 			);
 
-			wc_add_notice( $message, 'notice');
-			$this->log('Paytrail: check_paytrail_response, pay_for_order is true. Payment page will be shown. Reference: ' . $reference, 'debug');
+			wc_add_notice( $message, 'notice' );
+			$this->log( 'Paytrail: check_paytrail_response, pay_for_order is true. Payment page will be shown. Reference: ' . $reference, 'debug' );
 
-			//Check to see if this is the first load of the page
-			if (!$payment_method) {
-				//Handle the payment response so that orders will change to Failed status
-				$this->log('Paytrail: Start handle_payment_response for reference ' . $reference, 'debug');
+			// Check to see if this is the first load of the page
+			if ( ! $payment_method ) {
+				// Handle the payment response so that orders will change to Failed status
+				$this->log( 'Paytrail: Start handle_payment_response for reference ' . $reference, 'debug' );
 				$this->handle_payment_response( $status );
 			}
 
 			return;
 		}
 
-		$sleepTime = rand(0, 3);
-		$sleepTimeCallback = rand(3, 6);
+		$sleepTime         = rand( 0, 3 );
+		$sleepTimeCallback = rand( 3, 6 );
 
-		if (true === $this->callbackMode) {
-			$this->log('Paytrail: Callback check_paytrail_response for order ' . $reference, 'debug');
-			$this->log('Paytrail: Wait for ' . $sleepTimeCallback . ' seconds until processing order ' . $reference, 'debug');
-			sleep($sleepTimeCallback);
+		if ( true === $this->callbackMode ) {
+			$this->log( 'Paytrail: Callback check_paytrail_response for order ' . $reference, 'debug' );
+			$this->log( 'Paytrail: Wait for ' . $sleepTimeCallback . ' seconds until processing order ' . $reference, 'debug' );
+			sleep( $sleepTimeCallback );
 		} else {
-			$this->log('Paytrail: Redirect check_paytrail_response for reference ' . $reference, 'debug');
-			$this->log('Paytrail: Wait for ' . $sleepTime . ' seconds until processing reference ' . $reference, 'debug');
-			sleep($sleepTime);
+			$this->log( 'Paytrail: Redirect check_paytrail_response for reference ' . $reference, 'debug' );
+			$this->log( 'Paytrail: Wait for ' . $sleepTime . ' seconds until processing reference ' . $reference, 'debug' );
+			sleep( $sleepTime );
 		}
 
 		// Handle the response only if the status exists.
-		if ($refund_callback) {
-			$this->log('Paytrail: Start handle_refund_response for order_id ' . $order_id, 'debug');
-			$this->handle_refund_response($refund_callback, $refund_unique_id, $order_id);
+		if ( $refund_callback ) {
+			$this->log( 'Paytrail: Start handle_refund_response for order_id ' . $order_id, 'debug' );
+			$this->handle_refund_response( $refund_callback, $refund_unique_id, $order_id );
 
 		} else {
-			$this->log('Paytrail: Start handle_payment_response for reference ' . $reference, 'debug');
-			$this->handle_payment_response($status);
+			$this->log( 'Paytrail: Start handle_payment_response for reference ' . $reference, 'debug' );
+			$this->handle_payment_response( $status );
 		}
 	}
 
@@ -868,125 +865,125 @@ public function check_paytrail_response() {
 	 *
 	 * @return void
 	 */
-	public function handle_payment_response( $status) {
+	public function handle_payment_response( $status ) {
 		// Check the HMAC
 		try {
-			$this->client->validateHmac(filter_input_array(INPUT_GET), '', filter_input(INPUT_GET, 'signature'));
-		} catch (HmacException $exception) {
-			$this->signature_error($exception);
+			$this->client->validateHmac( filter_input_array( INPUT_GET ), '', filter_input( INPUT_GET, 'signature' ) );
+		} catch ( HmacException $exception ) {
+			$this->signature_error( $exception );
 		}
 
-		$reference = filter_input(INPUT_GET, 'checkout-reference');
-		$transaction_id = filter_input(INPUT_GET, 'checkout-transaction-id');
+		$reference      = filter_input( INPUT_GET, 'checkout-reference' );
+		$transaction_id = filter_input( INPUT_GET, 'checkout-transaction-id' );
 
 		try {
-			$order_query = new WC_Order_Query([
-				'limit'        => 1,
-				'meta_key'     => '_checkout_reference',
-				'meta_value'   => $reference,
-			]);
+			$order_query = new WC_Order_Query(
+				array(
+					'limit'      => 1,
+					'meta_key'   => '_checkout_reference',
+					'meta_value' => $reference,
+				)
+			);
 
 			$orders = $order_query->get_orders();
 
-			if (empty($orders)) {
-				$this->log('Paytrail: handle_payment_response, orders collection empty for reference: ' . $reference, 'debug');
+			if ( empty( $orders ) ) {
+				$this->log( 'Paytrail: handle_payment_response, orders collection empty for reference: ' . $reference, 'debug' );
 				return;
 			}
 			$order = $orders[0];
 
-		} catch (\Exception $e) {
-			$this->log('Paytrail: order_query, failed for reference: ' . $reference, 'debug');
+		} catch ( \Exception $e ) {
+			$this->log( 'Paytrail: order_query, failed for reference: ' . $reference, 'debug' );
 			return false;
 		}
 
 		try {
-			$transaction_query = new WC_Order_Query( [
-				'transaction_id' => $transaction_id,
-			] );
+			$transaction_query = new WC_Order_Query(
+				array(
+					'transaction_id' => $transaction_id,
+				)
+			);
 
 			$existing_orders = $transaction_query->get_orders();
 
 			// Cross-check if any other order already has this transaction ID
-			foreach ($existing_orders as $existing_order) {
+			foreach ( $existing_orders as $existing_order ) {
 				$existing_transaction_id = $existing_order->get_transaction_id();
 
-				if (empty($existing_transaction_id)) {
-					$this->log('Paytrail: Order ID ' . $existing_order->get_id() . ' has an empty transaction ID. Aborting processing.', 'debug');
+				if ( empty( $existing_transaction_id ) ) {
+					$this->log( 'Paytrail: Order ID ' . $existing_order->get_id() . ' has an empty transaction ID. Aborting processing.', 'debug' );
 					return false;
 				}
 
-				if ($existing_order->get_id() !== $order->get_id()) {
-					$this->log('Paytrail: Duplicate transaction ID ' . $transaction_id . ' detected. Already associated with order ' . $existing_order->get_id() . '.', 'debug');
+				if ( $existing_order->get_id() !== $order->get_id() ) {
+					$this->log( 'Paytrail: Duplicate transaction ID ' . $transaction_id . ' detected. Already associated with order ' . $existing_order->get_id() . '.', 'debug' );
 					return false;
 				}
 			}
-
-		} catch (\Exception $e) {
-			$this->log('Paytrail: transaction_query, failed for reference: ' . $reference, 'debug');
+		} catch ( \Exception $e ) {
+			$this->log( 'Paytrail: transaction_query, failed for reference: ' . $reference, 'debug' );
 			return false;
 		}
 
-
-
 		// Store information that transaction-specific settlement was used
 		if ( $this->transaction_settlement_enable ) {
 			$order->update_meta_data( '_paytrail_ppa_transaction_settlement', true );
 			$order->save();
 		}
 
-
-		switch ($status) {
+		switch ( $status ) {
 			case 'ok':
-				$this->log('Paytrail: handle_payment_response, case = ok for order ' . $order->get_id(), 'debug');
-				if (!$this->validate_order_payment_processing($order)) {
+				$this->log( 'Paytrail: handle_payment_response, case = ok for order ' . $order->get_id(), 'debug' );
+				if ( ! $this->validate_order_payment_processing( $order ) ) {
 					return;
 				}
-				$this->log('Paytrail: handle_payment_response payment_complete, order ' . $order->get_id() . ' needs processing ' . $order->needs_processing(), 'debug');
+				$this->log( 'Paytrail: handle_payment_response payment_complete, order ' . $order->get_id() . ' needs processing ' . $order->needs_processing(), 'debug' );
 
-				$transaction_id = filter_input(INPUT_GET, 'checkout-transaction-id');
+				$transaction_id = filter_input( INPUT_GET, 'checkout-transaction-id' );
 
 				// If this transaction has already been processed, don't process again
-				if ($order->get_transaction_id() === $transaction_id) {
-					$this->log('Paytrail: handle_payment_response, transaction id ' . $transaction_id . ' already processed for order ' . $order->get_id(), 'debug');
+				if ( $order->get_transaction_id() === $transaction_id ) {
+					$this->log( 'Paytrail: handle_payment_response, transaction id ' . $transaction_id . ' already processed for order ' . $order->get_id(), 'debug' );
 					return false;
 				}
 
 				// Save transient to avoid race condition between redirect and callback processing
-				\set_transient('checkout_transaction_id_processing_' . $transaction_id, 'yes', 60);
+				\set_transient( 'checkout_transaction_id_processing_' . $transaction_id, 'yes', 60 );
 
-				if (! $this->use_provider_selection()) {
-					$this->log('Paytrail: handle_payment_response, use_provider_selection = false for order ' . $order->get_id(), 'debug');
+				if ( ! $this->use_provider_selection() ) {
+					$this->log( 'Paytrail: handle_payment_response, use_provider_selection = false for order ' . $order->get_id(), 'debug' );
 					// Get the chosen payment provider and save it to the order
-					$payment_provider = filter_input(INPUT_GET, 'checkout-provider');
-					$payment_amount   = filter_input(INPUT_GET, 'checkout-amount');
+					$payment_provider = filter_input( INPUT_GET, 'checkout-provider' );
+					$payment_amount   = filter_input( INPUT_GET, 'checkout-amount' );
 
-					$order->update_meta_data('_checkout_payment_provider', $payment_provider);
+					$order->update_meta_data( '_checkout_payment_provider', $payment_provider );
 					$order->save();
-					$providers = $this->get_payment_providers($payment_amount);
+					$providers = $this->get_payment_providers( $payment_amount );
 
-					if (! empty($providers['error'])) {
-						$provider_name = ucfirst($payment_provider);
+					if ( ! empty( $providers['error'] ) ) {
+						$provider_name = ucfirst( $payment_provider );
 					} else {
 						// Get only the wanted payment provider object
-						$wanted_provider = $this->get_wanted_provider($providers, $payment_provider);
-						if (null !== $wanted_provider) {
-							$provider_name = !empty($wanted_provider->getName()) ? $wanted_provider->getName() : ucfirst($wanted_provider->getId());
+						$wanted_provider = $this->get_wanted_provider( $providers, $payment_provider );
+						if ( null !== $wanted_provider ) {
+							$provider_name = ! empty( $wanted_provider->getName() ) ? $wanted_provider->getName() : ucfirst( $wanted_provider->getId() );
 						} else {
-							$provider_name = ucfirst($payment_provider);
+							$provider_name = ucfirst( $payment_provider );
 						}
 					}
 
-					WC()->session->set('payment_provider', $wanted_provider);
+					WC()->session->set( 'payment_provider', $wanted_provider );
 
 					$message = sprintf(
 						// translators: First parameter is transaction ID, the other is the name of the payment provider.
-						__('Payment completed with transaction ID %1$s and payment provider %2$s.', 'paytrail-for-woocommerce'),
+						__( 'Payment completed with transaction ID %1$s and payment provider %2$s.', 'paytrail-for-woocommerce' ),
 						$transaction_id,
 						$provider_name
 					);
-					$this->log('Paytrail: handle_payment_response, use_provider_selection = false, add_order_note', 'debug');
+					$this->log( 'Paytrail: handle_payment_response, use_provider_selection = false, add_order_note', 'debug' );
 
-					$order->add_order_note($message);
+					$order->add_order_note( $message );
 				} else {
 					$order_note = sprintf(
 						// Translators: The placeholder is a transaction ID.
@@ -996,51 +993,53 @@ public function handle_payment_response( $status) {
 						),
 						$transaction_id
 					);
-					$this->log('Paytrail: handle_payment_response, use_provider_selection = true, add_order_note', 'debug');
+					$this->log( 'Paytrail: handle_payment_response, use_provider_selection = true, add_order_note', 'debug' );
 
-					$order->add_order_note($order_note);
+					$order->add_order_note( $order_note );
 				}
 
 				// Mark payment completed and store the transaction ID.
-				$order->payment_complete($transaction_id);
+				$order->payment_complete( $transaction_id );
 
 				// Clear the cart.
 				WC()->cart->empty_cart();
 
 				// Delete transient
-				\delete_transient('checkout_transaction_id_processing_' . $transaction_id);
+				\delete_transient( 'checkout_transaction_id_processing_' . $transaction_id );
 
 				break;
 			case 'pending':
-				$this->log('Paytrail: handle_payment_response, case = pending', 'debug');
-				if (!$this->validate_order_payment_process_status($order)) {
+				$this->log( 'Paytrail: handle_payment_response, case = pending', 'debug' );
+				if ( ! $this->validate_order_payment_process_status( $order ) ) {
 					break;
 				}
-				$order->update_status('on-hold');
-				$order->add_order_note(__('Payment pending.', 'paytrail-for-woocommerce'));
+				$order->update_status( 'on-hold' );
+				$order->add_order_note( __( 'Payment pending.', 'paytrail-for-woocommerce' ) );
 				break;
 			default:
-				$this->log('Paytrail: handle_payment_response, case = failed', 'debug');
-				if (!$this->validate_order_payment_process_status($order)) {
+				$this->log( 'Paytrail: handle_payment_response, case = failed', 'debug' );
+				if ( ! $this->validate_order_payment_process_status( $order ) ) {
 					break;
 				}
-				$order->update_status('failed');
-				$failed_order_note = __('Payment failed.', 'paytrail-for-woocommerce');
-				
-				$latest_order_note = wc_get_order_notes([
-					'order_id' => $order->get_id(),
-					'limit'    => 1,
-					'orderby'  => 'date_created',
-					'order'    => 'DESC',
-				]);
-
-				if (is_array($latest_order_note) && isset($latest_order_note[0])) {
-					if ($latest_order_note[0]->content === $failed_order_note) {
-						break;//Don't add another note if the latest note is the same
+				$order->update_status( 'failed' );
+				$failed_order_note = __( 'Payment failed.', 'paytrail-for-woocommerce' );
+
+				$latest_order_note = wc_get_order_notes(
+					array(
+						'order_id' => $order->get_id(),
+						'limit'    => 1,
+						'orderby'  => 'date_created',
+						'order'    => 'DESC',
+					)
+				);
+
+				if ( is_array( $latest_order_note ) && isset( $latest_order_note[0] ) ) {
+					if ( $latest_order_note[0]->content === $failed_order_note ) {
+						break;// Don't add another note if the latest note is the same
 					}
 				}
 
-				$order->add_order_note($failed_order_note);
+				$order->add_order_note( $failed_order_note );
 				break;
 		}
 	}
@@ -1049,49 +1048,49 @@ public function handle_payment_response( $status) {
 	 * Validate payment processing
 	 *
 	 * @param WC_Order $order
-	 * @param bool $retry Whether to try again after 15 seconds if order is being processed
+	 * @param bool     $retry Whether to try again after 15 seconds if order is being processed
 	 * @return bool
 	 */
-	protected function validate_order_payment_processing( WC_Order $order, $retry = true) {
-		$transaction_id = filter_input(INPUT_GET, 'checkout-transaction-id');
+	protected function validate_order_payment_processing( WC_Order $order, $retry = true ) {
+		$transaction_id = filter_input( INPUT_GET, 'checkout-transaction-id' );
 
-		if (!$transaction_id) {
-			$this->log('Paytrail: validate_order_payment_processing, transaction id empty for order: ' . $order->get_id(), 'debug');
+		if ( ! $transaction_id ) {
+			$this->log( 'Paytrail: validate_order_payment_processing, transaction id empty for order: ' . $order->get_id(), 'debug' );
 			return false;
 		}
 
 		$order_status = $order->get_status();
 
-		if ('completed' === $order_status || 'processing' === $order_status) {
-			$this->log('Paytrail: validate_order_payment_processing, order already processed ' . $order->get_id(), 'debug');
+		if ( 'completed' === $order_status || 'processing' === $order_status ) {
+			$this->log( 'Paytrail: validate_order_payment_processing, order already processed ' . $order->get_id(), 'debug' );
 			// This order has already been processed.
 			return false;
 		}
 
 		// If the transaction is currently being processed, wait for 15 seconds and check again
-		if ('yes' === \get_transient('checkout_transaction_id_processing_' . $transaction_id)) {
-			$this->log('Paytrail: validate_order_payment_processing, order is currently being processed ' . $order->get_id(), 'debug');
+		if ( 'yes' === \get_transient( 'checkout_transaction_id_processing_' . $transaction_id ) ) {
+			$this->log( 'Paytrail: validate_order_payment_processing, order is currently being processed ' . $order->get_id(), 'debug' );
 
-			if (true === $retry) {
-				$this->log('Paytrail: validate_order_payment_processing, waiting for 15 seconds ' . $order->get_id(), 'debug');
-				sleep(15);
+			if ( true === $retry ) {
+				$this->log( 'Paytrail: validate_order_payment_processing, waiting for 15 seconds ' . $order->get_id(), 'debug' );
+				sleep( 15 );
 
-				return $this->validate_order_payment_processing($order, false);
+				return $this->validate_order_payment_processing( $order, false );
 			}
 
-			$this->log('Paytrail: validate_order_payment_processing, not trying again ' . $order->get_id(), 'debug');
+			$this->log( 'Paytrail: validate_order_payment_processing, not trying again ' . $order->get_id(), 'debug' );
 			return false;
 		}
 
-		$this->log('Paytrail: validate_order_payment_processing, order is valid ' . $order->get_id(), 'debug');
+		$this->log( 'Paytrail: validate_order_payment_processing, order is valid ' . $order->get_id(), 'debug' );
 
 		return true;
 	}
 
-	protected function validate_order_payment_process_status( WC_Order $order) {
+	protected function validate_order_payment_process_status( WC_Order $order ) {
 		$order_status = $order->get_status();
 
-		if ('completed' === $order_status || 'processing' === $order_status) {
+		if ( 'completed' === $order_status || 'processing' === $order_status ) {
 			// This order has already been processed.
 			return false;
 		}
@@ -1104,7 +1103,7 @@ protected function validate_order_payment_process_status( WC_Order $order) {
 	 * @return boolean
 	 */
 	protected function use_provider_selection() {
-		return 'yes' === $this->get_option('provider_selection', 'yes');
+		return 'yes' === $this->get_option( 'provider_selection', 'yes' );
 	}
 
 	/**
@@ -1115,84 +1114,88 @@ protected function use_provider_selection() {
 	 * @param string $order_id         Order ID.
 	 * @return void
 	 */
-	public function handle_refund_response( $refund_callback, $refund_unique_id, $order_id) {
+	public function handle_refund_response( $refund_callback, $refund_unique_id, $order_id ) {
 		// Remove the callback indicators from the GET array
-		$get = filter_input_array(INPUT_GET);
+		$get = filter_input_array( INPUT_GET );
 
-		unset($get['refund_callback']);
-		unset($get['refund_unique_id']);
-		unset($get['order_id']);
+		unset( $get['refund_callback'] );
+		unset( $get['refund_unique_id'] );
+		unset( $get['order_id'] );
 
 		// Check the HMAC
 		try {
-			$this->client->validateHmac($get, '', filter_input(INPUT_GET, 'signature'));
-		} catch (HmacException $exception) {
-			$this->signature_error($exception);
+			$this->client->validateHmac( $get, '', filter_input( INPUT_GET, 'signature' ) );
+		} catch ( HmacException $exception ) {
+			$this->signature_error( $exception );
 		}
 
 		// Check if HPOS is enabled
-		if (class_exists('Automattic\WooCommerce\Utilities\OrderUtil') && \Automattic\WooCommerce\Utilities\OrderUtil::custom_orders_table_usage_is_enabled()) {
-			$refunds = \wc_get_orders([
-				'type' => 'shop_order_refund',
-				'meta_query' => [
-					[
-						'key' => '_checkout_refund_unique_id',
-						'value' => $refund_unique_id,
-						'compare' => '='
-					]
-				]
-			]);
+		if ( class_exists( 'Automattic\WooCommerce\Utilities\OrderUtil' ) && \Automattic\WooCommerce\Utilities\OrderUtil::custom_orders_table_usage_is_enabled() ) {
+			$refunds = \wc_get_orders(
+				array(
+					'type'       => 'shop_order_refund',
+					'meta_query' => array(
+						array(
+							'key'     => '_checkout_refund_unique_id',
+							'value'   => $refund_unique_id,
+							'compare' => '=',
+						),
+					),
+				)
+			);
 		} else {
-			$refunds = \wc_get_orders([
-				'type' => 'shop_order_refund',
-				'checkout_refund_unique_id' => $refund_unique_id,
-			]);
+			$refunds = \wc_get_orders(
+				array(
+					'type'                      => 'shop_order_refund',
+					'checkout_refund_unique_id' => $refund_unique_id,
+				)
+			);
 		}
 
-		if (empty($refunds)) {
-			wp_die(esc_html__('Refund cannot be found.', 'paytrail-for-woocommerce'), '', 404);
+		if ( empty( $refunds ) ) {
+			wp_die( esc_html__( 'Refund cannot be found.', 'paytrail-for-woocommerce' ), '', 404 );
 		} else {
 			$refund = $refunds[0];
 		}
 
-		switch ($refund_callback) {
+		switch ( $refund_callback ) {
 			case 'success':
-				$amount = $refund->get_meta('_checkout_refund_amount');
-				$reason = $refund->get_meta('_checkout_refund_reason');
+				$amount = $refund->get_meta( '_checkout_refund_amount' );
+				$reason = $refund->get_meta( '_checkout_refund_reason' );
 
-				$refund->set_amount($amount);
-				$refund->set_reason($reason);
+				$refund->set_amount( $amount );
+				$refund->set_reason( $reason );
 
-				$order = \wc_get_order($order_id);
+				$order = \wc_get_order( $order_id );
 
 				$order->add_order_note(
-					__('Refund process completed.', 'paytrail-for-woocommerce')
+					__( 'Refund process completed.', 'paytrail-for-woocommerce' )
 				);
 
-				$refund->update_meta_data('_checkout_refund_processing', false);
+				$refund->update_meta_data( '_checkout_refund_processing', false );
 				$refund->save();
 				break;
 			case 'cancel':
-				$refund->delete(true);
+				$refund->delete( true );
 
 				$order_note = __(
 					'Refund was cancelled by the payment provider.',
 					'paytrail-for-woocommerce'
 				);
 
-				$order = \wc_get_order($order_id);
-				$order->add_order_note($order_note);
+				$order = \wc_get_order( $order_id );
+				$order->add_order_note( $order_note );
 
 				/**
 				 * Delete refund action
 				 *
 				 * @since 1.0
 				 */
-				do_action('woocommerce_refund_delete', $refund->get_id(), $order_id);
+				do_action( 'woocommerce_refund_delete', $refund->get_id(), $order_id );
 				break;
 		}
 
-		die('ok');
+		die( 'ok' );
 	}
 
 	/**
@@ -1201,9 +1204,9 @@ public function handle_refund_response( $refund_callback, $refund_unique_id, $or
 	 * @return void
 	 */
 	public function payment_fields() {
-		if (is_checkout() && $this->use_provider_selection()) {
+		if ( is_checkout() && $this->use_provider_selection() ) {
 			$this->provider_form();
-		} elseif (is_checkout()) {
+		} elseif ( is_checkout() ) {
 			$this->payment_description();
 		}
 	}
@@ -1215,196 +1218,197 @@ public function payment_fields() {
 	 * @return array
 	 * @throws \Exception If the processing fails, this error is handled by WooCommerce.
 	 */
-	public function process_payment( $order_id) {
-		$this->log('Paytrail: process_payment', 'debug');
+	public function process_payment( $order_id ) {
+		$this->log( 'Paytrail: process_payment', 'debug' );
 		// @var WC_Order $order
-		$order = wc_get_order($order_id);
-		$token_id = filter_input(INPUT_POST, 'wc-paytrail-payment-token');
+		$order    = wc_get_order( $order_id );
+		$token_id = filter_input( INPUT_POST, 'wc-paytrail-payment-token' );
 
 		// Define if the process should die if an error occurs.
-		$die_on_error = filter_input(INPUT_POST, 'woocommerce_pay') ? true : false;
+		$die_on_error = filter_input( INPUT_POST, 'woocommerce_pay' ) ? true : false;
 
 		// Get the wanted payment provider and check that it exists
-		if ($this->use_provider_selection()) {
-			$this->log('Paytrail: use_provider_selection true', 'debug');
+		if ( $this->use_provider_selection() ) {
+			$this->log( 'Paytrail: use_provider_selection true', 'debug' );
 			// Try to get payment provider from POST
-			$payment_provider = filter_input(INPUT_POST, 'payment_provider');
+			$payment_provider = filter_input( INPUT_POST, 'payment_provider' );
 
 			// If empty, fallback to the meta data stored in the order
-			if (empty($payment_provider)) {
-				$payment_provider = get_post_meta($order_id, '_payment_provider', true);
-				$this->log('Paytrail: payment_provider retrieved from meta: ' . print_r($payment_provider, true), 'debug');
+			if ( empty( $payment_provider ) ) {
+				$payment_provider = get_post_meta( $order_id, '_payment_provider', true );
+				$this->log( 'Paytrail: payment_provider retrieved from meta: ' . print_r( $payment_provider, true ), 'debug' );
 			} else {
-				$this->log('Paytrail: payment_provider from POST: ' . print_r($payment_provider, true), 'debug');
+				$this->log( 'Paytrail: payment_provider from POST: ' . print_r( $payment_provider, true ), 'debug' );
 			}
-
 		} else {
 			// Try to get payment method from POST
-			$payment_provider = filter_input(INPUT_POST, 'payment_method');
-			$this->log('Paytrail: use_provider_selection false', 'debug');
+			$payment_provider = filter_input( INPUT_POST, 'payment_method' );
+			$this->log( 'Paytrail: use_provider_selection false', 'debug' );
 
 			// If empty, fallback to the meta data stored in the order
-			if (empty($payment_provider)) {
-				$payment_provider = get_post_meta($order_id, '_payment_method', true);
-				$this->log('Paytrail: payment_method retrieved from meta: ' . print_r($payment_provider, true), 'debug');
+			if ( empty( $payment_provider ) ) {
+				$payment_provider = get_post_meta( $order_id, '_payment_method', true );
+				$this->log( 'Paytrail: payment_method retrieved from meta: ' . print_r( $payment_provider, true ), 'debug' );
 			} else {
-				$this->log('Paytrail: payment_method from POST: ' . print_r($payment_provider, true), 'debug');
+				$this->log( 'Paytrail: payment_method from POST: ' . print_r( $payment_provider, true ), 'debug' );
 			}
 		}
 		return $this->process_paytrail_payment( $order, $token_id, $payment_provider, $die_on_error );
 	}
 
-	public function process_paytrail_payment( $order, $token_id, $payment_provider, $die_on_error) {
+	public function process_paytrail_payment( $order, $token_id, $payment_provider, $die_on_error ) {
 
-		$is_token_payment = !empty($token_id);
+		$is_token_payment = ! empty( $token_id );
 
-		if (! $payment_provider && ! $is_token_payment) {
-			wc_add_notice(__(
-				'The payment provider was not chosen.',
-				'paytrail-for-woocommerce'
-			), 'error');
-			return [
-				'result' => 'failure'
-			];
-		} elseif ($is_token_payment) {
-			$this->log('Paytrail: process_payment, is token payment', 'debug');
+		if ( ! $payment_provider && ! $is_token_payment ) {
+			wc_add_notice(
+				__(
+					'The payment provider was not chosen.',
+					'paytrail-for-woocommerce'
+				),
+				'error'
+			);
+			return array(
+				'result' => 'failure',
+			);
+		} elseif ( $is_token_payment ) {
+			$this->log( 'Paytrail: process_payment, is token payment', 'debug' );
 			$payment_provider = 'creditcard';
 		}
 
-		if ($is_token_payment) {
-			$token = \WC_Payment_Tokens::get($token_id);
+		if ( $is_token_payment ) {
+			$token = \WC_Payment_Tokens::get( $token_id );
 
-			$this->log('Paytrail: process_payment, add_payment_token', 'debug');
-			$order->add_payment_token($token);
+			$this->log( 'Paytrail: process_payment, add_payment_token', 'debug' );
+			$order->add_payment_token( $token );
 
-			if ($this->helper::getIsSubscriptionsEnabled()) {
-				$subscriptions = wcs_get_subscriptions_for_order($order->ID);
-				$this->log('Paytrail: add_payment_token to subscriptions', 'debug');
-				foreach ($subscriptions as $subscription) {
-					$subscription->add_payment_token($token);
+			if ( $this->helper::getIsSubscriptionsEnabled() ) {
+				$subscriptions = wcs_get_subscriptions_for_order( $order->ID );
+				$this->log( 'Paytrail: add_payment_token to subscriptions', 'debug' );
+				foreach ( $subscriptions as $subscription ) {
+					$subscription->add_payment_token( $token );
 				}
 			}
 
 			$payment = new CitPaymentRequest();
 
-			if ($token && method_exists($token, 'get_token')) {
-				$payment->setToken($token->get_token());
+			if ( $token && method_exists( $token, 'get_token' ) ) {
+				$payment->setToken( $token->get_token() );
 			} else {
-				$this->log('Paytrail: Token value: ' . print_r($token, true), 'debug');
+				$this->log( 'Paytrail: Token value: ' . print_r( $token, true ), 'debug' );
 			}
-
 		} else {
-			$this->log('Paytrail: init PaymentRequest', 'debug');
+			$this->log( 'Paytrail: init PaymentRequest', 'debug' );
 			$payment = new PaymentRequest();
 		}
 
-		if (0 == floatval($order->get_total())) {
-			$this->log('Paytrail: process_payment, order total 0, payment complete, order needs processing' . $order->needs_processing(), 'debug');
+		if ( 0 == floatval( $order->get_total() ) ) {
+			$this->log( 'Paytrail: process_payment, order total 0, payment complete, order needs processing' . $order->needs_processing(), 'debug' );
 			$order->payment_complete();
 
-			return [
+			return array(
 				'result'   => 'success',
-				'redirect' => $this->get_return_url($order)
-			];
+				'redirect' => $this->get_return_url( $order ),
+			);
 		}
 
-		$this->set_base_payment_data($payment, $order);
+		$this->set_base_payment_data( $payment, $order );
 
-		$this->log('Paytrail: process_payment, order update_meta_data', 'debug');
+		$this->log( 'Paytrail: process_payment, order update_meta_data', 'debug' );
 		// Save the reference for possible later use.
-		$order->update_meta_data('_checkout_reference', $payment->getReference());
+		$order->update_meta_data( '_checkout_reference', $payment->getReference() );
 		// Save it also as a key for fast indexed searches.
-		$order->update_meta_data('_checkout_reference_' . $payment->getReference(), true);
+		$order->update_meta_data( '_checkout_reference_' . $payment->getReference(), true );
 		// Save the wanted payment provider to the order
-		$order->update_meta_data('_checkout_payment_provider', $payment_provider);
+		$order->update_meta_data( '_checkout_payment_provider', $payment_provider );
 		$order->save();
 
 		// Create a payment via Paytrail SDK
 		try {
-			if ($is_token_payment) {
-				return $this->create_cit_payment($payment, $order);
+			if ( $is_token_payment ) {
+				return $this->create_cit_payment( $payment, $order );
 			} else {
-				return $this->create_normal_payment($payment, $order, $payment_provider);
+				return $this->create_normal_payment( $payment, $order, $payment_provider );
 			}
-		} catch (ValidationException $exception) {
+		} catch ( ValidationException $exception ) {
 			$message = __(
 				'An error occurred validating the payment.',
 				'paytrail-for-woocommerce'
 			);
 
-			$this->error($exception, $message, $die_on_error);
-		} catch (HmacException $exception) {
-			$this->signature_error($exception, $die_on_error);
-		} catch (\Exception $exception) {
+			$this->error( $exception, $message, $die_on_error );
+		} catch ( HmacException $exception ) {
+			$this->signature_error( $exception, $die_on_error );
+		} catch ( \Exception $exception ) {
 			$message = __(
 				'An error occurred performing the payment request.',
 				'paytrail-for-woocommerce'
 			);
 
-			$this->error($exception, $message, $die_on_error);
+			$this->error( $exception, $message, $die_on_error );
 		}
 
-		return [
-			'result'   => 'failure'
-		];
+		return array(
+			'result' => 'failure',
+		);
 	}
 
 	/**
 	 * Create payment
 	 *
 	 * @param PaymentRequest|CitPaymentRequest $payment
-	 * @param WC_Order $order
+	 * @param WC_Order                         $order
 	 * @param $payment_provider
 	 * @return array
 	 * @throws HmacException
 	 * @throws ValidationException
 	 * @throws \Exception
 	 */
-	private function create_normal_payment( $payment, $order, $payment_provider) {
-		$this->log('Paytrail: create_normal_payment', 'debug');
+	private function create_normal_payment( $payment, $order, $payment_provider ) {
+		$this->log( 'Paytrail: create_normal_payment', 'debug' );
 
 		try {
 			// Log the payment request if debug log is enabled.
-			$this->log('Paytrail\SDK\Request\PaymentRequest: ' . json_encode($payment), 'info');
-			$response = $this->client->createPayment($payment);
-		} catch (\Exception $exception) {
+			$this->log( 'Paytrail\SDK\Request\PaymentRequest: ' . json_encode( $payment ), 'info' );
+			$response = $this->client->createPayment( $payment );
+		} catch ( \Exception $exception ) {
 			// Log the error message if debug log is enabled.
-			$this->log($exception->getMessage() . $exception->getTraceAsString(), 'error');
-			new \WP_Error($exception->getCode(), $exception->getMessage());
+			$this->log( $exception->getMessage() . $exception->getTraceAsString(), 'error' );
+			new \WP_Error( $exception->getCode(), $exception->getMessage() );
 
-			//Add error messages to be displayed to the user by Woocommerce
+			// Add error messages to be displayed to the user by Woocommerce
 			$exceptionError = $exception->getMessage();
-			$jsonData = json_decode($exceptionError, true);
-
-			//The API may return JSON data in the message rather than plain string
-			if ($jsonData && isset($jsonData['message'])) {
-				wc_add_notice ($jsonData['message'], 'error');
-				//The API can return multiple error messages so add each of these messages
-				if (isset($jsonData['meta']) && is_array($jsonData['meta'])) {
-					foreach ($jsonData['meta'] as $meta) {
-						wc_add_notice ($meta, 'error');
+			$jsonData       = json_decode( $exceptionError, true );
+
+			// The API may return JSON data in the message rather than plain string
+			if ( $jsonData && isset( $jsonData['message'] ) ) {
+				wc_add_notice( $jsonData['message'], 'error' );
+				// The API can return multiple error messages so add each of these messages
+				if ( isset( $jsonData['meta'] ) && is_array( $jsonData['meta'] ) ) {
+					foreach ( $jsonData['meta'] as $meta ) {
+						wc_add_notice( $meta, 'error' );
 					}
 				}
 			} else {
-				wc_add_notice (ucwords($exceptionError), 'error');
+				wc_add_notice( ucwords( $exceptionError ), 'error' );
 			}
 		}
 
-		if (!isset($response) || null === $response) {
-			$this->log('FAILURE: Response is NULL or empty', 'error');
-			return [
-				'result'   => 'failure'
-			];
+		if ( ! isset( $response ) || null === $response ) {
+			$this->log( 'FAILURE: Response is NULL or empty', 'error' );
+			return array(
+				'result' => 'failure',
+			);
 		}
 
-		if ($this->use_provider_selection()) {
-			$this->log('Paytrail: create_normal_payment, use_provider_selection = true', 'debug');
+		if ( $this->use_provider_selection() ) {
+			$this->log( 'Paytrail: create_normal_payment, use_provider_selection = true', 'debug' );
 			$providers = $response->getProviders();
 
-			//Get only the wanted payment provider object
-			$wanted_provider = $this->get_wanted_provider($providers, $payment_provider);
+			// Get only the wanted payment provider object
+			$wanted_provider = $this->get_wanted_provider( $providers, $payment_provider );
 
-			WC()->session->set('payment_provider', $wanted_provider);
+			WC()->session->set( 'payment_provider', $wanted_provider );
 
 			$message = sprintf(
 				// translators: First parameter is transaction ID, the other is the name of the payment provider.
@@ -1413,17 +1417,17 @@ private function create_normal_payment( $payment, $order, $payment_provider) {
 					'paytrail-for-woocommerce'
 				),
 				$response->getTransactionId(),
-				!empty($wanted_provider->getName()) ? $wanted_provider->getName() : ucfirst($payment_provider)
+				! empty( $wanted_provider->getName() ) ? $wanted_provider->getName() : ucfirst( $payment_provider )
 			);
-			$this->log('Paytrail: create_normal_payment, use_provider_selection = true, redirect', 'debug');
-			$order->add_order_note($message);
+			$this->log( 'Paytrail: create_normal_payment, use_provider_selection = true, redirect', 'debug' );
+			$order->add_order_note( $message );
 
-			return [
+			return array(
 				'result'   => 'success',
-				'redirect' => $order->get_checkout_payment_url(true),
-			];
+				'redirect' => $order->get_checkout_payment_url( true ),
+			);
 		} else {
-			$this->log('Paytrail: create_normal_payment, use_provider_selection = false', 'debug');
+			$this->log( 'Paytrail: create_normal_payment, use_provider_selection = false', 'debug' );
 			$message = sprintf(
 				// translators: First parameter is transaction ID, the other is the name of the payment provider.
 				__(
@@ -1433,12 +1437,12 @@ private function create_normal_payment( $payment, $order, $payment_provider) {
 				$response->getTransactionId()
 			);
 
-			$order->add_order_note($message);
-			$this->log('Paytrail: create_normal_payment, use_provider_selection = false, redirect', 'debug');
-			return [
+			$order->add_order_note( $message );
+			$this->log( 'Paytrail: create_normal_payment, use_provider_selection = false, redirect', 'debug' );
+			return array(
 				'result'   => 'success',
 				'redirect' => $response->getHref(),
-			];
+			);
 		}
 	}
 
@@ -1446,37 +1450,37 @@ private function create_normal_payment( $payment, $order, $payment_provider) {
 	 * Create CIT payment
 	 *
 	 * @param CitPaymentRequest $payment
-	 * @param WC_Order $order
+	 * @param WC_Order          $order
 	 * @throws HmacException
 	 * @throws ValidationException
 	 */
-	private function create_cit_payment( $payment, $order) {
-		$this->log('Paytrail: create_cit_payment', 'debug');
+	private function create_cit_payment( $payment, $order ) {
+		$this->log( 'Paytrail: create_cit_payment', 'debug' );
 
 		try {
-			$response = $this->client->createCitPaymentCharge($payment);
+			$response = $this->client->createCitPaymentCharge( $payment );
 
 			// Log the payment request if debug log is enabled.
-			$this->log('Paytrail\SDK\Request\CitPaymentRequest: ' . json_encode($payment), 'info');
-		} catch (\Exception $exception) {
-			$fail_message = __('Failed to create token payment using card.', 'paytrail-for-woocommerce');
+			$this->log( 'Paytrail\SDK\Request\CitPaymentRequest: ' . json_encode( $payment ), 'info' );
+		} catch ( \Exception $exception ) {
+			$fail_message = __( 'Failed to create token payment using card.', 'paytrail-for-woocommerce' );
 
 			// Log the error message if debug log is enabled.
-			$this->log($exception->getMessage() . $exception->getTraceAsString(), 'error');
-			new \WP_Error($exception->getCode(), $exception->getMessage());
+			$this->log( $exception->getMessage() . $exception->getTraceAsString(), 'error' );
+			new \WP_Error( $exception->getCode(), $exception->getMessage() );
 
-			wc_add_notice($fail_message, 'error');
+			wc_add_notice( $fail_message, 'error' );
 
-			$order->add_order_note($fail_message);
+			$order->add_order_note( $fail_message );
 
-			return [
-				'result'   => 'fail'
-			];
+			return array(
+				'result' => 'fail',
+			);
 		}
 		$requires_threeds = $response->getThreeDSecureUrl() !== null;
 
-		if ($response->getTransactionId() === null && $requires_threeds) {
-			throw new \Exception('Transcaction Id not found');
+		if ( $response->getTransactionId() === null && $requires_threeds ) {
+			throw new \Exception( 'Transcaction Id not found' );
 		}
 
 		$message = sprintf(
@@ -1486,52 +1490,52 @@ private function create_cit_payment( $payment, $order) {
 				'paytrail-for-woocommerce'
 			),
 			$response->getTransactionId(),
-			$requires_threeds ? __('yes', 'paytrail-for-woocommerce') : __('no', 'paytrail-for-woocommerce')
+			$requires_threeds ? __( 'yes', 'paytrail-for-woocommerce' ) : __( 'no', 'paytrail-for-woocommerce' )
 		);
 
-		$order->add_order_note($message);
+		$order->add_order_note( $message );
 
-		if (!$requires_threeds) {
-			$this->log('Paytrail: create_cit_payment, No 3DS required, payment_complete ', 'info');
-			$order->payment_complete($response->getTransactionId());
+		if ( ! $requires_threeds ) {
+			$this->log( 'Paytrail: create_cit_payment, No 3DS required, payment_complete ', 'info' );
+			$order->payment_complete( $response->getTransactionId() );
 		}
 
-		$redirect_url = !empty($response->getThreeDSecureUrl()) ? $response->getThreeDSecureUrl() : $this->get_return_url($order);
+		$redirect_url = ! empty( $response->getThreeDSecureUrl() ) ? $response->getThreeDSecureUrl() : $this->get_return_url( $order );
 
-		return [
+		return array(
 			'result'   => 'success',
-			'redirect' => $redirect_url
-		];
+			'redirect' => $redirect_url,
+		);
 	}
 
 	/**
 	 * Create MIT payment
 	 *
 	 * @param MitPaymentRequest $payment
-	 * @param WC_Order $order
+	 * @param WC_Order          $order
 	 * @return bool
 	 * @throws \Exception
 	 */
-	private function create_mit_payment( $payment, $order) {
+	private function create_mit_payment( $payment, $order ) {
 		try {
-			$response = $this->client->createMitPaymentCharge($payment);
+			$response = $this->client->createMitPaymentCharge( $payment );
 
 			// Log the payment request if debug log is enabled.
-			$this->log('Paytrail\SDK\Request\MitPaymentRequest: ' . json_encode($payment), 'info');
-		} catch (\Exception $exception) {
-			$fail_message = __('Failed to create token payment using card.', 'paytrail-for-woocommerce');
+			$this->log( 'Paytrail\SDK\Request\MitPaymentRequest: ' . json_encode( $payment ), 'info' );
+		} catch ( \Exception $exception ) {
+			$fail_message = __( 'Failed to create token payment using card.', 'paytrail-for-woocommerce' );
 
 			// Log the error message if debug log is enabled.
-			$this->log($exception->getMessage() . $exception->getTraceAsString(), 'error');
-			new \WP_Error($exception->getCode(), $exception->getMessage());
+			$this->log( $exception->getMessage() . $exception->getTraceAsString(), 'error' );
+			new \WP_Error( $exception->getCode(), $exception->getMessage() );
 
-			$order->add_order_note($fail_message);
+			$order->add_order_note( $fail_message );
 
 			return false;
 		}
 
-		if ($response->getTransactionId() === null) {
-			throw new \Exception('Transcaction Id not found');
+		if ( $response->getTransactionId() === null ) {
+			throw new \Exception( 'Transcaction Id not found' );
 		}
 
 		$message = sprintf(
@@ -1543,9 +1547,9 @@ private function create_mit_payment( $payment, $order) {
 			$response->getTransactionId()
 		);
 
-		$order->add_order_note($message);
-		$this->log('Paytrail: create_mit_payment payment_complete ', 'info');
-		$order->payment_complete($response->getTransactionId());
+		$order->add_order_note( $message );
+		$this->log( 'Paytrail: create_mit_payment payment_complete ', 'info' );
+		$order->payment_complete( $response->getTransactionId() );
 
 		return true;
 	}
@@ -1554,13 +1558,13 @@ private function create_mit_payment( $payment, $order) {
 	 * Set payment data
 	 *
 	 * @param PaymentRequest|CitPaymentRequest|MitPaymentRequest $payment
-	 * @param WC_Order $order
+	 * @param WC_Order                                           $order
 	 * @return mixed
 	 * @throws \Exception
 	 */
-	private function set_base_payment_data( $payment, $order) {
+	private function set_base_payment_data( $payment, $order ) {
 		// Set the order ID as the stamp to the payment request
-		$payment->setStamp(get_current_blog_id() . '-' . $order->get_id() . '-' . time());
+		$payment->setStamp( get_current_blog_id() . '-' . $order->get_id() . '-' . time() );
 
 		// Use WooCom order number as reference
 		$reference = $order->get_order_number();
@@ -1571,50 +1575,50 @@ private function set_base_payment_data( $payment, $order) {
 		}
 
 		// Set WooCommerce order number as the payment reference
-		$payment->setReference($reference);
+		$payment->setReference( $reference );
 
 		// Fetch current currency and the cart total
 		$currency    = get_woocommerce_currency();
-		$order_total = $this->helper->handle_currency($order->get_total());
+		$order_total = $this->helper->handle_currency( $order->get_total() );
 
 		// Set the aforementioned values to the payment request
-		$payment->setCurrency($currency)
-			->setAmount($order_total);
+		$payment->setCurrency( $currency )
+			->setAmount( $order_total );
 
 		// Create a customer object from the order
-		$customer = $this->create_customer($order);
+		$customer = $this->create_customer( $order );
 
 		// Set the customer object to the payment request
-		$payment->setCustomer($customer);
+		$payment->setCustomer( $customer );
 
 		// Create a billing address and assign it to the payment request
-		$billing_address = $this->create_address($order, 'invoicing');
+		$billing_address = $this->create_address( $order, 'invoicing' );
 
-		if ($billing_address) {
-			$payment->setInvoicingAddress($billing_address);
+		if ( $billing_address ) {
+			$payment->setInvoicingAddress( $billing_address );
 		}
 
 		// Create a shipping address and assign it to the payment request
-		$shipping_address = $this->create_address($order, 'delivery');
+		$shipping_address = $this->create_address( $order, 'delivery' );
 
-		if ($shipping_address) {
-			$payment->setDeliveryAddress($shipping_address);
+		if ( $shipping_address ) {
+			$payment->setDeliveryAddress( $shipping_address );
 		}
 
-		$payment->setLanguage(Helper::getLocale());
+		$payment->setLanguage( Helper::getLocale() );
 
 		// Get the items from the order
-		$items = $this->get_order_items($order);
+		$items = $this->get_order_items( $order );
 
 		// Assign the items to the payment request.
-		$payment->setItems(array_filter($items));
+		$payment->setItems( array_filter( $items ) );
 
 		// Create and assign the return urls
-		$payment->setRedirectUrls($this->create_redirect_url($order));
-		$payment->setCallbackUrls($this->create_callback_url());
+		$payment->setRedirectUrls( $this->create_redirect_url( $order ) );
+		$payment->setCallbackUrls( $this->create_callback_url() );
 
 		// Set callback delay to the payment request
-		$payment->setCallbackDelay(3);
+		$payment->setCallbackDelay( 3 );
 
 		return $payment;
 	}
@@ -1626,41 +1630,48 @@ private function set_base_payment_data( $payment, $order) {
 	 * @return array
 	 * @throws \Exception
 	 */
-	private function get_order_items( $order) {
+	private function get_order_items( $order ) {
 		/**
 		 * Get the items from the order
 		 *
 		 * @since 1.0
 		 */
-		$order_items = apply_filters('woocommerce_paytrail_gateway_get_order_items', $order->get_items([ 'line_item', 'fee', 'shipping' ]), $order);
-		$order_total = intval($this->helper->handle_currency($order->get_total()));
+		$order_items = apply_filters( 'woocommerce_paytrail_gateway_get_order_items', $order->get_items( array( 'line_item', 'fee', 'shipping' ) ), $order );
+		$order_total = intval( $this->helper->handle_currency( $order->get_total() ) );
 
 		// Convert items to SDK Item objects.
 		$items = array_map(
-			function ( $item) use ( $order) {
-				return $this->create_item($item, $order);
+			function ( $item ) use ( $order ) {
+				return $this->create_item( $item, $order );
 			},
 			$order_items
 		);
 
-		$sub_sum = intval(array_sum(array_map(function ( Item $item) {
-			return ( $item->getUnitPrice() * $item->getUnits() );
-		}, $items)));
+		$sub_sum = intval(
+			array_sum(
+				array_map(
+					function ( Item $item ) {
+						return ( $item->getUnitPrice() * $item->getUnits() );
+					},
+					$items
+				)
+			)
+		);
 
 		$diff = $order_total - $sub_sum;
 
 		// If item total is negative, add positive amount for it.
-		if ($diff > 0) {
+		if ( $diff > 0 ) {
 			$rounding_item = new Item();
-			$rounding_item->setDescription(__('Rounding', 'paytrail-for-woocommerce'));
-			$rounding_item->setVatPercentage(0);
-			$rounding_item->setUnits(1);
-			$rounding_item->setUnitPrice(abs($diff));
-			$rounding_item->setProductCode('rounding-row');
-			$rounding_item->setStamp($this->helper->generate_item_stamp($order->get_id()));
+			$rounding_item->setDescription( __( 'Rounding', 'paytrail-for-woocommerce' ) );
+			$rounding_item->setVatPercentage( 0 );
+			$rounding_item->setUnits( 1 );
+			$rounding_item->setUnitPrice( abs( $diff ) );
+			$rounding_item->setProductCode( 'rounding-row' );
+			$rounding_item->setStamp( $this->helper->generate_item_stamp( $order->get_id() ) );
 			$items[] = $rounding_item;
-		} elseif ($diff < 0) {
-			$items = $this->fix_rounding_error($items, $diff, $order->get_id());
+		} elseif ( $diff < 0 ) {
+			$items = $this->fix_rounding_error( $items, $diff, $order->get_id() );
 		}
 
 		return $items;
@@ -1668,22 +1679,22 @@ function ( $item) use ( $order) {
 
 	private function fix_rounding_error( $items, $diff, $order_id ) {
 		// Subtract rounding error from first not zero price item if sub sum is too high.
-		$lastItemKey = $this->getLastNonZeroItemKey($items, $diff);
-		$lastItem = $items[$lastItemKey];
-		$lastItem->setUnitPrice($lastItem->getUnitPrice() + $diff);
-		$items[$lastItemKey] = $lastItem;
+		$lastItemKey = $this->getLastNonZeroItemKey( $items, $diff );
+		$lastItem    = $items[ $lastItemKey ];
+		$lastItem->setUnitPrice( $lastItem->getUnitPrice() + $diff );
+		$items[ $lastItemKey ] = $lastItem;
 
 		// If item quantity is not one, there's still negative difference to fix.
-		if ($lastItem->getUnits() > 1) {
-			$difference = ( $lastItem->getUnits() -1 )*$diff;
+		if ( $lastItem->getUnits() > 1 ) {
+			$difference = ( $lastItem->getUnits() - 1 ) * $diff;
 
 			$rounding_item = new Item();
-			$rounding_item->setDescription(__('Rounding', 'paytrail-for-woocommerce'));
-			$rounding_item->setVatPercentage(0);
-			$rounding_item->setUnits(1);
-			$rounding_item->setUnitPrice(abs($difference));
-			$rounding_item->setProductCode('rounding-row');
-			$rounding_item->setStamp($this->helper->generate_item_stamp($order_id));
+			$rounding_item->setDescription( __( 'Rounding', 'paytrail-for-woocommerce' ) );
+			$rounding_item->setVatPercentage( 0 );
+			$rounding_item->setUnits( 1 );
+			$rounding_item->setUnitPrice( abs( $difference ) );
+			$rounding_item->setProductCode( 'rounding-row' );
+			$rounding_item->setStamp( $this->helper->generate_item_stamp( $order_id ) );
 
 			$items[] = $rounding_item;
 		}
@@ -1695,8 +1706,8 @@ private function fix_rounding_error( $items, $diff, $order_id ) {
 	 * Loop items and find first non zero item to subtract difference.
 	 */
 	private function getLastNonZeroItemKey( $items, $diff ) {
-		foreach ($items as $key => $item) {
-			if (( $item->getUnitPrice() + $diff ) > 0) {
+		foreach ( $items as $key => $item ) {
+			if ( ( $item->getUnitPrice() + $diff ) > 0 ) {
 				// Return on first non zero item
 				return $key;
 			}
@@ -1710,18 +1721,17 @@ private function getLastNonZeroItemKey( $items, $diff ) {
 	 * @param $payment_provider
 	 * @return mixed|null
 	 */
-	private function get_wanted_provider( $providers, $payment_provider) {
+	private function get_wanted_provider( $providers, $payment_provider ) {
 		// Get only the wanted payment provider object
-		return
-			array_reduce(
-				$providers,
-				function ( $carry, $item = null) use ( $payment_provider) {
-					if ($item && $item->getId() === $payment_provider) {
-						return $item;
-					}
-					return $carry;
+		return array_reduce(
+			$providers,
+			function ( $carry, $item = null ) use ( $payment_provider ) {
+				if ( $item && $item->getId() === $payment_provider ) {
+					return $item;
 				}
-			);
+				return $carry;
+			}
+		);
 	}
 
 	/**
@@ -1731,42 +1741,42 @@ function ( $carry, $item = null) use ( $payment_provider) {
 	 * @param WC_Order $order
 	 * @throws \Exception
 	 */
-	public function scheduled_subscription_payment( $amount, $order) {
-		$this->log('Paytrail: scheduled_subscription_payment', 'debug');
-		$fail_message = __('Cannot schedule subscription payment. No valid tokens found for order.', 'paytrail-for-woocommerce');
+	public function scheduled_subscription_payment( $amount, $order ) {
+		$this->log( 'Paytrail: scheduled_subscription_payment', 'debug' );
+		$fail_message = __( 'Cannot schedule subscription payment. No valid tokens found for order.', 'paytrail-for-woocommerce' );
 
-		$tokens = \WC_Payment_Tokens::get_order_tokens($order->get_id());
-		$validTokens = [];
-		foreach ($tokens as $token) {
-			if (!$token->validate()) {
+		$tokens      = \WC_Payment_Tokens::get_order_tokens( $order->get_id() );
+		$validTokens = array();
+		foreach ( $tokens as $token ) {
+			if ( ! $token->validate() ) {
 				continue;
 			}
 			$validTokens[] = $token;
 		}
-		if (empty($validTokens)) {
+		if ( empty( $validTokens ) ) {
 			// Log the error message if debug log is enabled.
-			$this->log($fail_message, 'error');
-			$order->add_order_note($fail_message);
+			$this->log( $fail_message, 'error' );
+			$order->add_order_note( $fail_message );
 			return false;
 		}
 		try {
-			$token = reset($validTokens);
+			$token = reset( $validTokens );
 
 			$payment = new MitPaymentRequest();
-			$payment->setToken($token->get_token());
+			$payment->setToken( $token->get_token() );
 
-			$this->set_base_payment_data($payment, $order);
+			$this->set_base_payment_data( $payment, $order );
 
 			// Save the reference for possible later use.
-			$order->update_meta_data('_checkout_reference', $payment->getReference());
+			$order->update_meta_data( '_checkout_reference', $payment->getReference() );
 
 			// Save it also as a key for fast indexed searches.
-			$order->update_meta_data('_checkout_reference_' . $payment->getReference(), true);
+			$order->update_meta_data( '_checkout_reference_' . $payment->getReference(), true );
 			$order->save();
-			$this->create_mit_payment($payment, $order);
-		} catch (\Exception $exception) {
+			$this->create_mit_payment( $payment, $order );
+		} catch ( \Exception $exception ) {
 			// Log the error message if debug log is enabled.
-			$this->log($exception->getMessage() . $exception->getTraceAsString(), 'error');
+			$this->log( $exception->getMessage() . $exception->getTraceAsString(), 'error' );
 			return false;
 		}
 		return true;
@@ -1780,25 +1790,25 @@ public function scheduled_subscription_payment( $amount, $order) {
 	 * @param string  $reason   Optional reason for the refund.
 	 * @return boolean|\WP_Error
 	 */
-	public function process_refund( $order_id, $amount = null, $reason = '') {
-		$this->log('Paytrail: process_refund', 'debug');
+	public function process_refund( $order_id, $amount = null, $reason = '' ) {
+		$this->log( 'Paytrail: process_refund', 'debug' );
 
 		try {
-			$order = \wc_get_order($order_id);
+			$order = \wc_get_order( $order_id );
 
 			// Create a unique identifier for the refund
-			$refund_unique_id = sha1(uniqid(true));
+			$refund_unique_id = sha1( uniqid( true ) );
 
 			$refund = new RefundRequest();
 
-			if ($amount) {
-				$refund->setAmount($this->helper->handle_currency($amount));
+			if ( $amount ) {
+				$refund->setAmount( $this->helper->handle_currency( $amount ) );
 			} else {
-				$refund->setAmount($this->helper->handle_currency($order->get_total()));
+				$refund->setAmount( $this->helper->handle_currency( $order->get_total() ) );
 				$amount = $order->get_total();
 			}
 
-			if ($refund->getAmount() === 0) {
+			if ( $refund->getAmount() === 0 ) {
 				return new \WP_Error(
 					'400',
 					__(
@@ -1812,115 +1822,115 @@ public function process_refund( $order_id, $amount = null, $reason = '') {
 
 			$url = new CallbackUrl();
 
-			$callbacks = $this->create_redirect_url($order);
+			$callbacks = $this->create_redirect_url( $order );
 
 			$success_callback = add_query_arg(
 				array(
-					'refund_callback' => 'success',
+					'refund_callback'  => 'success',
 					'refund_unique_id' => $refund_unique_id,
-					'order_id' => $order_id
+					'order_id'         => $order_id,
 				),
 				$callbacks->getSuccess()
 			);
-			$cancel_callback = add_query_arg(
+			$cancel_callback  = add_query_arg(
 				array(
-					'refund_callback' => 'cancel',
+					'refund_callback'  => 'cancel',
 					'refund_unique_id' => $refund_unique_id,
-					'order_id' => $order_id
+					'order_id'         => $order_id,
 				),
 				$callbacks->getSuccess()
 			);
 
-			$url->setSuccess($success_callback)
-				->setCancel($cancel_callback);
+			$url->setSuccess( $success_callback )
+				->setCancel( $cancel_callback );
 
-			$refund->setCallbackUrls($url);
+			$refund->setCallbackUrls( $url );
 
 			$transaction_id = $order->get_transaction_id();
 
 			$order->add_order_note(
 				sprintf(
 					// Translators: placeholder is the optional reason for the refund.
-					__('Refunding process started.%s', 'paytrail-for-woocommerce'),
-					$reason ? esc_html__(' Reason: ', 'paytrail-for-woocommerce') . esc_html($reason) : ''
+					__( 'Refunding process started.%s', 'paytrail-for-woocommerce' ),
+					$reason ? esc_html__( ' Reason: ', 'paytrail-for-woocommerce' ) . esc_html( $reason ) : ''
 				)
 			);
 
 			// Do some additional stuff after the refund object has been created
 			add_action(
 				'woocommerce_order_refunded',
-				function ( $order_id, $refund_id) use ( $order, $refund, $reason, $transaction_id, $amount, $price, $refund_unique_id) {
-					$refund_object = wc_get_order($refund_id);
+				function ( $order_id, $refund_id ) use ( $order, $refund, $reason, $transaction_id, $amount, $price, $refund_unique_id ) {
+					$refund_object = wc_get_order( $refund_id );
 
 					try {
-						$this->client->refund($refund, $transaction_id);
-					} catch (\Exception $e) {
-						switch ($e->getCode()) {
+						$this->client->refund( $refund, $transaction_id );
+					} catch ( \Exception $e ) {
+						switch ( $e->getCode() ) {
 							case 422:
 								// An email refund request is needed
 								$email = $order->get_billing_email();
 
 								$email_refund_request = new EmailRefundRequest();
 
-								$email_refund_request->setEmail($email);
-								$email_refund_request->setAmount($refund->getAmount());
-								$email_refund_request->setCallbackUrls($refund->getCallbackUrls());
+								$email_refund_request->setEmail( $email );
+								$email_refund_request->setAmount( $refund->getAmount() );
+								$email_refund_request->setCallbackUrls( $refund->getCallbackUrls() );
 
-								if (count($refund->getItems()) > 0) {
-									$email_refund_request->setItems($refund->getItems());
+								if ( count( $refund->getItems() ) > 0 ) {
+									$email_refund_request->setItems( $refund->getItems() );
 								}
 
 								try {
-									$this->client->emailRefund($email_refund_request, $transaction_id);
-								} catch (\Exception $e) {
-									switch ($e->getCode()) {
+									$this->client->emailRefund( $email_refund_request, $transaction_id );
+								} catch ( \Exception $e ) {
+									switch ( $e->getCode() ) {
 										case 422:
-											$refund_object->delete(true);
+											$refund_object->delete( true );
 											$order->add_order_note(
 												__(
 													'The payment provider does not support either regular or email refunds. The refund was cancelled.',
 													'paytrail-for-woocommerce'
 												)
 											);
-											$order->update_status('failed');
+											$order->update_status( 'failed' );
 											return false; // Return when an error occurred.
 											// Default, should be 400.
 										default:
-											$refund_object->delete(true);
+											$refund_object->delete( true );
 											$order->add_order_note(
 												__(
 													'Something went wrong with the email refund and it was cancelled.',
 													'paytrail-for-woocommerce'
 												)
 											);
-											$order->update_status('failed');
+											$order->update_status( 'failed' );
 											return false; // Return when an error occurred.
 									}
 								}
 								break; // Break the email refund processing.
 								// Default, should be 400.
 							default:
-								$refund_object->delete(true);
+								$refund_object->delete( true );
 								$order->add_order_note(
 									__(
 										'Something went wrong with the refund and it was cancelled.',
 										'paytrail-for-woocommerce'
 									)
 								);
-								$order->update_status('failed');
+								$order->update_status( 'failed' );
 								return false; // Return when an error occurred.
 						}
 					}
 
 					$reason = $refund_object->get_reason();
 
-					$refund_object->update_meta_data( '_checkout_refund_amount', $amount);
-					$refund_object->update_meta_data( '_checkout_refund_reason', $reason);
-					$refund_object->update_meta_data( '_checkout_refund_unique_id', $refund_unique_id);
-					$refund_object->update_meta_data( '_checkout_refund_processing', true);
+					$refund_object->update_meta_data( '_checkout_refund_amount', $amount );
+					$refund_object->update_meta_data( '_checkout_refund_reason', $reason );
+					$refund_object->update_meta_data( '_checkout_refund_unique_id', $refund_unique_id );
+					$refund_object->update_meta_data( '_checkout_refund_processing', true );
 
-					$refund_object->set_amount(0);
-					$refund_object->set_reason($reason . ' Refund is still being processed. The status and the amount (' . $price . ') of the refund will update when the processing is completed.');
+					$refund_object->set_amount( 0 );
+					$refund_object->set_reason( $reason . ' Refund is still being processed. The status and the amount (' . $price . ') of the refund will update when the processing is completed.' );
 
 					$refund_object->save();
 
@@ -1931,10 +1941,10 @@ function ( $order_id, $refund_id) use ( $order, $refund, $reason, $transaction_i
 			);
 
 			return true;
-		} catch (\Exception $exception) {
-			$this->log($exception->getMessage() . $exception->getTraceAsString(), 'error');
+		} catch ( \Exception $exception ) {
+			$this->log( $exception->getMessage() . $exception->getTraceAsString(), 'error' );
 
-			return new \WP_Error($exception->getCode(), $exception->getMessage());
+			return new \WP_Error( $exception->getCode(), $exception->getMessage() );
 		}
 	}
 
@@ -1944,22 +1954,22 @@ function ( $order_id, $refund_id) use ( $order, $refund, $reason, $transaction_i
 	 * @param int $order_id Order ID to handle.
 	 * @return void
 	 */
-	public function refund_items( $order_id) {
-		$order = new \WC_Order($order_id);
+	public function refund_items( $order_id ) {
+		$order   = new \WC_Order( $order_id );
 		$refunds = $order->get_refunds();
 
-		if ($refunds) {
+		if ( $refunds ) {
 			array_walk(
 				$refunds,
-				function ( $refund) {
-					$meta = $refund->get_meta('_checkout_refund_processing');
-					if ($meta) {
+				function ( $refund ) {
+					$meta = $refund->get_meta( '_checkout_refund_processing' );
+					if ( $meta ) {
 						echo '<style>';
-						echo '[data-order_refund_id=' . esc_html($refund->get_id()) . '] span.amount {';
+						echo '[data-order_refund_id=' . esc_html( $refund->get_id() ) . '] span.amount {';
 						echo 'font-style: italic;';
 						echo '}';
 						echo '</style>';
-					};
+					}
 				}
 			);
 		}
@@ -1972,28 +1982,28 @@ function ( $refund) {
 	 */
 	protected function provider_form() {
 		$cart_total = $this->helper->get_cart_total();
-		$res = [];
+		$res        = array();
 
-		$providers = $this->get_grouped_payment_providers($cart_total, Helper::getLocale());
+		$providers = $this->get_grouped_payment_providers( $cart_total, Helper::getLocale() );
 
 		// If there was an error getting the payment providers, show it
-		if (! empty($providers['error'])) {
-			echo '<p>' . esc_html($providers['error']) . '</p>';
+		if ( ! empty( $providers['error'] ) ) {
+			echo '<p>' . esc_html( $providers['error'] ) . '</p>';
 			return;
 		}
-		$res['terms'] = !empty($providers['terms']) ? $providers['terms'] : '';
+		$res['terms']  = ! empty( $providers['terms'] ) ? $providers['terms'] : '';
 		$res['groups'] = $providers['groups'];
 
-		$provider_form_view = new View('ProviderForm');
+		$provider_form_view = new View( 'ProviderForm' );
 
-		$provider_form_view->render($res);
+		$provider_form_view->render( $res );
 	}
 
 	protected function payment_description() {
 		$data['description'] = $this->description;
 
-		$view = new View('PaymentDescription');
-		$view->render($data);
+		$view = new View( 'PaymentDescription' );
+		$view->render( $data );
 	}
 
 	/**
@@ -2003,18 +2013,18 @@ protected function payment_description() {
 	 *
 	 * @return \CheckoutFinland\SDK\Model\Customer
 	 */
-	protected function create_customer( \WC_Order $order) {
+	protected function create_customer( \WC_Order $order ) {
 		$customer = new Customer();
 
-		if (!$order) {
+		if ( ! $order ) {
 			return $customer;
 		}
 
-		$customer->setEmail($order->get_billing_email())
-			->setFirstName($order->get_billing_first_name())
-			->setLastName($order->get_billing_last_name())
-			->setPhone($order->get_billing_phone())
-			->setCompanyName($order->get_billing_company());
+		$customer->setEmail( $order->get_billing_email() )
+			->setFirstName( $order->get_billing_first_name() )
+			->setLastName( $order->get_billing_last_name() )
+			->setPhone( $order->get_billing_phone() )
+			->setCompanyName( $order->get_billing_company() );
 
 		return $customer;
 	}
@@ -2025,13 +2035,13 @@ protected function create_customer( \WC_Order $order) {
 	 * @param integer $payment_amount Payment amount in currency minor unit, eg. cents.
 	 * @return array
 	 */
-	protected function get_payment_providers( $payment_amount) {
+	protected function get_payment_providers( $payment_amount ) {
 		try {
-			$providers = $this->client->getPaymentProviders($payment_amount);
-		} catch (HmacException $exception) {
-			$providers = $this->get_payment_providers_error_handler($exception);
-		} catch (\Exception $exception) {
-			$providers = $this->get_payment_providers_error_handler($exception);
+			$providers = $this->client->getPaymentProviders( $payment_amount );
+		} catch ( HmacException $exception ) {
+			$providers = $this->get_payment_providers_error_handler( $exception );
+		} catch ( \Exception $exception ) {
+			$providers = $this->get_payment_providers_error_handler( $exception );
 		}
 
 		return $providers;
@@ -2041,27 +2051,27 @@ protected function get_payment_providers( $payment_amount) {
 	 * Get the grouped list of payment providers
 	 *
 	 * @param integer $payment_amount Payment amount in currency minor unit, eg. cents.
-	 * @param string $locale
+	 * @param string  $locale
 	 * @return array
 	 */
-	public function get_grouped_payment_providers( $payment_amount = null, $locale = null) {
-		$groups = [];
+	public function get_grouped_payment_providers( $payment_amount = null, $locale = null ) {
+		$groups = array();
 
-		if ($this->helper::getIsSubscriptionsEnabled()) {
-			$groups = ['creditcard'];
+		if ( $this->helper::getIsSubscriptionsEnabled() ) {
+			$groups = array( 'creditcard' );
 		}
 
 		try {
 			$providers = $this->client->getGroupedPaymentProviders(
-				isset($payment_amount) ? $payment_amount : $this->get_cart_total(),
-				isset($locale) ? $locale : Helper::getLocale(),
+				isset( $payment_amount ) ? $payment_amount : $this->get_cart_total(),
+				isset( $locale ) ? $locale : Helper::getLocale(),
 				$groups
 			);
 
-		} catch (HmacException $exception) {
-			$providers = $this->get_payment_providers_error_handler($exception);
-		} catch (\Exception $exception) {
-			$providers = $this->get_payment_providers_error_handler($exception);
+		} catch ( HmacException $exception ) {
+			$providers = $this->get_payment_providers_error_handler( $exception );
+		} catch ( \Exception $exception ) {
+			$providers = $this->get_payment_providers_error_handler( $exception );
 		}
 
 		return $providers;
@@ -2073,10 +2083,10 @@ public function get_grouped_payment_providers( $payment_amount = null, $locale =
 	 * @param \Exception $exception Exception to handle.
 	 * @return array
 	 */
-	protected function get_payment_providers_error_handler( \Exception $exception) {
+	protected function get_payment_providers_error_handler( \Exception $exception ) {
 
 		// Log the error message.
-		$this->log($exception->getMessage() . $exception->getTraceAsString(), 'error');
+		$this->log( $exception->getMessage() . $exception->getTraceAsString(), 'error' );
 
 		$error = __(
 			'An error occurred loading the payment providers.',
@@ -2088,10 +2098,10 @@ protected function get_payment_providers_error_handler( \Exception $exception) {
 		 *
 		 * @since 1.0
 		 */
-		$error = apply_filters('paytrail_provider_form_error', $error);
-		return [
+		$error = apply_filters( 'paytrail_provider_form_error', $error );
+		return array(
 			'error' => $error,
-		];
+		);
 	}
 
 	/**
@@ -2101,14 +2111,14 @@ protected function get_payment_providers_error_handler( \Exception $exception) {
 	 * @param string    $type  Whether we are creating an invoicing or a delivery address.
 	 * @return Address|null
 	 */
-	protected function create_address( \WC_Order $order, $type = 'invoicing') {
+	protected function create_address( \WC_Order $order, $type = 'invoicing' ) {
 		$address = new Address();
 
-		if (!$order) {
+		if ( ! $order ) {
 			return;
 		}
 
-		switch ($type) {
+		switch ( $type ) {
 			case 'delivery':
 				$prefix = 'shipping_';
 				break;
@@ -2117,25 +2127,25 @@ protected function create_address( \WC_Order $order, $type = 'invoicing') {
 				break;
 		}
 
-		$address_suffix = empty($order->{ 'get_' . $prefix . 'address_2' }())
+		$address_suffix = empty( $order->{ 'get_' . $prefix . 'address_2' }() )
 			? null : ' ' . $order->{ 'get_' . $prefix . 'address_2' }();
 
 		// Append 2nd address line to the address field if present
-		$address->setStreetAddress(( $order->{ 'get_' . $prefix . 'address_1' }() . $address_suffix ))
-			->setPostalCode($order->{ 'get_' . $prefix . 'postcode' }())
-			->setCity($order->{ 'get_' . $prefix . 'city' }())
-			->setCounty($order->{ 'get_' . $prefix . 'state' }())
-			->setCountry($order->{ 'get_' . $prefix . 'country' }());
+		$address->setStreetAddress( ( $order->{ 'get_' . $prefix . 'address_1' }() . $address_suffix ) )
+			->setPostalCode( $order->{ 'get_' . $prefix . 'postcode' }() )
+			->setCity( $order->{ 'get_' . $prefix . 'city' }() )
+			->setCounty( $order->{ 'get_' . $prefix . 'state' }() )
+			->setCountry( $order->{ 'get_' . $prefix . 'country' }() );
 
-		if (empty($address->getCountry())) {
-			$address->setCountry($this->get_option('fallback_country', ''));
+		if ( empty( $address->getCountry() ) ) {
+			$address->setCountry( $this->get_option( 'fallback_country', '' ) );
 		}
 
 		// If we have any of the listed properties, we are good to go
 		$has_values = array_filter(
-			[ 'StreetAddress', 'PostalCode', 'City', 'County' ],
-			function ( $key) use ( $address) {
-				return ! empty($address->{ 'get' . $key }());
+			array( 'StreetAddress', 'PostalCode', 'City', 'County' ),
+			function ( $key ) use ( $address ) {
+				return ! empty( $address->{ 'get' . $key }() );
 			}
 		);
 
@@ -2150,21 +2160,21 @@ function ( $key) use ( $address) {
 	 *
 	 * @return Item|null
 	 */
-	protected function create_item( WC_Order_Item $order_item, WC_Order $order) {
+	protected function create_item( WC_Order_Item $order_item, WC_Order $order ) {
 		$item = new Item();
 
 		// Get the item total with taxes and without rounding.
 		// Then convert it into the integer format required by Paytrail.
-		$sub_total = $this->helper->handle_currency($order->get_item_total($order_item, true, false));
-		$item->setUnitPrice($sub_total)
-			->setUnits((int) $order_item->get_quantity());
+		$sub_total = $this->helper->handle_currency( $order->get_item_total( $order_item, true, false ) );
+		$item->setUnitPrice( $sub_total )
+			->setUnits( (int) $order_item->get_quantity() );
 
-		$tax_rate = $this->get_item_tax_rate($order_item);
+		$tax_rate = $this->get_item_tax_rate( $order_item );
 
-		$item->setVatPercentage($tax_rate)
-			->setProductCode($this->get_item_product_code($order_item))
-			->setDescription($this->get_item_description($order_item))
-			->setStamp((string) $order_item->get_id());
+		$item->setVatPercentage( $tax_rate )
+			->setProductCode( $this->get_item_product_code( $order_item ) )
+			->setDescription( $this->get_item_description( $order_item ) )
+			->setStamp( (string) $order_item->get_id() );
 
 		return $item;
 	}
@@ -2176,18 +2186,18 @@ protected function create_item( WC_Order_Item $order_item, WC_Order $order) {
 	 *
 	 * @return string
 	 */
-	protected function get_item_product_code( WC_Order_Item $item) {
+	protected function get_item_product_code( WC_Order_Item $item ) {
 		$product_code = '';
-		switch (get_class($item)) {
+		switch ( get_class( $item ) ) {
 			case WC_Order_Item_Product::class:
-				$product_code = !empty($item->get_product()->get_sku()) ? $item->get_product()->get_sku() : $item->get_product()->get_id();
+				$product_code = ! empty( $item->get_product()->get_sku() ) ? $item->get_product()->get_sku() : $item->get_product()->get_id();
 				break;
 			case WC_Order_Item_Fee::class:
-				$product_code = __('fee', 'paytrail-for-woocommerce');
+				$product_code = __( 'fee', 'paytrail-for-woocommerce' );
 				$item->get_type();
 				break;
 			case WC_Order_Item_Shipping::class:
-				$product_code = __('shipping', 'paytrail-for-woocommerce');
+				$product_code = __( 'shipping', 'paytrail-for-woocommerce' );
 				break;
 		}
 
@@ -2196,7 +2206,7 @@ protected function get_item_product_code( WC_Order_Item $item) {
 		 *
 		 * @since 1.0
 		 */
-		return apply_filters('paytrail_item_product_code', $product_code, $item);
+		return apply_filters( 'paytrail_item_product_code', $product_code, $item );
 	}
 
 	/**
@@ -2206,10 +2216,10 @@ protected function get_item_product_code( WC_Order_Item $item) {
 	 *
 	 * @return string
 	 */
-	protected function get_item_description( WC_Order_Item $item) {
-		switch (get_class($item)) {
+	protected function get_item_description( WC_Order_Item $item ) {
+		switch ( get_class( $item ) ) {
 			case WC_Order_Item_Product::class:
-				$description = !empty($item->get_product()->get_name()) ? $item->get_product()->get_name() : $item->get_product()->get_id();
+				$description = ! empty( $item->get_product()->get_name() ) ? $item->get_product()->get_name() : $item->get_product()->get_id();
 				break;
 			default:
 				$description = $item->get_name();
@@ -2217,14 +2227,14 @@ protected function get_item_description( WC_Order_Item $item) {
 		}
 
 		// Ensure the description is maximum of 1000 characters long.
-		$description = mb_substr($description, 0, 1000);
+		$description = mb_substr( $description, 0, 1000 );
 
 		/**
 		 * Return item description
 		 *
 		 * @since 1.0
 		 */
-		return apply_filters('paytrail_item_description', $description, $item);
+		return apply_filters( 'paytrail_item_description', $description, $item );
 	}
 
 	/**
@@ -2234,7 +2244,7 @@ protected function get_item_description( WC_Order_Item $item) {
 	 *
 	 * @return float The tax percentage.
 	 */
-	protected function get_item_tax_rate( WC_Order_Item $item) {
+	protected function get_item_tax_rate( WC_Order_Item $item ) {
 		$taxes       = $item->get_taxes();
 		$tax_total   = 0;
 		$total_price = $item->get_total();
@@ -2243,7 +2253,7 @@ protected function get_item_tax_rate( WC_Order_Item $item) {
 			$tax_total += (float) $tax;
 		}
 
-		if ( $total_price > 0 && $tax_total > 0) {
+		if ( $total_price > 0 && $tax_total > 0 ) {
 			$tax_rate = NumberUtil::round( ( $tax_total / $total_price ) * 100, self::TAX_RATE_PRECISION );
 		} else {
 			$tax_rate = 0;
@@ -2258,12 +2268,12 @@ protected function get_item_tax_rate( WC_Order_Item $item) {
 	 * @param \WC_Order $order The order object.
 	 * @return CallbackUrl
 	 */
-	public function create_redirect_url( \WC_Order $order) {
+	public function create_redirect_url( \WC_Order $order ) {
 		$callback = new CallbackUrl();
 
-		$callback->setSuccess($this->get_return_url($order));
-		//Customers choosing cancel option will be shown a payment page to allow re-attempt to pay
-		$callback->setCancel($order->get_checkout_payment_url());
+		$callback->setSuccess( $this->get_return_url( $order ) );
+		// Customers choosing cancel option will be shown a payment page to allow re-attempt to pay
+		$callback->setCancel( $order->get_checkout_payment_url() );
 		return $callback;
 	}
 
@@ -2275,8 +2285,8 @@ public function create_redirect_url( \WC_Order $order) {
 	protected function create_callback_url() {
 		$callback = new CallbackUrl();
 
-		$callback->setSuccess(Router::get_url(Plugin::CALLBACK_URL, 'index'));
-		$callback->setCancel(Router::get_url(Plugin::CALLBACK_URL, 'index'));
+		$callback->setSuccess( Router::get_url( Plugin::CALLBACK_URL, 'index' ) );
+		$callback->setCancel( Router::get_url( Plugin::CALLBACK_URL, 'index' ) );
 
 		return $callback;
 	}
@@ -2288,28 +2298,28 @@ protected function create_callback_url() {
 	 * @param array $query_vars Query vars from WC_Order_Query.
 	 * @return array
 	 */
-	public function handle_custom_searches( $query, $query_vars) {
-		if (! empty($query_vars['checkout_reference'])) {
-			$query['meta_query'][] = [
-				'key'     => '_checkout_reference_' . esc_attr($query_vars['checkout_reference']),
+	public function handle_custom_searches( $query, $query_vars ) {
+		if ( ! empty( $query_vars['checkout_reference'] ) ) {
+			$query['meta_query'][] = array(
+				'key'     => '_checkout_reference_' . esc_attr( $query_vars['checkout_reference'] ),
 				'compare' => 'EXISTS',
-			];
+			);
 		}
 
-		if (! empty($query_vars['checkout_refund_unique_id'])) {
-			$query['meta_query'][] = [
+		if ( ! empty( $query_vars['checkout_refund_unique_id'] ) ) {
+			$query['meta_query'][] = array(
 				'key'     => '_checkout_refund_unique_id',
-				'value'   => esc_attr($query_vars['checkout_refund_unique_id']),
+				'value'   => esc_attr( $query_vars['checkout_refund_unique_id'] ),
 				'compare' => '=',
-			];
+			);
 		}
 
 		return $query;
 	}
 
 	public function get_cart_total() {
-		if (WC()->cart && is_callable([WC()->cart, 'get_total'])) {
-			return (int) round(WC()->cart->get_total('edit') * 100);
+		if ( WC()->cart && is_callable( array( WC()->cart, 'get_total' ) ) ) {
+			return (int) round( WC()->cart->get_total( 'edit' ) * 100 );
 		}
 		return 0;
 	}
@@ -2329,7 +2339,7 @@ protected function register_scripts() {
 		wp_register_script(
 			'paytrail-woocommerce-payment-fields',
 			$plugin_dir_url . 'dist/assets/frontend/main.js',
-			[],
+			array(),
 			$plugin_version
 		);
 	}
@@ -2338,9 +2348,9 @@ public function enqueue_admin_scripts() {
 		$screen = get_current_screen();
 
 		// Check if the current screen is the WooCommerce settings page
-		if ($screen && 'woocommerce_page_wc-settings' === $screen->id) {
+		if ( $screen && 'woocommerce_page_wc-settings' === $screen->id ) {
 			// Enqueue the introScripts only on the WooCommerce settings page
-			wp_enqueue_script('introScripts');
+			wp_enqueue_script( 'introScripts' );
 		}
 	}
 
@@ -2359,14 +2369,14 @@ protected function register_styles() {
 		wp_register_style(
 			'paytrail-woocommerce-payment-fields',
 			$plugin_dir_url . 'dist/assets/frontend/main.css',
-			[],
+			array(),
 			$plugin_version
 		);
 
 		wp_register_style(
 			'introStyles',
 			$plugin_dir_url . 'dist/assets/frontend/main.css',
-			[],
+			array(),
 			$plugin_version
 		);
 	}
@@ -2375,9 +2385,9 @@ public function enqueue_admin_styles() {
 		$screen = get_current_screen();
 
 		// Check if the current screen is the WooCommerce settings page
-		if ($screen && 'woocommerce_page_wc-settings' === $screen->id) {
+		if ( $screen && 'woocommerce_page_wc-settings' === $screen->id ) {
 			// Enqueue the style 'paytrail-woocommerce-payment-fields'
-			wp_enqueue_style('introStyles');
+			wp_enqueue_style( 'introStyles' );
 		}
 	}
 
@@ -2388,15 +2398,15 @@ public function enqueue_admin_styles() {
 	 * @param string $level   Log level. Defaults to 'info'. Possible values:
 	 *                        emergency|alert|critical|error|warning|notice|info|debug.
 	 */
-	public function log( $message, $level = 'info') {
-		if ($this->debug) {
-			if (empty($this->logger)) {
+	public function log( $message, $level = 'info' ) {
+		if ( $this->debug ) {
+			if ( empty( $this->logger ) ) {
 				$this->logger = \wc_get_logger();
 			}
 
-			$context = [ 'source' => Plugin::GATEWAY_ID ];
+			$context = array( 'source' => Plugin::GATEWAY_ID );
 
-			$this->logger->log($level, $message, $context);
+			$this->logger->log( $level, $message, $context );
 		}
 	}
 
@@ -2408,22 +2418,22 @@ public function log( $message, $level = 'info') {
 	 * @param bool       $die       Defines if the process should be terminated.
 	 * @throws \Exception If the process is not killed, the error is passed on.
 	 */
-	protected function error( \Exception $exception, $message, $die = true) {
+	protected function error( \Exception $exception, $message, $die = true ) {
 		$glue = PHP_EOL . '- ';
 
 		$log_message = $message . $glue;
 
-		$this->log($log_message . PHP_EOL . $exception->getTraceAsString(), 'error');
+		$this->log( $log_message . PHP_EOL . $exception->getTraceAsString(), 'error' );
 
 		/**
 		 * You can use this filter to modify the error message.
 		 *
 		 * @since 1.0
 		 */
-		$error = apply_filters('paytrail_error_message', $message, $exception);
+		$error = apply_filters( 'paytrail_error_message', $message, $exception );
 
-		if (true === $die) {
-			wp_die(esc_html($error), '', esc_html($exception->getCode()));
+		if ( true === $die ) {
+			wp_die( esc_html( $error ), '', esc_html( $exception->getCode() ) );
 		} else {
 			throw $exception;
 		}
@@ -2435,7 +2445,7 @@ protected function error( \Exception $exception, $message, $die = true) {
 	 * @param HmacException $exception The exception instance.
 	 * @param bool          $die       Defines if the process should be terminated.
 	 */
-	protected function signature_error( HmacException $exception, $die = true) {
+	protected function signature_error( HmacException $exception, $die = true ) {
 		$message = __(
 			'An error occurred validating the signature.',
 			'paytrail-for-woocommerce'
@@ -2446,8 +2456,8 @@ protected function signature_error( HmacException $exception, $die = true) {
 		 *
 		 * @since 1.0
 		 */
-		$message = apply_filters('paytrail_signature_error', $message, $exception);
+		$message = apply_filters( 'paytrail_signature_error', $message, $exception );
 
-		$this->error($exception, $message, $die);
+		$this->error( $exception, $message, $die );
 	}
 }
diff --git a/src/Helper.php b/src/Helper.php
index d701d659..414b47df 100644
--- a/src/Helper.php
+++ b/src/Helper.php
@@ -16,18 +16,18 @@ class Helper {
 	 * @return bool
 	 */
 	public static function getIsSubscriptionsEnabled() {
-		if (!class_exists('WC_Subscriptions_Cart')) {
+		if ( ! class_exists( 'WC_Subscriptions_Cart' ) ) {
 			return false;
 		}
-		if (!class_exists('WC_Subscriptions_Change_Payment_Gateway')) {
+		if ( ! class_exists( 'WC_Subscriptions_Change_Payment_Gateway' ) ) {
 			return false;
 		}
-		if (!function_exists('wcs_cart_contains_renewal')) {
+		if ( ! function_exists( 'wcs_cart_contains_renewal' ) ) {
 			return false;
 		}
-		if (class_exists('\WC_Subscriptions_Admin')) {
-			$accept_manual_renewals = ( 'no' !== get_option(\WC_Subscriptions_Admin::$option_prefix . '_accept_manual_renewals', 'no') );
-			if (true == $accept_manual_renewals) {
+		if ( class_exists( '\WC_Subscriptions_Admin' ) ) {
+			$accept_manual_renewals = ( 'no' !== get_option( \WC_Subscriptions_Admin::$option_prefix . '_accept_manual_renewals', 'no' ) );
+			if ( true == $accept_manual_renewals ) {
 				return false;
 			}
 		}
@@ -35,12 +35,12 @@ public static function getIsSubscriptionsEnabled() {
 		return (
 			\WC_Subscriptions_Cart::cart_contains_subscription() ||
 			wcs_cart_contains_renewal() ||
-			filter_input(INPUT_GET, 'change_payment_method')
+			filter_input( INPUT_GET, 'change_payment_method' )
 		);
 	}
 
 	public static function getIsChangeSubscriptionPaymentMethod() {
-		return filter_input(INPUT_GET, 'change_payment_method');
+		return filter_input( INPUT_GET, 'change_payment_method' );
 	}
 
 	/**
@@ -49,8 +49,8 @@ public static function getIsChangeSubscriptionPaymentMethod() {
 	 * @param int|double $sum The sum to format.
 	 * @return integer
 	 */
-	public function handle_currency( $sum) {
-		return round($sum*100);
+	public function handle_currency( $sum ) {
+		return round( $sum * 100 );
 	}
 
 	/**
@@ -61,16 +61,16 @@ public function handle_currency( $sum) {
 	public function get_cart_total() {
 		$sum = WC()->cart->total;
 
-		return $this->handle_currency($sum);
+		return $this->handle_currency( $sum );
 	}
 
 	public static function getLocale() {
 		$full_locale = get_locale();
 
-		$short_locale = substr($full_locale, 0, 2);
+		$short_locale = substr( $full_locale, 0, 2 );
 
 		// Get and assign the WordPress locale
-		switch ($short_locale) {
+		switch ( $short_locale ) {
 			case 'sv':
 				$locale = 'SV';
 				break;
@@ -91,8 +91,7 @@ public static function getLocale() {
 	 *
 	 * @return string
 	 */
-	public function generate_item_stamp ( $order_id) {
-		return uniqid($order_id . '-', true);
+	public function generate_item_stamp( $order_id ) {
+		return uniqid( $order_id . '-', true );
 	}
-
 }
diff --git a/src/Model/PaymentSubscriptionMigration.php b/src/Model/PaymentSubscriptionMigration.php
index cdacb305..9300fa42 100644
--- a/src/Model/PaymentSubscriptionMigration.php
+++ b/src/Model/PaymentSubscriptionMigration.php
@@ -14,17 +14,18 @@ class PaymentSubscriptionMigration implements MigrationInterface {
 	protected $subscriptions;
 
 	public function __construct() {
-		if (function_exists('wcs_get_subscriptions')) {
+		if ( function_exists( 'wcs_get_subscriptions' ) ) {
 			$this->subscriptions = wcs_get_subscriptions(
-				['subscriptions_per_page' => -1,
-					'meta_query' => [
-						[
+				array(
+					'subscriptions_per_page' => -1,
+					'meta_query'             => array(
+						array(
 							'key'     => '_payment_method',
 							'value'   => 'checkout_finland',
-							'compare' => '='
-						]
-					]
-				]
+							'compare' => '=',
+						),
+					),
+				)
 			);
 		}
 	}
@@ -33,12 +34,12 @@ public function __construct() {
 	 * Executes migration for Subscriptions
 	 */
 	public function execute() {
-		if (empty($this->subscriptions)) {
+		if ( empty( $this->subscriptions ) ) {
 			return;
 		}
-		foreach ($this->subscriptions as $subscription) {
-			$subscription->set_payment_method('paytrail');
-			$subscription->set_payment_method_title('Paytrail for Woocommerce');
+		foreach ( $this->subscriptions as $subscription ) {
+			$subscription->set_payment_method( 'paytrail' );
+			$subscription->set_payment_method_title( 'Paytrail for Woocommerce' );
 			$subscription->save();
 		}
 	}
diff --git a/src/Model/PaymentTokenMigration.php b/src/Model/PaymentTokenMigration.php
index 32a01a84..1a65bfcc 100644
--- a/src/Model/PaymentTokenMigration.php
+++ b/src/Model/PaymentTokenMigration.php
@@ -14,18 +14,18 @@ class PaymentTokenMigration implements MigrationInterface {
 	protected $tokens;
 
 	public function __construct() {
-		$this->tokens = \WC_Payment_Tokens::get_tokens(['gateway_id' => 'checkout_finland']);
+		$this->tokens = \WC_Payment_Tokens::get_tokens( array( 'gateway_id' => 'checkout_finland' ) );
 	}
 
 	/**
 	 * Executes migration for subscriptions
 	 */
 	public function execute() {
-		if (empty($this->tokens)) {
+		if ( empty( $this->tokens ) ) {
 			return;
 		}
-		foreach ($this->tokens as $token) {
-			$token->set_gateway_id('paytrail');
+		foreach ( $this->tokens as $token ) {
+			$token->set_gateway_id( 'paytrail' );
 			$token->save();
 		}
 	}
diff --git a/src/PaytrailBlocks.php b/src/PaytrailBlocks.php
index 753dd58d..84037d3f 100644
--- a/src/PaytrailBlocks.php
+++ b/src/PaytrailBlocks.php
@@ -22,14 +22,14 @@ class Paytrail_Blocks_Support extends AbstractPaymentMethodType {
 	 * Constructor.
 	 */
 	public function __construct() {
-		add_action( 'woocommerce_rest_checkout_process_payment_with_context', [ $this, 'add_payment_request_order_meta' ], 8, 2 );
+		add_action( 'woocommerce_rest_checkout_process_payment_with_context', array( $this, 'add_payment_request_order_meta' ), 8, 2 );
 	}
 
 	/**
 	 * Initialize the payment method settings.
 	 */
 	public function initialize() {
-		$this->settings = get_option( 'woocommerce_paytrail_settings', [] );
+		$this->settings = get_option( 'woocommerce_paytrail_settings', array() );
 	}
 
 	/**
@@ -73,14 +73,14 @@ private function get_gateway() {
 	 * @return array Script handles.
 	 */
 	public function get_payment_method_script_handles() {
-		$script_handles = [];
+		$script_handles = array();
 
 		$script_path       = '/dist/assets/frontend/blocks.js';
 		$script_asset_path = \Paytrail\WooCommercePaymentGateway\Plugin::plugin_abspath() . 'dist/assets/frontend/blocks.asset.php';
-		$script_asset      = file_exists( $script_asset_path ) ? require $script_asset_path : [
-			'dependencies' => [],
+		$script_asset      = file_exists( $script_asset_path ) ? require $script_asset_path : array(
+			'dependencies' => array(),
 			'version'      => \Paytrail\WooCommercePaymentGateway\Plugin::$version,
-		];
+		);
 		$script_url        = \Paytrail\WooCommercePaymentGateway\Plugin::plugin_url() . $script_path;
 
 		wp_register_script(
@@ -98,9 +98,9 @@ public function get_payment_method_script_handles() {
 		}
 
 		// Register OP Lasku scripts on cart page
-		if (is_cart()) { 
-			$settings = get_option('woocommerce_paytrail_settings');
-			if (isset($settings['op_lasku_calculator']) && 'yes' === $settings['op_lasku_calculator']) {
+		if ( is_cart() ) {
+			$settings = get_option( 'woocommerce_paytrail_settings' );
+			if ( isset( $settings['op_lasku_calculator'] ) && 'yes' === $settings['op_lasku_calculator'] ) {
 				OPLasku::register_blocks_cart_scripts();
 				$script_handles[] = 'paytrail-op-lasku-helper-blocks';
 			}
@@ -120,7 +120,7 @@ public function add_payment_request_order_meta( PaymentContext $context, Payment
 		if ( $context->payment_method !== $this->name ) {
 			return;
 		}
-		
+
 		$payment_data = $context->payment_data;
 		$gateway      = $this->get_gateway();
 
@@ -138,9 +138,9 @@ public function add_payment_request_order_meta( PaymentContext $context, Payment
 				} else {
 					$result->set_status( 'failure' );
 					$result->set_payment_details(
-						[
+						array(
 							'error_message' => __( 'Payment failed, please try again.', 'paytrail-for-woocommerce' ),
-						]
+						)
 					);
 				}
 
@@ -152,21 +152,21 @@ public function add_payment_request_order_meta( PaymentContext $context, Payment
 		$payment_result = $gateway->process_paytrail_payment(
 			$context->order,
 			null,
-			!empty($payment_data['payment_provider']) 
-				? $payment_data['payment_provider'] 
+			! empty( $payment_data['payment_provider'] )
+				? $payment_data['payment_provider']
 				: $payment_data['payment_method'],
 			false
 		);
-		
+
 		if ( 'success' === $payment_result['result'] ) {
 			$result->set_status( 'success' );
 			$result->set_redirect_url( $payment_result['redirect'] );
 		} else {
 			$result->set_status( 'failure' );
 			$result->set_payment_details(
-				[
+				array(
 					'error_message' => __( 'Payment failed, please try again.', 'paytrail-for-woocommerce' ),
-				]
+				)
 			);
 		}
 
@@ -181,18 +181,18 @@ public function add_payment_request_order_meta( PaymentContext $context, Payment
 	public function get_payment_method_style_handles() {
 		$style_handle        = 'paytrail-woocommerce-payment-fields';
 		$blocks_style_handle = 'paytrail-woocommerce-blocks-style';
-		$blocks_css_url      = plugins_url( 'dist/assets/frontend/blocks.css', dirname( __FILE__ ) );
-		$blocks_css_file     = plugin_dir_path( dirname( __FILE__ ) ) . 'dist/assets/frontend/blocks.css';
+		$blocks_css_url      = plugins_url( 'dist/assets/frontend/blocks.css', __DIR__ );
+		$blocks_css_file     = plugin_dir_path( __DIR__ ) . 'dist/assets/frontend/blocks.css';
 
 		if ( ! wp_style_is( $style_handle, 'enqueued' ) ) {
 			wp_enqueue_style( $style_handle );
 		}
 
 		if ( ! wp_style_is( $blocks_style_handle, 'enqueued' ) ) {
-			wp_enqueue_style( $blocks_style_handle, $blocks_css_url, [], filemtime( $blocks_css_file ) );
+			wp_enqueue_style( $blocks_style_handle, $blocks_css_url, array(), filemtime( $blocks_css_file ) );
 		}
 
-		return [ $style_handle, $blocks_style_handle ];
+		return array( $style_handle, $blocks_style_handle );
 	}
 
 	/**
@@ -213,37 +213,37 @@ public function is_active() {
 	public function get_payment_method_data( $context = null ) {
 		$gateway = $this->get_gateway();
 		if ( ! $this->is_provider_selection_enabled() ) {
-				return [
+				return array(
 					'title'        => $gateway->title,
 					'description'  => $gateway->description,
-					'supports'     => array_filter( $gateway->supports, [ $gateway, 'supports' ] ),
-					'groups'       => [],
+					'supports'     => array_filter( $gateway->supports, array( $gateway, 'supports' ) ),
+					'groups'       => array(),
 					'terms'        => '',
 					'no_providers' => true,
-				];
+				);
 		}
 
 		$grouped_providers = $gateway->get_grouped_payment_providers();
 		$this->get_payment_method_style_handles();
 		$tokens = WC_Payment_Tokens::get_customer_tokens( get_current_user_id() );
 
-		return [
+		return array(
 			'title'                 => $gateway->title,
 			'description'           => $gateway->description,
-			'supports'              => array_filter( $gateway->supports, [ $gateway, 'supports' ] ),
-			'groups' => isset($grouped_providers['groups']) ? $grouped_providers['groups'] : [],
-			'terms'  => isset($grouped_providers['terms']) ? $grouped_providers['terms'] : '',
+			'supports'              => array_filter( $gateway->supports, array( $gateway, 'supports' ) ),
+			'groups'                => isset( $grouped_providers['groups'] ) ? $grouped_providers['groups'] : array(),
+			'terms'                 => isset( $grouped_providers['terms'] ) ? $grouped_providers['terms'] : '',
 			'saved_payment_methods' => ! empty( $tokens ) ? array_map(
 				function ( $token ) {
-					return [
+					return array(
 						'id'     => $token->get_id(),
 						'last4'  => $token->get_last4(),
 						'expiry' => $token->get_expiry_month() . '/' . $token->get_expiry_year(),
 						'type'   => $token->get_card_type(),
-					];
+					);
 				},
 				$tokens
-			) : [],
-		];
+			) : array(),
+		);
 	}
 }
diff --git a/src/Providers/OPLasku.php b/src/Providers/OPLasku.php
index 87774756..918e7b32 100644
--- a/src/Providers/OPLasku.php
+++ b/src/Providers/OPLasku.php
@@ -12,23 +12,27 @@ class OPLasku {
 
 	public function __construct() {
 		// Hooks for product and classic cart page
-		add_action('woocommerce_before_add_to_cart_form', array($this, 'product_page'));
-		add_action('woocommerce_proceed_to_checkout', array($this, 'cart_page'));
+		add_action( 'woocommerce_before_add_to_cart_form', array( $this, 'product_page' ) );
+		add_action( 'woocommerce_proceed_to_checkout', array( $this, 'cart_page' ) );
 		// Register scripts and styles
-		add_action('wp_enqueue_scripts', array($this, 'register_scripts'));
-		//Enqueue blocks cart scripts and styles
-		add_action('woocommerce_blocks_cart_enqueue_data', array($this, 'enqueue_blocks_cart_assets'));
+		add_action( 'wp_enqueue_scripts', array( $this, 'register_scripts' ) );
+		// Enqueue blocks cart scripts and styles
+		add_action( 'woocommerce_blocks_cart_enqueue_data', array( $this, 'enqueue_blocks_cart_assets' ) );
 	}
 
 	/**
 	 * Enqueue assets for blocks cart
 	 */
 	public function enqueue_blocks_cart_assets() {
-		wp_enqueue_script('paytrail-op-lasku');
-		wp_enqueue_style('paytrail-op-lasku');
-		wp_localize_script('paytrail-op-lasku', 'op_lasku_data', array(
-			'language' => esc_js($this->get_language()),
-		));
+		wp_enqueue_script( 'paytrail-op-lasku' );
+		wp_enqueue_style( 'paytrail-op-lasku' );
+		wp_localize_script(
+			'paytrail-op-lasku',
+			'op_lasku_data',
+			array(
+				'language' => esc_js( $this->get_language() ),
+			)
+		);
 	}
 
 	/**
@@ -37,10 +41,10 @@ public function enqueue_blocks_cart_assets() {
 	public static function register_blocks_cart_scripts() {
 		$op_lasku_script_path       = '/dist/assets/frontend/op-lasku-helper-blocks.js';
 		$op_lasku_script_asset_path = \Paytrail\WooCommercePaymentGateway\Plugin::plugin_abspath() . 'dist/assets/frontend/op-lasku-helper-blocks.asset.php';
-		$op_lasku_script_asset      = file_exists($op_lasku_script_asset_path) ? require $op_lasku_script_asset_path : [
-			'dependencies' => [],
+		$op_lasku_script_asset      = file_exists( $op_lasku_script_asset_path ) ? require $op_lasku_script_asset_path : array(
+			'dependencies' => array(),
 			'version'      => \Paytrail\WooCommercePaymentGateway\Plugin::$version,
-		];
+		);
 		$op_lasku_script_url        = \Paytrail\WooCommercePaymentGateway\Plugin::plugin_url() . $op_lasku_script_path;
 		wp_register_script(
 			'paytrail-op-lasku-helper-blocks',
@@ -55,49 +59,57 @@ public static function register_blocks_cart_scripts() {
 	 * Register scripts for product and classic cart page
 	 */
 	public function register_scripts() {
-		wp_register_script('paytrail-op-lasku', Plugin::plugin_url() . '/assets/op-lasku-assets/op-lasku-widget.js', [], Plugin::$version, true);
-		wp_register_script('paytrail-op-lasku-helper', Plugin::plugin_url() . '/assets/op-lasku-assets/op-lasku-helper.js', array('jquery'), Plugin::$version, true);
-		wp_register_style('paytrail-op-lasku', Plugin::plugin_url() . '/assets/op-lasku-assets/op-lasku-widget.css', [], Plugin::$version);
+		wp_register_script( 'paytrail-op-lasku', Plugin::plugin_url() . '/assets/op-lasku-assets/op-lasku-widget.js', array(), Plugin::$version, true );
+		wp_register_script( 'paytrail-op-lasku-helper', Plugin::plugin_url() . '/assets/op-lasku-assets/op-lasku-helper.js', array( 'jquery' ), Plugin::$version, true );
+		wp_register_style( 'paytrail-op-lasku', Plugin::plugin_url() . '/assets/op-lasku-assets/op-lasku-widget.css', array(), Plugin::$version );
 	}
 
 	/**
 	 * Display OP Lasku calculator in the product page
 	 */
 	public function product_page() {
-		global $product;    
-		if (!$product) {
+		global $product;
+		if ( ! $product ) {
 			return;
 		}
 
 		$this->product_price = $product->get_price() ? $product->get_price() : 0;
 
-		wp_enqueue_script('paytrail-op-lasku');
-		wp_enqueue_script('paytrail-op-lasku-helper');
-		wp_enqueue_style('paytrail-op-lasku');
-
-		wp_localize_script('paytrail-op-lasku', 'op_lasku_data', array(
-			'product_price' => esc_js($this->product_price),
-			'language' => esc_js($this->get_language()),
-		));
+		wp_enqueue_script( 'paytrail-op-lasku' );
+		wp_enqueue_script( 'paytrail-op-lasku-helper' );
+		wp_enqueue_style( 'paytrail-op-lasku' );
+
+		wp_localize_script(
+			'paytrail-op-lasku',
+			'op_lasku_data',
+			array(
+				'product_price' => esc_js( $this->product_price ),
+				'language'      => esc_js( $this->get_language() ),
+			)
+		);
 
-		echo wp_kses_post('<div id="op-lasku--init"></div>');
+		echo wp_kses_post( '<div id="op-lasku--init"></div>' );
 	}
 
 	/**
 	 * Display OP Lasku calculator in the cart page
 	 */
 	public function cart_page() {
-		$this->cart_total = WC()->cart ? WC()->cart->get_total('raw') : 0;
-
-		wp_enqueue_script('paytrail-op-lasku');
-		wp_enqueue_script('paytrail-op-lasku-helper');
-		wp_enqueue_style('paytrail-op-lasku');
-
-		wp_localize_script('paytrail-op-lasku', 'op_lasku_data', array(
-			'cart_total' => esc_js($this->cart_total),
-			'language' => esc_js($this->get_language()),
-		));
-		echo wp_kses_post('<div id="op-lasku--init"></div>');
+		$this->cart_total = WC()->cart ? WC()->cart->get_total( 'raw' ) : 0;
+
+		wp_enqueue_script( 'paytrail-op-lasku' );
+		wp_enqueue_script( 'paytrail-op-lasku-helper' );
+		wp_enqueue_style( 'paytrail-op-lasku' );
+
+		wp_localize_script(
+			'paytrail-op-lasku',
+			'op_lasku_data',
+			array(
+				'cart_total' => esc_js( $this->cart_total ),
+				'language'   => esc_js( $this->get_language() ),
+			)
+		);
+		echo wp_kses_post( '<div id="op-lasku--init"></div>' );
 	}
 
 	/**
@@ -106,10 +118,10 @@ public function cart_page() {
 	 * @return string
 	 */
 	public static function settings_title() {
-		$icon_url = sprintf('%s/assets/img/icon_oplasku_admin.svg', Plugin::plugin_url());
+		$icon_url = sprintf( '%s/assets/img/icon_oplasku_admin.svg', Plugin::plugin_url() );
 		return sprintf(
-			__('OP Lasku', 'paytrail-for-woocommerce') . '<br><img src="%s" alt="OP Lasku calculator" style="width: 70px; height: auto; margin-top: 5px;">',
-			esc_url($icon_url)
+			__( 'OP Lasku', 'paytrail-for-woocommerce' ) . '<br><img src="%s" alt="OP Lasku calculator" style="width: 70px; height: auto; margin-top: 5px;">',
+			esc_url( $icon_url )
 		);
 	}
 
@@ -119,8 +131,8 @@ public static function settings_title() {
 	 * @return string
 	 */
 	protected function get_language() {
-		$locale = strtolower(Helper::getLocale());
-		if ('sv' === $locale) {
+		$locale = strtolower( Helper::getLocale() );
+		if ( 'sv' === $locale ) {
 			$locale = 'se';
 		}
 		return $locale;
diff --git a/src/Router.php b/src/Router.php
index 539a446e..b8bdb66c 100644
--- a/src/Router.php
+++ b/src/Router.php
@@ -20,8 +20,8 @@ class Router {
 	 * Router constructor.
 	 */
 	public function __construct() {
-		add_filter('init', [$this, 'register_rewrites']);
-		add_filter('template_include', [$this, 'routes']);
+		add_filter( 'init', array( $this, 'register_rewrites' ) );
+		add_filter( 'template_include', array( $this, 'routes' ) );
 	}
 
 	/**
@@ -31,13 +31,13 @@ public function __construct() {
 	 * @param $action
 	 * @return string
 	 */
-	public static function get_url( $route, $action) {
-		$home_url = esc_url(home_url('/'));
-		$base_url = Plugin::BASE_URL;
-		$route_base_url = self::ROUTE_BASE_URL;
+	public static function get_url( $route, $action ) {
+		$home_url        = esc_url( home_url( '/' ) );
+		$base_url        = Plugin::BASE_URL;
+		$route_base_url  = self::ROUTE_BASE_URL;
 		$action_base_url = self::ACTION_BASE_URL;
 
-		if (!get_option('permalink_structure')) {
+		if ( ! get_option( 'permalink_structure' ) ) {
 			return "{$home_url}index.php?{$route_base_url}={$route}&{$action_base_url}={$action}";
 		}
 
@@ -48,12 +48,12 @@ public static function get_url( $route, $action) {
 	 * Register router rewrites
 	 */
 	public function register_rewrites() {
-		$base_url = Plugin::BASE_URL;
+		$base_url        = Plugin::BASE_URL;
 		$action_base_url = self::ACTION_BASE_URL;
-		$route_base_url = self::ROUTE_BASE_URL;
-		add_rewrite_rule('paytrail/([^/]*)/([^/]*)/?$', 'index.php?' . $route_base_url . '=$matches[1]&' . $action_base_url . '=$matches[2]', 'top');
-		add_rewrite_tag("%$route_base_url%", '([^&]+)');
-		add_rewrite_tag("%$action_base_url%", '([^&]+)');
+		$route_base_url  = self::ROUTE_BASE_URL;
+		add_rewrite_rule( 'paytrail/([^/]*)/([^/]*)/?$', 'index.php?' . $route_base_url . '=$matches[1]&' . $action_base_url . '=$matches[2]', 'top' );
+		add_rewrite_tag( "%$route_base_url%", '([^&]+)' );
+		add_rewrite_tag( "%$action_base_url%", '([^&]+)' );
 	}
 
 	/**
@@ -62,14 +62,14 @@ public function register_rewrites() {
 	 * @param $template
 	 * @return mixed
 	 */
-	public function routes( $template) {
-		$route = get_query_var(self::ROUTE_BASE_URL);
+	public function routes( $template ) {
+		$route = get_query_var( self::ROUTE_BASE_URL );
 
-		if (!$route) {
+		if ( ! $route ) {
 			return $template;
 		}
-		$action = !empty(get_query_var(self::ACTION_BASE_URL)) ? get_query_var(self::ACTION_BASE_URL) : 'index';
-		switch ($route) {
+		$action = ! empty( get_query_var( self::ACTION_BASE_URL ) ) ? get_query_var( self::ACTION_BASE_URL ) : 'index';
+		switch ( $route ) {
 			case Plugin::ADD_CARD_REDIRECT_SUCCESS_URL:
 				$controller = new CardSuccess();
 				break;
@@ -83,10 +83,10 @@ public function routes( $template) {
 				$controller = new Callback();
 				break;
 			default:
-				echo esc_html('Route did not match');
+				echo esc_html( 'Route did not match' );
 		}
 
-		$controller->execute($action);
+		$controller->execute( $action );
 
 		return $template;
 	}
diff --git a/src/View.php b/src/View.php
index 0698ebf8..69defe5d 100644
--- a/src/View.php
+++ b/src/View.php
@@ -29,8 +29,8 @@ class View {
 	 *
 	 * @param string $template The template to render.
 	 */
-	public function __construct( $template) {
-		$this->template = $this->get_template_path($template);
+	public function __construct( $template ) {
+		$this->template = $this->get_template_path( $template );
 	}
 
 	/**
@@ -39,7 +39,7 @@ public function __construct( $template) {
 	 * @param mixed $data The data to render the view with.
 	 * @return void
 	 */
-	public function render( $data = null) {
+	public function render( $data = null ) {
  // @codingStandardsIgnoreLine
 	require $this->template;
 	}
@@ -52,7 +52,7 @@ public function render( $data = null) {
 	 *
 	 * @throws \Exception An exception if the template file given was not found.
 	 */
-	protected function get_template_path( $template) {
+	protected function get_template_path( $template ) {
 		$plugin_instance = Plugin::instance();
 
 		$plugin_dir = $plugin_instance->get_plugin_dir();
@@ -60,10 +60,10 @@ protected function get_template_path( $template) {
 		$templateFile = $plugin_dir . '/src/View/' . $template . '.php';
 
 		// Check the existence of the template.
-		if (file_exists($templateFile)) {
+		if ( file_exists( $templateFile ) ) {
 			return $templateFile;
 		} else {
-			throw new \Exception("Template $template ($templateFile) could not be found.");
+			throw new \Exception( "Template $template ($templateFile) could not be found." );
 		}
 	}
 }
diff --git a/src/View/CheckoutForm.php b/src/View/CheckoutForm.php
index 94462cb7..b81069d9 100644
--- a/src/View/CheckoutForm.php
+++ b/src/View/CheckoutForm.php
@@ -4,27 +4,30 @@
  */
 
 // Ensure that the file is being run within the WordPress context.
-if (! defined('ABSPATH')) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die;
 }
 ?>
 
-<form action="<?php echo esc_html($data->getUrl()); ?>" method="POST" id="checkout-redirect-form">
+<form action="<?php echo esc_html( $data->getUrl() ); ?>" method="POST" id="checkout-redirect-form">
 	<?php
 		$parameters = $data->getParameters();
 
-array_walk($parameters, function ( $parameter) {
-		printf(
-		'<input type="hidden" name="%s" value="%s" />',
-		esc_html($parameter->name),
-		esc_html($parameter->value)
-		);
-	});
+	array_walk(
+		$parameters,
+		function ( $parameter ) {
+			printf(
+				'<input type="hidden" name="%s" value="%s" />',
+				esc_html( $parameter->name ),
+				esc_html( $parameter->value )
+			);
+		}
+	);
 
-esc_html_e('Redirecting... If nothing happens in a few seconds, click the button below.', 'paytrail-for-woocommerce');
+	esc_html_e( 'Redirecting... If nothing happens in a few seconds, click the button below.', 'paytrail-for-woocommerce' );
 	?>
 
-	<p><input type="submit" value="<?php esc_html_e('Submit', 'paytrail-for-woocommerce'); ?>" /></p>
+	<p><input type="submit" value="<?php esc_html_e( 'Submit', 'paytrail-for-woocommerce' ); ?>" /></p>
 </form>
 
 <script>
diff --git a/src/View/Intro-form.php b/src/View/Intro-form.php
index 8eec124f..a2eed100 100644
--- a/src/View/Intro-form.php
+++ b/src/View/Intro-form.php
@@ -6,33 +6,33 @@
 					<img style="max-width:100px" src="https://www.paytrail.com/hubfs/images/Banners_and_logos/logo-white.svg"/>
 				</div>
 				<div class="paytrail-intro-title-container">
-					<h2><?php /* translators: Get started with Paytrail */ esc_html_e('Get started with Paytrail', 'paytrail-for-woocommerce'); ?></h2>
-					<p><?php /* translators: To start accepting payments with Paytrail, you need an account. */ esc_html_e('To start accepting payments with Paytrail, you need an account.', 'paytrail-for-woocommerce'); ?></p>
+					<h2><?php /* translators: Get started with Paytrail */ esc_html_e( 'Get started with Paytrail', 'paytrail-for-woocommerce' ); ?></h2>
+					<p><?php /* translators: To start accepting payments with Paytrail, you need an account. */ esc_html_e( 'To start accepting payments with Paytrail, you need an account.', 'paytrail-for-woocommerce' ); ?></p>
 				</div>
 			</div>
 		</div>
 		<div style="width:calc(50% - 2px);background-color:#fff;;border:1px solid #D92D83;">
 			<div style="padding:25px 90px;text-align:center;">
-				<h3 style="font-size:20px;"><?php /* translators: I need an account */ esc_html_e('I need an account', 'paytrail-for-woocommerce'); ?></h3>
-				<p style="font-size:15px;line-height:1.2;"><?php esc_html_e('You can start our fast on-boarding process by clicking the register button', 'paytrail-for-woocommerce'); ?></p>
-				<button class="modern-button" id="open-lightbox"><?php esc_html_e('Register now', 'paytrail-for-woocommerce'); ?></button>
+				<h3 style="font-size:20px;"><?php /* translators: I need an account */ esc_html_e( 'I need an account', 'paytrail-for-woocommerce' ); ?></h3>
+				<p style="font-size:15px;line-height:1.2;"><?php esc_html_e( 'You can start our fast on-boarding process by clicking the register button', 'paytrail-for-woocommerce' ); ?></p>
+				<button class="modern-button" id="open-lightbox"><?php esc_html_e( 'Register now', 'paytrail-for-woocommerce' ); ?></button>
 				<?php
 				$sales_link = 'https://www.paytrail.com/en/contact-us';
 				?>
 				<p style="font-size:15px;">
-					<?php /* translators: Or <a href="%s" target="_blank">contact sales</a> */ echo sprintf(__('Or <a href="%s" target="_blank">contact sales</a>'), esc_html($sales_link)); ?>
+					<?php /* translators: Or <a href="%s" target="_blank">contact sales</a> */ printf( __( 'Or <a href="%s" target="_blank">contact sales</a>' ), esc_html( $sales_link ) ); ?>
 				</p>
 			</div>
 		</div>
 		<div style="width:calc(50% - 2px);background-color:#F3C0D9;border:1px solid #D92D83;align-items:center;display:flex;">
 			<div style="padding:25px 90px;text-align:center;">
-				<h3 style="font-size:20px;"><?php /* translators: I already have an account */ esc_html_e('I already have an account', 'paytrail-for-woocommerce'); ?></h3>
-				<button class="modern-button" id="credentials"><?php esc_html_e('Add credentials', 'paytrail-for-woocommerce'); ?></button>
+				<h3 style="font-size:20px;"><?php /* translators: I already have an account */ esc_html_e( 'I already have an account', 'paytrail-for-woocommerce' ); ?></h3>
+				<button class="modern-button" id="credentials"><?php esc_html_e( 'Add credentials', 'paytrail-for-woocommerce' ); ?></button>
 				<?php
 				$merchant_link = 'https://merchant.paytrail.com/';
 				?>
 				<p style="font-size:15px;">
-					<?php /* translators: Credentials can be found in the <a href="%s" target="_blank">merchant panel</a> */ echo sprintf(__('Credentials can be found in the <a href="%s" target="_blank">merchant panel</a>'), esc_html($merchant_link)); ?>
+					<?php /* translators: Credentials can be found in the <a href="%s" target="_blank">merchant panel</a> */ printf( __( 'Credentials can be found in the <a href="%s" target="_blank">merchant panel</a>' ), esc_html( $merchant_link ) ); ?>
 				</p>
 			</div>
 		</div>
@@ -41,18 +41,18 @@
 			$customer_service_link = 'https://www.paytrail.com/en/customer-service#merchants/';
 			?>
 			<h2 style="font-weight:300;color:#fff;">
-				<?php /* translators: <b>Need help?</b> Dont hesitate to <a href="%s" target="_blank" style="color:#fff;">contact support!</a> */ echo sprintf(__('<b>Need help?</b> Dont hesitate to <a href="%s" target="_blank" style="color:#fff;">contact support!</a>'), esc_html($customer_service_link)); ?>
+				<?php /* translators: <b>Need help?</b> Dont hesitate to <a href="%s" target="_blank" style="color:#fff;">contact support!</a> */ printf( __( '<b>Need help?</b> Dont hesitate to <a href="%s" target="_blank" style="color:#fff;">contact support!</a>' ), esc_html( $customer_service_link ) ); ?>
 			</h2>
 		</div>
 		<div classs="paytrail-intro-footer" style="display:flex;align-items: center;justify-content:center;padding-top:25px;padding-bottom:25px;width:calc(100% - 2px);background-color:#fff;;border:1px solid #D92D83;">
 			<div style="display:inline-block;width:24%;text-align:center;font-size:0px;">
-				<p style="font-weight:bold;font-size:15px;margin-bottom:0px;margin-top:0px;"><?php esc_html_e('I just want to try it', 'paytrail-for-woocommerce'); ?></p>
+				<p style="font-weight:bold;font-size:15px;margin-bottom:0px;margin-top:0px;"><?php esc_html_e( 'I just want to try it', 'paytrail-for-woocommerce' ); ?></p>
 			</div>
 			<div style="display:inline-block;width:50%;font-size:0px;">
-				<p style="font-size:14px;"><?php esc_html_e('Activate the test mode and try out the test credentials for various payment methods from our API documentation', 'paytrail-for-woocommerce'); ?></p>
+				<p style="font-size:14px;"><?php esc_html_e( 'Activate the test mode and try out the test credentials for various payment methods from our API documentation', 'paytrail-for-woocommerce' ); ?></p>
 			</div>
 			<div style="display:inline-block;width:25%;font-size:0px;text-align:center">
-				<button class="modern-button gray" id="test-mode-button"><?php esc_html_e('Test mode', 'paytrail-for-woocommerce'); ?></button>
+				<button class="modern-button gray" id="test-mode-button"><?php esc_html_e( 'Test mode', 'paytrail-for-woocommerce' ); ?></button>
 			</div>
 		</div>
 	</div>
diff --git a/src/View/PaymentDescription.php b/src/View/PaymentDescription.php
index e12d2ace..7e9804a9 100644
--- a/src/View/PaymentDescription.php
+++ b/src/View/PaymentDescription.php
@@ -3,42 +3,42 @@
  * Checkout payment description
  */
 
-$allowedHtml = [
-	'a'          => [
+$allowedHtml = array(
+	'a'          => array(
 		'href'  => true,
-		'title' => true
-	],
-	'abbr'       => [
-		'title' => true
-	],
-	'acronym'    => [
-		'title' => true
-	],
-	'b'          => [],
-	'blockquote' => [
-		'cite' => true
-	],
-	'cite'       => [],
-	'code'       => [],
-	'del'        => [
-		'datetime' => true
-	],
-	'em'         => [],
-	'i'          => [],
-	'q'          => [
-		'cite' => true
-	],
-	's'          => [],
-	'strike'     => [],
-	'strong'     => [],
-	'img'        => [
+		'title' => true,
+	),
+	'abbr'       => array(
+		'title' => true,
+	),
+	'acronym'    => array(
+		'title' => true,
+	),
+	'b'          => array(),
+	'blockquote' => array(
+		'cite' => true,
+	),
+	'cite'       => array(),
+	'code'       => array(),
+	'del'        => array(
+		'datetime' => true,
+	),
+	'em'         => array(),
+	'i'          => array(),
+	'q'          => array(
+		'cite' => true,
+	),
+	's'          => array(),
+	'strike'     => array(),
+	'strong'     => array(),
+	'img'        => array(
 		'src'      => true,
 		'class'    => true,
 		'alt'      => true,
 		'title'    => true,
-		'longdesc' => true
-	]
-];
+		'longdesc' => true,
+	),
+);
 
 // Ensure that the file is being run within the WordPress context.
 if ( ! defined( 'ABSPATH' ) ) {
diff --git a/src/View/ProviderForm.php b/src/View/ProviderForm.php
index d72237e6..083b023e 100644
--- a/src/View/ProviderForm.php
+++ b/src/View/ProviderForm.php
@@ -4,103 +4,108 @@
  */
 
 // Ensure that the file is being run within the WordPress context.
-if (! defined('ABSPATH')) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die;
 }
 $allowed_html = array(
-	'a'      => array(
+	'a' => array(
 		'href'  => array(),
 		'title' => array(),
-	)
+	),
 );
 
-wp_enqueue_style('paytrail-woocommerce-payment-fields');
-wp_enqueue_script('paytrail-woocommerce-payment-fields');
+wp_enqueue_style( 'paytrail-woocommerce-payment-fields' );
+wp_enqueue_script( 'paytrail-woocommerce-payment-fields' );
 
 // Something went wrong loading the providers.
-if (! empty($data['error'])) {
+if ( ! empty( $data['error'] ) ) {
 	printf(
 		'<p class="paytrail-for-woocommerce-payment-fields__error" role="alert">%s</p>',
-		esc_html($data['error'])
+		esc_html( $data['error'] )
 	);
 	return;
 }
 
 // Terms
 $terms_link = $data['terms'];
-echo '<div class="checkout-terms-link" aria-label="' . esc_attr__('Payment terms', 'paytrail-for-woocommerce') . '">' . wp_kses($terms_link, $allowed_html) . '</div>';
-array_walk($data['groups'], function ( $group) {
-	if (\Paytrail\WooCommercePaymentGateway\Helper::getIsSubscriptionsEnabled() && 'creditcard' == $group['id']) {
-		echo '<div class="paytrail-provider-group" tabindex="0" role="button" aria-haspopup="true" aria-expanded="false">';
-	} elseif (\Paytrail\WooCommercePaymentGateway\Helper::getIsSubscriptionsEnabled()) {
-		echo '<div class="paytrail-provider-group" style="display:none;">';
-	} else {
-		echo '<div class="paytrail-provider-group" tabindex="0" role="button" aria-haspopup="true" aria-expanded="false">';
-	}
-	$providers_list = [];
-	//var_dump($group['providers']);
-	echo '<style type="text/css">';
-	foreach ($group['providers'] as $key => $provider) {
-		// Create simple list of provider names only
-		$providers_list[] = $provider->getName();
-		// Styles for group icons
-		$group_id =  $group['id'];
-		$group_icon = $group['icon'];
-		if (0 === $key) { ?>
-			.payment_method_paytrail .paytrail-provider-group-title.<?php echo esc_html($group_id); ?> i {
-				background: url(<?php echo esc_html($group_icon); ?>) no-repeat;
+echo '<div class="checkout-terms-link" aria-label="' . esc_attr__( 'Payment terms', 'paytrail-for-woocommerce' ) . '">' . wp_kses( $terms_link, $allowed_html ) . '</div>';
+array_walk(
+	$data['groups'],
+	function ( $group ) {
+		if ( \Paytrail\WooCommercePaymentGateway\Helper::getIsSubscriptionsEnabled() && 'creditcard' == $group['id'] ) {
+			echo '<div class="paytrail-provider-group" tabindex="0" role="button" aria-haspopup="true" aria-expanded="false">';
+		} elseif ( \Paytrail\WooCommercePaymentGateway\Helper::getIsSubscriptionsEnabled() ) {
+			echo '<div class="paytrail-provider-group" style="display:none;">';
+		} else {
+			echo '<div class="paytrail-provider-group" tabindex="0" role="button" aria-haspopup="true" aria-expanded="false">';
+		}
+		$providers_list = array();
+		// var_dump($group['providers']);
+		echo '<style type="text/css">';
+		foreach ( $group['providers'] as $key => $provider ) {
+			// Create simple list of provider names only
+			$providers_list[] = $provider->getName();
+			// Styles for group icons
+			$group_id   = $group['id'];
+			$group_icon = $group['icon'];
+			if ( 0 === $key ) { ?>
+			.payment_method_paytrail .paytrail-provider-group-title.<?php echo esc_html( $group_id ); ?> i {
+				background: url(<?php echo esc_html( $group_icon ); ?>) no-repeat;
 				background-size: 28px 28px;
 				background-position-y: center;
 			}
-			.payment_method_paytrail .paytrail-provider-group.selected .paytrail-provider-group-title.<?php echo esc_html($group_id); ?> i {
-				background: url(<?php echo esc_html($group_icon); ?>) no-repeat;
+			.payment_method_paytrail .paytrail-provider-group.selected .paytrail-provider-group-title.<?php echo esc_html( $group_id ); ?> i {
+				background: url(<?php echo esc_html( $group_icon ); ?>) no-repeat;
 				background-size: 28px 28px;
 				background-position-y: center;
 			}
-			<?php
+				<?php
+			}
 		}
+		echo '</style>';
+		echo '<div class="paytrail-provider-group-title ' . esc_attr( $group['id'] ) . '" id="paytrail-provider-group-title-' . esc_attr( $group['id'] ) . '">';
+		echo '<i aria-hidden="true"></i>';
+		echo esc_html( $group['name'] );
+		echo '</div>';
+		echo '<div class="provider-list">';
+		echo esc_html( implode( ', ', $providers_list ) );
+		echo '</div>';
+		echo '</div>';
+		echo '<ul class="paytrail-woocommerce-payment-fields hidden" aria-labelledby="paytrail-provider-group-title-' . esc_attr( $group['id'] ) . '">';
+		if ( ! \Paytrail\WooCommercePaymentGateway\Helper::getIsSubscriptionsEnabled() ) {
+			array_walk(
+				$group['providers'],
+				function ( $provider ) {
+					$provider_name = $provider->getName();
+					$provider_id   = $provider->getId();
+					$provider_svg  = $provider->getSvg();
 
+					// Create unique ID for credit cards
+					$input_id = ( 'creditcard' === $provider_id ) ? 'creditcard-' . $provider_name : $provider_id;
+
+					echo '<li class="paytrail-woocommerce-payment-fields--list-item">';
+					echo '<label for="' . esc_attr( $input_id ) . '">';
+					echo '<input id="' . esc_attr( $input_id ) . '" class="paytrail-woocommerce-payment-fields--list-item--input" type="radio" name="payment_provider" value="' . esc_attr( $provider_id ) . '" aria-label="' . esc_attr( $provider_name ) . '">';
+					echo '<div class="paytrail-woocommerce-payment-fields--list-item--wrapper" aria-hidden="true">';
+					echo '<img class="paytrail-woocommerce-payment-fields--list-item--img" src="' . esc_url( $provider_svg ) . '" alt="' . esc_attr( $provider_name ) . '">';
+					echo '</div>';
+					echo '</label>';
+					echo '</li>';
+				}
+			);
+		}
+		if ( is_user_logged_in() && 'creditcard' == $group['id'] ) {
+			( new \Paytrail\WooCommercePaymentGateway\Gateway() )->render_saved_payment_methods();
+		} elseif ( get_option( 'users_can_register' ) == 1 && 'creditcard' == $group['id'] ) {
+			$mypage_link = get_permalink( wc_get_page_id( 'myaccount' ) );
+			echo '<p class="add-card-login-description" role="link">';
+			/* translators: %s - Logging link */
+			printf( __( 'You can save your card details for next time by <a href="%s">logging in to the store or by creating an account.</a>' ), esc_html( $mypage_link ) );
+			echo '</p>';
+		}
+		echo '</ul>';
 	}
-	echo '</style>';
-	echo '<div class="paytrail-provider-group-title ' . esc_attr($group['id']) . '" id="paytrail-provider-group-title-' . esc_attr($group['id']) . '">';
-	echo '<i aria-hidden="true"></i>';
-	echo esc_html($group['name']);
-	echo '</div>';
-	echo '<div class="provider-list">';
-	echo esc_html(implode(', ', $providers_list));
-	echo '</div>';
-	echo '</div>';
-	echo '<ul class="paytrail-woocommerce-payment-fields hidden" aria-labelledby="paytrail-provider-group-title-' . esc_attr($group['id']) . '">';
-	if (!\Paytrail\WooCommercePaymentGateway\Helper::getIsSubscriptionsEnabled()) {
-		array_walk($group['providers'], function ( $provider) {
-			$provider_name = $provider->getName();
-			$provider_id = $provider->getId();
-			$provider_svg = $provider->getSvg();
-			
-			// Create unique ID for credit cards
-			$input_id = ( 'creditcard' === $provider_id ) ? 'creditcard-' . $provider_name : $provider_id;
-			
-			echo '<li class="paytrail-woocommerce-payment-fields--list-item">';
-			echo '<label for="' . esc_attr($input_id) . '">';
-			echo '<input id="' . esc_attr($input_id) . '" class="paytrail-woocommerce-payment-fields--list-item--input" type="radio" name="payment_provider" value="' . esc_attr($provider_id) . '" aria-label="' . esc_attr($provider_name) . '">';
-			echo '<div class="paytrail-woocommerce-payment-fields--list-item--wrapper" aria-hidden="true">';
-			echo '<img class="paytrail-woocommerce-payment-fields--list-item--img" src="' . esc_url($provider_svg) . '" alt="' . esc_attr($provider_name) . '">';
-			echo '</div>';
-			echo '</label>';
-			echo '</li>';
-		});
-	}
-	if (is_user_logged_in() && 'creditcard' == $group['id']) {
-		( new \Paytrail\WooCommercePaymentGateway\Gateway() )->render_saved_payment_methods();
-	} elseif (get_option('users_can_register') == 1 && 'creditcard' == $group['id']) {
-		$mypage_link = get_permalink(wc_get_page_id('myaccount'));
-		echo '<p class="add-card-login-description" role="link">';
-		/* translators: %s - Logging link */
-		echo sprintf(__('You can save your card details for next time by <a href="%s">logging in to the store or by creating an account.</a>'), esc_html($mypage_link));
-		echo '</p>';
-	}
-	echo '</ul>';
-});
+);
 
 // @todo move this where it is more suitable
 // toggle payment method group sections' visibility
diff --git a/src/View/SavedPaymentMethods.php b/src/View/SavedPaymentMethods.php
index a940c665..0bd634b9 100644
--- a/src/View/SavedPaymentMethods.php
+++ b/src/View/SavedPaymentMethods.php
@@ -5,35 +5,35 @@
 use Paytrail\WooCommercePaymentGateway\Router;
 
 // Ensure that the file is being run within the WordPress context.
-if (!defined('ABSPATH')) {
+if ( ! defined( 'ABSPATH' ) ) {
 	die;
 }
 
-$saved_methods = wc_get_customer_saved_methods_list(get_current_user_id());
-$has_methods = (bool) $saved_methods;
+$saved_methods = wc_get_customer_saved_methods_list( get_current_user_id() );
+$has_methods   = (bool) $saved_methods;
 
-if (\Paytrail\WooCommercePaymentGateway\Helper::getIsChangeSubscriptionPaymentMethod()) {
-	$add_card_form_url = Router::get_url(Plugin::CARD_ENDPOINT, 'add') . '?change_payment_method=1';
+if ( \Paytrail\WooCommercePaymentGateway\Helper::getIsChangeSubscriptionPaymentMethod() ) {
+	$add_card_form_url    = Router::get_url( Plugin::CARD_ENDPOINT, 'add' ) . '?change_payment_method=1';
 	$is_subscription_page = true;
 } else {
-	$add_card_form_url = Router::get_url(Plugin::CARD_ENDPOINT, 'add');
+	$add_card_form_url    = Router::get_url( Plugin::CARD_ENDPOINT, 'add' );
 	$is_subscription_page = false;
 }
 
-$delete_card_url = Router::get_url(Plugin::CARD_ENDPOINT, 'delete');
+$delete_card_url = Router::get_url( Plugin::CARD_ENDPOINT, 'delete' );
 ?>
 <div class="paytrail-provider-group-title mobile paytrail-for-woocommerce-tokenized-payment-methods-saved-payment-methods-title">
-	<?php esc_html_e('Pay with saved card', 'paytrail-for-woocommerce'); ?>
+	<?php esc_html_e( 'Pay with saved card', 'paytrail-for-woocommerce' ); ?>
 </div>
-<?php if ($has_methods) : ?>
+<?php if ( $has_methods ) : ?>
 	<?php ( new Gateway() )->saved_payment_methods(); ?>
 	<a class="paytrail-for-woocommerce-tokenized-payment-method-links delete-card-button button"
-	   href="#"><?php esc_html_e('Delete selected card', 'paytrail-for-woocommerce'); ?></a>
+		href="#"><?php esc_html_e( 'Delete selected card', 'paytrail-for-woocommerce' ); ?></a>
 <?php endif; ?>
 <a class="paytrail-for-woocommerce-tokenized-payment-method-links add-card-button button"
-   href="<?php echo esc_url($add_card_form_url); ?>">
+	href="<?php echo esc_url( $add_card_form_url ); ?>">
 	<span class="paytrail-for-woocommerce-tokenized-payment-add-card-button dashicons dashicons-plus"></span>
-	<?php esc_html_e('Add new card', 'paytrail-for-woocommerce'); ?>
+	<?php esc_html_e( 'Add new card', 'paytrail-for-woocommerce' ); ?>
 </a>
 
 <script>
@@ -58,12 +58,12 @@ function openTokenizedCardProviderGroupSelection() {
 	jQuery(".paytrail-for-woocommerce-tokenized-payment-method-links.delete-card-button").click(function (evt) {
 		evt.preventDefault();
 		let cardTokenId = jQuery("input[name='wc-paytrail-payment-token']:checked").val();
-		const isSubscriptionPage = <?php echo json_encode($is_subscription_page); ?>;
+		const isSubscriptionPage = <?php echo json_encode( $is_subscription_page ); ?>;
 
 		jQuery.ajax({
 			type: 'POST',
 			contentType: 'application/json',
-			url: '<?php echo esc_url_raw($delete_card_url); ?>',
+			url: '<?php echo esc_url_raw( $delete_card_url ); ?>',
 			data: JSON.stringify({token_id: cardTokenId}),
 			success: function (response) {
 				if (response.success && !isSubscriptionPage) {
diff --git a/src/View/User-data-form.php b/src/View/User-data-form.php
index 42fea4f2..37434c51 100644
--- a/src/View/User-data-form.php
+++ b/src/View/User-data-form.php
@@ -1,51 +1,51 @@
 <div class="wrap" style="display:none">
 	<div class="paytrail-registration-container">
-		<form id="user-data-form" method="get" action="<?php echo esc_url(admin_url('admin-post.php')); ?>">
-			<p><?php esc_html_e('To begin the Paytrail registration process, please review the following information', 'paytrail-for-woocommerce'); ?></p>
+		<form id="user-data-form" method="get" action="<?php echo esc_url( admin_url( 'admin-post.php' ) ); ?>">
+			<p><?php esc_html_e( 'To begin the Paytrail registration process, please review the following information', 'paytrail-for-woocommerce' ); ?></p>
 			<div class="form-columns">
 				<div class="form-column">
 					<div class="form-group">
-						<label for="firstname"><?php esc_html_e('First Name:', 'paytrail-for-woocommerce'); ?>:</label>
-						<input type="text" name="firstname" id="firstname" value="<?php echo esc_attr($first_name); ?>" placeholder="First Name">
+						<label for="firstname"><?php esc_html_e( 'First Name:', 'paytrail-for-woocommerce' ); ?>:</label>
+						<input type="text" name="firstname" id="firstname" value="<?php echo esc_attr( $first_name ); ?>" placeholder="First Name">
 					</div>
 					<div class="form-group">
-						<label for="lastname"><?php esc_html_e('Last Name:', 'paytrail-for-woocommerce'); ?></label>
-						<input type="text" name="lastname" id="lastname" value="<?php echo esc_attr($last_name); ?>" placeholder="Last Name">
+						<label for="lastname"><?php esc_html_e( 'Last Name:', 'paytrail-for-woocommerce' ); ?></label>
+						<input type="text" name="lastname" id="lastname" value="<?php echo esc_attr( $last_name ); ?>" placeholder="Last Name">
 					</div>
 					<div class="form-group">
-						<label for="email"><?php esc_html_e('Email:', 'paytrail-for-woocommerce'); ?></label>
-						<input type="text" name="email" id="email" value="<?php echo esc_attr($user_email); ?>" placeholder="Email">
+						<label for="email"><?php esc_html_e( 'Email:', 'paytrail-for-woocommerce' ); ?></label>
+						<input type="text" name="email" id="email" value="<?php echo esc_attr( $user_email ); ?>" placeholder="Email">
 					</div>
 					<div class="form-group">
-						<label for="puhelinnumero"><?php esc_html_e('Phone:', 'paytrail-for-woocommerce'); ?></label>
-						<input type="text" name="puhelinnumero" id="puhelinnumero" value="<?php echo esc_attr($phone_number); ?>" placeholder="Phone number">
+						<label for="puhelinnumero"><?php esc_html_e( 'Phone:', 'paytrail-for-woocommerce' ); ?></label>
+						<input type="text" name="puhelinnumero" id="puhelinnumero" value="<?php echo esc_attr( $phone_number ); ?>" placeholder="Phone number">
 					</div>
 				</div>
 				<div class="form-column">
 					<div class="form-group">
-						<label for="verkkokaupan_www_osoite"><?php esc_html_e('Site URL:', 'paytrail-for-woocommerce'); ?></label>
-						<input type="text" name="verkkokaupan_www_osoite" id="verkkokaupan_www_osoite" value="<?php echo esc_attr($site_url); ?>" placeholder="Site URL">
+						<label for="verkkokaupan_www_osoite"><?php esc_html_e( 'Site URL:', 'paytrail-for-woocommerce' ); ?></label>
+						<input type="text" name="verkkokaupan_www_osoite" id="verkkokaupan_www_osoite" value="<?php echo esc_attr( $site_url ); ?>" placeholder="Site URL">
 					</div>
 					<div class="form-group">
-						<label for="company"><?php esc_html_e('Company Name:', 'paytrail-for-woocommerce'); ?></label>
-						<input type="text" name="company" id="company" value="<?php echo esc_attr($company_name); ?>" placeholder="Company Name">
+						<label for="company"><?php esc_html_e( 'Company Name:', 'paytrail-for-woocommerce' ); ?></label>
+						<input type="text" name="company" id="company" value="<?php echo esc_attr( $company_name ); ?>" placeholder="Company Name">
 					</div>
 					<div class="form-group">
-						<label for="address"><?php esc_html_e('Shop Address:', 'paytrail-for-woocommerce'); ?></label>
-						<input type="text" name="address" id="address" value="<?php echo esc_attr($shop_address); ?>" placeholder="Shop Address">
+						<label for="address"><?php esc_html_e( 'Shop Address:', 'paytrail-for-woocommerce' ); ?></label>
+						<input type="text" name="address" id="address" value="<?php echo esc_attr( $shop_address ); ?>" placeholder="Shop Address">
 					</div>
 					<div class="form-group">
-						<label for="city"><?php esc_html_e('Shop City:', 'paytrail-for-woocommerce'); ?></label>
-						<input type="text" name="city" id="city" value="<?php echo esc_attr($shop_city); ?>" placeholder="Shop City">
+						<label for="city"><?php esc_html_e( 'Shop City:', 'paytrail-for-woocommerce' ); ?></label>
+						<input type="text" name="city" id="city" value="<?php echo esc_attr( $shop_city ); ?>" placeholder="Shop City">
 					</div>
 					<div class="form-group">
-						<label for="postinumero"><?php esc_html_e('Shop Postcode:', 'paytrail-for-woocommerce'); ?></label>
-						<input type="text" name="postinumero" id="postinumero" value="<?php echo esc_attr($shop_postcode); ?>" placeholder="Shop Postcode">
+						<label for="postinumero"><?php esc_html_e( 'Shop Postcode:', 'paytrail-for-woocommerce' ); ?></label>
+						<input type="text" name="postinumero" id="postinumero" value="<?php echo esc_attr( $shop_postcode ); ?>" placeholder="Shop Postcode">
 					</div>
 				</div>
 			</div>
 			<input type="submit" style=" background-color: #D92D83;color: #fff;border:none;padding:5px 15px;border-radius:10px;font-size:14px;;margin-right: 8px;text-transform:uppercase;font-weight: bold;" class="button-primary" value="Submit">
 		</form>
-		<button id="close-lightbox"><?php esc_html_e('Close', 'paytrail-for-woocommerce'); ?></button>
+		<button id="close-lightbox"><?php esc_html_e( 'Close', 'paytrail-for-woocommerce' ); ?></button>
 	</div>
 </div>

From 30756d3af76531b05af74842cfe69578dd2088b2 Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Tue, 25 Nov 2025 20:28:03 +0100
Subject: [PATCH 05/44] Adds Singleton trait

---
 src/Traits/Singleton.php | 50 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 src/Traits/Singleton.php

diff --git a/src/Traits/Singleton.php b/src/Traits/Singleton.php
new file mode 100644
index 00000000..38ade58b
--- /dev/null
+++ b/src/Traits/Singleton.php
@@ -0,0 +1,50 @@
+<?php
+namespace Krokedil\Paytrail\Traits;
+
+defined( 'ABSPATH' ) || exit;
+
+/**
+ * Trait Singleton
+ *
+ * A trait to make a class a singleton
+ */
+trait Singleton {
+
+	/**
+	 * Instance of the class
+	 *
+	 * @var object
+	 */
+	private static $instance;
+
+	/**
+	 * Get the instance of the class
+	 *
+	 * @return object
+	 */
+	public static function get_instance() {
+		if ( null === self::$instance ) {
+			self::$instance = new self();
+		}
+
+		return self::$instance;
+	}
+
+	/**
+	 * Prevent creating a new instance of the class
+	 */
+	private function __construct() {
+	}
+
+	/**
+	 * Prevent cloning the instance of the class
+	 */
+	public function __clone() {
+	}
+
+	/**
+	 * Prevent unserializing the instance of the class
+	 */
+	public function __wakeup() {
+	}
+}

From d8c9321ee3cb23f9c4b58bd7b73f263d63370168 Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Tue, 25 Nov 2025 21:18:10 +0100
Subject: [PATCH 06/44] Add helper methods for gateway and client

---
 src/Gateway.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/Gateway.php b/src/Gateway.php
index 701e625d..512dc166 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -202,6 +202,27 @@ public function __construct( $params = array() ) {
 
 		// Check if we are in response phase
 		$this->check_paytrail_response();
+
+		new Controllers\MetaBox();
+	}
+
+	/**
+	 * Get gateway instance
+	 *
+	 * @param string|null $gateway_id The gateway ID. Defaults to Plugin::GATEWAY_ID.
+	 * @return Gateway|null
+	 */
+	public static function get_gateway( $gateway_id = null ) {
+		return isset( WC()->payment_gateways ) ? WC()->payment_gateways()->get_available_payment_gateways()[ $gateway_id ?? Plugin::GATEWAY_ID ] : null;
+	}
+
+	/**
+	 * Get Paytrail SDK Client instance.
+	 *
+	 * @return Client
+	 */
+	public function get_client() {
+		return $this->client;
 	}
 
 	/**

From ac1d49c9cd46e3d06ec91d148d6f52d531505940 Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Tue, 25 Nov 2025 23:13:51 +0100
Subject: [PATCH 07/44] Displays Paytail order status in Metabox

---
 src/Controllers/MetaBox.php |  82 ++++++++++++++++++++++
 src/Gateway.php             |  12 +---
 src/Model/MetaBox.php       | 136 ++++++++++++++++++++++++++++++++++++
 src/View/MetaBox.php        |  39 +++++++++++
 4 files changed, 259 insertions(+), 10 deletions(-)
 create mode 100644 src/Controllers/MetaBox.php
 create mode 100644 src/Model/MetaBox.php
 create mode 100644 src/View/MetaBox.php

diff --git a/src/Controllers/MetaBox.php b/src/Controllers/MetaBox.php
new file mode 100644
index 00000000..422c1cd1
--- /dev/null
+++ b/src/Controllers/MetaBox.php
@@ -0,0 +1,82 @@
+<?php
+/**
+ * Paytrail for Woocommerce payment MetaBox controller class
+ *
+ * @package Paytrail\WooCommercePaymentGateway\Controllers
+ */
+
+namespace Paytrail\WooCommercePaymentGateway\Controllers;
+
+use Paytrail\WooCommercePaymentGateway\Plugin;
+use Paytrail\WooCommercePaymentGateway\View;
+use Paytrail\WooCommercePaymentGateway\Model;
+
+/**
+ * Class MetaBox
+ *
+ * @package Paytrail\WooCommercePaymentGateway\Controllers
+ */
+class MetaBox extends AbstractController {
+
+	/**
+	 * MetaBox constructor.
+	 */
+	public function __construct() {
+		add_action( 'add_meta_boxes', array( $this, 'register_meta_box' ), 10, 2 );
+	}
+
+	/**
+	 * Register meta box for order post type.
+	 *
+	 * @param string             $screen_id The screen ID (or post type).
+	 * @param \WC_Order|\WP_Post $order The WC Order or WP Post.
+	 * @return void
+	 */
+	public function register_meta_box( $screen_id, $order ) {
+		if ( \in_array( $screen_id, array( 'woocommerce_page_wc-orders', 'shop_order' ), true ) ) {
+			$order = $order instanceof \WP_Post ? wc_get_order( $order->ID ) : $order;
+			if ( Plugin::GATEWAY_ID === $order->get_payment_method() ) {
+				add_meta_box(
+					'paytrail_meta_box',
+					__( 'Paytrail', 'paytrail-for-woocommerce' ),
+					function () use ( $order ) {
+						$this->meta_box_content( $order );
+					},
+					$screen_id,
+					'side',
+					'core'
+				);
+			}
+		}
+	}
+
+	/**
+	 * Determines whether the success or error content should be printed.
+	 *
+	 * @param \WC_Order $order The WC order.
+	 * @return void
+	 */
+	public function meta_box_content( $order ) {
+		// Note: when this method is called, we've already registered the metabox. Thus, it will appear for the merchant. We should display something, even if it is something as simple as error message that explains why it is empty.
+
+		if ( empty( $order->get_transaction_id() ) ) {
+			$data = array( 'error' => __( 'The order is missing transaction ID.', 'paytrail-for-woocommerce' ) );
+		} else {
+
+			$model          = new Model\MetaBox( $order );
+			$paytrail_order = $model->get_status();
+			if ( empty( $paytrail_order ) ) {
+				$data = array( 'error' => __( 'Failed to retrieve the order from Paytrail.', 'paytrail-for-woocommerce' ) );
+			} else {
+				$data = array(
+					'status'         => $model->get_status(),
+					'amount'         => $model->get_amount(),
+					'currency'       => $model->get_currency(),
+					'transaction_id' => $model->get_transaction_id(),
+				);
+			}
+		}
+
+		( new View( 'MetaBox' ) )->render( $data );
+	}
+}
diff --git a/src/Gateway.php b/src/Gateway.php
index 512dc166..117056f2 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -34,6 +34,8 @@
 use WC_Order_Item_Shipping;
 use WC_Payment_Token_CC;
 
+use Paytrail\WooCommercePaymentGateway\Controllers\MetaBox;
+
 /**
  * Class Gateway
  * The Gateway class
@@ -206,16 +208,6 @@ public function __construct( $params = array() ) {
 		new Controllers\MetaBox();
 	}
 
-	/**
-	 * Get gateway instance
-	 *
-	 * @param string|null $gateway_id The gateway ID. Defaults to Plugin::GATEWAY_ID.
-	 * @return Gateway|null
-	 */
-	public static function get_gateway( $gateway_id = null ) {
-		return isset( WC()->payment_gateways ) ? WC()->payment_gateways()->get_available_payment_gateways()[ $gateway_id ?? Plugin::GATEWAY_ID ] : null;
-	}
-
 	/**
 	 * Get Paytrail SDK Client instance.
 	 *
diff --git a/src/Model/MetaBox.php b/src/Model/MetaBox.php
new file mode 100644
index 00000000..3b0fc5c4
--- /dev/null
+++ b/src/Model/MetaBox.php
@@ -0,0 +1,136 @@
+<?php
+/**
+ * Paytrail for Woocommerce Meta box model class
+ *
+ * @package Paytrail\WooCommercePaymentGateway\Model
+ */
+
+namespace Paytrail\WooCommercePaymentGateway\Model;
+
+use Paytrail\SDK\Request\PaymentStatusRequest;
+use Paytrail\WooCommercePaymentGateway\Gateway;
+
+/**
+ * Paytrail for Woocommerce Meta box model class
+ */
+class MetaBox {
+
+	/**
+	 * The order the metabox retrieves its data from.
+	 *
+	 * @var \WC_Order
+	 */
+	private $order;
+
+	/**
+	 * The Paytrail order status.
+	 *
+	 * @var array
+	 */
+	private $status;
+
+	/**
+	 * The Paytrail order amount.
+	 *
+	 * @var string
+	 */
+	private $amount;
+
+	/**
+	 * The WC order currency.
+	 *
+	 * @var string
+	 */
+	private $currency;
+
+	/**
+	 * The Paytrail transaction ID.
+	 *
+	 * @var string
+	 */
+	private $transaction_id;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param \WC_Order $order The WC order.
+	 */
+	public function __construct( $order ) {
+		$this->order = $order;
+	}
+
+	/**
+	 * Retrieves the Paytrail order status.
+	 *
+	 * @return array|null The Paytrail order status.
+	 */
+	public function get_status() {
+		if ( empty( $this->status ) ) {
+			$gateway = new Gateway();
+
+			$request = new PaymentStatusRequest();
+			$request->setTransactionId( $this->order->get_transaction_id() );
+
+			$client = $gateway->get_client();
+			try {
+				$response     = $client->getPaymentStatus( $request );
+				$this->status = $response->getTransactionId() === $this->order->get_transaction_id() ? $response->getStatus() : null;
+			} catch ( \Exception $e ) {
+				$this->status = null;
+			}
+		}
+
+		return $this->status;
+	}
+
+	/**
+	 * Retrieves the Paytrail order amount.
+	 *
+	 * @return string The Paytrail order amount.
+	 */
+	public function get_amount() {
+		if ( empty( $this->amount ) ) {
+			$gateway = new Gateway();
+
+			$request = new PaymentStatusRequest();
+			$request->setTransactionId( $this->order->get_transaction_id() );
+
+			$client = $gateway->get_client();
+			try {
+				$response     = $client->getPaymentStatus( $request );
+				$this->amount = $response->getTransactionId() === $this->order->get_transaction_id() ? $response->getAmount() : null;
+			} catch ( \Exception $e ) {
+				$this->amount = null;
+			}
+		}
+
+		return $this->amount;
+	}
+
+	/**
+	 * Retrieves the WC order currency.
+	 *
+	 * @return string The WC order currency.
+	 */
+	public function get_currency() {
+		if ( empty( $this->currency ) ) {
+			$this->currency = $this->order->get_currency();
+		}
+
+		return $this->currency;
+	}
+
+	/**
+	 * Retrieves the Paytrail transaction ID.
+	 *
+	 * @return string The Paytrail transaction ID.
+	 */
+	public function get_transaction_id() {
+		// The Paytrail transaction ID is stored as the order's transaction ID. We don't need to fetch it from Paytrail.
+		if ( empty( $this->transaction_id ) ) {
+			$this->transaction_id = $this->order->get_transaction_id();
+		}
+
+		return $this->transaction_id;
+	}
+}
diff --git a/src/View/MetaBox.php b/src/View/MetaBox.php
new file mode 100644
index 00000000..af114ee7
--- /dev/null
+++ b/src/View/MetaBox.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * Metabox view.
+ *
+ * @package Paytrail\WooCommercePaymentGateway\View
+ */
+
+$allowed_html = array(
+	'strong' => array(),
+);
+
+if ( isset( $data['error'] ) ) {
+	$error_message = $data['error'];
+} else {
+
+	$amount   = $data['amount'] / 100;
+	$currency = array(
+		'currency' => $data['currency'],
+		'decimals' => 2,
+	);
+
+	// translators: Paytrail order status.
+	$order_status = sprintf( __( '<strong>Status:</strong> %s', 'paytrail-for-woocommerce' ), wc_strtoupper( $data['status'] ) );
+	// translators: Paytrail order amount.
+	$amount = sprintf( __( '<strong>Amount:</strong> %s', 'paytrail-for-woocommerce' ), wc_price( $amount, $currency ) );
+	// translators: Paytrail transaction ID.
+	$transaction_id = sprintf( __( '<strong>Paytrail transaction ID:</strong> %s', 'paytrail-for-woocommerce' ), $data['transaction_id'] );
+}
+
+?>
+<div class='paytrail-meta-box-content'>
+	<?php if ( isset( $error_message ) ) : ?>
+		<p><?php echo wp_kses( $error_message, $allowed_html ); ?></p>
+	<?php else : ?>
+		<?php echo wp_kses( $order_status, $allowed_html ); ?><br/>
+		<?php echo wp_kses( $amount, $allowed_html ); ?><br/>
+		<?php echo wp_kses( $transaction_id, $allowed_html ); ?><br/>
+	<?php endif; ?>
+</div>

From 7c66b874b87ea3f975b73c07c7b9f2e7ed7f2fa2 Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Fri, 28 Nov 2025 13:43:16 +0100
Subject: [PATCH 08/44] Reflect namespace naming elsewhere

---
 src/Traits/Singleton.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Traits/Singleton.php b/src/Traits/Singleton.php
index 38ade58b..02acac7f 100644
--- a/src/Traits/Singleton.php
+++ b/src/Traits/Singleton.php
@@ -1,5 +1,5 @@
 <?php
-namespace Krokedil\Paytrail\Traits;
+namespace Paytrail\WooCommercePaymentGateway\Traits;
 
 defined( 'ABSPATH' ) || exit;
 

From 4ab9df95e5dc1aac86cf2632725ed47ef5fc45cd Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Fri, 28 Nov 2025 14:16:47 +0100
Subject: [PATCH 09/44] Retrieve and cache the payment status

---
 src/Model/MetaBox.php | 62 ++++++++++++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 22 deletions(-)

diff --git a/src/Model/MetaBox.php b/src/Model/MetaBox.php
index 3b0fc5c4..931a7ac3 100644
--- a/src/Model/MetaBox.php
+++ b/src/Model/MetaBox.php
@@ -8,6 +8,7 @@
 namespace Paytrail\WooCommercePaymentGateway\Model;
 
 use Paytrail\SDK\Request\PaymentStatusRequest;
+use Paytrail\SDK\Response\PaymentStatusResponse;
 use Paytrail\WooCommercePaymentGateway\Gateway;
 
 /**
@@ -50,6 +51,13 @@ class MetaBox {
 	 */
 	private $transaction_id;
 
+	/**
+	 * The Paytrail payment status.
+	 *
+	 * @var PaymentStatusResponse|null
+	 */
+	private $payment_status;
+
 	/**
 	 * Constructor.
 	 *
@@ -66,18 +74,11 @@ public function __construct( $order ) {
 	 */
 	public function get_status() {
 		if ( empty( $this->status ) ) {
-			$gateway = new Gateway();
 
-			$request = new PaymentStatusRequest();
-			$request->setTransactionId( $this->order->get_transaction_id() );
-
-			$client = $gateway->get_client();
-			try {
-				$response     = $client->getPaymentStatus( $request );
-				$this->status = $response->getTransactionId() === $this->order->get_transaction_id() ? $response->getStatus() : null;
-			} catch ( \Exception $e ) {
-				$this->status = null;
+			if ( empty( $this->payment_status ) ) {
+				$this->payment_status = $this->get_payment_status();
 			}
+			$this->status = empty( $this->payment_status ) ? null : $this->payment_status->getStatus();
 		}
 
 		return $this->status;
@@ -89,19 +90,12 @@ public function get_status() {
 	 * @return string The Paytrail order amount.
 	 */
 	public function get_amount() {
-		if ( empty( $this->amount ) ) {
-			$gateway = new Gateway();
-
-			$request = new PaymentStatusRequest();
-			$request->setTransactionId( $this->order->get_transaction_id() );
-
-			$client = $gateway->get_client();
-			try {
-				$response     = $client->getPaymentStatus( $request );
-				$this->amount = $response->getTransactionId() === $this->order->get_transaction_id() ? $response->getAmount() : null;
-			} catch ( \Exception $e ) {
-				$this->amount = null;
+		if ( null === $this->amount ) {
+
+			if ( empty( $this->payment_status ) ) {
+				$this->payment_status = $this->get_payment_status();
 			}
+			$this->amount = empty( $this->payment_status ) ? null : $this->payment_status->getAmount();
 		}
 
 		return $this->amount;
@@ -133,4 +127,28 @@ public function get_transaction_id() {
 
 		return $this->transaction_id;
 	}
+
+	/**
+	 * Get the Payment status from Paytrail.
+	 *
+	 * @return PaymentStatusResponse|null
+	 */
+	private function get_payment_status() {
+		$gateway = new Gateway();
+
+		$request = new PaymentStatusRequest();
+		$request->setTransactionId( $this->order->get_transaction_id() );
+
+		$client = $gateway->get_client();
+		try {
+			$response = $client->getPaymentStatus( $request );
+			if ( $response->getTransactionId() === $this->order->get_transaction_id() ) {
+				return $response;
+			}
+		} catch ( \Exception $e ) {
+			return null;
+		}
+
+		return null;
+	}
 }

From 76fef545d0871aead4a0598c4c2fd56a6db9a54b Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Sat, 29 Nov 2025 20:46:45 +0100
Subject: [PATCH 10/44] PHPCS

---
 src/Gateway.php | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/Gateway.php b/src/Gateway.php
index b700578e..863fe910 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -1608,42 +1608,42 @@ private function create_mit_payment( $payment, $order ) {
 	 * @throws \Exception
 	 */
 	private function set_base_payment_data( $payment, $order ) {
-		// Set the order ID as the stamp to the payment request
+		// Set the order ID as the stamp to the payment request.
 		$payment->setStamp( get_current_blog_id() . '-' . $order->get_id() . '-' . time() );
 
-		// Use WooCom order number as reference
+		// Use WooCom order number as reference.
 		$reference = $order->get_order_number();
 
-		// Calculate bank reference for transaction-specific settlements
+		// Calculate bank reference for transaction-specific settlements.
 		if ( $this->transaction_settlement_enable ) {
 			$reference = $this->calculate_reference( $reference );
 		}
 
-		// Set WooCommerce order number as the payment reference
+		// Set WooCommerce order number as the payment reference.
 		$payment->setReference( $reference );
 
-		// Fetch current currency and the cart total
+		// Fetch current currency and the cart total.
 		$currency    = get_woocommerce_currency();
 		$order_total = $this->helper->handle_currency( $order->get_total() );
 
-		// Set the aforementioned values to the payment request
+		// Set the aforementioned values to the payment request.
 		$payment->setCurrency( $currency )
 			->setAmount( $order_total );
 
-		// Create a customer object from the order
+		// Create a customer object from the order.
 		$customer = $this->create_customer( $order );
 
-		// Set the customer object to the payment request
+		// Set the customer object to the payment request.
 		$payment->setCustomer( $customer );
 
-		// Create a billing address and assign it to the payment request
+		// Create a billing address and assign it to the payment request.
 		$billing_address = $this->create_address( $order, 'invoicing' );
 
 		if ( $billing_address ) {
 			$payment->setInvoicingAddress( $billing_address );
 		}
 
-		// Create a shipping address and assign it to the payment request
+		// Create a shipping address and assign it to the payment request.
 		$shipping_address = $this->create_address( $order, 'delivery' );
 
 		if ( $shipping_address ) {
@@ -1652,19 +1652,20 @@ private function set_base_payment_data( $payment, $order ) {
 
 		$payment->setLanguage( Helper::getLocale() );
 
-		// Get the items from the order
+		// Get the items from the order.
 		$items = $this->get_order_items( $order );
 
 		// Assign the items to the payment request.
 		$payment->setItems( array_filter( $items ) );
 
-		// Create and assign the return urls
+		// Create and assign the return urls.
 		$payment->setRedirectUrls( $this->create_redirect_url( $order ) );
 		$payment->setCallbackUrls( $this->create_callback_url() );
 
-		// Set callback delay to the payment request
+		// Set callback delay to the payment request.
 		$payment->setCallbackDelay( 3 );
 
+		$manual_invoice_activation = wc_string_to_bool( $this->get_option( 'manual_invoice_activation', 'no' ) );
 		return $payment;
 	}
 
@@ -2056,7 +2057,7 @@ protected function payment_description() {
 	 *
 	 * @param \WC_Order $order The order to create the customer object from.
 	 *
-	 * @return \CheckoutFinland\SDK\Model\Customer
+	 * @return Paytrail\SDK\Model\Customer
 	 */
 	protected function create_customer( \WC_Order $order ) {
 		$customer = new Customer();

From da23cc30e9be5a5a56038b07d77e2cf95afc836d Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Sat, 29 Nov 2025 20:46:54 +0100
Subject: [PATCH 11/44] Add manual_invoice_activation setting

---
 src/Gateway.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/Gateway.php b/src/Gateway.php
index 863fe910..b6512948 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -437,6 +437,13 @@ protected function set_form_fields() {
 				'title' => __( 'Advanced settings', 'paytrail-for-woocommerce' ),
 				'type'  => 'title',
 			),
+			'manual_invoice_activation'   => array(
+				'title'       => __( 'Manual invoice activation', 'paytrail-for-woocommerce' ),
+				'label'       => __( 'Enable manual invoice activation', 'paytrail-for-woocommerce' ),
+				'type'        => 'checkbox',
+				'default'     => 'no',
+				'description' => __( 'If paid with invoice payment method, the invoice will not be activated automatically immediately. Currently only supported with Walley.', 'paytrail-for-woocommerce' ),
+			),
 			'settlement_enablement'       => array(
 				'title'       => __( 'Enable individual settlements', 'paytrail-for-woocommerce' ),
 				'type'        => 'checkbox',
@@ -1666,6 +1673,8 @@ private function set_base_payment_data( $payment, $order ) {
 		$payment->setCallbackDelay( 3 );
 
 		$manual_invoice_activation = wc_string_to_bool( $this->get_option( 'manual_invoice_activation', 'no' ) );
+		$payment->setManualInvoiceActivation( $manual_invoice_activation );
+
 		return $payment;
 	}
 

From 1a7c93e3f36c80e816a56beeb0087aa2073d69c3 Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Sat, 29 Nov 2025 23:29:26 +0100
Subject: [PATCH 12/44] PHPCS

---
 plugin.php | 1028 ++++++++++++++++++++++++++++------------------------
 1 file changed, 560 insertions(+), 468 deletions(-)

diff --git a/plugin.php b/plugin.php
index e5d90161..ebbc62be 100644
--- a/plugin.php
+++ b/plugin.php
@@ -23,7 +23,7 @@
 
 // Ensure that the file is being run within the WordPress context.
 if ( ! defined( 'ABSPATH' ) ) {
-    die;
+	die;
 }
 
 /**
@@ -31,414 +31,503 @@
  */
 final class Plugin {
 
-    /**
-     * WooCommerce payment gateway ID.
-     */
-    public const GATEWAY_ID = 'paytrail';
-
-    /**
-     * Merchant ID for the test mode.
-     */
-    public const TEST_MERCHANT_ID = 375917;
-
-    /**
-     * Secret key for the test mode.
-     */
-    public const TEST_SECRET_KEY = 'SAIPPUAKAUPPIAS';
-
-    public const PAYMENT_METHOD_IMG_URL = 'https://static.paytrail.com/static/img/payment-methods';
-
-    public const BASE_URL = 'paytrail/';
-
-    public const ADD_CARD_REDIRECT_SUCCESS_URL = 'card-success';
-
-    public const ADD_CARD_REDIRECT_CANCEL_URL = 'card-cancel';
-
-    public const ADD_CARD_CONTEXT_MY_ACCOUNT = 'my_account';
-
-    public const ADD_CARD_CONTEXT_CHECKOUT= 'checkout';
-
-    public const ADD_CARD_CONTEXT_CHANGE_PAYMENT_METHOD = 'change_payment_method';
-
-    public const CARD_ENDPOINT = 'card';
-
-    public const CALLBACK_URL = 'callback';
-
-    /**
-     * Singleton instance.
-     *
-     * @var Plugin
-     */
-    private static $instance;
-
-    /**
-     * Plugin version.
-     *
-     * @var string
-     */
-    public static $version;
-
-    /**
-     * Plugin directory.
-     *
-     * @var string
-     */
-    protected $plugin_dir;
-
-    /**
-     * Plugin directory URL.
-     *
-     * @var string
-     */
-    protected $plugin_dir_url;
-
-    /**
-     * Container array for possible initialization errors.
-     *
-     * @var array
-     */
-    protected $errors = [];
-
-    /**
-     * Plugin info
-     *
-     * @var array
-     */
-    protected $plugin_info = [
-        'Plugin Name',
-        'Plugin URI',
-        'Description',
-        'Version',
-        'Author',
-        'Author URI',
-        'Text Domain',
-        'Domain Path',
-    ];
-    public function enqueue_jquery() {
-        // Enqueue jQuery script
-        wp_enqueue_script('jquery');
-    }
-
-    /**
-     * Constructor function
-     */
-    protected function __construct() {
-        $this->plugin_dir     = __DIR__;
-        $this->plugin_dir_url = plugin_dir_url( __FILE__ );
-        $this->plugin_info    = array_combine( $this->plugin_info, get_file_data( __FILE__, $this->plugin_info ) );
-
-        self::$version = $this->plugin_info['Version'];
-
-        // Load the plugin textdomain.
-        load_plugin_textdomain( 'paytrail-for-woocommerce', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
-
-        // Register customizations
-        add_action( 'customize_register', [ $this, 'checkout_customizations' ] );
-        // Add custom styles
-        add_action( 'wp_head', [ $this, 'paytrail_checkout_customize_css' ] );
-        // Enable WP Dashicons on frontend
-        add_action( 'wp_enqueue_scripts', function() {
-            wp_enqueue_style( 'dashicons' );
-        } );
-
-        add_action( 'before_woocommerce_init', function() {
-            if ( class_exists( \Automattic\WooCommerce\Utilities\FeaturesUtil::class ) ) {
-                \Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'custom_order_tables', __FILE__, true );
-                \Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'cart_checkout_blocks',__FILE__, true );
-            }
-        } );
-
-        // Blocks compatibility
-		add_action( 'woocommerce_blocks_loaded', [__CLASS__,'register_blocks_support'] );
-        
-        // Enqueue jQuery
-        add_action('admin_enqueue_scripts', array($this, 'enqueue_jquery'));
-        add_action('admin_enqueue_scripts', array($this, 'enque_jquery_scripts'));
-
-        //Add OP Lasku calculator to the product and cart page
-        add_action('woocommerce_init', array($this, 'op_lasku_init'));
-    }
-
-    /**
-     * Register intro scripts
-     */
-    public static function register_intro_scripts() {
-        // Get plugin directory URL
-        $plugin_instance = Plugin::instance();
-		$plugin_dir_url = $plugin_instance->get_plugin_dir_url();
-		$plugin_version = $plugin_instance->get_plugin_info()['Version'];
-
-        // Register the custom script
-        wp_register_script(
-            'introScripts',
-            $plugin_dir_url . 'dist/assets/frontend/intro-scripts.js',
-            ['jquery'], // Dependency on jQuery
-            $plugin_version,
-            true // Enqueue in the footer
-        );
-
-        // Enqueue the custom script
-        wp_enqueue_script('introScripts');
-    }
-
-    /**
-     * Enqueue jQuery UI from WordPress core
-     */
-    public function enque_jquery_scripts($hook) {
-        if ($hook == 'woocommerce_page_wc-settings' && isset($_GET['tab']) && $_GET['tab'] == 'checkout' && isset($_GET['section']) && $_GET['section'] == 'paytrail') {
-
-        wp_enqueue_script('jquery');
-        // Enqueue jQuery UI Core
-        wp_enqueue_script('jquery-ui-core');
-        // Enqueue jQuery UI Dialog
-        wp_enqueue_script('jquery-ui-dialog');
-        // Add jQuery UI styles
-        wp_enqueue_style('jquery-ui-css', 'https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css');
-        // Enqueue intro scripts
-        self::register_intro_scripts();
-
-        }
-    }
-
-    /**
-     * Print custom styles
-     */
-    public function paytrail_checkout_customize_css() {
-        ?>
-            <style type="text/css">
-                .paytrail-provider-group {
-                    background-color: <?php echo get_theme_mod('paytrail_group_background', '#ebebeb'); ?> !important;
-                    color: <?php echo get_theme_mod('paytrail_group_text', '#515151'); ?> !important;
-                }
-                .paytrail-provider-group.selected {
-                    background-color: <?php echo get_theme_mod('paytrail_group_highlighted_background', '#33798d'); ?> !important;
-                    color: <?php echo get_theme_mod('paytrail_group_highlighted_text', '#ffffff'); ?> !important;
-                }
-                .paytrail-provider-group.selected div {
-                    color: <?php echo get_theme_mod('paytrail_group_highlighted_text', '#ffffff'); ?> !important;
-                }
-                .paytrail-provider-group:hover {
-                    background-color: <?php echo get_theme_mod('paytrail_group_hover_background', '#d0d0d0'); ?> !important;
-                    color: <?php echo get_theme_mod('paytrail_group_hover_text', '#515151'); ?> !important;
-                }
-                .paytrail-provider-group.selected:hover {
-                    background-color: <?php echo get_theme_mod('paytrail_group_highlighted_background', '#33798d'); ?> !important;
-                    color: <?php echo get_theme_mod('paytrail_group_highlighted_text', '#ffffff'); ?> !important;
-                }
-                .woocommerce-checkout #payment .paytrail-woocommerce-payment-fields--list-item--input:checked+.paytrail-woocommerce-payment-fields--list-item--wrapper, .woocommerce-checkout #payment .paytrail-woocommerce-payment-fields--list-item:hover .paytrail-woocommerce-payment-fields--list-item--wrapper {
-                    border: 2px solid <?php esc_html_e( get_theme_mod('paytrail_method_highlighted', '#33798d')); ?> !important;
-                }
-                .woocommerce-checkout #payment ul.payment_methods li.paytrail-woocommerce-payment-fields--list-item .paytrail-woocommerce-payment-fields--list-item--wrapper:hover {
-                    border: 2px solid <?php esc_html_e( get_theme_mod('paytrail_method_hover', '#5399ad')); ?> !important;
-                }
-            </style>
-        <?php
-    }
-
-    /**
-     * Customizer options
-     */
-    public function checkout_customizations( $wp_customize ) {
-        // Settings
-        $wp_customize->add_setting( 'paytrail_group_background' , array(
-            'default'   => '#ebebeb',
-            'transport' => 'refresh',
-        ) );
-        $wp_customize->add_setting( 'paytrail_group_text' , array(
-            'default'   => '#515151',
-            'transport' => 'refresh',
-        ) );
-        $wp_customize->add_setting( 'paytrail_group_highlighted_background' , array(
-            'default'   => '#33798d',
-            'transport' => 'refresh',
-        ) );
-        $wp_customize->add_setting( 'paytrail_group_highlighted_text' , array(
-            'default'   => '#ffffff',
-            'transport' => 'refresh',
-        ) );
-        $wp_customize->add_setting( 'paytrail_group_hover_background' , array(
-            'default'   => '#d0d0d0',
-            'transport' => 'refresh',
-        ) );
-        $wp_customize->add_setting( 'paytrail_group_hover_text' , array(
-            'default'   => '#313131',
-            'transport' => 'refresh',
-        ) );
-        $wp_customize->add_setting( 'paytrail_method_highlighted' , array(
-            'default'   => '#33798d',
-            'transport' => 'refresh',
-        ) );
-        $wp_customize->add_setting( 'paytrail_method_hover' , array(
-            'default'   => '#5399ad',
-            'transport' => 'refresh',
-        ) );
-        // Section
-        $wp_customize->add_section( 'paytrail_checkout_customize_section' , array(
-            'title'      => __( 'Payment page personalization', 'paytrail-for-woocommerce' ),
-            'priority'   => 30,
-        ) );
-        // Controls
-        $wp_customize->add_control( new \WP_Customize_Color_Control( $wp_customize, 'paytrail_bgcolor', array(
-            'label'      => __( 'Payment method group background', 'paytrail-for-woocommerce' ),
-            'section'    => 'paytrail_checkout_customize_section',
-            'settings'   => 'paytrail_group_background',
-        ) ) );
-        $wp_customize->add_control( new \WP_Customize_Color_Control( $wp_customize, 'paytrail_fgcolor', array(
-            'label'      => __( 'Payment method group text', 'paytrail-for-woocommerce' ),
-            'section'    => 'paytrail_checkout_customize_section',
-            'settings'   => 'paytrail_group_text',
-        ) ) );
-        $wp_customize->add_control( new \WP_Customize_Color_Control( $wp_customize, 'paytrail_bgcolor_selected', array(
-            'label'      => __( 'Selected payment method group background', 'paytrail-for-woocommerce' ),
-            'section'    => 'paytrail_checkout_customize_section',
-            'settings'   => 'paytrail_group_highlighted_background',
-        ) ) );
-        $wp_customize->add_control( new \WP_Customize_Color_Control( $wp_customize, 'paytrail_fgcolor_selected', array(
-            'label'      => __( 'Selected payment method group text', 'paytrail-for-woocommerce' ),
-            'section'    => 'paytrail_checkout_customize_section',
-            'settings'   => 'paytrail_group_highlighted_text',
-        ) ) );
-        $wp_customize->add_control( new \WP_Customize_Color_Control( $wp_customize, 'paytrail_bgcolor_hover', array(
-            'label'      => __( 'Payment method group background hover', 'paytrail-for-woocommerce' ),
-            'section'    => 'paytrail_checkout_customize_section',
-            'settings'   => 'paytrail_group_hover_background',
-        ) ) );
-        $wp_customize->add_control( new \WP_Customize_Color_Control( $wp_customize, 'paytrail_fgcolor_hover', array(
-            'label'      => __( 'Payment method group text hover', 'paytrail-for-woocommerce' ),
-            'section'    => 'paytrail_checkout_customize_section',
-            'settings'   => 'paytrail_group_hover_text',
-        ) ) );
-        $wp_customize->add_control( new \WP_Customize_Color_Control( $wp_customize, 'paytrail_bordercolor_selected', array(
-            'label'      => __( 'Selected payment method', 'paytrail-for-woocommerce' ),
-            'section'    => 'paytrail_checkout_customize_section',
-            'settings'   => 'paytrail_method_highlighted',
-        ) ) );
-        $wp_customize->add_control( new \WP_Customize_Color_Control( $wp_customize, 'paytrail_bordercolor_hover', array(
-            'label'      => __( 'Payment method hover', 'paytrail-for-woocommerce' ),
-            'section'    => 'paytrail_checkout_customize_section',
-            'settings'   => 'paytrail_method_hover',
-        ) ) );
-    }
-
-    /**
-     * Singleton instance getter function
-     *
-     * @return Plugin
-     */
-    public static function instance() {
-        if ( is_null( self::$instance ) ) {
-            // Construct the object.
-            self::$instance = new self();
-
-            // Run initialization checks. If any of the checks
-            // fails, interrupt the execution.
-            if ( ! self::$instance->initialization_checks() ) {
-                return;
-            }
-
-            // Check if Composer has been initialized in this directory.
-            // Otherwise we just use global composer autoloading.
-            if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
-                require_once __DIR__ . '/vendor/autoload.php';
-            }
-
-            // Create new instance of Router class
-            new Router();
-
-            // Add the gateway class to WooCommerce.
-            add_filter( 'woocommerce_payment_gateways', function( $gateways ) {
-                $gateways[] = Gateway::CLASS;
-
-                return $gateways;
-            });
-
-        }
-
-        return self::$instance;
-    }
-
-    /**
-     * Run checks for plugin requirements.
-     *
-     * Returns false if checks failed.
-     *
-     * @return bool
-     */
-    protected function initialization_checks() {
-        $errors = [];
-
-        $errors[] = self::check_php_version();
-        $errors[] = self::check_woocommerce_active_status();
-        $errors[] = self::check_woocommerce_version();
-
-        $errors = array_filter( $errors );
-
-        if ( ! empty( $errors ) ) {
-            add_action( 'admin_notices', function() use ( $errors ) {
-                echo '<div class="notice notice-error">';
-                array_walk( $errors, 'esc_html_e' );
-                echo '</div>';
-            });
-
-            return false;
-        }
-        else {
-            return true;
-        }
-    }
-
-    /**
-     * Checks to run on plugin activation
-     *
-     * @return void
-     */
-    public static function activation_check() {
-        $checks = [
-            'check_php_version',
-            'check_woocommerce_active_status',
-            'check_woocommerce_version',
-        ];
-
-        array_walk( $checks, function( $check ) {
-            $error = call_user_func( __CLASS__ . '::' . $check );
-
-            if ( $error ) {
-                wp_die( esc_html( $error ) );
-            }
-        });
-    }
-
-    /**
-     * Ensure that the PHP version is at least 7.3.
-     *
-     * @return string|null
-     */
-    public static function check_php_version() : ?string {
-        if ( ! version_compare( PHP_VERSION, '7.3.0', '>=' ) ) {
-            return sprintf(
-                // translators: The placeholder contains the current PHP version.
-                esc_html__( 'Paytrail payment gateway plugin requires a PHP version of at least 7.3. You are currently running version %1$s.', 'paytrail-for-woocommerce' ),
-                esc_html( PHP_VERSION )
-            );
-        }
-
-        return null;
-    }
-
-    /**
-     * Ensure that the WooCommerce plugin is active.
-     *
-     * @return string|null
-     */
-    public static function check_woocommerce_active_status() : ?string {
-        if ( ! class_exists( '\WC_Payment_Gateway' ) ) {
-            return esc_html__( 'Paytrail payment gateway plugin requires WooCommerce to be activated.', 'paytrail-for-woocommerce' );
-        }
-
-        return null;
-    }
-
-    /**
+	/**
+	 * WooCommerce payment gateway ID.
+	 */
+	public const GATEWAY_ID = 'paytrail';
+
+	/**
+	 * Merchant ID for the test mode.
+	 */
+	public const TEST_MERCHANT_ID = 375917;
+
+	/**
+	 * Secret key for the test mode.
+	 */
+	public const TEST_SECRET_KEY = 'SAIPPUAKAUPPIAS';
+
+	public const PAYMENT_METHOD_IMG_URL = 'https://static.paytrail.com/static/img/payment-methods';
+
+	public const BASE_URL = 'paytrail/';
+
+	public const ADD_CARD_REDIRECT_SUCCESS_URL = 'card-success';
+
+	public const ADD_CARD_REDIRECT_CANCEL_URL = 'card-cancel';
+
+	public const ADD_CARD_CONTEXT_MY_ACCOUNT = 'my_account';
+
+	public const ADD_CARD_CONTEXT_CHECKOUT = 'checkout';
+
+	public const ADD_CARD_CONTEXT_CHANGE_PAYMENT_METHOD = 'change_payment_method';
+
+	public const CARD_ENDPOINT = 'card';
+
+	public const CALLBACK_URL = 'callback';
+
+	/**
+	 * Singleton instance.
+	 *
+	 * @var Plugin
+	 */
+	private static $instance;
+
+	/**
+	 * Plugin version.
+	 *
+	 * @var string
+	 */
+	public static $version;
+
+	/**
+	 * Plugin directory.
+	 *
+	 * @var string
+	 */
+	protected $plugin_dir;
+
+	/**
+	 * Plugin directory URL.
+	 *
+	 * @var string
+	 */
+	protected $plugin_dir_url;
+
+	/**
+	 * Container array for possible initialization errors.
+	 *
+	 * @var array
+	 */
+	protected $errors = array();
+
+	/**
+	 * Plugin info
+	 *
+	 * @var array
+	 */
+	protected $plugin_info = array(
+		'Plugin Name',
+		'Plugin URI',
+		'Description',
+		'Version',
+		'Author',
+		'Author URI',
+		'Text Domain',
+		'Domain Path',
+	);
+	public function enqueue_jquery() {
+		// Enqueue jQuery script
+		wp_enqueue_script( 'jquery' );
+	}
+
+	/**
+	 * Constructor function
+	 */
+	protected function __construct() {
+		$this->plugin_dir     = __DIR__;
+		$this->plugin_dir_url = plugin_dir_url( __FILE__ );
+		$this->plugin_info    = array_combine( $this->plugin_info, get_file_data( __FILE__, $this->plugin_info ) );
+
+		self::$version = $this->plugin_info['Version'];
+
+		// Load the plugin textdomain.
+		load_plugin_textdomain( 'paytrail-for-woocommerce', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
+
+		// Register customizations
+		add_action( 'customize_register', array( $this, 'checkout_customizations' ) );
+		// Add custom styles
+		add_action( 'wp_head', array( $this, 'paytrail_checkout_customize_css' ) );
+		// Enable WP Dashicons on frontend
+		add_action(
+			'wp_enqueue_scripts',
+			function () {
+				wp_enqueue_style( 'dashicons' );
+			}
+		);
+
+		add_action(
+			'before_woocommerce_init',
+			function () {
+				if ( class_exists( \Automattic\WooCommerce\Utilities\FeaturesUtil::class ) ) {
+					\Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'custom_order_tables', __FILE__, true );
+					\Automattic\WooCommerce\Utilities\FeaturesUtil::declare_compatibility( 'cart_checkout_blocks', __FILE__, true );
+				}
+			}
+		);
+
+		// Blocks compatibility
+		add_action( 'woocommerce_blocks_loaded', array( __CLASS__, 'register_blocks_support' ) );
+
+		// Enqueue jQuery
+		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_jquery' ) );
+		add_action( 'admin_enqueue_scripts', array( $this, 'enque_jquery_scripts' ) );
+
+		// Add OP Lasku calculator to the product and cart page
+		add_action( 'woocommerce_init', array( $this, 'op_lasku_init' ) );
+	}
+
+	/**
+	 * Register intro scripts
+	 */
+	public static function register_intro_scripts() {
+		// Get plugin directory URL
+		$plugin_instance = self::instance();
+		$plugin_dir_url  = $plugin_instance->get_plugin_dir_url();
+		$plugin_version  = $plugin_instance->get_plugin_info()['Version'];
+
+		// Register the custom script
+		wp_register_script(
+			'introScripts',
+			$plugin_dir_url . 'dist/assets/frontend/intro-scripts.js',
+			array( 'jquery' ), // Dependency on jQuery
+			$plugin_version,
+			true // Enqueue in the footer
+		);
+
+		// Enqueue the custom script
+		wp_enqueue_script( 'introScripts' );
+	}
+
+	/**
+	 * Enqueue jQuery UI from WordPress core
+	 */
+	public function enque_jquery_scripts( $hook ) {
+		if ( $hook == 'woocommerce_page_wc-settings' && isset( $_GET['tab'] ) && $_GET['tab'] == 'checkout' && isset( $_GET['section'] ) && $_GET['section'] == 'paytrail' ) {
+
+			wp_enqueue_script( 'jquery' );
+			// Enqueue jQuery UI Core
+			wp_enqueue_script( 'jquery-ui-core' );
+			// Enqueue jQuery UI Dialog
+			wp_enqueue_script( 'jquery-ui-dialog' );
+			// Add jQuery UI styles
+			wp_enqueue_style( 'jquery-ui-css', 'https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css' );
+			// Enqueue intro scripts
+			self::register_intro_scripts();
+
+		}
+	}
+
+	/**
+	 * Print custom styles
+	 */
+	public function paytrail_checkout_customize_css() {
+		?>
+			<style type="text/css">
+				.paytrail-provider-group {
+					background-color: <?php echo get_theme_mod( 'paytrail_group_background', '#ebebeb' ); ?> !important;
+					color: <?php echo get_theme_mod( 'paytrail_group_text', '#515151' ); ?> !important;
+				}
+				.paytrail-provider-group.selected {
+					background-color: <?php echo get_theme_mod( 'paytrail_group_highlighted_background', '#33798d' ); ?> !important;
+					color: <?php echo get_theme_mod( 'paytrail_group_highlighted_text', '#ffffff' ); ?> !important;
+				}
+				.paytrail-provider-group.selected div {
+					color: <?php echo get_theme_mod( 'paytrail_group_highlighted_text', '#ffffff' ); ?> !important;
+				}
+				.paytrail-provider-group:hover {
+					background-color: <?php echo get_theme_mod( 'paytrail_group_hover_background', '#d0d0d0' ); ?> !important;
+					color: <?php echo get_theme_mod( 'paytrail_group_hover_text', '#515151' ); ?> !important;
+				}
+				.paytrail-provider-group.selected:hover {
+					background-color: <?php echo get_theme_mod( 'paytrail_group_highlighted_background', '#33798d' ); ?> !important;
+					color: <?php echo get_theme_mod( 'paytrail_group_highlighted_text', '#ffffff' ); ?> !important;
+				}
+				.woocommerce-checkout #payment .paytrail-woocommerce-payment-fields--list-item--input:checked+.paytrail-woocommerce-payment-fields--list-item--wrapper, .woocommerce-checkout #payment .paytrail-woocommerce-payment-fields--list-item:hover .paytrail-woocommerce-payment-fields--list-item--wrapper {
+					border: 2px solid <?php esc_html_e( get_theme_mod( 'paytrail_method_highlighted', '#33798d' ) ); ?> !important;
+				}
+				.woocommerce-checkout #payment ul.payment_methods li.paytrail-woocommerce-payment-fields--list-item .paytrail-woocommerce-payment-fields--list-item--wrapper:hover {
+					border: 2px solid <?php esc_html_e( get_theme_mod( 'paytrail_method_hover', '#5399ad' ) ); ?> !important;
+				}
+			</style>
+		<?php
+	}
+
+	/**
+	 * Customizer options
+	 */
+	public function checkout_customizations( $wp_customize ) {
+		// Settings
+		$wp_customize->add_setting(
+			'paytrail_group_background',
+			array(
+				'default'   => '#ebebeb',
+				'transport' => 'refresh',
+			)
+		);
+		$wp_customize->add_setting(
+			'paytrail_group_text',
+			array(
+				'default'   => '#515151',
+				'transport' => 'refresh',
+			)
+		);
+		$wp_customize->add_setting(
+			'paytrail_group_highlighted_background',
+			array(
+				'default'   => '#33798d',
+				'transport' => 'refresh',
+			)
+		);
+		$wp_customize->add_setting(
+			'paytrail_group_highlighted_text',
+			array(
+				'default'   => '#ffffff',
+				'transport' => 'refresh',
+			)
+		);
+		$wp_customize->add_setting(
+			'paytrail_group_hover_background',
+			array(
+				'default'   => '#d0d0d0',
+				'transport' => 'refresh',
+			)
+		);
+		$wp_customize->add_setting(
+			'paytrail_group_hover_text',
+			array(
+				'default'   => '#313131',
+				'transport' => 'refresh',
+			)
+		);
+		$wp_customize->add_setting(
+			'paytrail_method_highlighted',
+			array(
+				'default'   => '#33798d',
+				'transport' => 'refresh',
+			)
+		);
+		$wp_customize->add_setting(
+			'paytrail_method_hover',
+			array(
+				'default'   => '#5399ad',
+				'transport' => 'refresh',
+			)
+		);
+		// Section
+		$wp_customize->add_section(
+			'paytrail_checkout_customize_section',
+			array(
+				'title'    => __( 'Payment page personalization', 'paytrail-for-woocommerce' ),
+				'priority' => 30,
+			)
+		);
+		// Controls
+		$wp_customize->add_control(
+			new \WP_Customize_Color_Control(
+				$wp_customize,
+				'paytrail_bgcolor',
+				array(
+					'label'    => __( 'Payment method group background', 'paytrail-for-woocommerce' ),
+					'section'  => 'paytrail_checkout_customize_section',
+					'settings' => 'paytrail_group_background',
+				)
+			)
+		);
+		$wp_customize->add_control(
+			new \WP_Customize_Color_Control(
+				$wp_customize,
+				'paytrail_fgcolor',
+				array(
+					'label'    => __( 'Payment method group text', 'paytrail-for-woocommerce' ),
+					'section'  => 'paytrail_checkout_customize_section',
+					'settings' => 'paytrail_group_text',
+				)
+			)
+		);
+		$wp_customize->add_control(
+			new \WP_Customize_Color_Control(
+				$wp_customize,
+				'paytrail_bgcolor_selected',
+				array(
+					'label'    => __( 'Selected payment method group background', 'paytrail-for-woocommerce' ),
+					'section'  => 'paytrail_checkout_customize_section',
+					'settings' => 'paytrail_group_highlighted_background',
+				)
+			)
+		);
+		$wp_customize->add_control(
+			new \WP_Customize_Color_Control(
+				$wp_customize,
+				'paytrail_fgcolor_selected',
+				array(
+					'label'    => __( 'Selected payment method group text', 'paytrail-for-woocommerce' ),
+					'section'  => 'paytrail_checkout_customize_section',
+					'settings' => 'paytrail_group_highlighted_text',
+				)
+			)
+		);
+		$wp_customize->add_control(
+			new \WP_Customize_Color_Control(
+				$wp_customize,
+				'paytrail_bgcolor_hover',
+				array(
+					'label'    => __( 'Payment method group background hover', 'paytrail-for-woocommerce' ),
+					'section'  => 'paytrail_checkout_customize_section',
+					'settings' => 'paytrail_group_hover_background',
+				)
+			)
+		);
+		$wp_customize->add_control(
+			new \WP_Customize_Color_Control(
+				$wp_customize,
+				'paytrail_fgcolor_hover',
+				array(
+					'label'    => __( 'Payment method group text hover', 'paytrail-for-woocommerce' ),
+					'section'  => 'paytrail_checkout_customize_section',
+					'settings' => 'paytrail_group_hover_text',
+				)
+			)
+		);
+		$wp_customize->add_control(
+			new \WP_Customize_Color_Control(
+				$wp_customize,
+				'paytrail_bordercolor_selected',
+				array(
+					'label'    => __( 'Selected payment method', 'paytrail-for-woocommerce' ),
+					'section'  => 'paytrail_checkout_customize_section',
+					'settings' => 'paytrail_method_highlighted',
+				)
+			)
+		);
+		$wp_customize->add_control(
+			new \WP_Customize_Color_Control(
+				$wp_customize,
+				'paytrail_bordercolor_hover',
+				array(
+					'label'    => __( 'Payment method hover', 'paytrail-for-woocommerce' ),
+					'section'  => 'paytrail_checkout_customize_section',
+					'settings' => 'paytrail_method_hover',
+				)
+			)
+		);
+	}
+
+	/**
+	 * Singleton instance getter function
+	 *
+	 * @return Plugin
+	 */
+	public static function instance() {
+		if ( is_null( self::$instance ) ) {
+			// Construct the object.
+			self::$instance = new self();
+
+			// Run initialization checks. If any of the checks
+			// fails, interrupt the execution.
+			if ( ! self::$instance->initialization_checks() ) {
+				return;
+			}
+
+			// Check if Composer has been initialized in this directory.
+			// Otherwise we just use global composer autoloading.
+			if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
+				require_once __DIR__ . '/vendor/autoload.php';
+			}
+
+			// Create new instance of Router class
+			new Router();
+
+			// Add the gateway class to WooCommerce.
+			add_filter(
+				'woocommerce_payment_gateways',
+				function ( $gateways ) {
+					$gateways[] = Gateway::class;
+
+					return $gateways;
+				}
+			);
+
+		}
+
+		return self::$instance;
+	}
+
+	/**
+	 * Run checks for plugin requirements.
+	 *
+	 * Returns false if checks failed.
+	 *
+	 * @return bool
+	 */
+	protected function initialization_checks() {
+		$errors = array();
+
+		$errors[] = self::check_php_version();
+		$errors[] = self::check_woocommerce_active_status();
+		$errors[] = self::check_woocommerce_version();
+
+		$errors = array_filter( $errors );
+
+		if ( ! empty( $errors ) ) {
+			add_action(
+				'admin_notices',
+				function () use ( $errors ) {
+					echo '<div class="notice notice-error">';
+					array_walk( $errors, 'esc_html_e' );
+					echo '</div>';
+				}
+			);
+
+			return false;
+		} else {
+			return true;
+		}
+	}
+
+	/**
+	 * Checks to run on plugin activation
+	 *
+	 * @return void
+	 */
+	public static function activation_check() {
+		$checks = array(
+			'check_php_version',
+			'check_woocommerce_active_status',
+			'check_woocommerce_version',
+		);
+
+		array_walk(
+			$checks,
+			function ( $check ) {
+				$error = call_user_func( __CLASS__ . '::' . $check );
+
+				if ( $error ) {
+					wp_die( esc_html( $error ) );
+				}
+			}
+		);
+	}
+
+	/**
+	 * Ensure that the PHP version is at least 7.3.
+	 *
+	 * @return string|null
+	 */
+	public static function check_php_version(): ?string {
+		if ( ! version_compare( PHP_VERSION, '7.3.0', '>=' ) ) {
+			return sprintf(
+				// translators: The placeholder contains the current PHP version.
+				esc_html__( 'Paytrail payment gateway plugin requires a PHP version of at least 7.3. You are currently running version %1$s.', 'paytrail-for-woocommerce' ),
+				esc_html( PHP_VERSION )
+			);
+		}
+
+		return null;
+	}
+
+	/**
+	 * Ensure that the WooCommerce plugin is active.
+	 *
+	 * @return string|null
+	 */
+	public static function check_woocommerce_active_status(): ?string {
+		if ( ! class_exists( '\WC_Payment_Gateway' ) ) {
+			return esc_html__( 'Paytrail payment gateway plugin requires WooCommerce to be activated.', 'paytrail-for-woocommerce' );
+		}
+
+		return null;
+	}
+
+	/**
 	 * Register blocks support
 	 */
 	public static function register_blocks_support() {
@@ -447,57 +536,57 @@ public static function register_blocks_support() {
 
 			add_action(
 				'woocommerce_blocks_payment_method_type_registration',
-				function( \Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry $payment_method_registry ) {
-				$payment_method_registry->register( new Paytrail_Blocks_Support() );
+				function ( \Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry $payment_method_registry ) {
+					$payment_method_registry->register( new Paytrail_Blocks_Support() );
 				}
 			);
 		}
 	}
 
-    /**
-     * Ensure that we have at least version 3.5 of the WooCommerce plugin.
-     *
-     * @return string|null
-     */
-    public static function check_woocommerce_version() : ?string {
-        if (
-            defined( 'WOO_COMMERCE_VERSION' ) &&
-            version_compare( WOO_COMMERCE_VERSION, '3.5' ) === -1
-        ) {
-            return esc_html__( 'Paytrail gateway plugin requires WooCommerce version of 3.5 or greater.', 'paytrail-for-woocommerce' );
-        }
-
-        return null;
-    }
-
-    /**
-     * Get plugin directory.
-     *
-     * @return string
-     */
-    public function get_plugin_dir() : string {
-        return $this->plugin_dir;
-    }
-
-    /**
-     * Get plugin directory URL.
-     *
-     * @return string
-     */
-    public function get_plugin_dir_url() : string {
-        return $this->plugin_dir_url;
-    }
-
-    /**
-     * Get plugin info.
-     *
-     * @return array
-     */
-    public function get_plugin_info() : array {
-        return $this->plugin_info;
-    }
-
-    /**
+	/**
+	 * Ensure that we have at least version 3.5 of the WooCommerce plugin.
+	 *
+	 * @return string|null
+	 */
+	public static function check_woocommerce_version(): ?string {
+		if (
+			defined( 'WOO_COMMERCE_VERSION' ) &&
+			version_compare( WOO_COMMERCE_VERSION, '3.5' ) === -1
+		) {
+			return esc_html__( 'Paytrail gateway plugin requires WooCommerce version of 3.5 or greater.', 'paytrail-for-woocommerce' );
+		}
+
+		return null;
+	}
+
+	/**
+	 * Get plugin directory.
+	 *
+	 * @return string
+	 */
+	public function get_plugin_dir(): string {
+		return $this->plugin_dir;
+	}
+
+	/**
+	 * Get plugin directory URL.
+	 *
+	 * @return string
+	 */
+	public function get_plugin_dir_url(): string {
+		return $this->plugin_dir_url;
+	}
+
+	/**
+	 * Get plugin info.
+	 *
+	 * @return array
+	 */
+	public function get_plugin_info(): array {
+		return $this->plugin_info;
+	}
+
+	/**
 	 * Plugin url.
 	 *
 	 * @return string
@@ -515,21 +604,24 @@ public static function plugin_abspath() {
 		return trailingslashit( plugin_dir_path( __FILE__ ) );
 	}
 
-    /**
-     * Initialize OP Lasku calculator for product and cart page
-     */
-    public function op_lasku_init() {
-        $settings = get_option('woocommerce_paytrail_settings');
-        
-        if(isset($settings['op_lasku_calculator']) && 'yes' === $settings['op_lasku_calculator']) {
-           new \Paytrail\WooCommercePaymentGateway\Providers\OPLasku();
-        }
-    }
+	/**
+	 * Initialize OP Lasku calculator for product and cart page
+	 */
+	public function op_lasku_init() {
+		$settings = get_option( 'woocommerce_paytrail_settings' );
+
+		if ( isset( $settings['op_lasku_calculator'] ) && 'yes' === $settings['op_lasku_calculator'] ) {
+			new \Paytrail\WooCommercePaymentGateway\Providers\OPLasku();
+		}
+	}
 }
 
-add_action( 'plugins_loaded', function() {
-    Plugin::instance();
-});
+add_action(
+	'plugins_loaded',
+	function () {
+		Plugin::instance();
+	}
+);
 
 
 register_activation_hook( __FILE__, __NAMESPACE__ . '\\Plugin::activation_check' );

From 638b363fa755dfe2f69120a847c66310b87cd147 Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Sun, 30 Nov 2025 01:51:46 +0100
Subject: [PATCH 13/44] Add optional arguments to Singleton trait

---
 src/Traits/Singleton.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Traits/Singleton.php b/src/Traits/Singleton.php
index 02acac7f..d2a2a344 100644
--- a/src/Traits/Singleton.php
+++ b/src/Traits/Singleton.php
@@ -20,11 +20,12 @@ trait Singleton {
 	/**
 	 * Get the instance of the class
 	 *
+	 * @param mixed ...$args Optional arguments to pass to the class constructor.
 	 * @return object
 	 */
-	public static function get_instance() {
+	public static function get_instance( ...$args ) {
 		if ( null === self::$instance ) {
-			self::$instance = new self();
+			self::$instance = new self( ...$args );
 		}
 
 		return self::$instance;

From 2beb3bb06bd70920819562d69ded38b610f368f5 Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Sun, 30 Nov 2025 01:52:23 +0100
Subject: [PATCH 14/44] Implement Singleton trait in Gateway class

---
 src/Controllers/Callback.php     | 2 +-
 src/Controllers/Card.php         | 2 +-
 src/Controllers/CardSuccess.php  | 6 +++---
 src/Gateway.php                  | 2 ++
 src/Model/MetaBox.php            | 2 +-
 src/View/SavedPaymentMethods.php | 2 +-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Controllers/Callback.php b/src/Controllers/Callback.php
index 5cc3a57e..d6dee37c 100644
--- a/src/Controllers/Callback.php
+++ b/src/Controllers/Callback.php
@@ -10,6 +10,6 @@
 class Callback extends AbstractController {
 
 	protected function index() {
-		new Gateway( array( 'callbackMode' => true ) );
+		Gateway::get_instance( array( 'callbackMode' => true ) );
 	}
 }
diff --git a/src/Controllers/Card.php b/src/Controllers/Card.php
index 2d5c981b..fc6f040b 100644
--- a/src/Controllers/Card.php
+++ b/src/Controllers/Card.php
@@ -15,7 +15,7 @@
 class Card extends AbstractController {
 
 	protected function add() {
-		$gateway = new Gateway();
+		$gateway = Gateway::get_instance();
 		try {
 			$gateway->add_card_form();
 		} catch ( \Exception $e ) {
diff --git a/src/Controllers/CardSuccess.php b/src/Controllers/CardSuccess.php
index 39d045f5..9e8aa6fd 100644
--- a/src/Controllers/CardSuccess.php
+++ b/src/Controllers/CardSuccess.php
@@ -12,7 +12,7 @@
 class CardSuccess extends AbstractController {
 
 	protected function checkout() {
-		$gateway = new Gateway();
+		$gateway = Gateway::get_instance();
 		try {
 			$gateway->process_card_token();
 			wc_add_notice( __( 'Card was added successfully', 'paytrail-for-woocommerce' ), 'success' );
@@ -26,7 +26,7 @@ protected function checkout() {
 	}
 
 	protected function my_account() {
-		$gateway = new Gateway();
+		$gateway = Gateway::get_instance();
 		try {
 			$gateway->process_card_token();
 			wc_add_notice( __( 'Card was added successfully', 'paytrail-for-woocommerce' ), 'success' );
@@ -40,7 +40,7 @@ protected function my_account() {
 	}
 
 	protected function change_payment_method() {
-		$gateway = new Gateway();
+		$gateway = Gateway::get_instance();
 		try {
 			$gateway->process_card_token();
 			wc_add_notice( __( 'Card was added successfully', 'paytrail-for-woocommerce' ), 'success' );
diff --git a/src/Gateway.php b/src/Gateway.php
index b6512948..5c421f92 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -26,6 +26,7 @@
 use Paytrail\WooCommercePaymentGateway\Model\PaymentSubscriptionMigration;
 use Paytrail\WooCommercePaymentGateway\Model\PaymentTokenMigration;
 use Paytrail\WooCommercePaymentGateway\Providers\OPLasku;
+use Paytrail\WooCommercePaymentGateway\Traits\Singleton;
 use WC_Order;
 use WC_Order_Query;
 use WC_Order_Item;
@@ -43,6 +44,7 @@
  * @package Paytrail\WooCommercePaymentGateway
  */
 final class Gateway extends \WC_Payment_Gateway {
+	use Singleton;
 
 	/**
 	 * Paytrail merchant ID.
diff --git a/src/Model/MetaBox.php b/src/Model/MetaBox.php
index 931a7ac3..197c8f69 100644
--- a/src/Model/MetaBox.php
+++ b/src/Model/MetaBox.php
@@ -134,7 +134,7 @@ public function get_transaction_id() {
 	 * @return PaymentStatusResponse|null
 	 */
 	private function get_payment_status() {
-		$gateway = new Gateway();
+		$gateway = Gateway::get_instance();
 
 		$request = new PaymentStatusRequest();
 		$request->setTransactionId( $this->order->get_transaction_id() );
diff --git a/src/View/SavedPaymentMethods.php b/src/View/SavedPaymentMethods.php
index 0bd634b9..a72ae1eb 100644
--- a/src/View/SavedPaymentMethods.php
+++ b/src/View/SavedPaymentMethods.php
@@ -26,7 +26,7 @@
 	<?php esc_html_e( 'Pay with saved card', 'paytrail-for-woocommerce' ); ?>
 </div>
 <?php if ( $has_methods ) : ?>
-	<?php ( new Gateway() )->saved_payment_methods(); ?>
+	<?php ( Gateway::get_instance() )->saved_payment_methods(); ?>
 	<a class="paytrail-for-woocommerce-tokenized-payment-method-links delete-card-button button"
 		href="#"><?php esc_html_e( 'Delete selected card', 'paytrail-for-woocommerce' ); ?></a>
 <?php endif; ?>

From 7d644dc40de55089417e2980c53b32c919c12393 Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Mon, 1 Dec 2025 11:54:02 +0100
Subject: [PATCH 15/44] PHPCS and string interpolation

---
 src/Gateway.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Gateway.php b/src/Gateway.php
index 5c421f92..fe98da70 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -245,7 +245,7 @@ protected function add_actions() {
 		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_styles' ) );
 
 		// Check if we are in response phase.
-		add_action( 'template_redirect', array( $this, 'on_redirect_to_thankyou_page' ) );
+		add_action( 'init', array( $this, 'on_redirect_to_thankyou_page' ) );
 	}
 
 

From 6369bdb3c5c641261c433cd12e0619a93b83eae9 Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Thu, 4 Dec 2025 03:15:51 +0100
Subject: [PATCH 16/44] Fix typo

---
 plugin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugin.php b/plugin.php
index ebbc62be..32d62d95 100644
--- a/plugin.php
+++ b/plugin.php
@@ -159,7 +159,7 @@ function () {
 
 		// Enqueue jQuery
 		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_jquery' ) );
-		add_action( 'admin_enqueue_scripts', array( $this, 'enque_jquery_scripts' ) );
+		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_jquery_scripts' ) );
 
 		// Add OP Lasku calculator to the product and cart page
 		add_action( 'woocommerce_init', array( $this, 'op_lasku_init' ) );
@@ -190,7 +190,7 @@ public static function register_intro_scripts() {
 	/**
 	 * Enqueue jQuery UI from WordPress core
 	 */
-	public function enque_jquery_scripts( $hook ) {
+	public function enqueue_jquery_scripts( $hook ) {
 		if ( $hook == 'woocommerce_page_wc-settings' && isset( $_GET['tab'] ) && $_GET['tab'] == 'checkout' && isset( $_GET['section'] ) && $_GET['section'] == 'paytrail' ) {
 
 			wp_enqueue_script( 'jquery' );

From 151a6c9405db989662b202bb963cf36f43aec51a Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Thu, 4 Dec 2025 03:39:18 +0100
Subject: [PATCH 17/44] Remove initialization check

This is already taken care of by WordPress using the header requirements.
---
 plugin.php      | 38 --------------------------------------
 src/Gateway.php |  2 +-
 2 files changed, 1 insertion(+), 39 deletions(-)

diff --git a/plugin.php b/plugin.php
index 32d62d95..381fb3ba 100644
--- a/plugin.php
+++ b/plugin.php
@@ -411,12 +411,6 @@ public static function instance() {
 			// Construct the object.
 			self::$instance = new self();
 
-			// Run initialization checks. If any of the checks
-			// fails, interrupt the execution.
-			if ( ! self::$instance->initialization_checks() ) {
-				return;
-			}
-
 			// Check if Composer has been initialized in this directory.
 			// Otherwise we just use global composer autoloading.
 			if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
@@ -441,38 +435,6 @@ function ( $gateways ) {
 		return self::$instance;
 	}
 
-	/**
-	 * Run checks for plugin requirements.
-	 *
-	 * Returns false if checks failed.
-	 *
-	 * @return bool
-	 */
-	protected function initialization_checks() {
-		$errors = array();
-
-		$errors[] = self::check_php_version();
-		$errors[] = self::check_woocommerce_active_status();
-		$errors[] = self::check_woocommerce_version();
-
-		$errors = array_filter( $errors );
-
-		if ( ! empty( $errors ) ) {
-			add_action(
-				'admin_notices',
-				function () use ( $errors ) {
-					echo '<div class="notice notice-error">';
-					array_walk( $errors, 'esc_html_e' );
-					echo '</div>';
-				}
-			);
-
-			return false;
-		} else {
-			return true;
-		}
-	}
-
 	/**
 	 * Checks to run on plugin activation
 	 *
diff --git a/src/Gateway.php b/src/Gateway.php
index fe98da70..5c421f92 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -245,7 +245,7 @@ protected function add_actions() {
 		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_admin_styles' ) );
 
 		// Check if we are in response phase.
-		add_action( 'init', array( $this, 'on_redirect_to_thankyou_page' ) );
+		add_action( 'template_redirect', array( $this, 'on_redirect_to_thankyou_page' ) );
 	}
 
 

From 3bdf600299c874b838df7ccb1864d9a3529a57ca Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Thu, 4 Dec 2025 03:44:31 +0100
Subject: [PATCH 18/44] Instantiate Gateway immediately

---
 plugin.php | 50 +++++++++++---------------------------------------
 1 file changed, 11 insertions(+), 39 deletions(-)

diff --git a/plugin.php b/plugin.php
index 381fb3ba..12e88883 100644
--- a/plugin.php
+++ b/plugin.php
@@ -132,11 +132,14 @@ protected function __construct() {
 		// Load the plugin textdomain.
 		load_plugin_textdomain( 'paytrail-for-woocommerce', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
 
-		// Register customizations
+		// Initialize the gateway.
+		add_action( 'init', array( Gateway::class, 'get_instance' ) );
+
+		// Register customizations.
 		add_action( 'customize_register', array( $this, 'checkout_customizations' ) );
-		// Add custom styles
+		// Add custom styles.
 		add_action( 'wp_head', array( $this, 'paytrail_checkout_customize_css' ) );
-		// Enable WP Dashicons on frontend
+		// Enable WP Dashicons on frontend.
 		add_action(
 			'wp_enqueue_scripts',
 			function () {
@@ -154,14 +157,14 @@ function () {
 			}
 		);
 
-		// Blocks compatibility
+		// Blocks compatibility.
 		add_action( 'woocommerce_blocks_loaded', array( __CLASS__, 'register_blocks_support' ) );
 
-		// Enqueue jQuery
+		// Enqueue jQuery.
 		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_jquery' ) );
 		add_action( 'admin_enqueue_scripts', array( $this, 'enqueue_jquery_scripts' ) );
 
-		// Add OP Lasku calculator to the product and cart page
+		// Add OP Lasku calculator to the product and cart page.
 		add_action( 'woocommerce_init', array( $this, 'op_lasku_init' ) );
 	}
 
@@ -417,7 +420,7 @@ public static function instance() {
 				require_once __DIR__ . '/vendor/autoload.php';
 			}
 
-			// Create new instance of Router class
+			// Create new instance of Router class.
 			new Router();
 
 			// Add the gateway class to WooCommerce.
@@ -435,30 +438,6 @@ function ( $gateways ) {
 		return self::$instance;
 	}
 
-	/**
-	 * Checks to run on plugin activation
-	 *
-	 * @return void
-	 */
-	public static function activation_check() {
-		$checks = array(
-			'check_php_version',
-			'check_woocommerce_active_status',
-			'check_woocommerce_version',
-		);
-
-		array_walk(
-			$checks,
-			function ( $check ) {
-				$error = call_user_func( __CLASS__ . '::' . $check );
-
-				if ( $error ) {
-					wp_die( esc_html( $error ) );
-				}
-			}
-		);
-	}
-
 	/**
 	 * Ensure that the PHP version is at least 7.3.
 	 *
@@ -578,12 +557,5 @@ public function op_lasku_init() {
 	}
 }
 
-add_action(
-	'plugins_loaded',
-	function () {
-		Plugin::instance();
-	}
-);
-
 
-register_activation_hook( __FILE__, __NAMESPACE__ . '\\Plugin::activation_check' );
+$paytrail = Plugin::instance();
\ No newline at end of file

From 67b6df6e496936d6d675b46fe15ef644d0dee6ec Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Thu, 4 Dec 2025 03:47:53 +0100
Subject: [PATCH 19/44] Use wp_rand instead of rand

---
 src/Gateway.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Gateway.php b/src/Gateway.php
index 5c421f92..7a373e7f 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -888,8 +888,8 @@ public function check_paytrail_response() {
 			return;
 		}
 
-		$sleepTime         = rand( 0, 3 );
-		$sleepTimeCallback = rand( 3, 6 );
+		$sleepTime         = wp_rand( 0, 3 );
+		$sleepTimeCallback = wp_rand( 3, 6 );
 
 		if ( true === $this->callbackMode ) {
 			$this->log( 'Paytrail: Callback check_paytrail_response for order ' . $reference, 'debug' );

From f5f3ad1c326d387a0e85c17f0814a7fbf87deb77 Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Thu, 4 Dec 2025 03:49:55 +0100
Subject: [PATCH 20/44] Allow setting callback mode from public space

---
 src/Controllers/Callback.php | 5 ++++-
 src/Gateway.php              | 8 ++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/Controllers/Callback.php b/src/Controllers/Callback.php
index d6dee37c..370b0363 100644
--- a/src/Controllers/Callback.php
+++ b/src/Controllers/Callback.php
@@ -9,7 +9,10 @@
 
 class Callback extends AbstractController {
 
+	/**
+	 * Index method for the Callback controller
+	 */
 	protected function index() {
-		Gateway::get_instance( array( 'callbackMode' => true ) );
+		Gateway::get_instance()->set_callback_mode( true );
 	}
 }
diff --git a/src/Gateway.php b/src/Gateway.php
index 7a373e7f..56fa0d30 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -248,6 +248,14 @@ protected function add_actions() {
 		add_action( 'template_redirect', array( $this, 'on_redirect_to_thankyou_page' ) );
 	}
 
+	/**
+	 * Set callback mode
+	 *
+	 * @param boolean $mode Callback mode.
+	 */
+	public function set_callback_mode( $mode ) {
+		$this->callbackMode = $mode;
+	}
 
 	/**
 	 * Process Paytrail order on redirect to thankyou-page.

From d8f9cb98318eee5f54db169ed16ccd83aa25c85f Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Thu, 4 Dec 2025 03:51:41 +0100
Subject: [PATCH 21/44] Use snake_case

---
 src/Gateway.php | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/Gateway.php b/src/Gateway.php
index 56fa0d30..05434246 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -80,7 +80,12 @@ final class Gateway extends \WC_Payment_Gateway {
 	 */
 	public $debug = false;
 
-	public $callbackMode = false;
+	/**
+	 * Whether we are in callback mode.
+	 *
+	 * @var boolean
+	 */
+	public $callback_mode = false;
 
 	/**
 	 * Supported features.
@@ -182,26 +187,26 @@ public function __construct( $params = array() ) {
 			$this->secret_key  = $this->get_option( 'secret_key' );
 		}
 
-		$platformName = 'paytrail-for-woocommerce-' . \Paytrail\WooCommercePaymentGateway\Plugin::$version;
+		$platform_name = 'paytrail-for-woocommerce-' . \Paytrail\WooCommercePaymentGateway\Plugin::$version;
 
-		// Create SDK client instance
+		// Create SDK client instance.
 		$this->client = new Client(
 			$this->merchant_id,
 			$this->secret_key,
-			$platformName
+			$platform_name
 		);
 
-		// Create Helper instance
+		// Create Helper instance.
 		$this->helper = new Helper();
 
 		// Whether we are in debug mode or not.
 		$this->debug = 'yes' === $this->get_option( 'debug', 'no' );
 
-		// Check if transaction settlement is enabled
+		// Check if transaction settlement is enabled.
 		$this->transaction_settlement_enable = $this->get_option( 'settlement_enablement', 'no' ) === 'yes';
 
 		if ( ! empty( $params ) && isset( $params['callbackMode'] ) ) {
-			$this->callbackMode = true;
+			$this->callback_mode = true;
 		}
 
 		$this->settlement_prefix = $this->get_option( 'settlement_prefix', '10' );
@@ -209,10 +214,10 @@ public function __construct( $params = array() ) {
 		// Add actions and filters.
 		$this->add_actions();
 
-		// Register stylesheet for payment fields
+		// Register stylesheet for payment fields.
 		$this->register_styles();
 
-		// Register scripts for payment fields
+		// Register scripts for payment fields.
 		$this->register_scripts();
 
 		new Controllers\MetaBox();
@@ -254,7 +259,7 @@ protected function add_actions() {
 	 * @param boolean $mode Callback mode.
 	 */
 	public function set_callback_mode( $mode ) {
-		$this->callbackMode = $mode;
+		$this->callback_mode = $mode;
 	}
 
 	/**
@@ -899,7 +904,7 @@ public function check_paytrail_response() {
 		$sleepTime         = wp_rand( 0, 3 );
 		$sleepTimeCallback = wp_rand( 3, 6 );
 
-		if ( true === $this->callbackMode ) {
+		if ( true === $this->callback_mode ) {
 			$this->log( 'Paytrail: Callback check_paytrail_response for order ' . $reference, 'debug' );
 			$this->log( 'Paytrail: Wait for ' . $sleepTimeCallback . ' seconds until processing order ' . $reference, 'debug' );
 			sleep( $sleepTimeCallback );

From 6a82608bb877057d403cab5444f1918506a9b7cf Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Thu, 4 Dec 2025 03:52:45 +0100
Subject: [PATCH 22/44] Remove Gateway instance params

---
 src/Gateway.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/Gateway.php b/src/Gateway.php
index 05434246..784e86ba 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -149,8 +149,8 @@ final class Gateway extends \WC_Payment_Gateway {
 	/**
 	 * Object constructor
 	 */
-	public function __construct( $params = array() ) {
-		// Set payment gateway ID
+	public function __construct() {
+		// Set payment gateway ID.
 		$this->id = Plugin::GATEWAY_ID;
 
 		$this->has_fields = $this->use_provider_selection();
@@ -205,10 +205,6 @@ public function __construct( $params = array() ) {
 		// Check if transaction settlement is enabled.
 		$this->transaction_settlement_enable = $this->get_option( 'settlement_enablement', 'no' ) === 'yes';
 
-		if ( ! empty( $params ) && isset( $params['callbackMode'] ) ) {
-			$this->callback_mode = true;
-		}
-
 		$this->settlement_prefix = $this->get_option( 'settlement_prefix', '10' );
 
 		// Add actions and filters.

From 07c8bc1fb56089685a435abef786f6c2ce9eabf4 Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Thu, 4 Dec 2025 04:03:43 +0100
Subject: [PATCH 23/44] Use wc_string_to_bool

---
 src/Gateway.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Gateway.php b/src/Gateway.php
index 784e86ba..72d055d9 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -176,7 +176,7 @@ public function __construct() {
 		$this->init_settings();
 
 		// Whether we are in test mode or not.
-		$this->enable_test_mode = 'yes' === $this->get_option( 'enable_test_mode', 'no' );
+		$this->enable_test_mode = wc_string_to_bool( $this->get_option( 'enable_test_mode', 'no' ) );
 
 		// Set merchant ID and secret key either from the options or for test mode.
 		if ( $this->enable_test_mode ) {
@@ -200,10 +200,10 @@ public function __construct() {
 		$this->helper = new Helper();
 
 		// Whether we are in debug mode or not.
-		$this->debug = 'yes' === $this->get_option( 'debug', 'no' );
+		$this->debug = wc_string_to_bool( $this->get_option( 'debug', 'no' ) );
 
 		// Check if transaction settlement is enabled.
-		$this->transaction_settlement_enable = $this->get_option( 'settlement_enablement', 'no' ) === 'yes';
+		$this->transaction_settlement_enable = wc_string_to_bool( $this->get_option( 'settlement_enablement', 'no' ) );
 
 		$this->settlement_prefix = $this->get_option( 'settlement_prefix', '10' );
 

From 3bf6ba9a1cd85fb5ddd1cf72322c3c6f20118bed Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Thu, 4 Dec 2025 04:14:19 +0100
Subject: [PATCH 24/44] Retrieve order using wc_get_orders instead

---
 src/Gateway.php | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/Gateway.php b/src/Gateway.php
index 72d055d9..2c9c08d6 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -20,9 +20,7 @@
 use Paytrail\SDK\Request\RefundRequest;
 use Paytrail\SDK\Client;
 use Paytrail\SDK\Request\EmailRefundRequest;
-use Paytrail\SDK\Model\Provider;
 use Paytrail\SDK\Response\GetTokenResponse;
-use Paytrail\SDK\Response\InvoiceActivationResponse;
 use Paytrail\WooCommercePaymentGateway\Model\PaymentSubscriptionMigration;
 use Paytrail\WooCommercePaymentGateway\Model\PaymentTokenMigration;
 use Paytrail\WooCommercePaymentGateway\Providers\OPLasku;
@@ -926,10 +924,10 @@ public function check_paytrail_response() {
 	 *
 	 * @param string $status The status of the response.
 	 *
-	 * @return void
+	 * @return bool|null
 	 */
 	public function handle_payment_response( $status ) {
-		// Check the HMAC
+		// Check the HMAC.
 		try {
 			$this->client->validateHmac( filter_input_array( INPUT_GET ), '', filter_input( INPUT_GET, 'signature' ) );
 		} catch ( HmacException $exception ) {
@@ -940,7 +938,7 @@ public function handle_payment_response( $status ) {
 		$transaction_id = filter_input( INPUT_GET, 'checkout-transaction-id' );
 
 		try {
-			$order_query = new WC_Order_Query(
+			$orders = wc_get_orders(
 				array(
 					'limit'      => 1,
 					'meta_key'   => '_checkout_reference',
@@ -948,16 +946,18 @@ public function handle_payment_response( $status ) {
 				)
 			);
 
-			$orders = $order_query->get_orders();
-
 			if ( empty( $orders ) ) {
 				$this->log( 'Paytrail: handle_payment_response, orders collection empty for reference: ' . $reference, 'debug' );
 				return;
 			}
-			$order = $orders[0];
 
+			$order = reset( $orders );
+			if ( $order->get_meta( '_checkout_reference' ) !== $reference ) {
+				$this->log( "Paytrail: handle_payment_response, reference mismatch for order {$order->get_id()} and reference: {$reference}", 'debug' );
+				return false;
+			}
 		} catch ( \Exception $e ) {
-			$this->log( 'Paytrail: order_query, failed for reference: ' . $reference, 'debug' );
+			$this->log( "Paytrail: orders query, failed for reference: $reference", 'debug' );
 			return false;
 		}
 
@@ -970,7 +970,7 @@ public function handle_payment_response( $status ) {
 
 			$existing_orders = $transaction_query->get_orders();
 
-			// Cross-check if any other order already has this transaction ID
+			// Cross-check if any other order already has this transaction ID.
 			foreach ( $existing_orders as $existing_order ) {
 				$existing_transaction_id = $existing_order->get_transaction_id();
 
@@ -989,7 +989,7 @@ public function handle_payment_response( $status ) {
 			return false;
 		}
 
-		// Store information that transaction-specific settlement was used
+		// Store information that transaction-specific settlement was used.
 		if ( $this->transaction_settlement_enable ) {
 			$order->update_meta_data( '_paytrail_ppa_transaction_settlement', true );
 			$order->save();
@@ -1005,18 +1005,18 @@ public function handle_payment_response( $status ) {
 
 				$transaction_id = filter_input( INPUT_GET, 'checkout-transaction-id' );
 
-				// If this transaction has already been processed, don't process again
+				// If this transaction has already been processed, don't process again.
 				if ( $order->get_transaction_id() === $transaction_id ) {
 					$this->log( 'Paytrail: handle_payment_response, transaction id ' . $transaction_id . ' already processed for order ' . $order->get_id(), 'debug' );
 					return false;
 				}
 
-				// Save transient to avoid race condition between redirect and callback processing
+				// Save transient to avoid race condition between redirect and callback processing.
 				\set_transient( 'checkout_transaction_id_processing_' . $transaction_id, 'yes', 60 );
 
 				if ( ! $this->use_provider_selection() ) {
 					$this->log( 'Paytrail: handle_payment_response, use_provider_selection = false for order ' . $order->get_id(), 'debug' );
-					// Get the chosen payment provider and save it to the order
+					// Get the chosen payment provider and save it to the order.
 					$payment_provider = filter_input( INPUT_GET, 'checkout-provider' );
 					$payment_amount   = filter_input( INPUT_GET, 'checkout-amount' );
 
@@ -1027,7 +1027,7 @@ public function handle_payment_response( $status ) {
 					if ( ! empty( $providers['error'] ) ) {
 						$provider_name = ucfirst( $payment_provider );
 					} else {
-						// Get only the wanted payment provider object
+						// Get only the wanted payment provider object.
 						$wanted_provider = $this->get_wanted_provider( $providers, $payment_provider );
 						if ( null !== $wanted_provider ) {
 							$provider_name = ! empty( $wanted_provider->getName() ) ? $wanted_provider->getName() : ucfirst( $wanted_provider->getId() );
@@ -1067,7 +1067,7 @@ public function handle_payment_response( $status ) {
 				// Clear the cart.
 				WC()->cart->empty_cart();
 
-				// Delete transient
+				// Delete transient.
 				\delete_transient( 'checkout_transaction_id_processing_' . $transaction_id );
 
 				break;
@@ -1096,9 +1096,9 @@ public function handle_payment_response( $status ) {
 					)
 				);
 
-				if ( is_array( $latest_order_note ) && isset( $latest_order_note[0] ) ) {
+				if ( \is_array( $latest_order_note ) && isset( $latest_order_note[0] ) ) {
 					if ( $latest_order_note[0]->content === $failed_order_note ) {
-						break;// Don't add another note if the latest note is the same
+						break;// Don't add another note if the latest note is the same.
 					}
 				}
 

From c0ef1809b04bcee943034e2ece8afe01d80cd64a Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Thu, 4 Dec 2025 04:18:16 +0100
Subject: [PATCH 25/44] Check if date paid to determine order is processed

---
 src/Gateway.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Gateway.php b/src/Gateway.php
index 2c9c08d6..21ebb60c 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -1150,14 +1150,14 @@ protected function validate_order_payment_processing( WC_Order $order, $retry =
 		return true;
 	}
 
+	/**
+	 * Checks whether an order has already been paid, and thus considered processed.
+	 *
+	 * @param WC_Order $order The WC order.
+	 * @return bool TRUE if paid, FALSE otherwise.
+	 */
 	protected function validate_order_payment_process_status( WC_Order $order ) {
-		$order_status = $order->get_status();
-
-		if ( 'completed' === $order_status || 'processing' === $order_status ) {
-			// This order has already been processed.
-			return false;
-		}
-		return true;
+		return ! empty( $order->get_date_paid() );
 	}
 
 	/**

From ce6448d6ca5dddb57475dfff2b2e81b845d6fdba Mon Sep 17 00:00:00 2001
From: Montazar <github.v0its@slmail.me>
Date: Thu, 4 Dec 2025 10:44:55 +0100
Subject: [PATCH 26/44] Revert "Check if date paid to determine order is
 processed"

This reverts commit c0ef1809b04bcee943034e2ece8afe01d80cd64a.
---
 src/Gateway.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Gateway.php b/src/Gateway.php
index 21ebb60c..2c9c08d6 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -1150,14 +1150,14 @@ protected function validate_order_payment_processing( WC_Order $order, $retry =
 		return true;
 	}
 
-	/**
-	 * Checks whether an order has already been paid, and thus considered processed.
-	 *
-	 * @param WC_Order $order The WC order.
-	 * @return bool TRUE if paid, FALSE otherwise.
-	 */
 	protected function validate_order_payment_process_status( WC_Order $order ) {
-		return ! empty( $order->get_date_paid() );
+		$order_status = $order->get_status();
+
+		if ( 'completed' === $order_status || 'processing' === $order_status ) {
+			// This order has already been processed.
+			return false;
+		}
+		return true;
 	}
 
 	/**

From dfc8457fc07222863afc2492e1fcfc553ffa4a49 Mon Sep 17 00:00:00 2001
From: MichaelBengtsson <michael@krokedil.se>
Date: Fri, 12 Dec 2025 10:57:00 +0100
Subject: [PATCH 27/44] Change Gateway::render_saved_payment_methods to not
 make new class instance

---
 src/Gateway.php           | 2 +-
 src/View/ProviderForm.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Gateway.php b/src/Gateway.php
index 2c9c08d6..980c3798 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -627,7 +627,7 @@ public function receipt_page() {
 	 *
 	 * @return void
 	 */
-	public function render_saved_payment_methods() {
+	public static function render_saved_payment_methods() {
 		$view = new View( 'SavedPaymentMethods' );
 
 		$view->render();
diff --git a/src/View/ProviderForm.php b/src/View/ProviderForm.php
index 083b023e..d5ba6527 100644
--- a/src/View/ProviderForm.php
+++ b/src/View/ProviderForm.php
@@ -95,7 +95,7 @@ function ( $provider ) {
 			);
 		}
 		if ( is_user_logged_in() && 'creditcard' == $group['id'] ) {
-			( new \Paytrail\WooCommercePaymentGateway\Gateway() )->render_saved_payment_methods();
+			\Paytrail\WooCommercePaymentGateway\Gateway::render_saved_payment_methods();
 		} elseif ( get_option( 'users_can_register' ) == 1 && 'creditcard' == $group['id'] ) {
 			$mypage_link = get_permalink( wc_get_page_id( 'myaccount' ) );
 			echo '<p class="add-card-login-description" role="link">';

From 3fc1b6d1b16e08b3782212eff2993504c1ebfd56 Mon Sep 17 00:00:00 2001
From: MichaelBengtsson <michael@krokedil.se>
Date: Fri, 12 Dec 2025 14:16:05 +0100
Subject: [PATCH 28/44] Fix issues with gateway initialization in different
 places

---
 plugin.php                       | 66 +++++++++++++++++++++++---------
 src/Controllers/Callback.php     |  4 +-
 src/Controllers/Card.php         |  4 +-
 src/Controllers/CardSuccess.php  |  8 ++--
 src/Gateway.php                  |  4 --
 src/Model/MetaBox.php            |  4 +-
 src/View/SavedPaymentMethods.php |  4 +-
 7 files changed, 60 insertions(+), 34 deletions(-)

diff --git a/plugin.php b/plugin.php
index 12e88883..bf8d0f0c 100644
--- a/plugin.php
+++ b/plugin.php
@@ -114,6 +114,17 @@ final class Plugin {
 		'Text Domain',
 		'Domain Path',
 	);
+
+	/**
+	 * Gateway instance
+	 *
+	 * @var Gateway
+	 */
+	protected $gateway;
+
+	/**
+	 * Enqueue jQuery script
+	 */
 	public function enqueue_jquery() {
 		// Enqueue jQuery script
 		wp_enqueue_script( 'jquery' );
@@ -132,9 +143,6 @@ protected function __construct() {
 		// Load the plugin textdomain.
 		load_plugin_textdomain( 'paytrail-for-woocommerce', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
 
-		// Initialize the gateway.
-		add_action( 'init', array( Gateway::class, 'get_instance' ) );
-
 		// Register customizations.
 		add_action( 'customize_register', array( $this, 'checkout_customizations' ) );
 		// Add custom styles.
@@ -166,6 +174,25 @@ function () {
 
 		// Add OP Lasku calculator to the product and cart page.
 		add_action( 'woocommerce_init', array( $this, 'op_lasku_init' ) );
+
+		add_action( 'init', array( $this, 'initialize_gateway' ) );
+	}
+
+	/**
+	 * Initialize the gateway
+	 */
+	public function initialize_gateway() {
+		$this->gateway();
+
+		add_filter(
+			'woocommerce_payment_gateways',
+			function ( $gateways ) {
+				$gateways[] = $this->gateway();
+				add_action( 'template_redirect', array( $this->gateway, 'on_redirect_to_thankyou_page' ) );
+
+				return $gateways;
+			}
+		);
 	}
 
 	/**
@@ -411,28 +438,17 @@ public function checkout_customizations( $wp_customize ) {
 	 */
 	public static function instance() {
 		if ( is_null( self::$instance ) ) {
-			// Construct the object.
-			self::$instance = new self();
-
 			// Check if Composer has been initialized in this directory.
 			// Otherwise we just use global composer autoloading.
 			if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
 				require_once __DIR__ . '/vendor/autoload.php';
 			}
 
+			// Construct the object.
+			self::$instance = new self();
+
 			// Create new instance of Router class.
 			new Router();
-
-			// Add the gateway class to WooCommerce.
-			add_filter(
-				'woocommerce_payment_gateways',
-				function ( $gateways ) {
-					$gateways[] = Gateway::class;
-
-					return $gateways;
-				}
-			);
-
 		}
 
 		return self::$instance;
@@ -555,7 +571,21 @@ public function op_lasku_init() {
 			new \Paytrail\WooCommercePaymentGateway\Providers\OPLasku();
 		}
 	}
+
+	/**
+	 * Get the Gateway class instance.
+	 *
+	 * @return Gateway
+	 */
+	public function gateway(): Gateway {
+		// If the gateway is not initialized, initialize it.
+		if ( ! isset( $this->gateway ) ) {
+			$this->gateway = new Gateway();
+		}
+
+		return $this->gateway;
+	}
 }
 
 
-$paytrail = Plugin::instance();
\ No newline at end of file
+$paytrail = Plugin::instance();
diff --git a/src/Controllers/Callback.php b/src/Controllers/Callback.php
index 370b0363..11c44af3 100644
--- a/src/Controllers/Callback.php
+++ b/src/Controllers/Callback.php
@@ -5,7 +5,7 @@
 
 namespace Paytrail\WooCommercePaymentGateway\Controllers;
 
-use Paytrail\WooCommercePaymentGateway\Gateway;
+use Paytrail\WooCommercePaymentGateway\Plugin;
 
 class Callback extends AbstractController {
 
@@ -13,6 +13,6 @@ class Callback extends AbstractController {
 	 * Index method for the Callback controller
 	 */
 	protected function index() {
-		Gateway::get_instance()->set_callback_mode( true );
+		Plugin::instance()->gateway()->set_callback_mode( true );
 	}
 }
diff --git a/src/Controllers/Card.php b/src/Controllers/Card.php
index fc6f040b..9f3fc2ed 100644
--- a/src/Controllers/Card.php
+++ b/src/Controllers/Card.php
@@ -5,7 +5,6 @@
 
 namespace Paytrail\WooCommercePaymentGateway\Controllers;
 
-use Paytrail\WooCommercePaymentGateway\Gateway;
 use Paytrail\WooCommercePaymentGateway\Plugin;
 // use Paytrail\WooCommercePaymentGateway\Exception;
 use WC_Payment_Tokens;
@@ -15,7 +14,8 @@
 class Card extends AbstractController {
 
 	protected function add() {
-		$gateway = Gateway::get_instance();
+		$gateway = Plugin::instance()->gateway();
+
 		try {
 			$gateway->add_card_form();
 		} catch ( \Exception $e ) {
diff --git a/src/Controllers/CardSuccess.php b/src/Controllers/CardSuccess.php
index 9e8aa6fd..932b9df5 100644
--- a/src/Controllers/CardSuccess.php
+++ b/src/Controllers/CardSuccess.php
@@ -7,12 +7,12 @@
 
 use Paytrail\SDK\Exception\HmacException;
 use Paytrail\SDK\Exception\ValidationException;
-use Paytrail\WooCommercePaymentGateway\Gateway;
+use Paytrail\WooCommercePaymentGateway\Plugin;
 
 class CardSuccess extends AbstractController {
 
 	protected function checkout() {
-		$gateway = Gateway::get_instance();
+		$gateway = Plugin::instance()->gateway();
 		try {
 			$gateway->process_card_token();
 			wc_add_notice( __( 'Card was added successfully', 'paytrail-for-woocommerce' ), 'success' );
@@ -26,7 +26,7 @@ protected function checkout() {
 	}
 
 	protected function my_account() {
-		$gateway = Gateway::get_instance();
+		$gateway = Plugin::instance()->gateway();
 		try {
 			$gateway->process_card_token();
 			wc_add_notice( __( 'Card was added successfully', 'paytrail-for-woocommerce' ), 'success' );
@@ -40,7 +40,7 @@ protected function my_account() {
 	}
 
 	protected function change_payment_method() {
-		$gateway = Gateway::get_instance();
+		$gateway = Plugin::instance()->gateway();
 		try {
 			$gateway->process_card_token();
 			wc_add_notice( __( 'Card was added successfully', 'paytrail-for-woocommerce' ), 'success' );
diff --git a/src/Gateway.php b/src/Gateway.php
index 980c3798..1a065d5f 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -24,7 +24,6 @@
 use Paytrail\WooCommercePaymentGateway\Model\PaymentSubscriptionMigration;
 use Paytrail\WooCommercePaymentGateway\Model\PaymentTokenMigration;
 use Paytrail\WooCommercePaymentGateway\Providers\OPLasku;
-use Paytrail\WooCommercePaymentGateway\Traits\Singleton;
 use WC_Order;
 use WC_Order_Query;
 use WC_Order_Item;
@@ -33,8 +32,6 @@
 use WC_Order_Item_Shipping;
 use WC_Payment_Token_CC;
 
-use Paytrail\WooCommercePaymentGateway\Controllers\MetaBox;
-
 /**
  * Class Gateway
  * The Gateway class
@@ -42,7 +39,6 @@
  * @package Paytrail\WooCommercePaymentGateway
  */
 final class Gateway extends \WC_Payment_Gateway {
-	use Singleton;
 
 	/**
 	 * Paytrail merchant ID.
diff --git a/src/Model/MetaBox.php b/src/Model/MetaBox.php
index 197c8f69..53c534ec 100644
--- a/src/Model/MetaBox.php
+++ b/src/Model/MetaBox.php
@@ -9,7 +9,7 @@
 
 use Paytrail\SDK\Request\PaymentStatusRequest;
 use Paytrail\SDK\Response\PaymentStatusResponse;
-use Paytrail\WooCommercePaymentGateway\Gateway;
+use Paytrail\WooCommercePaymentGateway\Plugin;
 
 /**
  * Paytrail for Woocommerce Meta box model class
@@ -134,7 +134,7 @@ public function get_transaction_id() {
 	 * @return PaymentStatusResponse|null
 	 */
 	private function get_payment_status() {
-		$gateway = Gateway::get_instance();
+		$gateway = Plugin::instance()->gateway();
 
 		$request = new PaymentStatusRequest();
 		$request->setTransactionId( $this->order->get_transaction_id() );
diff --git a/src/View/SavedPaymentMethods.php b/src/View/SavedPaymentMethods.php
index a72ae1eb..c420da94 100644
--- a/src/View/SavedPaymentMethods.php
+++ b/src/View/SavedPaymentMethods.php
@@ -1,6 +1,5 @@
 <?php
 
-use Paytrail\WooCommercePaymentGateway\Gateway;
 use Paytrail\WooCommercePaymentGateway\Plugin;
 use Paytrail\WooCommercePaymentGateway\Router;
 
@@ -8,6 +7,7 @@
 if ( ! defined( 'ABSPATH' ) ) {
 	die;
 }
+$gateway = Plugin::instance()->gateway();
 
 $saved_methods = wc_get_customer_saved_methods_list( get_current_user_id() );
 $has_methods   = (bool) $saved_methods;
@@ -26,7 +26,7 @@
 	<?php esc_html_e( 'Pay with saved card', 'paytrail-for-woocommerce' ); ?>
 </div>
 <?php if ( $has_methods ) : ?>
-	<?php ( Gateway::get_instance() )->saved_payment_methods(); ?>
+	<?php $gateway->saved_payment_methods(); ?>
 	<a class="paytrail-for-woocommerce-tokenized-payment-method-links delete-card-button button"
 		href="#"><?php esc_html_e( 'Delete selected card', 'paytrail-for-woocommerce' ); ?></a>
 <?php endif; ?>

From f7b06db3dda446cc75fe64e9ff555fe759da3f6c Mon Sep 17 00:00:00 2001
From: Louise-Krokedil <129946914+Louise-Krokedil@users.noreply.github.com>
Date: Mon, 22 Dec 2025 12:36:35 +0100
Subject: [PATCH 29/44] Bumped WP version after test.

---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index 82549c6c..c38e1a64 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: loueranta, kotivuori
 Donate link: https://www.paytrail.com/
 Tags: woocommerce
 Requires at least: 4.9
-Tested up to: 6.8
+Tested up to: 6.9
 Stable tag: 2.5.3
 Requires PHP: 7.3
 License: MIT

From 8314f17a16711ff66963d90c08d87744d739d2dc Mon Sep 17 00:00:00 2001
From: MichaelBengtsson <michael@krokedil.se>
Date: Wed, 14 Jan 2026 14:08:07 +0100
Subject: [PATCH 30/44] Add support for activating manual invoice when order is
 set to completed

---
 src/Controllers/MetaBox.php | 47 +++++++++++++++++++++++++++++++++++++
 src/Gateway.php             |  3 ++-
 src/Model/MetaBox.php       |  5 +++-
 src/View/MetaBox.php        |  1 -
 4 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/src/Controllers/MetaBox.php b/src/Controllers/MetaBox.php
index 422c1cd1..11011b6d 100644
--- a/src/Controllers/MetaBox.php
+++ b/src/Controllers/MetaBox.php
@@ -7,6 +7,7 @@
 
 namespace Paytrail\WooCommercePaymentGateway\Controllers;
 
+use Paytrail\SDK\Response\InvoiceActivationResponse;
 use Paytrail\WooCommercePaymentGateway\Plugin;
 use Paytrail\WooCommercePaymentGateway\View;
 use Paytrail\WooCommercePaymentGateway\Model;
@@ -23,6 +24,9 @@ class MetaBox extends AbstractController {
 	 */
 	public function __construct() {
 		add_action( 'add_meta_boxes', array( $this, 'register_meta_box' ), 10, 2 );
+
+		// Maybe trigger the manual invoice sending when the order is set to completed.
+		add_action( 'woocommerce_order_status_completed', array( $this, 'maybe_handle_manual_invoice_request' ) );
 	}
 
 	/**
@@ -79,4 +83,47 @@ public function meta_box_content( $order ) {
 
 		( new View( 'MetaBox' ) )->render( $data );
 	}
+
+	/**
+	 * Handles manual invoice request if submitted.
+	 *
+	 * @param int $order_id The WC order ID.
+	 * @return void
+	 */
+	public function maybe_handle_manual_invoice_request( $order_id ) {
+		$order = wc_get_order( $order_id );
+		try {
+			if ( ! $order ) {
+				return;
+			}
+
+			// If the WooCommerce order is not for Paytrail or it has already been paid.
+			if ( Plugin::GATEWAY_ID !== $order->get_payment_method() ) {
+				return;
+			}
+
+			$manual_invoice_providers = array( 'walley', 'klarna' );
+
+			// Only if the order is for a manual invoice order.
+			$model            = new Model\MetaBox( $order );
+			$payment_status   = $model->get_payment_status();
+			$payment_provider = $payment_status ? strtolower( $payment_status->getProvider() ) : '';
+
+			// Ensure the payment status was retrieved, is still pending, and the provider is one that supports manual invoices. Otherwise skip.
+			if ( empty( $payment_status ) || 'pending' !== $payment_status->getStatus() || ! in_array( $payment_provider, $manual_invoice_providers, true ) ) {
+				return;
+			}
+
+			$gateway  = Plugin::instance()->gateway();
+			$client   = $gateway->get_client();
+			$response = $client->activateInvoice( $order->get_transaction_id() );
+			Plugin::instance()->gateway()->log(  InvoiceActivationResponse::class . " Successfully activated invoice for order $order_id with transaction id {$order->get_transaction_id()}: " . json_encode( $response ) );
+		} catch ( \Exception $e ) {
+			$message = $e->getMessage();
+			$gateway->log( "Failed to send manual invoice for order $order_id with transaction id {$order->get_transaction_id()}: $message", 'error' );
+			$order->set_status( 'on-hold', __( 'Failed to activate manual invoice: ' . $message, 'paytrail-for-woocommerce' ) );
+			$order->save();
+			return;
+		}
+	}
 }
diff --git a/src/Gateway.php b/src/Gateway.php
index 1a065d5f..a86a0077 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -774,7 +774,6 @@ public function saved_payment_methods() {
 	 */
 	public function get_token_payment_option_html( $html, $token ) {
 		if ( Plugin::GATEWAY_ID !== $token->get_gateway_id() ) {
-			error_log( 'Not the expected gateway ID. Returning original HTML.' );
 			return $html;
 		}
 		$html = sprintf(
@@ -1068,10 +1067,12 @@ public function handle_payment_response( $status ) {
 
 				break;
 			case 'pending':
+				$transaction_id = filter_input( INPUT_GET, 'checkout-transaction-id' );
 				$this->log( 'Paytrail: handle_payment_response, case = pending', 'debug' );
 				if ( ! $this->validate_order_payment_process_status( $order ) ) {
 					break;
 				}
+				$order->set_transaction_id( $transaction_id );
 				$order->update_status( 'on-hold' );
 				$order->add_order_note( __( 'Payment pending.', 'paytrail-for-woocommerce' ) );
 				break;
diff --git a/src/Model/MetaBox.php b/src/Model/MetaBox.php
index 53c534ec..ee4cf829 100644
--- a/src/Model/MetaBox.php
+++ b/src/Model/MetaBox.php
@@ -133,7 +133,7 @@ public function get_transaction_id() {
 	 *
 	 * @return PaymentStatusResponse|null
 	 */
-	private function get_payment_status() {
+	public function get_payment_status() {
 		$gateway = Plugin::instance()->gateway();
 
 		$request = new PaymentStatusRequest();
@@ -142,10 +142,13 @@ private function get_payment_status() {
 		$client = $gateway->get_client();
 		try {
 			$response = $client->getPaymentStatus( $request );
+			// Log the retrieved response for debugging purposes.
+			Plugin::instance()->gateway()->log(  PaymentStatusRequest::class . ' retrieved: ' . $response->getTransactionId() . ', status: ' . $response->getStatus() . ', amount: ' . $response->getAmount() );
 			if ( $response->getTransactionId() === $this->order->get_transaction_id() ) {
 				return $response;
 			}
 		} catch ( \Exception $e ) {
+			Plugin::instance()->gateway()->log( 'Error retrieving ' . PaymentStatusRequest::class . ': ' . $e->getMessage(), 'error' );
 			return null;
 		}
 
diff --git a/src/View/MetaBox.php b/src/View/MetaBox.php
index af114ee7..801101c4 100644
--- a/src/View/MetaBox.php
+++ b/src/View/MetaBox.php
@@ -26,7 +26,6 @@
 	// translators: Paytrail transaction ID.
 	$transaction_id = sprintf( __( '<strong>Paytrail transaction ID:</strong> %s', 'paytrail-for-woocommerce' ), $data['transaction_id'] );
 }
-
 ?>
 <div class='paytrail-meta-box-content'>
 	<?php if ( isset( $error_message ) ) : ?>

From b29e004e269803a47259572d913a0ec525a221a7 Mon Sep 17 00:00:00 2001
From: MichaelBengtsson <michael@krokedil.se>
Date: Fri, 16 Jan 2026 15:54:06 +0100
Subject: [PATCH 31/44] Fix check for both Walley and Klarna manual invoice
 providers

---
 src/Controllers/MetaBox.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Controllers/MetaBox.php b/src/Controllers/MetaBox.php
index 11011b6d..5f756a79 100644
--- a/src/Controllers/MetaBox.php
+++ b/src/Controllers/MetaBox.php
@@ -25,7 +25,6 @@ class MetaBox extends AbstractController {
 	public function __construct() {
 		add_action( 'add_meta_boxes', array( $this, 'register_meta_box' ), 10, 2 );
 
-		// Maybe trigger the manual invoice sending when the order is set to completed.
 		add_action( 'woocommerce_order_status_completed', array( $this, 'maybe_handle_manual_invoice_request' ) );
 	}
 
@@ -102,15 +101,13 @@ public function maybe_handle_manual_invoice_request( $order_id ) {
 				return;
 			}
 
-			$manual_invoice_providers = array( 'walley', 'klarna' );
-
 			// Only if the order is for a manual invoice order.
 			$model            = new Model\MetaBox( $order );
 			$payment_status   = $model->get_payment_status();
 			$payment_provider = $payment_status ? strtolower( $payment_status->getProvider() ) : '';
 
 			// Ensure the payment status was retrieved, is still pending, and the provider is one that supports manual invoices. Otherwise skip.
-			if ( empty( $payment_status ) || 'pending' !== $payment_status->getStatus() || ! in_array( $payment_provider, $manual_invoice_providers, true ) ) {
+			if ( empty( $payment_status ) || 'pending' !== $payment_status->getStatus() || ( ! str_contains( $payment_provider, 'walley' ) && ! str_contains( $payment_provider, 'klarna' ) ) ) {
 				return;
 			}
 

From 4d9c6b66890f4c676571d9e458f30a26fa32620c Mon Sep 17 00:00:00 2001
From: MichaelBengtsson <michael@krokedil.se>
Date: Wed, 21 Jan 2026 13:08:19 +0100
Subject: [PATCH 32/44] Trigger Gateway::check_paytrail_response() in the
 callback handler

---
 src/Controllers/Callback.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Controllers/Callback.php b/src/Controllers/Callback.php
index 11c44af3..c5f85c90 100644
--- a/src/Controllers/Callback.php
+++ b/src/Controllers/Callback.php
@@ -14,5 +14,6 @@ class Callback extends AbstractController {
 	 */
 	protected function index() {
 		Plugin::instance()->gateway()->set_callback_mode( true );
+		Plugin::instance()->gateway()->check_paytrail_response(); // Trigger the response check to process any potential payment response.
 	}
 }

From 162b025a035c70995bf3cf9d1091239ba8c656bb Mon Sep 17 00:00:00 2001
From: MichaelBengtsson <michael@krokedil.se>
Date: Wed, 21 Jan 2026 13:09:11 +0100
Subject: [PATCH 33/44] Check if order has been paid when preventing a
 transaction from being processed again

---
 src/Gateway.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Gateway.php b/src/Gateway.php
index a86a0077..92d39e1e 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -1001,7 +1001,7 @@ public function handle_payment_response( $status ) {
 				$transaction_id = filter_input( INPUT_GET, 'checkout-transaction-id' );
 
 				// If this transaction has already been processed, don't process again.
-				if ( $order->get_transaction_id() === $transaction_id ) {
+				if ( $order->get_transaction_id() === $transaction_id && ! empty( $order->get_date_paid() ) ) {
 					$this->log( 'Paytrail: handle_payment_response, transaction id ' . $transaction_id . ' already processed for order ' . $order->get_id(), 'debug' );
 					return false;
 				}

From e1de66546463feb90f6f61e3616e071323aa09b4 Mon Sep 17 00:00:00 2001
From: anyakro <anya@krokedil.se>
Date: Tue, 27 Jan 2026 10:39:37 +0100
Subject: [PATCH 34/44] Update description for setting
 manual_invoice_activation

---
 src/Gateway.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Gateway.php b/src/Gateway.php
index 92d39e1e..75d4cc8f 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -447,7 +447,7 @@ protected function set_form_fields() {
 				'label'       => __( 'Enable manual invoice activation', 'paytrail-for-woocommerce' ),
 				'type'        => 'checkbox',
 				'default'     => 'no',
-				'description' => __( 'If paid with invoice payment method, the invoice will not be activated automatically immediately. Currently only supported with Walley.', 'paytrail-for-woocommerce' ),
+				'description' => __( 'For certain invoice payment methods (Walley/Klarna), you can activate the invoice at a later time, for example for pre-ordered products.<br><br><strong>Activation window:</strong><br>Walley: up to 90 days <br>Klarna: up to 28 days', 'paytrail-for-woocommerce' ),
 			),
 			'settlement_enablement'       => array(
 				'title'       => __( 'Enable individual settlements', 'paytrail-for-woocommerce' ),

From 18e8c28fe5e5e5fc64db38e9376a4d50f84f7676 Mon Sep 17 00:00:00 2001
From: anyakro <anya@krokedil.se>
Date: Tue, 27 Jan 2026 11:28:27 +0100
Subject: [PATCH 35/44] Remove double new line

---
 src/Gateway.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Gateway.php b/src/Gateway.php
index 75d4cc8f..26e0b4f7 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -447,7 +447,7 @@ protected function set_form_fields() {
 				'label'       => __( 'Enable manual invoice activation', 'paytrail-for-woocommerce' ),
 				'type'        => 'checkbox',
 				'default'     => 'no',
-				'description' => __( 'For certain invoice payment methods (Walley/Klarna), you can activate the invoice at a later time, for example for pre-ordered products.<br><br><strong>Activation window:</strong><br>Walley: up to 90 days <br>Klarna: up to 28 days', 'paytrail-for-woocommerce' ),
+				'description' => __( 'For certain invoice payment methods (Walley/Klarna), you can activate the invoice at a later time, for example for pre-ordered products.<br><strong>Activation window:</strong><br>Walley: up to 90 days <br>Klarna: up to 28 days', 'paytrail-for-woocommerce' ),
 			),
 			'settlement_enablement'       => array(
 				'title'       => __( 'Enable individual settlements', 'paytrail-for-woocommerce' ),

From 8af0295734deead924b02e286989bf935a4ffe22 Mon Sep 17 00:00:00 2001
From: anyakro <anya@krokedil.se>
Date: Tue, 27 Jan 2026 11:30:47 +0100
Subject: [PATCH 36/44] Grammar fix

---
 src/Gateway.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Gateway.php b/src/Gateway.php
index 26e0b4f7..6adb4f7f 100644
--- a/src/Gateway.php
+++ b/src/Gateway.php
@@ -447,7 +447,7 @@ protected function set_form_fields() {
 				'label'       => __( 'Enable manual invoice activation', 'paytrail-for-woocommerce' ),
 				'type'        => 'checkbox',
 				'default'     => 'no',
-				'description' => __( 'For certain invoice payment methods (Walley/Klarna), you can activate the invoice at a later time, for example for pre-ordered products.<br><strong>Activation window:</strong><br>Walley: up to 90 days <br>Klarna: up to 28 days', 'paytrail-for-woocommerce' ),
+				'description' => __( 'For certain invoice payment methods (Walley/Klarna), you can activate the invoice at a later time, for example for pre-ordered products.<br><strong>Activation window</strong><br>Walley: Up to 90 days <br>Klarna: Up to 28 days', 'paytrail-for-woocommerce' ),
 			),
 			'settlement_enablement'       => array(
 				'title'       => __( 'Enable individual settlements', 'paytrail-for-woocommerce' ),

From 7dde89e21673cc94b5c4952fad6c95fae570751f Mon Sep 17 00:00:00 2001
From: anyakro <anya@krokedil.se>
Date: Tue, 27 Jan 2026 12:00:32 +0100
Subject: [PATCH 37/44] Version 2.6.0

- Added support for manual activation of invoices for payments made with Walley and Klarna invoice methods.
- Fixed compatibility issue with Visma Pay.
---
 CHANGELOG.md      | 6 ++++++
 package-lock.json | 4 ++--
 package.json      | 2 +-
 plugin.php        | 6 +++---
 readme.txt        | 5 ++++-
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bff56eb..e1ef9fcb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.5.3] - 2026-01-27
+### Added
+- Added support for manual activation of invoices for payments made with Walley and Klarna invoice methods.
+### Fixed
+- Fixed compatibility issue with Visma Pay.
+
 ## [2.5.3] - 2025-07-02
 ### Added
 - Added missing accessibility features 
diff --git a/package-lock.json b/package-lock.json
index 2532214e..40aee09b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "paytrail-for-woocommerce",
-    "version": "2.5.2",
+    "version": "2.6.0",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "paytrail-for-woocommerce",
-            "version": "2.5.2",
+            "version": "2.6.0",
             "license": "MIT",
             "dependencies": {
                 "babel-runtime": "^6.23.0",
diff --git a/package.json b/package.json
index 7e3c47a0..941a9a1e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "paytrail-for-woocommerce",
-    "version": "2.5.3",
+    "version": "2.6.0",
     "description": "Paytrail is a payment gateway that offers 20+ payment methods for Finnish customers.",
     "private": true,
     "dependencies": {
diff --git a/plugin.php b/plugin.php
index bf8d0f0c..9599b4ba 100644
--- a/plugin.php
+++ b/plugin.php
@@ -3,13 +3,13 @@
  * Plugin Name: Paytrail for WooCommerce
  * Plugin URI: https://github.com/paytrail/paytrail-for-woocommerce
  * Description: Paytrail is a payment gateway that offers 20+ payment methods for Finnish customers.
- * Version: 2.5.3
+ * Version: 2.6.0
  * Requires at least: 4.9
  * Requires Plugins: woocommerce
- * Tested up to: 6.8
+ * Tested up to: 6.9
  * Requires PHP: 7.3
  * WC requires at least: 3.5
- * WC tested up to: 9.9
+ * WC tested up to: 10.4.3
  * Author: Paytrail
  * Author URI: https://www.paytrail.com/
  * Text Domain: paytrail-for-woocommerce
diff --git a/readme.txt b/readme.txt
index c38e1a64..4cd9f0d4 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Donate link: https://www.paytrail.com/
 Tags: woocommerce
 Requires at least: 4.9
 Tested up to: 6.9
-Stable tag: 2.5.3
+Stable tag: 2.6.0
 Requires PHP: 7.3
 License: MIT
 License URI: https://opensource.org/licenses/MIT
@@ -55,6 +55,9 @@ Test credentials:
 With test credentials, you can test most of the payment methods included in Paytrail’s payment service. You can find the payment method specific credentials needed for testing in Paytrail’s [documentation](https://docs.paytrail.com/#/payment-method-providers).
 
 == Changelog ==
+= 2.6.0 =
+- Added support for manual activation of invoices for payments made with Walley and Klarna invoice methods.
+- Fixed compatibility issue with Visma Pay.
 
 = 2.5.3 =
 - Added missing accessibility features

From 64d062b42a51a169605dba1e1091bbc805abe779 Mon Sep 17 00:00:00 2001
From: anyakro <anya@krokedil.se>
Date: Wed, 28 Jan 2026 10:30:08 +0100
Subject: [PATCH 38/44] Update changelog date

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1ef9fcb..ea0036a4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.5.3] - 2026-01-27
+## [2.5.3] - 2026-01-28
 ### Added
 - Added support for manual activation of invoices for payments made with Walley and Klarna invoice methods.
 ### Fixed

From fae58098b1e82b561401d2720f1512e82c98f448 Mon Sep 17 00:00:00 2001
From: anyakro <anya@krokedil.se>
Date: Wed, 28 Jan 2026 10:35:21 +0100
Subject: [PATCH 39/44] Fix CHANGELOG version

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ea0036a4..1caf5c69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.5.3] - 2026-01-28
+## [2.6.0] - 2026-01-28
 ### Added
 - Added support for manual activation of invoices for payments made with Walley and Klarna invoice methods.
 ### Fixed

From 13155eb6cf2bf4d9b14efa349bf89271a87105a0 Mon Sep 17 00:00:00 2001
From: anyakro <anya@krokedil.se>
Date: Wed, 28 Jan 2026 11:00:00 +0100
Subject: [PATCH 40/44] Escape needed output

---
 src/View/Intro-form.php   | 50 ++++++++++++++++++++++++++++++++++++---
 src/View/ProviderForm.php |  8 ++++++-
 2 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/src/View/Intro-form.php b/src/View/Intro-form.php
index a2eed100..9004ba59 100644
--- a/src/View/Intro-form.php
+++ b/src/View/Intro-form.php
@@ -20,7 +20,21 @@
 				$sales_link = 'https://www.paytrail.com/en/contact-us';
 				?>
 				<p style="font-size:15px;">
-					<?php /* translators: Or <a href="%s" target="_blank">contact sales</a> */ printf( __( 'Or <a href="%s" target="_blank">contact sales</a>' ), esc_html( $sales_link ) ); ?>
+					<?php
+					/* translators: Or <a href="%s" target="_blank">contact sales</a> */
+					printf(
+						wp_kses(
+							__( 'Or <a href="%s" target="_blank">contact sales</a>', 'paytrail-for-woocommerce' ),
+							array(
+								'a' => array(
+									'href'   => array(),
+									'target' => array(),
+								),
+							)
+						),
+						esc_url( $sales_link )
+					);
+					?>
 				</p>
 			</div>
 		</div>
@@ -32,7 +46,21 @@
 				$merchant_link = 'https://merchant.paytrail.com/';
 				?>
 				<p style="font-size:15px;">
-					<?php /* translators: Credentials can be found in the <a href="%s" target="_blank">merchant panel</a> */ printf( __( 'Credentials can be found in the <a href="%s" target="_blank">merchant panel</a>' ), esc_html( $merchant_link ) ); ?>
+					<?php
+					/* translators: Credentials can be found in the <a href="%s" target="_blank">merchant panel</a> */
+					printf(
+						wp_kses(
+							__( 'Credentials can be found in the <a href="%s" target="_blank">merchant panel</a>', 'paytrail-for-woocommerce' ),
+							array(
+								'a' => array(
+									'href'   => array(),
+									'target' => array(),
+								),
+							)
+						),
+						esc_url( $merchant_link )
+					);
+					?>
 				</p>
 			</div>
 		</div>
@@ -41,7 +69,23 @@
 			$customer_service_link = 'https://www.paytrail.com/en/customer-service#merchants/';
 			?>
 			<h2 style="font-weight:300;color:#fff;">
-				<?php /* translators: <b>Need help?</b> Dont hesitate to <a href="%s" target="_blank" style="color:#fff;">contact support!</a> */ printf( __( '<b>Need help?</b> Dont hesitate to <a href="%s" target="_blank" style="color:#fff;">contact support!</a>' ), esc_html( $customer_service_link ) ); ?>
+				<?php
+				/* translators: <b>Need help?</b> Don't hesitate to <a href="%s" target="_blank" style="color:#fff;">contact support!</a> */
+				printf(
+					wp_kses(
+						__( '<b>Need help?</b> Don\'t hesitate to <a href="%s" target="_blank" style="color:#fff;">contact support!</a>', 'paytrail-for-woocommerce' ),
+						array(
+							'b' => array(),
+							'a' => array(
+								'href'   => array(),
+								'target' => array(),
+								'style'  => array(),
+							),
+						)
+					),
+					esc_url( $customer_service_link )
+				);
+				?>
 			</h2>
 		</div>
 		<div classs="paytrail-intro-footer" style="display:flex;align-items: center;justify-content:center;padding-top:25px;padding-bottom:25px;width:calc(100% - 2px);background-color:#fff;;border:1px solid #D92D83;">
diff --git a/src/View/ProviderForm.php b/src/View/ProviderForm.php
index d5ba6527..e3b3e3d2 100644
--- a/src/View/ProviderForm.php
+++ b/src/View/ProviderForm.php
@@ -100,7 +100,13 @@ function ( $provider ) {
 			$mypage_link = get_permalink( wc_get_page_id( 'myaccount' ) );
 			echo '<p class="add-card-login-description" role="link">';
 			/* translators: %s - Logging link */
-			printf( __( 'You can save your card details for next time by <a href="%s">logging in to the store or by creating an account.</a>' ), esc_html( $mypage_link ) );
+			printf(
+				esc_html__(
+					'You can save your card details for next time by <a href="%s">logging in to the store or by creating an account.</a>',
+					'paytrail-for-woocommerce'
+				),
+				esc_url( $mypage_link )
+			);
 			echo '</p>';
 		}
 		echo '</ul>';

From f3d3a216f6d63fe4fed55f0a7a7003732f4c3bee Mon Sep 17 00:00:00 2001
From: anyakro <anya@krokedil.se>
Date: Wed, 28 Jan 2026 11:13:09 +0100
Subject: [PATCH 41/44] Fix translators placement

---
 src/View/Intro-form.php   | 21 +++++++++++++++------
 src/View/ProviderForm.php |  2 +-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/View/Intro-form.php b/src/View/Intro-form.php
index 9004ba59..bf3fefb9 100644
--- a/src/View/Intro-form.php
+++ b/src/View/Intro-form.php
@@ -21,10 +21,13 @@
 				?>
 				<p style="font-size:15px;">
 					<?php
-					/* translators: Or <a href="%s" target="_blank">contact sales</a> */
 					printf(
 						wp_kses(
-							__( 'Or <a href="%s" target="_blank">contact sales</a>', 'paytrail-for-woocommerce' ),
+							/* translators: %s - Sales contact URL */
+							__(
+								'Or <a href="%s" target="_blank">contact sales</a>',
+								'paytrail-for-woocommerce'
+							),
 							array(
 								'a' => array(
 									'href'   => array(),
@@ -47,10 +50,13 @@
 				?>
 				<p style="font-size:15px;">
 					<?php
-					/* translators: Credentials can be found in the <a href="%s" target="_blank">merchant panel</a> */
 					printf(
 						wp_kses(
-							__( 'Credentials can be found in the <a href="%s" target="_blank">merchant panel</a>', 'paytrail-for-woocommerce' ),
+							/* translators: %s - Merchant URL */
+							__(
+								'Credentials can be found in the <a href="%s" target="_blank">merchant panel</a>',
+								'paytrail-for-woocommerce'
+							),
 							array(
 								'a' => array(
 									'href'   => array(),
@@ -70,10 +76,13 @@
 			?>
 			<h2 style="font-weight:300;color:#fff;">
 				<?php
-				/* translators: <b>Need help?</b> Don't hesitate to <a href="%s" target="_blank" style="color:#fff;">contact support!</a> */
 				printf(
+					/* translators: %s - Customer service URL */
 					wp_kses(
-						__( '<b>Need help?</b> Don\'t hesitate to <a href="%s" target="_blank" style="color:#fff;">contact support!</a>', 'paytrail-for-woocommerce' ),
+						__(
+							'<b>Need help?</b> Don\'t hesitate to <a href="%s" target="_blank" style="color:#fff;">contact support!</a>',
+							'paytrail-for-woocommerce'
+						),
 						array(
 							'b' => array(),
 							'a' => array(
diff --git a/src/View/ProviderForm.php b/src/View/ProviderForm.php
index e3b3e3d2..651cc45a 100644
--- a/src/View/ProviderForm.php
+++ b/src/View/ProviderForm.php
@@ -99,8 +99,8 @@ function ( $provider ) {
 		} elseif ( get_option( 'users_can_register' ) == 1 && 'creditcard' == $group['id'] ) {
 			$mypage_link = get_permalink( wc_get_page_id( 'myaccount' ) );
 			echo '<p class="add-card-login-description" role="link">';
-			/* translators: %s - Logging link */
 			printf(
+				/* translators: %s - My account / login URL */
 				esc_html__(
 					'You can save your card details for next time by <a href="%s">logging in to the store or by creating an account.</a>',
 					'paytrail-for-woocommerce'

From d8537802a9b3b47671c1734f1778ed1e9f9a9047 Mon Sep 17 00:00:00 2001
From: anyakro <anya@krokedil.se>
Date: Wed, 28 Jan 2026 11:15:40 +0100
Subject: [PATCH 42/44] Move translator

---
 src/View/Intro-form.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/View/Intro-form.php b/src/View/Intro-form.php
index bf3fefb9..677af900 100644
--- a/src/View/Intro-form.php
+++ b/src/View/Intro-form.php
@@ -77,8 +77,8 @@
 			<h2 style="font-weight:300;color:#fff;">
 				<?php
 				printf(
-					/* translators: %s - Customer service URL */
 					wp_kses(
+						/* translators: %s - Customer service URL */
 						__(
 							'<b>Need help?</b> Don\'t hesitate to <a href="%s" target="_blank" style="color:#fff;">contact support!</a>',
 							'paytrail-for-woocommerce'

From 52e03347aaf9f63b8eacab4b1ece14c2e2bb73e0 Mon Sep 17 00:00:00 2001
From: anyakro <anya@krokedil.se>
Date: Wed, 28 Jan 2026 12:00:14 +0100
Subject: [PATCH 43/44] Use wp_kses for card detail link

---
 src/View/ProviderForm.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/View/ProviderForm.php b/src/View/ProviderForm.php
index 651cc45a..6b6112f7 100644
--- a/src/View/ProviderForm.php
+++ b/src/View/ProviderForm.php
@@ -100,10 +100,14 @@ function ( $provider ) {
 			$mypage_link = get_permalink( wc_get_page_id( 'myaccount' ) );
 			echo '<p class="add-card-login-description" role="link">';
 			printf(
-				/* translators: %s - My account / login URL */
-				esc_html__(
-					'You can save your card details for next time by <a href="%s">logging in to the store or by creating an account.</a>',
-					'paytrail-for-woocommerce'
+				wp_kses(
+					/* translators: %s - My account / login URL */
+					__( 'You can save your card details for next time by <a href="%s">logging in to the store or by creating an account.</a>', 'paytrail-for-woocommerce' ),
+					array(
+						'a' => array(
+							'href' => array(),
+						),
+					)
 				),
 				esc_url( $mypage_link )
 			);

From 32e9115dcd7cb7624aa436f53477a200fc54f406 Mon Sep 17 00:00:00 2001
From: MichaelBengtsson <michael@krokedil.se>
Date: Mon, 2 Feb 2026 16:24:30 +0100
Subject: [PATCH 44/44] Remove unused singleton trait

---
 src/Traits/Singleton.php | 51 ----------------------------------------
 1 file changed, 51 deletions(-)
 delete mode 100644 src/Traits/Singleton.php

diff --git a/src/Traits/Singleton.php b/src/Traits/Singleton.php
deleted file mode 100644
index d2a2a344..00000000
--- a/src/Traits/Singleton.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-namespace Paytrail\WooCommercePaymentGateway\Traits;
-
-defined( 'ABSPATH' ) || exit;
-
-/**
- * Trait Singleton
- *
- * A trait to make a class a singleton
- */
-trait Singleton {
-
-	/**
-	 * Instance of the class
-	 *
-	 * @var object
-	 */
-	private static $instance;
-
-	/**
-	 * Get the instance of the class
-	 *
-	 * @param mixed ...$args Optional arguments to pass to the class constructor.
-	 * @return object
-	 */
-	public static function get_instance( ...$args ) {
-		if ( null === self::$instance ) {
-			self::$instance = new self( ...$args );
-		}
-
-		return self::$instance;
-	}
-
-	/**
-	 * Prevent creating a new instance of the class
-	 */
-	private function __construct() {
-	}
-
-	/**
-	 * Prevent cloning the instance of the class
-	 */
-	public function __clone() {
-	}
-
-	/**
-	 * Prevent unserializing the instance of the class
-	 */
-	public function __wakeup() {
-	}
-}